Initial implementation of Locale framework, with updates to asyncLoad to handle json files, and updates to testsuite.

Author: dpvc

components/json.cjs

@@ -0,0 +1,2 @@
+module.exports.json = async function (file) {return require(file)};
+module.exports.require = require;

components/mjs/core/core.js

@@ -1,7 +1,9 @@
+import './locale.js';
 import './lib/core.js';
 
 import {HTMLHandler} from '#js/handlers/html/HTMLHandler.js';
 import {browserAdaptor} from '#js/adaptors/browserAdaptor.js';
+import {Package} from '#js/components/package.js';
 
 if (MathJax.startup) {
   MathJax.startup.registerConstructor('HTMLHandler', HTMLHandler);
@@ -11,9 +13,16 @@ if (MathJax.startup) {
 }
 if (MathJax.loader) {
   const config = MathJax.config.loader;
-  MathJax._.mathjax.mathjax.asyncLoad = (
-    (name) => name.substring(0, 5) === 'node:'
+  const {mathjax} = MathJax._.mathjax;
+  mathjax.asyncLoad = (name => {
+    if (name.match(/\.json$/)) {
+      if (name.charAt(0) === '[') {
+        name = Package.resolvePath(name);
+      }
+      return (config.json || mathjax.json)(name).then((data) => data.default ?? data);
+    }
+    return name.substring(0, 5) === 'node:'
       ? config.require(name)
-      : MathJax.loader.load(name).then(result => result[0])
-  );
+      : MathJax.loader.load(name).then(result => result[0]);
+  });
 }

components/mjs/core/locale.js

@@ -0,0 +1,4 @@
+import {Locale} from '#js/util/Locale.js';
+
+Locale.isComponent = true;
+

components/mjs/input/tex/extensions/bbox/config.json

@@ -4,6 +4,11 @@
     "component": "input/tex/extensions/bbox",
     "targets": ["input/tex/bbox"]
   },
+  "copy": {
+    "to": "[bundle]/input/tex/extensions/bbox",
+    "from": "[ts]/input/tex/bbox",
+    "copy": ["locales"]
+  },
   "webpack": {
     "name": "input/tex/extensions/bbox",
     "libs": [

components/mjs/node-main/node-main.js

@@ -21,16 +21,16 @@
 
 import '../startup/init.js';
 import {Loader, CONFIG} from '#js/components/loader.js';
-import {Package} from '#js/components/package.js';
-import {combineDefaults, combineConfig} from '#js/components/global.js';
+import {MathJax, combineDefaults, combineConfig} from '#js/components/global.js';
+import {resolvePath} from '#js/util/AsyncLoad.js';
 import {context} from '#js/util/context.js';
 import '../core/core.js';
 import '../adaptors/liteDOM/liteDOM.js';
 import {source} from '../source.js';
 
-const MathJax = global.MathJax;
-
-const path = eval('require("path")');   // get path from node, not webpack
+const REQUIRE = eval('require');          // get require from node, not webpack
+const path = REQUIRE("path");
+const fs = REQUIRE("fs").promises;
 const dir = context.path(MathJax.config.__dirname);   // set up by node-main.mjs or node-main.cjs
 
 /*
@@ -48,23 +48,26 @@ combineDefaults(MathJax.config, 'output', {font: 'mathjax-newcm'});
  */
 Loader.preLoaded('loader', 'startup', 'core', 'adaptors/liteDOM');
 
+/*
+ * Set the paths.
+ */
 if (path.basename(dir) === 'node-main') {
   CONFIG.paths.esm = CONFIG.paths.mathjax;
   CONFIG.paths.sre = '[esm]/sre';
-  CONFIG.paths.mathjax = path.dirname(dir);
+  CONFIG.paths.mathjax = path.resolve(dir, '..', '..', '..', 'bundle');
   combineDefaults(CONFIG, 'source', source);
 } else {
   CONFIG.paths.mathjax = dir;
 }
-//
-//  Set the asynchronous loader to use the js directory, so we can load
-//  other files like entity definitions
-//
-const ROOT = path.resolve(dir, '..', '..', '..', path.basename(path.dirname(dir)));
-const REQUIRE = MathJax.config.loader.require;
+
+/*
+ * Set the asynchronous loader to handle json files
+ */
 MathJax._.mathjax.mathjax.asyncLoad = function (name) {
-  return REQUIRE(name.charAt(0) === '.' ? path.resolve(ROOT, name) :
-                 name.charAt(0) === '[' ? Package.resolvePath(name) : name);
+  const file = resolvePath(name, (name) => path.resolve(CONFIG.paths.mathjax, name));
+  return file.match(/\.json$/)
+    ? fs.readFile(REQUIRE.resolve(file)).then((json) => JSON.parse(json))
+    : REQUIRE(file);
 };
 
 /*

components/mjs/require/config.json

@@ -3,7 +3,8 @@
     "to": "[bundle]",
     "from": "../..",
     "copy": [
-      "require.mjs"
+      "require.mjs",
+      "json.cjs"
     ]
   }
 }

package.json

@@ -80,10 +80,11 @@
     "clean:lib": "clean() { pnpm -s log:single \"Cleaning $1 component libs\"; pnpm rimraf -g components/$1'/**/lib'; }; clean",
     "clean:mod": "clean() { pnpm -s log:comp \"Cleaning $1 module\"; pnpm -s clean:dir $1 && pnpm -s clean:lib $1; }; clean",
     "=============================================================================== copy": "",
-    "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy",
+    "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy",
     "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy",
+    "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/*/locales/*.json' $1/input/tex/extensions; }; copy",
     "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy",
-    "copy:mml3": "copy() { pnpm -s log:single 'Copying legacy code MathML3'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy",
+    "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy",
     "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy",
     "=============================================================================== log": "",
     "log:comp": "log() { echo \u001b[32m$1\u001b[0m; }; log",

testsuite/lib/AsyncLoad.child.json

@@ -0,0 +1,3 @@
+{
+  "json": true
+}

testsuite/lib/component/locales/en.json

@@ -0,0 +1,3 @@
+{
+  "Id1": "Test of %1 in %2"
+}

testsuite/lib/component/locales/test.json

@@ -0,0 +1,8 @@
+{
+  "test1": "Has %% percent",
+  "test2": "Has %1 one",
+  "test3": "Order %2 %1 reversed",
+  "test4": "Skip %1 %3",
+  "test5": "Named %{hello} %world",
+  "error": "Error in %1"
+}