@mml-io/mml-schema-validator 0.17.1 → 0.18.1

package/build/index.js

@@ -1,16 +1,33 @@
 // src/validate.ts
 import { schemaXML } from "@mml-io/mml-schema";
-import validateAgainstSchema from "xsd-validator";
-function validateMMLDocument(document) {
-  const result = validateAgainstSchema.default(
-    document,
-    schemaXML
-  );
-  if (result === true) {
-    return null;
-  } else {
-    return result;
+import { XmlDocument, XmlValidateError, XsdValidator } from "libxml2-wasm";
+function validateMMLDocument(xml) {
+  const parsedXML = XmlDocument.fromString(xml.toString());
+  const parsedSchema = XmlDocument.fromString(schemaXML.toString());
+  const validator = XsdValidator.fromDoc(parsedSchema);
+  let error = null;
+  try {
+    validator.validate(parsedXML);
+  } catch (e) {
+    error = e;
   }
+  parsedXML.dispose();
+  parsedSchema.dispose();
+  validator.dispose();
+  if (error) {
+    if (error instanceof XmlValidateError) {
+      return error.details.map((detail) => ({
+        name: "ValidationError",
+        message: detail.message,
+        file: detail.file,
+        line: detail.line,
+        col: detail.col
+      }));
+    } else {
+      throw error;
+    }
+  }
+  return null;
 }
 export {
   validateMMLDocument

package/build/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/validate.ts"],
-  "sourcesContent": ["import { schemaXML } from \"@mml-io/mml-schema\";\nimport validateAgainstSchema from \"xsd-validator\";\n\nexport function validateMMLDocument(document: string): Array<Error> | null {\n  const result = ((validateAgainstSchema as any).default as typeof validateAgainstSchema)(\n    document,\n    schemaXML,\n  );\n  if (result === true) {\n    return null;\n  } else {\n    return result;\n  }\n}\n"],
-  "mappings": ";AAAA,SAAS,iBAAiB;AAC1B,OAAO,2BAA2B;AAE3B,SAAS,oBAAoB,UAAuC;AACzE,QAAM,SAAW,sBAA8B;AAAA,IAC7C;AAAA,IACA;AAAA,EACF;AACA,MAAI,WAAW,MAAM;AACnB,WAAO;AAAA,EACT,OAAO;AACL,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { schemaXML } from \"@mml-io/mml-schema\";\nimport { XmlDocument, XmlError, XmlValidateError, XsdValidator } from \"libxml2-wasm\";\n\nexport interface ValidationError extends Error {\n  /**\n   * The message of the error during processing.\n   */\n  message: string;\n  /**\n   * The filename\n   */\n  file?: string;\n  /**\n   * The line number of the xml file, where the error is occurred.\n   */\n  line: number;\n  /**\n   * The column number of the xml file, where the error is occurred.\n   */\n  col: number;\n}\n\nexport function validateMMLDocument(xml: string | Buffer): null | ValidationError[] {\n  const parsedXML = XmlDocument.fromString(xml.toString());\n  const parsedSchema = XmlDocument.fromString(schemaXML.toString());\n  const validator = XsdValidator.fromDoc(parsedSchema);\n\n  let error: XmlValidateError | XmlError | null = null;\n  try {\n    validator.validate(parsedXML);\n  } catch (e) {\n    error = e;\n  }\n  parsedXML.dispose();\n  parsedSchema.dispose();\n  validator.dispose();\n\n  if (error) {\n    if (error instanceof XmlValidateError) {\n      return error.details.map((detail) => ({\n        name: \"ValidationError\",\n        message: detail.message,\n        file: detail.file,\n        line: detail.line,\n        col: detail.col,\n      }));\n    } else {\n      throw error;\n    }\n  }\n  return null;\n}\n"],
+  "mappings": ";AAAA,SAAS,iBAAiB;AAC1B,SAAS,aAAuB,kBAAkB,oBAAoB;AAqB/D,SAAS,oBAAoB,KAAgD;AAClF,QAAM,YAAY,YAAY,WAAW,IAAI,SAAS,CAAC;AACvD,QAAM,eAAe,YAAY,WAAW,UAAU,SAAS,CAAC;AAChE,QAAM,YAAY,aAAa,QAAQ,YAAY;AAEnD,MAAI,QAA4C;AAChD,MAAI;AACF,cAAU,SAAS,SAAS;AAAA,EAC9B,SAAS,GAAG;AACV,YAAQ;AAAA,EACV;AACA,YAAU,QAAQ;AAClB,eAAa,QAAQ;AACrB,YAAU,QAAQ;AAElB,MAAI,OAAO;AACT,QAAI,iBAAiB,kBAAkB;AACrC,aAAO,MAAM,QAAQ,IAAI,CAAC,YAAY;AAAA,QACpC,MAAM;AAAA,QACN,SAAS,OAAO;AAAA,QAChB,MAAM,OAAO;AAAA,QACb,MAAM,OAAO;AAAA,QACb,KAAK,OAAO;AAAA,MACd,EAAE;AAAA,IACJ,OAAO;AACL,YAAM;AAAA,IACR;AAAA,EACF;AACA,SAAO;AACT;",
   "names": []
 }

package/build/validate.d.ts

@@ -1 +1,19 @@
-export declare function validateMMLDocument(document: string): Array<Error> | null;
+export interface ValidationError extends Error {
+    /**
+     * The message of the error during processing.
+     */
+    message: string;
+    /**
+     * The filename
+     */
+    file?: string;
+    /**
+     * The line number of the xml file, where the error is occurred.
+     */
+    line: number;
+    /**
+     * The column number of the xml file, where the error is occurred.
+     */
+    col: number;
+}
+export declare function validateMMLDocument(xml: string | Buffer): null | ValidationError[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mml-io/mml-schema-validator",
-  "version": "0.17.1",
+  "version": "0.18.1",
   "publishConfig": {
     "access": "public"
   },
@@ -17,8 +17,8 @@
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest"
   },
   "dependencies": {
-    "@mml-io/mml-schema": "^0.17.1",
-    "xsd-validator": "1.1.1"
+    "@mml-io/mml-schema": "^0.18.1",
+    "libxml2-wasm": "0.4.0"
   },
-  "gitHead": "d1069c5541fadd1ae78700dbbd94d55a481d373a"
+  "gitHead": "ef5baff6cda84a1acaed56a957c6b81f4c5acfd5"
 }