@wiris/mathtype-viewer 1.4.1 → 1.5.0

package/dist/WIRISplugins.js.LICENSE.txt

@@ -1 +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 */
+/*! @license DOMPurify 3.1.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.0/LICENSE */

package/dist/app.d.ts

@@ -4,6 +4,7 @@ declare global {
         viewer: {
             properties: Properties;
             isLoaded: boolean;
+            version: string;
         };
     }
 }

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE;YACN,UAAU,EAAE,UAAU,CAAC;YACvB,QAAQ,EAAE,OAAO,CAAC;YAClB,OAAO,EAAE,MAAM,CAAA;SAChB,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;AAyD1C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC3F"}
+{"version":3,"file":"mathml.d.ts","sourceRoot":"","sources":["../src/mathml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AA0D1C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC3F"}

package/dist/properties.d.ts

@@ -6,6 +6,7 @@ export declare type Config = {
     backendConfig?: {
         wirispluginperformance?: Wirispluginperformance;
         wiriseditormathmlattribute?: string;
+        wiriscustomheaders?: object;
     };
     dpi?: number;
     element?: string;
@@ -14,10 +15,12 @@ export declare type Config = {
     zoom?: number;
 };
 export declare class Properties {
+    private static instance;
     render: () => Promise<void>;
     config: Config;
     private new;
-    static generate(): Promise<Properties>;
+    static getInstance(): Properties;
+    private initialize;
     private checkServices;
     get editorServicesRoot(): string;
     set editorServicesRoot(editorServicesRoot: 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;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"}
+{"version":3,"file":"properties.d.ts","sourceRoot":"","sources":["../src/properties.ts"],"names":[],"mappings":"AAIA,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;QACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,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;AAuBF,qBAAa,UAAU;IAErB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2B;IAElD,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAkB;IAG7C,MAAM,EAAE,MAAM,CAAiB;IAM/B,OAAO,CAAC,GAAG;IAEX,MAAM,CAAC,WAAW,IAAI,UAAU;YAWlB,UAAU;IAqDxB,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/dist/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"AAEA,aAAK,UAAU;IACb,IAAI,SAAS;IACb,GAAG,QAAQ;CACZ;AAKD,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,KAAA;CAIpB;AAUD,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAanF;AAUD,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CAyB7I;AAUD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CAahH;AAUD,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAyBvG;AAUD,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAUzG;AASD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAQ/F;AAQD,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CAO7G"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"AAGA,aAAK,UAAU;IACb,IAAI,SAAS;IACb,GAAG,QAAQ;CACZ;AAKD,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,KAAA;CAIpB;AAUD,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAanF;AAUD,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CA8B7I;AAUD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CAahH;AAUD,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAyBvG;AAUD,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAUzG;AASD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAQ/F;AAQD,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC,CAO7G"}

package/index.html

@@ -14,13 +14,7 @@
 </head>
 <body>
   <p>
-    <math>
-      <mn>2</mn>
-      <mo>+</mo>
-      <mn>2</mn>
-      <mo>=</mo>
-      <mn>4</mn>
-    </math>
+    <math xmlns="http://www.w3.org/1998/Math/MathML"><mn>2</mn><mo>+</mo><mn>2</mn><mo>=</mo><mn>4</mn></math>
   </p>
   <p>
     $$4 - 2 = 2$$

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiris/mathtype-viewer",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -16,7 +16,7 @@
   "author": "Integrations",
   "license": "ISC",
   "dependencies": {
-    "@wiris/mathtype-html-integration-devkit": "1.16.1"
+    "@wiris/mathtype-html-integration-devkit": "1.17.0"
   },
   "devDependencies": {
     "babel-loader": "^9.1.2",

package/src/app.ts

@@ -2,12 +2,14 @@ import { Properties } from './properties';
 import { renderLatex } from './latex';
 import { renderMathML } from './mathml';
 import { bypassEncapsulation } from './retro';
+import packageInformation from '../../../node_modules/@wiris/mathtype-viewer/package.json'
 
 declare global {
   interface Window {
     viewer: {
       properties: Properties,
-      isLoaded: boolean
+      isLoaded: boolean,
+      version: string
     };
   }
 }
@@ -23,14 +25,19 @@ main(window);
  */
 async function main(w: Window): Promise<void> {
 
-  const properties: Properties = await Properties.generate();
+  const properties: Properties = await Properties.getInstance();
 
   // Expose the globals to the browser
   if (!w.viewer) {
     w.viewer = {
       properties,
       isLoaded: false,
+      version: packageInformation.version
     };
+  } else {
+    w.viewer.properties = properties;
+    w.viewer.isLoaded = false;
+    w.viewer.version = packageInformation.version;
   }
 
   const document = w.document;

package/src/mathml.ts

@@ -11,6 +11,7 @@ interface FormulaData {
   baseline: string,
   height: string,
   width: string,
+  alt?: string,
 }
 
 /**
@@ -118,8 +119,15 @@ async function setImageProperties(properties: Properties, data: FormulaData, mml
 
   // Set the alt text whenever there's a translation for the characters and MathML on the mml.
   if (!corruptMathML.some(corruptMathML => mml.includes(corruptMathML))) {
-    const { text } = await mathml2accessible(mml, properties.lang, properties.editorServicesRoot, properties.editorServicesExtension);
-    img.alt = text;
+    try {
+      if (!data.alt) {
+        const { text } = await mathml2accessible(mml, properties.lang, properties.editorServicesRoot, properties.editorServicesExtension);
+        data.alt = text;
+      }
+      img.alt = data.alt;
+    } catch {
+      img.alt = 'Alternative text not available';
+    }
   }
 
   return img;

package/src/properties.ts

@@ -1,4 +1,5 @@
 import { configurationJson, StatusError } from './services';
+import Util from '@wiris/mathtype-html-integration-devkit/src/util';
 
 // Helper types for Config below
 type Viewer = 'none' | 'image' | 'mathml' | 'latex';
@@ -13,6 +14,7 @@ export type Config = {
   backendConfig?: {
     wirispluginperformance?: Wirispluginperformance,
     wiriseditormathmlattribute?: string,
+    wiriscustomheaders?: object,
   },
   dpi?: number,
   element?: string,
@@ -29,7 +31,8 @@ const defaultValues: Config = {
   editorServicesExtension: '',
   backendConfig: {
     wirispluginperformance: 'true',
-    wiriseditormathmlattribute: 'data-mathml'
+    wiriseditormathmlattribute: 'data-mathml',
+    wiriscustomheaders: {},
   },
   dpi: 96,
   element: 'body',
@@ -43,6 +46,8 @@ const defaultValues: Config = {
  */
 export class Properties {
 
+  private static instance: Properties | null = null;
+
   render: () => Promise<void> = async () => {};
 
   // Get URL properties (retrocompatibility).
@@ -54,13 +59,18 @@ export class Properties {
    */
   private new() {}
 
+  static getInstance(): Properties {
+    if (!Properties.instance) {
+      Properties.instance = new Properties();
+      Properties.instance.initialize();
+    }
+    return Properties.instance;
+  }
+
   /**
    * Creates and sets up a new instance of class Properties
    */
-  static async generate(): Promise<Properties> {
-
-    const instance = new Properties();
-
+  private async initialize(): Promise<void> {
     // Get URL parameters from <script>
     const pluginName = 'WIRISplugins.js';
     const script: HTMLScriptElement = document.querySelector(`script[src*="${pluginName}"]`);
@@ -71,31 +81,34 @@ export class Properties {
       const urlParams = new URLSearchParams(params);
 
       if (urlParams.get('dpi') !== null && urlParams.get('dpi') !== undefined) {
-        instance.config.dpi = +urlParams.get('dpi');
+        Properties.instance.config.dpi = +urlParams.get('dpi');
       }
       if (urlParams.get('element') !== null && urlParams.get('element') !== undefined) {
-        instance.config.element = urlParams.get('element');
+        Properties.instance.config.element = urlParams.get('element');
       }
       if (urlParams.get('lang') !== null && urlParams.get('lang') !== undefined) {
-        instance.config.lang = urlParams.get('lang');
+        Properties.instance.config.lang = urlParams.get('lang');
       }
       if (urlParams.get('viewer') !== null && urlParams.get('viewer') !== undefined) {
-        instance.config.viewer = (urlParams.get('viewer') as Viewer);
+        Properties.instance.config.viewer = (urlParams.get('viewer') as Viewer);
       }
       if (urlParams.get('zoom') !== null && urlParams.get('zoom') !== undefined) {
-        instance.config.zoom = +urlParams.get('zoom');
+        Properties.instance.config.zoom = +urlParams.get('zoom');
       }
     }
 
-    instance.checkServices();
+    Properties.instance.checkServices();
 
     // Get backend parameters calling the configurationjson service
     try {
-      instance.config.backendConfig = await configurationJson(
-        ['wirispluginperformance', 'wiriseditormathmlattribute'],
-        instance.editorServicesRoot,
-        instance.editorServicesExtension,
+      Properties.instance.config.backendConfig = await configurationJson(
+        ['wirispluginperformance', 'wiriseditormathmlattribute', 'wiriscustomheaders'],
+        Properties.instance.editorServicesRoot,
+        Properties.instance.editorServicesExtension
       );
+
+      // We'll always get a string from the wiriscustomheaders backend parameter. It needs to be converted to an object. 
+      Properties.instance.config.backendConfig.wiriscustomheaders = Util.convertStringToObject(Properties.instance.config.backendConfig.wiriscustomheaders);
     } catch(e) {
       if (e instanceof StatusError) {
         // Do nothing; leave default values.
@@ -104,8 +117,6 @@ export class Properties {
         throw e;
       }
     }
-
-    return instance;
   }
 
   /**

package/src/retro.ts

@@ -87,7 +87,8 @@ class JsPluginViewer {
    * @deprecated Please consider using {@link renderMathML}.
    */
   async parseElement(element: HTMLElement, asynchronously?: boolean, callbackFunc?: () => void): Promise<void> {
-    return renderMathML(JsPluginViewer.properties, element);
+    await renderLatex(JsPluginViewer.properties, element);
+    return await renderMathML(JsPluginViewer.properties, element);
   }
 
   /**

package/src/services.ts

@@ -1,4 +1,5 @@
 import Parser from '@wiris/mathtype-html-integration-devkit/src/parser';
+import { Properties } from './properties';
 
 enum MethodType {
   Post = "POST",
@@ -49,11 +50,16 @@ export async function processJsonResponse(response: Promise<Response>): Promise<
 export async function callService(query: object, serviceName: string, method: MethodType, serverURL: string, extension: string) : Promise<any> {
   try {
     const url = new URL(serviceName + extension, serverURL);
+
+    const properties = Properties.getInstance();
+    const headers = {
+      'Content-type': 'application/x-www-form-urlencoded; charset=utf-8',
+      ...properties.config.backendConfig.wiriscustomheaders
+    }
+
     const init: RequestInit = {
       method,
-      headers: {
-        'Content-type': 'application/x-www-form-urlencoded; charset=utf-8',
-      },
+      headers
     };
 
     if (method === MethodType.Get) {
@@ -113,7 +119,7 @@ export async function showImage(mml: string, lang: string, url: string, extensio
   }
 
   // Try to obtain the image via GET
-  const getParams = Parser.createShowImageSrcData(params);
+  const getParams = Parser.createShowImageSrcData(params, params.lang);
   const getResponse = callService(getParams, 'showimage', MethodType.Get, url, extension);
   try {
     return await processJsonResponse(getResponse);

package/tsconfig.json

@@ -69,6 +69,7 @@
     /* Experimental Options */
     "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "resolveJsonModule": true
   },
   "exclude": [
     "node_modules", // would be the default