From 1d991bb4bc877363532971a74f70e55939c637bb Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 9 Nov 2023 20:16:30 -0400
Subject: upd8, data, test: export internal strings path cleanly, fix tests

---
 src/repl.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/repl.js')

diff --git a/src/repl.js b/src/repl.js
index 7a6f5c45..3f5d752a 100644
--- a/src/repl.js
+++ b/src/repl.js
@@ -5,7 +5,7 @@ import {fileURLToPath} from 'node:url';
 
 import {logError, logWarn, parseOptions} from '#cli';
 import {isMain} from '#node-utils';
-import {processLanguageFile} from '#language';
+import {internalDefaultStringsFile, processLanguageFile} from '#language';
 import {bindOpts, showAggregate} from '#sugar';
 import {generateURLs, urlSpec} from '#urls';
 import {quickLoadAllFromYAML} from '#yaml';
@@ -16,8 +16,6 @@ import * as serialize from '#serialize';
 import * as sugar from '#sugar';
 import * as wikiDataUtils from '#wiki-data';
 
-import {DEFAULT_STRINGS_FILE} from './upd8.js';
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export async function getContextAssignments({
@@ -45,10 +43,7 @@ export async function getContextAssignments({
 
   let language;
   try {
-    language = await processLanguageFile(
-      path.join(
-        path.dirname(fileURLToPath(import.meta.url)),
-        DEFAULT_STRINGS_FILE));
+    language = await processLanguageFile(internalDefaultStringsFile);
   } catch (error) {
     console.error(error);
     logWarn`Failed to create Language object`;
-- 
cgit 1.3.0-6-gf8a5


From b053fa14052aaa24883e73a3f899016f963b5d43 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 14 Nov 2023 21:45:08 -0400
Subject: data: expose CacheableObject directly via #cacheable-object import

---
 src/repl.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/repl.js')

diff --git a/src/repl.js b/src/repl.js
index ead01567..26879be4 100644
--- a/src/repl.js
+++ b/src/repl.js
@@ -11,7 +11,8 @@ import {generateURLs, urlSpec} from '#urls';
 import {quickLoadAllFromYAML} from '#yaml';
 
 import _find, {bindFind} from '#find';
-import thingConstructors, {CacheableObject} from '#things';
+import CacheableObject from '#cacheable-object';
+import thingConstructors from '#things';
 import * as serialize from '#serialize';
 import * as sugar from '#sugar';
 import * as wikiDataUtils from '#wiki-data';
-- 
cgit 1.3.0-6-gf8a5