Update node-main to work in (webpacked) browser as well as node, and rename node-main to main

components/mjs/core/core.js

@@ -14,16 +14,18 @@ if (MathJax.startup) {
 if (MathJax.loader) {
   const config = MathJax.config.loader;
   const {mathjax} = MathJax._.mathjax;
-  mathjax.asyncLoad = (name) => {
-    if (name.match(/\.json$/)) {
+  if (!mathjax.asyncLoad) {
+    mathjax.asyncLoad = (name) => {
+      if (name.match(/\.json$/)) {
       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.json = mathjax.context.window
-    ? (file) => fetch(file).then((data) => data.json())
-    : (file) => import( /* webpackIgnore: true */ file, {with: {type: 'json'}});
+        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.json = mathjax.context.window
+      ? (file) => fetch(file).then((data) => data.json())
+      : (file) => import( /* webpackIgnore: true */ file, {with: {type: 'json'}});
+  }
 }

components/mjs/core/locale.js

@@ -1,4 +1,6 @@
 import {Locale} from '#js/util/Locale.js';
 
 Locale.isComponent = true;
-
+for (const location of Object.values(Locale.locations)) {
+  location[0].replace(/^(?:\.\.\/)*ts\//, '[mathjax]/');
+}

components/mjs/loader/loader.js

@@ -15,7 +15,13 @@ combineDefaults(MathJax.config.loader, 'provides', provides);
 
 let locale = MathJax.config.locale ?? Locale.current;
 try { locale = localStorage.getitem('MathJax-locale') ?? locale; } catch (_err) {}
+if (MathJax.config.options?.sre) {
+  combineDefaults(MathJax.config.options, 'sre', { locale });
+}
+const load = CONFIG.load;
+CONFIG.load = [];
 Locale.setLocale(locale)
-  .then(() => Loader.load(...CONFIG.load))
+  .then(() => Loader.load(...load))
   .then(() => CONFIG.ready())
+  .then(() => CONFIG.load = load)
   .catch((message, name) => CONFIG.failed(message, name));

components/mjs/main/browser/browser.cjs

@@ -0,0 +1 @@
+module.exports = require('./browser.js').default;

components/mjs/main/browser/browser.d.cts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'browser'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;

components/mjs/main/browser/browser.d.mts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'browser'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;

components/mjs/main/browser/browser.d.ts

@@ -0,0 +1,20 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'browser'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;
+

components/mjs/main/browser/browser.js

@@ -0,0 +1,50 @@
+import { MathJax, combineConfig, combineDefaults } from '#js/components/global.js';
+import { Loader } from '#js/components/loader.js';
+import { hasWindow } from '#js/util/context.js';
+
+if (hasWindow) {
+  window.exports ??= {};
+}
+
+/**
+ * This funciton is called below and by ../main.js in order to create
+ * the needed init() function that is exported for initializing
+ * MathJax and returning the completed MathJax object.  For use in node,
+ * the nodeSetup function is called to do extra setup (like setting the
+ * the asyncLoad function and getting the path to the MathJax files), and
+ * the adaptor will be added to the loading list if one isnt already
+ * inclkuded there.
+ *
+ * @param {() => void} nodeSetup   The function to do extra setup for node
+ * @param {string} adaptor         The adaptor to use for node
+ * @returns {(config} => MathJax}  The init() function for export
+ */
+export function makeInit(nodeSetup = null, adaptor = '') {
+  return async function init(config, component = 'startup') {
+    Loader.preLoaded('loader', 'core');
+    MathJax.config.loader.failed = (err) => {throw err};
+    if (hasWindow) {
+      MathJax.config.loader.paths.mathjax = 'https://cdn.jsdelivr.net/npm/mathjax';
+    }
+    if (nodeSetup) {
+      await nodeSetup();
+    }
+    combineConfig(MathJax.config, config);
+    if (adaptor) {
+      const CONFIG = MathJax.config.loader;
+      CONFIG.load ??= [];
+      if (CONFIG.load.filter((name) => name.substring(0, 9) === 'adaptors/').length === 0) {
+        CONFIG.load.unshift(adaptor);
+      }
+    }
+    MathJax.loader = Loader;
+    if (component) {
+      await Loader.load(component);
+    }
+    await MathJax.startup?.promise ?? Promise.resolve();
+    return MathJax;
+  }
+};
+
+export const init = MathJax.init = makeInit();
+export default MathJax;

components/mjs/main/browser/browser.mjs

@@ -0,0 +1,4 @@
+import MathJax from './browser.js';
+
+export default MathJax;
+export const init = MathJax.init;

components/mjs/main/browser/config.json

@@ -0,0 +1,15 @@
+{
+  "copy": {
+    "to": "[bundle]/main",
+    "from": ".",
+    "copy": [
+      "browser.mjs",
+      "browser.d.mts",
+      "browser.d.ts"
+    ]
+  },
+  "webpack": {
+    "name": "main/browser",
+    "noDTS": true
+  }
+}

components/mjs/main/browser/json.cjs

@@ -0,0 +1 @@
+export const json = (file) => fetch(file).then((data) => data.json())

components/mjs/main/browser/json.d.cts

@@ -0,0 +1 @@
+export const json: (file: string) => Promise<any>;

components/mjs/main/browser/webpack.cjs

@@ -0,0 +1,18 @@
+const webpack = require('webpack');
+
+module.exports = (pkg) => {
+  pkg.output.library = {
+    type: 'commonjs2',
+    export: ['default'],
+  };
+  pkg.plugins.push(
+    new webpack.NormalModuleReplacementPlugin(
+      /mjs\/components\/mjs\/json\.js/,
+      '../../../components/mjs/main/browser/json.cjs',
+    ),
+    new webpack.optimize.LimitChunkCountPlugin({
+      maxChunks: 1,
+    }),
+  );
+  return pkg;
+}

components/mjs/main/config.json

@@ -0,0 +1,15 @@
+{
+  "copy": {
+    "to": "[bundle]/main",
+    "from": ".",
+    "copy": [
+      "main.mjs",
+      "main.d.mts",
+      "main.d.ts"
+    ]
+  },
+  "webpack": {
+    "name": "main/main",
+    "noDTS": true
+  }
+}

components/mjs/main/json.cjs

@@ -0,0 +1,4 @@
+let REQUIRE;
+try { REQUIRE = eval("require") } catch (_) { REQUIRE = () => {} }
+export const json = (file) => Promise.resolve().then(() => REQUIRE(file));
+

components/mjs/main/json.d.cts

@@ -0,0 +1 @@
+export const json: (file: string) => Promise<any>;

components/mjs/main/main.cjs

@@ -0,0 +1 @@
+module.exports = require('./main.js').default;

components/mjs/main/main.d.cts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'liteDOM'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;

components/mjs/main/main.d.mts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'liteDOM'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;

components/mjs/main/main.d.ts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'liteDOM'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;

components/mjs/main/main.js

@@ -0,0 +1,12 @@
+import { MathJax } from '#js/components/global.js';
+import { hasWindow } from '#js/util/context.js';
+import { setup, adaptor } from './node/setup.js';
+import { makeInit } from './browser/browser.js';
+
+if (!hasWindow) {
+  MathJax.init = makeInit(setup, adaptor);
+}
+
+export const init = MathJax.init;
+export default MathJax;
+

components/mjs/main/main.mjs

@@ -0,0 +1,4 @@
+import MathJax from './main.js';
+
+export default MathJax;
+export const init = MathJax.init;

components/mjs/main/node/config.json

@@ -0,0 +1,17 @@
+{
+  "copy": {
+    "to": "[bundle]/main",
+    "from": ".",
+    "copy": [
+      "data.cjs",
+      "data.d.cts",
+      "node.mjs",
+      "node.d.mts",
+      "node.d.ts"
+    ]
+  },
+  "webpack": {
+    "name": "main/node",
+    "noDTS": true
+  }
+}

components/mjs/main/node/data.cjs

@@ -0,0 +1,14 @@
+let REQUIRE;
+try { REQUIRE = eval("require") } catch(_) { REQUIRE = () => {} }
+const path = REQUIRE("path");
+const fs = REQUIRE("fs");
+
+let source = null;
+if (fs.existsSync(path.resolve(__dirname, '..', '..', 'source.js'))) {
+  source = async () => {return (await import(/* webpackIgnore: true */ '../../source.js')).source};
+}
+
+module.exports.REQUIRE = REQUIRE;
+module.exports.path = path;
+module.exports.source = source;
+

components/mjs/main/node/data.d.cts

@@ -0,0 +1,16 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'liteDOM'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;

components/mjs/main/node/node.cjs

@@ -0,0 +1 @@
+module.exports = require('./node.js').default;

components/mjs/main/node/node.d.cts

@@ -0,0 +1,19 @@
+import type {
+  COMPONENT_LIST,
+  ADAPTOR_LIST,
+  MATHJAX_CONFIG,
+  MATHJAX_OBJECT,
+  MATHJAX_COMPONENTS,
+  ADAPTOR_DOM,
+} from '@mathjax/src/mjs/types/mathjax.js';
+import type { MathJaxObject } from '@mathjax/src/mjs/components/startup.js';
+
+export function init<
+  T extends COMPONENT_LIST<ADAPTOR_DOM<A>> = 'startup',
+  A extends ADAPTOR_LIST = 'liteDOM'
+>(
+  config: MATHJAX_CONFIG<T, A>,
+  component?: MATHJAX_COMPONENTS<T, A>
+): Promise<MATHJAX_OBJECT<T, A>>;
+
+export const MathJax: MathJaxObject;