clean up imports & miscellaneous metastructures across codebase

2 files changed, 11 insertions, 21 deletions

diff --git a/data-tests/index.js b/data-tests/index.js
index 1b9ec99..b05de9e 100644
--- a/data-tests/index.js
+++ b/data-tests/index.js
@@ -1,23 +1,13 @@
+import * as path from 'node:path';
+import {fileURLToPath} from 'node:url';
+
 import chokidar from 'chokidar';
-import * as path from 'path';
-import {fileURLToPath} from 'url';
-
-import {quickLoadAllFromYAML} from '../../src/data/yaml.js';
-import {isMain} from '../../src/util/node-utils.js';
-import {getContextAssignments} from '../../src/repl.js';
-
-import {
-  color,
-  logError,
-  logInfo,
-  logWarn,
-  parseOptions,
-} from '../../src/util/cli.js';
-
-import {
-  bindOpts,
-  showAggregate,
-} from '../../src/util/sugar.js';
+
+import {color, logError, logInfo, logWarn, parseOptions} from '#cli';
+import {isMain} from '#node-utils';
+import {getContextAssignments} from '#repl';
+import {bindOpts, showAggregate} from '#sugar';
+import {quickLoadAllFromYAML} from '#yaml';
 
 async function main() {
   const miscOptions = await parseOptions(process.argv.slice(2), {
diff --git a/data-tests/test-order-of-album-groups.js b/data-tests/test-order-of-album-groups.js
index de2fcbe..57500e3 100644
--- a/data-tests/test-order-of-album-groups.js
+++ b/data-tests/test-order-of-album-groups.js
@@ -1,4 +1,4 @@
-import * as util from 'util';
+import {inspect} from 'node:util';
 
 export default function({
   albumData,
@@ -38,7 +38,7 @@ export default function({
   for (const album of badAlbums) {
     console.log('-', album);
     for (const group of album.groups) {
-      console.log(`  - ${util.inspect(group)}`)
+      console.log(`  - ${inspect(group)}`)
     }
   }