Merge branch 'develop'

Author: dpvc

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- stable
+- 17
 sudo: false
 script:
 - npm install

components/bin/build

@@ -30,7 +30,7 @@ const path = require('path');
 /**
  * The amount of space for each level of indentation
  */
-const INDENT = '    ';
+const INDENT = '  ';
 
 /**
  * The pattern to use when looking for explort commands to process
@@ -43,24 +43,36 @@ const EXPORT_PROCESS = ['let', 'const', 'var', 'function', 'class', 'namespace']
 /**
  * The relative path to the MathJax directory
  */
-const mjPath = path.relative(process.cwd(), path.resolve(__dirname,'../../js'));
+const mjPath = path.relative(process.cwd(), path.resolve(__dirname, '..', '..', 'js'));
+const mjGlobal = path.join('..', mjPath, 'components', 'global.js');
 
 /**
  * Read the configuration for the component
  */
 const config = JSON.parse(fs.readFileSync(process.argv[2] || 'build.json'));
 
+function getType() {
+  const component = config.component || 'part';
+  if (component.match(/\/(svg|chtml|common)\/fonts\//)) return RegExp.$1 + '-font';
+  if (component.match(/\/(mathml|tex)\/.+\//)) return RegExp.$1 + '-extension';
+  if (component.match(/^(.+)\//)) return RegExp.$1;
+  return component;
+}
+
 /**
  * Extract the configuration values
  */
+const COMPONENT = path.basename(config.component || 'part');                // name of the component
+const ID = config.id || config.component || 'part';                         // the ID of the component
 const TARGETS = config.targets || [];                                       // the files to include in the component
 const EXCLUDE = new Map((config.exclude || []).map(name => [name, true]));  // files to exclude from the component
-const EXCLUDESUBDIRS = config.excludeSubdirs === 'true';                    // exclude subdirectories
-const MATHJAX = config.js || config.mathjax || mjPath;                      // path to the compiled .js files
+const EXCLUDESUBDIRS = config.excludeSubdirs === 'true';                    // exclude subdirectories or not
+const JS = config.js || config.mathjax || mjPath;                           // path to the compiled .js files
 const LIB = config.lib || './lib';                                          // path to the lib directory to create
-const COMPONENT = path.basename(config.component || 'part');                // name of the component
-const GLOBAL = config.global || `../${MATHJAX}/components/global.js`;       // the location of global.js
-const SRC = config.ts || MATHJAX.replace(/js$/, 'ts');                      // path to the .ts files
+const TS = config.ts || JS.replace(/js$/, 'ts');                            // path to the .ts files
+const GLOBAL = config.global || mjGlobal;                                   // path to the global.js file
+const VERSION = config.version || mjGlobal.replace(/global/, 'version');    // path to the version.js file
+const TYPE = config.type || getType();                                      // the module type
 
 /**
  * The list of files that need to be added to the lib directory
@@ -160,17 +172,15 @@ function processLines(file, objects) {
   if (objects.length === 0) return [];
   const dir = path.dirname(file).replace(/^\.$/, '');
   const dots = dir.replace(/[^\/]+/g, '..') || '.';
-  const relative = path.join(dots, '..', MATHJAX, dir, path.basename(file)).replace(/\.ts$/, '.js');
+  const relative = path.join(dots, '..', JS, dir, path.basename(file)).replace(/\.ts$/, '.js');
   const name = path.parse(file).name;
   const lines = [
     '"use strict";',
     `Object.defineProperty(exports, '__esModule', {value: true});`
   ];
-  let source = (dir.replace(/\//g, '.') + '.' + name).replace(/^\./, '')
+  let source = ((dir.replace(/\//g, '.') + '.' + name).replace(/^\./, '')
+                + (exists(path.resolve(JS, file.replace(/\.ts$/, ''))) ? '_ts' : ''))
       .replace(/\.[^.]*/g, (x) => (x.substr(1).match(/[^a-zA-Z_]/) ? '[\'' + x.substr(1) + '\']' : x));
-  if (exists(path.resolve(MATHJAX, file.replace(/\.ts$/, '')))) {
-    source += '_ts';
-  }
   for (const id of objects) {
     lines.push(`exports.${id} = MathJax._.${source}.${id};`);
   }
@@ -223,6 +233,7 @@ function processGlobal() {
   console.info('  ' + COMPONENT + '.ts');
   const lines = [
     `import {combineWithMathJax} from '${GLOBAL}';`,
+    `import {VERSION} from '${VERSION}';`,
     '',
   ];
   const packages = [];
@@ -231,9 +242,17 @@ function processGlobal() {
     const dir = path.dirname(PACKAGE[0]).split(path.sep)[0];
     packages.push(processPackage(lines, INDENT, dir));
   }
-  lines.push('', `combineWithMathJax({_: {`);
-  lines.push(INDENT + packages.join(',\n' + INDENT));
-  lines.push('}});');
+  const name = (ID.match(/[^a-zA-Z0-9_]/) ? `"${ID}"` : ID);
+  lines.push(
+    '',
+    'if (MathJax.loader) {',
+      INDENT + `MathJax.loader.checkVersion('${ID}', VERSION, '${TYPE}');`,
+    '}',
+    '',
+    `combineWithMathJax({_: {`,
+      INDENT + packages.join(',\n' + INDENT),
+    '}});'
+  );
   fs.writeFileSync(path.join(LIB, COMPONENT + '.js'), lines.join('\n') + '\n');
 }
 
@@ -273,11 +292,11 @@ function processPackage(lines, space, dir) {
     if (path.dirname(PACKAGE[0]) === dir) {
       const file = PACKAGE.shift();
       const name = path.basename(file);
-      const relativefile = path.join('..', MATHJAX, dir, name).replace(/\.ts$/, '.js');
+      const relativefile = path.join('..', JS, dir, name).replace(/\.ts$/, '.js');
       const component = 'module' + (++importCount);
       lines.push(`import * as ${component} from '${relativefile}';`);
       let property = name.replace(/\.ts$/, '');
-      if (property !== name && exists(path.resolve(MATHJAX, file.replace(/\.ts$/, '')))) {
+      if (property !== name && exists(path.resolve(JS, file.replace(/\.ts$/, '')))) {
         property += '_ts';
       }
       if (property.match(/[^a-zA-Z0-9_]/)) {
@@ -324,5 +343,5 @@ function rmDir(dir) {
 //
 rmDir(LIB);
 console.info("Processing:");
-processList(SRC, '', TARGETS);
+processList(TS, '', TARGETS);
 processGlobal();

components/bin/makeAll

@@ -29,10 +29,20 @@ const fs = require('fs');
 const path = require('path');
 const {execSync} = require('child_process');
 
+const options = {
+  recursive: true
+};
+
 /**
- * Get the directories to process
+ * Get the directories to process and check for options
  */
 const dirs = process.argv.slice(2);
+
+if (dirs[0] === '--no-subdirs') {
+  dirs.shift();
+  options.recursive = false;
+}
+
 if (dirs.length === 0) {
   dirs.push('.');
 }
@@ -74,7 +84,9 @@ function processList(dirs) {
  */
 function processDir(dir, action) {
   action(dir);
-  processSubdirs(dir, action);
+  if (options.recursive) {
+    processSubdirs(dir, action);
+  }
 }
 
 /**

components/bin/pack

@@ -48,7 +48,7 @@ function fileSize(file) {
 /**
  * Regular expressions for the components directory and the MathJax .js location
  */
-const compRE = fileRegExp(path.join(path.dirname(__dirname), 'src'));
+const compRE = fileRegExp(path.dirname(__dirname));
 const rootRE = fileRegExp(path.join(path.dirname(path.dirname(__dirname)), 'js'));
 const nodeRE = fileRegExp(path.join(path.dirname(path.dirname(__dirname)), 'node_modules'));
 
@@ -83,7 +83,7 @@ async function webpackLib(dir) {
     //
     // Get js directory from the webpack.config.js file
     //
-    const jsdir = require(path.resolve(dir, 'webpack.config.js')).plugins[0].definitions.jsdir;
+    const jsdir = require(path.resolve(dir, 'webpack.config.js')).plugins[0].definitions.__JSDIR__;
     const jsRE = fileRegExp(jsdir);
     const libRE = fileRegExp(path.resolve(jsdir, '..', 'components'));
 
@@ -103,17 +103,27 @@ async function webpackLib(dir) {
         .replace(/ \+ \d+ modules/, '')
         .replace(dirRE, '.');
     }
-    for (const module of modules.sort((a,b) => a.name < b.name ? -1 : 1)) {
+    const list = [];
+    for (const module of modules) {
       if (module.moduleType.match(/javascript/)) {
-        const name = module.name
-              .replace(compRE, '[components]')
-              .replace(rootRE, '[mathjax]')
-              .replace(nodeRE, '[node]')
-              .replace(jsRE,   '[js]')
-              .replace(libRE,  '[lib]');
-        console.log('  ' + name + fileSize(module));
+        let name = module.name
+            .replace(compRE, '[components]')
+            .replace(rootRE, '[mathjax]')
+            .replace(nodeRE, '[node]')
+            .replace(jsRE,   '[js]')
+            .replace(libRE,  '[lib]');
+        if (name.charAt(0) !== '.' && name.charAt(0) !== '[') {
+          name = path.relative(dir, name);
+        }
+        list.push('  ' + name + fileSize(module));
       }
     }
+    console.log(
+      list
+        .filter(a => a.slice(2, 4) === './').sort()
+        .concat(list.filter(a => a.slice(2, 4) !== './').sort())
+        .join('\n')
+    );
   } catch (err) {
     console.error(err);
   }

components/src/a11y/complexity/build.json

@@ -3,7 +3,6 @@
   "targets": [
     "a11y/complexity.ts",
     "a11y/complexity",
-    "a11y/semantic-enrich.ts",
-    "a11y/sre.ts"
+    "a11y/semantic-enrich.ts"
   ]
 }

components/src/a11y/explorer/build.json

@@ -1,4 +1,4 @@
 {
   "component": "a11y/explorer",
-  "targets": ["a11y/explorer.ts", "a11y/sre.ts", "a11y/explorer"]
+  "targets": ["a11y/explorer.ts", "a11y/explorer"]
 }

components/src/a11y/explorer/webpack.config.js

@@ -6,6 +6,7 @@ module.exports = PACKAGE(
   [                                   // packages to link to
     'components/src/ui/menu/lib',
     'components/src/a11y/semantic-enrich/lib',
+    'components/src/a11y/sre/lib',
     'components/src/input/mml/lib',
     'components/src/core/lib'
   ],

components/src/a11y/semantic-enrich/build.json

@@ -1,5 +1,5 @@
 {
   "component": "a11y/semantic-enrich",
-  "targets": ["a11y/semantic-enrich.ts", "a11y/sre.ts"]
+  "targets": ["a11y/semantic-enrich.ts"]
 }
 

components/src/a11y/semantic-enrich/semantic-enrich.js

@@ -1,12 +1,12 @@
 import './lib/semantic-enrich.js';
 
 import {combineDefaults} from '../../../../js/components/global.js';
-import {sreReady} from '../../../../js/a11y/sre.js';
+import Sre from '../../../../js/a11y/sre.js';
 import {EnrichHandler} from '../../../../js/a11y/semantic-enrich.js';
 import {MathML} from '../../../../js/input/mathml.js';
 
 if (MathJax.loader) {
-  combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => sreReady()});
+  combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => Sre.sreReady()});
 }
 
 if (MathJax.startup) {

components/src/a11y/semantic-enrich/webpack.config.js

@@ -5,7 +5,8 @@ module.exports = PACKAGE(
   '../../../../js',                   // location of the MathJax js library
   [                                   // packages to link to
     'components/src/input/mml/lib',
-    'components/src/core/lib'
+    'components/src/core/lib',
+    'components/src/a11y/sre/lib'
   ],
   __dirname                           // our directory
 );