@aml-org/amf-custom-validator 0.1.0-SNAPSHOT.6 → 1.0.0-SNAPSHOT.56

package/cli.js

@@ -0,0 +1,13 @@
+const validator = require("./index.js");
+const fs = require("fs");
+
+const args = process.argv.slice(2);
+
+const profile = fs.readFileSync(process.cwd() + "/" + args[0]).toString();
+const data = fs.readFileSync(process.cwd() + "/" + args[1]).toString();
+const debug = args[2] === 'true';
+
+validator.validate(profile, data, debug, (result, other) => {
+    console.log(result);
+    validator.exit();
+});

package/index.js

@@ -1,11 +1,11 @@
 require(__dirname + "/lib/wasm_exec");
 const fs = require("fs");
 const pako = require("pako");
-const wasm_gz = fs.readFileSync(__dirname + "/lib/main.wasm.gz")
-const wasm = pako.ungzip(wasm_gz)
+let wasm_gz
+let wasm
 
-let INIT = false
-let go = new Go();
+let initialized = false
+let go = undefined;
 
 const run = function(profile, data, debug) {
     let before = new Date()
@@ -16,31 +16,41 @@ const run = function(profile, data, debug) {
 }
 
 const validateCustomProfile = function(profile, data, debug, cb) {
-    if (INIT) {
+    if (initialized) {
         let res = run(profile, data, debug);
-        cb(res,null);
+        cb(res,undefined);
     } else {
-        if (WebAssembly) {
-            WebAssembly.instantiate(wasm, go.importObject).then((result) => {
-                go.run(result.instance);
-                INIT = true;
-                let res = run(profile, data, debug);
-                cb(res,null);
-            });
-        } else {
-            cb(null,new Error("WebAssembly is not supported in your JS environment"));
-        }
+        cb(undefined,new Error("WASM/GO not initialized"))
+    }
+}
+const initialize = function(cb) {
+    if (initialized === true) {
+        cb(undefined)
+    }
+    go = new Go();
+    if(!wasm_gz || !wasm) {
+        wasm_gz = fs.readFileSync(__dirname + "/lib/main.wasm.gz")
+        wasm = pako.ungzip(wasm_gz)
+    }
+    if (WebAssembly) {
+        WebAssembly.instantiate(wasm, go.importObject).then((result) => {
+            go.run(result.instance);
+            initialized = true;
+            cb(undefined);
+        });
+    } else {
+        cb(new Error("WebAssembly is not supported in your JS environment"));
     }
 }
 
 const exit = function() {
-    if(INIT) {
+    if(initialized) {
         __AMF__terminateValidator()
         go.exit(0)
-        INIT = false;
-        go = new Go();
+        initialized = false;
     }
 }
 
+module.exports.initialize = initialize;
 module.exports.validate = validateCustomProfile;
 module.exports.exit = exit;

package/lib/wasm_exec.js

@@ -1,3 +1,8 @@
+// wasm_exec.js obtained from https://github.com/golang/go/blob/758ac371ab930734053ed226ac62681e62ab8eea/misc/wasm/wasm_exec.js
+// Log with custom changes (we should keep track if we diverge from original content):
+//  -
+
+// ---------------------------------------------------
 // Copyright 2018 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
@@ -11,6 +16,7 @@
 	// - Node.js
 	// - Electron
 	// - Parcel
+	// - Webpack
 
 	if (typeof global !== "undefined") {
 		// global already exists
@@ -28,7 +34,7 @@
 
 	if (!global.fs && global.require) {
 		const fs = require("fs");
-		if (Object.keys(fs) !== 0) {
+		if (typeof fs === "object" && fs !== null && Object.keys(fs).length !== 0) {
 			global.fs = fs;
 		}
 	}
@@ -556,6 +562,7 @@
 	}
 
 	if (
+		typeof module !== "undefined" &&
 		global.require &&
 		global.require.main === module &&
 		global.process &&
@@ -585,4 +592,4 @@
 			process.exit(1);
 		});
 	}
-})();
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aml-org/amf-custom-validator",
-  "version": "0.1.0-SNAPSHOT.6",
+  "version": "1.0.0-SNAPSHOT.56",
   "description": "AMF validator backed by OPA Rego",
   "main": "index.js",
   "scripts": {
@@ -12,6 +12,6 @@
     "mocha": "^8.4.0"
   },
   "dependencies": {
-    "pako": "^2.0.3"
+    "pako": "^2.0.4"
   }
 }

package/test/simple.js

@@ -4,30 +4,37 @@ var assert = require('assert');
 describe('validator', () => {
 
     describe('validate', () => {
+
+        function invalidReport(report) {
+            return report[0]["doc:encodes"][0]["conforms"] === false
+        }
+
         it("should load the WASM code, validate a profile, exit", (done) => {
             const profile = fs.readFileSync(__dirname + "/../../../test/data/integration/profile10/profile.yaml").toString()
             const data = fs.readFileSync(__dirname + "/../../../test/data/integration/profile10/negative.data.jsonld").toString()
 
             const validator = require(__dirname + "/../index")
 
-            validator.validate(profile, data, false, (r, err) => {
-                if (err) {
-                    done(err);
-                } else {
-                    let report = JSON.parse(r)
-                    assert.ok(report["http://www.w3.org/ns/shacl#conforms"] === false)
-                    validator.validate(profile, data, false, (r,err) => {
-                        if (err) {
-                            done(err)
-                        } else {
-                            let report = JSON.parse(r)
-                            assert.ok(report["http://www.w3.org/ns/shacl#conforms"] === false)
-                            validator.exit();
-                            done();
-                        }
-                    });
-                }
-            });
+            validator.initialize(() => {
+                validator.validate(profile, data, false, (r, err) => {
+                    if (err) {
+                        done(err);
+                    } else {
+                        let report = JSON.parse(r)
+                        assert.ok(invalidReport(report))
+                        validator.validate(profile, data, false, (r, err) => {
+                            if (err) {
+                                done(err)
+                            } else {
+                                let report = JSON.parse(r)
+                                assert.ok(invalidReport(report))
+                                validator.exit();
+                                done();
+                            }
+                        });
+                    }
+                });
+            })
         });
     })
 })