@wiris/mathtype-viewer 1.2.0 → 1.3.0

package/dist/WIRISplugins.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! @license DOMPurify 2.4.7 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.7/LICENSE */

package/dist/app.d.ts

@@ -1,2 +1,10 @@
-export {};
+import { Properties } from './properties';
+declare global {
+    interface Window {
+        viewer: {
+            properties: Properties;
+            isLoaded: boolean;
+        };
+    }
+}
 //# sourceMappingURL=app.d.ts.map

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":""}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE;YACN,UAAU,EAAE,UAAU,CAAC;YACvB,QAAQ,EAAE,OAAO,CAAA;SAClB,CAAC;KACH;CACF"}

package/dist/mathml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mathml.d.ts","sourceRoot":"","sources":["../src/mathml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAmB1C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B3F"}
+{"version":3,"file":"mathml.d.ts","sourceRoot":"","sources":["../src/mathml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAyD1C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC3F"}

package/dist/properties.d.ts

@@ -18,6 +18,7 @@ export declare class Properties {
     config: Config;
     private new;
     static generate(): Promise<Properties>;
+    private checkServices;
     get editorServicesRoot(): string;
     set editorServicesRoot(editorServicesRoot: string);
     get editorServicesExtension(): string;

package/dist/properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../src/properties.ts"],"names":[],"mappings":"AAGA,aAAK,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AACpD,aAAK,sBAAsB,GAAG,MAAM,GAAG,OAAO,CAAC;AAK/C,oBAAY,MAAM,GAAG;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,aAAa,CAAC,EAAE;QACd,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;QAChD,0BAA0B,CAAC,EAAE,MAAM,CAAC;KACrC,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAsBF,qBAAa,UAAU;IAErB,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAkB;IAG7C,MAAM,EAAE,MAAM,CAAiB;IAM/B,OAAO,CAAC,GAAG;WAKE,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAmD5C,IAAI,kBAAkB,IAAI,MAAM,CAG/B;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAGhD;IAED,IAAI,uBAAuB,IAAI,MAAM,CAGpC;IAED,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,MAAM,EAG1D;IAWD,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAGpB;IAQD,IAAI,MAAM,IAAI,MAAM,CAGnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAGxB;IAQD,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAGlB;IAQD,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAGpB;IAQD,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAG1B;IAQD,IAAI,sBAAsB,IAAI,sBAAsB,CAGnD;IAED,IAAI,sBAAsB,CAAC,sBAAsB,EAAE,sBAAsB,EAGxE;IAQD,IAAI,0BAA0B,IAAI,MAAM,CAGvC;IAED,IAAI,0BAA0B,CAAC,0BAA0B,EAAE,MAAM,EAGhE;CACF"}
+{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../src/properties.ts"],"names":[],"mappings":"AAGA,aAAK,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AACpD,aAAK,sBAAsB,GAAG,MAAM,GAAG,OAAO,CAAC;AAK/C,oBAAY,MAAM,GAAG;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,aAAa,CAAC,EAAE;QACd,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;QAChD,0BAA0B,CAAC,EAAE,MAAM,CAAC;KACrC,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAsBF,qBAAa,UAAU;IAErB,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAkB;IAG7C,MAAM,EAAE,MAAM,CAAiB;IAM/B,OAAO,CAAC,GAAG;WAKE,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAuD5C,OAAO,CAAC,aAAa;IAcrB,IAAI,kBAAkB,IAAI,MAAM,CAG/B;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAGhD;IAED,IAAI,uBAAuB,IAAI,MAAM,CAGpC;IAED,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,MAAM,EAG1D;IAWD,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAGpB;IAQD,IAAI,MAAM,IAAI,MAAM,CAGnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAGxB;IAQD,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,EAGlB;IAQD,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAGpB;IAQD,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAG1B;IAQD,IAAI,sBAAsB,IAAI,sBAAsB,CAGnD;IAED,IAAI,sBAAsB,CAAC,sBAAsB,EAAE,sBAAsB,EAGxE;IAQD,IAAI,0BAA0B,IAAI,MAAM,CAGvC;IAED,IAAI,0BAA0B,CAAC,0BAA0B,EAAE,MAAM,EAGhE;CACF"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@wiris/mathtype-viewer",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "",
   "main": "app.js",
   "scripts": {
-    "build": "webpack",
+    "build": "webpack --mode production",
+    "build-dev": "webpack --mode development",
     "serve": "webpack serve",
     "prepack": "yarn && npm run build"
   },
@@ -15,7 +16,7 @@
   "author": "Integrations",
   "license": "ISC",
   "dependencies": {
-    "@wiris/mathtype-html-integration-devkit": "1.14.0"
+    "@wiris/mathtype-html-integration-devkit": "1.15.0"
   },
   "devDependencies": {
     "babel-loader": "^9.1.2",

package/project.json

@@ -13,6 +13,16 @@
         "{options.outputPath}"
       ]
     },
+    "build-dev": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "build-dev",
+        "outputPath": "packages/viewer/dist"
+      },
+      "outputs": [
+        "{options.outputPath}"
+      ]
+    },
     "lint": {
       "executor": "@nx/linter:eslint",
       "options": {

package/src/app.ts

@@ -3,6 +3,15 @@ import { renderLatex } from './latex';
 import { renderMathML } from './mathml';
 import { bypassEncapsulation } from './retro';
 
+declare global {
+  interface Window {
+    viewer: {
+      properties: Properties,
+      isLoaded: boolean
+    };
+  }
+}
+
 // This should be the only code executed outside of a function
 // and the only code containing browser globals (e.g. window)
 // TODO try to set up the linter to check these two constraints
@@ -17,9 +26,12 @@ async function main(w: Window): Promise<void> {
   const properties: Properties = await Properties.generate();
 
   // Expose the globals to the browser
-  (w as any).viewer = {
-    properties,
-  };
+  if (!w.viewer) {
+    w.viewer = {
+      properties,
+      isLoaded: false,
+    };
+  }
 
   const document = w.document;
 
@@ -40,6 +52,11 @@ async function main(w: Window): Promise<void> {
   // Initial function to call once document is loaded
   // Renders formulas and sets observer
   const start = async () => {
+    // Check if the viewer is alredy loaded
+    if (w.viewer.isLoaded) return;
+
+    w.viewer.isLoaded = true;
+
     // First render
     properties.render();
 

package/src/mathml.ts

@@ -1,6 +1,7 @@
 import { Properties } from "./properties";
 import { showImage, createImage, mathml2accessible, processJsonResponse } from './services';
 import { htmlEntitiesToXmlEntities, corruptMathML } from './utils';
+import MathML from '@wiris/mathtype-html-integration-devkit/src/mathml';
 
 /**
  * Data obtained when rendering image. Data needed to set the formula image parameters.
@@ -12,6 +13,43 @@ interface FormulaData {
   width: string,
 }
 
+/**
+ * Look for safe MathML «math» formulas.
+ * @param {HTMLElement} root - Any DOM element that can contain MathML.
+ */
+function findSafeMathMLTextNodes(root: HTMLElement): Node[] {
+  const nodeIterator: NodeIterator = document.createNodeIterator(
+    root,
+    NodeFilter.SHOW_TEXT,
+    node => /«math(.*?)«\/math»/g.test(node.nodeValue || '') ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT
+  );
+  const safeNodes : Node[] = [];
+
+  let currentNode: Node | null;
+  while (currentNode = nodeIterator.nextNode()) {
+    safeNodes.push(currentNode);
+  }
+
+  return safeNodes;
+}
+
+/**
+ * Parse the DOM looking for «math» formulas and replace them with the corresponding rendered images within the given element.
+ * @param {HTMLElement} root - Any DOM element that can contain MathML.
+ */
+function decodeSafeMathML(root: HTMLElement) {
+  const safeNodes = findSafeMathMLTextNodes(root);
+
+  for (const safeNode of safeNodes) {
+    const mathml = MathML.safeXmlDecode(safeNode.textContent);
+    // Insert mathml node.
+    const fragment = document.createRange().createContextualFragment(mathml);
+
+    safeNode.parentNode?.insertBefore(fragment, safeNode);
+    safeNode.parentNode?.removeChild(safeNode);
+  }
+}
+
 /**
  * Parse the DOM looking for <math> elements and replace them with the corresponding rendered images within the given element.
  * @param {Properties} properties - Properties of the viewer.
@@ -23,6 +61,8 @@ export async function renderMathML(properties: Properties, root: HTMLElement): P
     return;
   }
 
+  decodeSafeMathML(root);
+
   for(const mathElement of [...root.getElementsByTagName('math')]) {
     const mml = htmlEntitiesToXmlEntities(mathElement.outerHTML);
 

package/src/properties.ts

@@ -66,7 +66,6 @@ export class Properties {
     const script: HTMLScriptElement = document.querySelector(`script[src*="${pluginName}"]`);
 
     if (!!script) {
-
       const pluginNamePosition: number = script.src.lastIndexOf(pluginName);
       const params: string = script.src.substring(pluginNamePosition + pluginName.length);
       const urlParams = new URLSearchParams(params);
@@ -86,9 +85,10 @@ export class Properties {
       if (urlParams.get('zoom') !== null && urlParams.get('zoom') !== undefined) {
         instance.config.zoom = +urlParams.get('zoom');
       }
-
     }
 
+    instance.checkServices();
+
     // Get backend parameters calling the configurationjson service
     try {
       instance.config.backendConfig = await configurationJson(
@@ -108,6 +108,24 @@ export class Properties {
     return instance;
   }
 
+  /**
+   * Check if is inside Integrations Services
+   * @deprecated This will be removed once the viewer uncouple from the integration services.
+   */
+  private checkServices(): void {
+    const path = ((document.currentScript as HTMLScriptElement).src);
+
+    if (path.includes('pluginwiris_engine')) {
+      // If the path includes pluginwiris_engine use Java Integrations Services
+      this.config.editorServicesRoot = path;
+      this.config.editorServicesExtension = '';
+    } else if (path.includes('integration/WIRISplugins')) {
+      // If the path includes 'integration/WIRISplugins' use PHP Integrations Services
+      this.config.editorServicesRoot = path;
+      this.config.editorServicesExtension = '.php';
+    }
+  }
+
   get editorServicesRoot(): string {
     return this.config.editorServicesRoot ||
       defaultValues.editorServicesRoot;

package/webpack.config.js

@@ -3,8 +3,7 @@ const path = require('path');
 module.exports = (config, context) => {
   return {
     entry: './src/app.ts',
-    mode: 'development',
-    devtool: 'inline-source-map',
+    mode: 'none',
     module: {
       rules: [
         {
@@ -35,5 +34,8 @@ module.exports = (config, context) => {
       port: 8001,
       open: true,
     },
+    optimization: {
+      minimize: true, // enabling this reduces file size and readability
+    },
   }
 };