Merge pull request #1286 from mathjax/update/mathmap-config

Improve mathmap configuration

Author: dpvc

components/mjs/a11y/speech/speech.js

@@ -7,18 +7,21 @@ import {SpeechHandler} from '#js/a11y/speech.js';
 
 if (MathJax.loader) {
   let path = Package.resolvePath('[sre]', false);
+  let maps = Package.resolvePath('[mathmaps]', false);
   if (hasWindow) {
     path = new URL(path, location).href;
+    maps = new URL(maps, location).href;
   } else {
     const REQUIRE = typeof require !== 'undefined' ? require : MathJax.config.loader.require;
     if (REQUIRE?.resolve) {
-      path = REQUIRE.resolve(`${path}/require.mjs`).replace(/\/[^\/]*$/, '');
+      path = REQUIRE.resolve(`${path}/package.json`).replace(/\/[^\/]*$/, '');
+      maps = REQUIRE.resolve(`${maps}/base.json`).replace(/\/[^\/]*$/, '');
     } else {
-      path = '';
+      path = maps = '';
     }
   }
   if (path) {
-    combineDefaults(MathJax.config, 'options', { worker: { path } });
+    combineDefaults(MathJax.config, 'options', { worker: { path, maps } });
   }
 }
 

components/mjs/dependencies.js

@@ -67,7 +67,8 @@ export const dependencies = {
 export const paths = {
   tex: '[mathjax]/input/tex/extensions',
   mml: '[mathjax]/input/mml/extensions',
-  sre: '[mathjax]/sre'
+  sre: '[mathjax]/sre',
+  mathmaps: '[sre]/mathmaps',
 };
 
 export const provides = {

components/mjs/source.js

@@ -75,6 +75,7 @@ export const source = {
   'a11y/complexity': `${src}/a11y/complexity/complexity.js`,
   'a11y/explorer': `${src}/a11y/explorer/explorer.js`,
   'a11y/sre': `${src}/a11y/sre/sre.js`,
+  '[mathmaps]': `${src}/../../bundle/sre/mathmaps`,
   'ui/lazy': `${src}/ui/lazy/lazy.js`,
   'ui/menu': `${src}/ui/menu/menu.js`,
   'ui/safe': `${src}/ui/safe/safe.js`,

lab/build/init.js

@@ -1,2 +1 @@
-import './init.js';
 export * from '#js/a11y/sre/sre.js';

lab/build/sre.js

@@ -170,6 +170,6 @@
     "@mathjax/mathjax-newcm-font": "4.0.0-rc.2",
     "mhchemparser": "^4.2.1",
     "mj-context-menu": "^0.9.1",
-    "speech-rule-engine": "5.0.0-alpha.6"
+    "speech-rule-engine": "5.0.0-alpha.7"
   }
 }

package.json

@@ -221,6 +221,7 @@ export function SpeechMathDocumentMixin<
       }),
       worker: {
         path: sreRoot(),
+        maps: sreRoot().replace(/[cm]js\/a11y\/sre$/, 'bundle/sre/mathmaps'),
         worker: 'speech-worker.js',
         debug: false,
       },

pnpm-lock.yaml

@@ -47,14 +47,20 @@ declare const SRE: any;
   // Set up for node worker_threads versus browser webworker
   //
   if (typeof self === 'undefined') {
-    self = global.self = global; // for node, make self be the global object
+    //
+    // For node, make self be the global object
+    //
+    self = global.self = global;
 
-    global.DedicatedWorkerGlobalScope = global.constructor; // so SRE knows we are a worker
+    //
+    // This is so SRE knows we are a worker
+    //
+    global.DedicatedWorkerGlobalScope = global.constructor;
 
     //
-    // Create addEventListener() and postMessage() function
+    // Create addEventListener() and postMessage() functions
     //
-    const { parentPort } = await import(
+    const { parentPort, workerData } = await import(
       /* webpackIgnore: true */ 'node:worker_threads'
     );
     global.addEventListener = (
@@ -68,25 +74,38 @@ declare const SRE: any;
     };
 
     //
-    // SRE needs require(), and we use it to load mathmaps
+    // Get the path to the mathmaps
+    //
+    global.maps = workerData.maps;
+
+    //
+    // We use require() to load mathmaps in node
     //
     if (!global.require) {
       await import(/* webpackIgnore: true */ './require.mjs');
     }
-
+    global.getMap = (file: string) =>
+      Promise.resolve(JSON.stringify(global.require(file)));
+  } else {
     //
-    // Custom loader for mathmaps
+    // For web workers, make global be the self object
     //
-    global.SREfeature = {
-      custom: (locale: string) => {
-        const file = 'speech-rule-engine/lib/mathmaps/' + locale + '.json';
-        return Promise.resolve(JSON.stringify(global.require(file)));
-      },
-    };
-  } else {
-    global = (self as any).global = self; // for web workers make global be the self object
+    global = (self as any).global = self;
+    //
+    // We use fetch() to load mathmaps in web workers
+    //
+    global.getMap = (file: string) =>
+      fetch(file)
+        .then((data) => data.json())
+        .catch((err) => console.log(err));
   }
-  global.exports = self; // lets SRE get defined as a global variable
+
+  //
+  // Custom loader for mathmaps
+  //
+  global.SREfeature = {
+    custom: (locale: string) => global.getMap(`${global.maps}/${locale}.json`),
+  };
 
   //
   // Load SRE

ts/a11y/speech.ts

@@ -3,4 +3,5 @@ declare module 'node:worker_threads' {
     on(kind: string, listener: (event: Event) => void): void;
     postMessage(msg: any): void;
   };
+  const workerData: any;
 }