Merge branch 'develop' into refactor/mappings

Author: zorkow

.gitignore

@@ -1,9 +1,10 @@
 *~
-/node_modules
+node_modules
+coverage
 /components/mjs/**/lib
 /components/cjs
 /cjs
 /mjs
 /bundle
 /bundle-cjs
-/coverage
+/testsuite/js

components/mjs/input/tex/extension.js

@@ -1,24 +1,16 @@
 import {combineDefaults} from '#js/components/global.js';
 
 export function fontExtension(id, name, pkg = `@mathjax/${name}`) {
-  if (MathJax.config?.loader) {
-    const FONTPATH = (typeof document === 'undefined' ? pkg :
-                      `https://cdn.jsdelivr.net/npm/${name}`);
+  if (MathJax.loader) {
+    const FONTPATH = (typeof document === 'undefined' ? pkg : `https://cdn.jsdelivr.net/npm/${name}`);
     const path = name.replace(/-font-extension$/, '-extension');
     const extension = name.replace(/-font-extension$/, '');
+    const jax = (MathJax.config?.startup?.output || 'chtml');
     combineDefaults(MathJax.config.loader, 'paths', {[path]: FONTPATH});
-    combineDefaults(MathJax.config.loader, 'dependencies', {
-      [`[${path}]/chtml`]: ['output/chtml'],
-      [`[${path}]/svg`]: ['output/svg']
+    combineDefaults(MathJax.config.loader, 'dependencies', {[`[${path}]/${jax}`]: [`output/${jax}`]});
+    MathJax.loader.addPackageData(id, {
+      extraLoads: [`[${path}]/${jax}`],
+      rendererExtensions: [path]
     });
-    MathJax.config.loader[id] = {
-      checkReady() {
-        return MathJax.loader.load(
-          `[${path}]/${MathJax.config?.startup?.output || 'chtml'}`
-        ).then(() => {
-          MathJax.startup.document?.outputJax?.addExtension(extension);
-        });
-      }
-    };
   }
 }

components/mjs/output/chtml/config.json

@@ -5,10 +5,6 @@
       "output/chtml.ts",
       "output/chtml",
       "output/common"
-    ],
-    "exclude": [
-      "output/chtml/ts5",
-      "output/chtml/ts6"
     ]
   },
   "webpack": {

components/mjs/output/chtml/nofont.js

@@ -4,3 +4,5 @@ export class DefaultFont extends ChtmlFontData {};
 export const fontName = 'nofont';
 
 DefaultFont.OPTIONS = {fontURL: '.'};
+
+export const Font = {fontName, DefaultFont};

components/mjs/output/svg/config.json

@@ -5,10 +5,6 @@
       "output/svg.ts",
       "output/svg",
       "output/common"
-    ],
-    "exclude": [
-      "output/svg/ts5",
-      "output/svg/ts6"
     ]
   },
   "webpack": {

components/mjs/output/svg/nofont.js

@@ -2,3 +2,5 @@ import {SvgFontData} from '#js/output/svg/FontData.js';
 
 export class DefaultFont extends SvgFontData {};
 export const fontName = 'nofont';
+
+export const Font = {fontName, DefaultFont};

components/mjs/output/util.js

@@ -31,14 +31,15 @@ export const OutputUtil = {
 
       if (name !== defaultFont) {
 
-        combineDefaults(MathJax.config.loader, `output/${jax}`, {
-          checkReady() {
-            return MathJax.loader.load(`${font}/${jax}`).catch(err => console.log(err));
-          }
-        });
+        MathJax.loader.addPackageData(`output/${jax}`, {extraLoads: [`${font}/${jax}`]});
 
       } else {
 
+        const extraLoads = MathJax.config.loader[`${font}/${jax}`]?.extraLoads;
+        if (extraLoads) {
+          MathJax.loader.addPackageData(`output/${jax}`, {extraLoads});
+        }
+
         combineWithMathJax({_: {
           output: {
             fonts: {
@@ -78,14 +79,12 @@ export const OutputUtil = {
 
   loadFont(startup, jax, font, preload) {
     if (!MathJax.loader) {
-      return Promise.resolve();
+      return startup;
     }
     if (preload) {
       MathJax.loader.preLoad(`[${font}]/${jax}`);
     }
-    const check = MathJax.config.loader[`output/${jax}`];
-    const start = (check && check.checkReady ? check.checkReady().then(startup) : startup());
-    return start.catch(err => console.log(err));
+    return Package.loadPromise(`output/${jax}`).then(startup);
   }
 
 };

package.json

@@ -108,7 +108,7 @@
     "use-cjs": "echo '{\n  \"extends\": \"./tsconfig/cjs.json\"\n}' > tsconfig.json",
     "use-mjs": "echo '{\n  \"extends\": \"./tsconfig/mjs.json\"\n}' > tsconfig.json",
     "=============================================================================== aliases": "",
-    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' pnpm jest",
+    "test": "cd testsuite && pnpm -s test --",
     "clean": "pnpm -s clean:mod cjs && pnpm -s cjs:bundle:clean && pnpm -s clean:mod mjs && pnpm -s clean:dir bundle",
     "compile-cjs": "pnpm -s cjs:compile",
     "compile-mjs": "pnpm -s mjs:compile",
@@ -123,24 +123,17 @@
     "build-all": "pnpm -s build-mjs ; echo ; pnpm -s build-cjs"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.12",
     "copyfiles": "^2.4.1",
     "diff": "^5.2.0",
-    "jest": "^29.7.0",
     "rimraf": "^5.0.5",
-    "tape": "^5.7.5",
     "terser-webpack-plugin": "^5.3.10",
-    "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.2",
     "tslint": "^6.1.3",
     "tslint-jsdoc-rules": "^0.2.0",
     "tslint-unix-formatter": "^0.2.0",
     "typescript": "^5.4.5",
     "typescript-tools": "^0.3.1",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
-    "xml-js": "^1.6.11",
     "xslt3": "^2.6.0"
   },
   "dependencies": {