clean up imports & miscellaneous metastructures across codebase

3 files changed, 15 insertions, 12 deletions

diff --git a/test/lib/content-function.js b/test/lib/content-function.js
index a9e5f449..bb12be82 100644
--- a/test/lib/content-function.js
+++ b/test/lib/content-function.js
@@ -1,17 +1,17 @@
+import * as path from 'node:path';
+import {fileURLToPath} from 'node:url';
+
 import chroma from 'chroma-js';
-import * as path from 'path';
-import {fileURLToPath} from 'url';
+
+import {getColors} from '#colors';
+import {quickLoadContentDependencies} from '#content-dependencies';
+import {quickEvaluate} from '#content-function';
+import * as html from '#html';
+import {processLanguageFile} from '#language';
+import {empty, showAggregate} from '#sugar';
+import {generateURLs, thumb, urlSpec} from '#urls';
 
 import mock from './generic-mock.js';
-import {quickEvaluate} from '../../src/content-function.js';
-import {quickLoadContentDependencies} from '../../src/content/dependencies/index.js';
-
-import urlSpec from '../../src/url-spec.js';
-import * as html from '../../src/util/html.js';
-import {empty, showAggregate} from '../../src/util/sugar.js';
-import {getColors} from '../../src/util/colors.js';
-import {generateURLs, thumb} from '../../src/util/urls.js';
-import {processLanguageFile} from '../../src/data/language.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
diff --git a/test/lib/generic-mock.js b/test/lib/generic-mock.js
index 119f8731..28309ab0 100644
--- a/test/lib/generic-mock.js
+++ b/test/lib/generic-mock.js
@@ -1,6 +1,6 @@
 import {same} from 'tcompare';
 
-import {empty} from '../../src/util/sugar.js';
+import {empty} from '#sugar';
 
 export default function mock(callback) {
   const mocks = [];
diff --git a/test/lib/index.js b/test/lib/index.js
new file mode 100644
index 00000000..b9cc82f8
--- /dev/null
+++ b/test/lib/index.js
@@ -0,0 +1,3 @@
+export * from './content-function.js';
+export * from './generic-mock.js';
+export * from './strict-match-error.js';