swipl-wasm 1.1.0 → 2.0.0

package/dist/swipl-node.d.ts

@@ -0,0 +1,2 @@
+import SWIPL = require("./common");
+export = SWIPL;

package/dist/swipl-node.js

@@ -0,0 +1,17 @@
+const path = require("path");
+const SWIPL = require("./swipl/swipl");
+
+// Wraps swipl.js built by Emscripten to provide location for
+// the .data file.
+
+module.exports = (options) => {
+  return SWIPL({
+    locateFile: (url, prefix) => {
+      if (url === "swipl-web.data") {
+        return path.join(__dirname, "swipl", "swipl-web.data");
+      }
+      return prefix + url;
+    },
+    ...options,
+  });
+};

package/package.json

@@ -1,38 +1,25 @@
 {
   "name": "swipl-wasm",
-  "version": "1.1.0",
-  "exports": {
-    "./swipl": "./dist/swipl/swipl.js",
-    "./swipl-web": "./dist/swipl/swipl-web.js",
-    ".": "./dist/index.js"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "version": "2.0.0",
   "contributors": [
     "Raivo Laanemets",
-    "Jesse Wright"
+    "Jesse Wright",
+    "Jan Wielemaker"
   ],
   "license": "BSD-2-Clause",
   "type": "commonjs",
   "devDependencies": {
     "@types/emscripten": "^1.39.6",
-    "@types/jest": "^29.0.0",
     "@types/node": "^18.7.14",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
-    "copyfiles": "^2.4.1",
-    "eslint": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^5.39.0",
+    "@typescript-eslint/parser": "^5.39.0",
+    "eslint": "^8.24.0",
     "http-server": "^14.1.1",
-    "jest": "28",
-    "jest-environment-jsdom": "^29.0.1",
+    "mocha": "^10.0.0",
+    "node-static": "^0.7.11",
     "npm-run-all": "^4.1.5",
-    "pre-commit": "^1.2.2",
-    "ts-jest": "^28.0.8",
-    "typescript": "^4.8.2"
-  },
-  "browser": {
-    "./dist/locateFile.js": "./dist/locateFile-browser.js",
-    "./dist/swipl/swipl.js": "./dist/swipl/swipl-web.js"
+    "puppeteer": "^18.0.5",
+    "typescript": "^4.8.4"
   },
   "files": [
     "dist"
@@ -41,40 +28,19 @@
     "build:wasm-docker:build": "docker build -t swipl-wasm-image docker",
     "build:wasm-docker:create": "docker create --name swipl-wasm swipl-wasm-image",
     "build:wasm-docker:remove": "docker rm swipl-wasm",
-    "build:wasm-docker:extract:data": "docker cp swipl-wasm:/swipl-devel/swipl.wasm/src/swipl-web.data dist/swipl/swipl-web.data",
-    "build:wasm-docker:extract:wasm": "docker cp swipl-wasm:/swipl-devel/swipl.wasm/src/swipl-web.wasm dist/swipl/swipl-web.wasm",
-    "build:wasm-docker:extract:web": "docker cp swipl-wasm:/swipl-devel/swipl.wasm/src/swipl-web.js dist/swipl/swipl-web.js",
-    "build:wasm-docker:extract:node": "docker cp swipl-wasm:/swipl-devel/swipl.wasm/src/swipl-web.js dist/swipl/swipl.js",
+    "build:wasm-docker:extract:data": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.data dist/swipl/swipl-web.data",
+    "build:wasm-docker:extract:wasm": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.wasm dist/swipl/swipl-web.wasm",
+    "build:wasm-docker:extract:web": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.js dist/swipl/swipl-web.js",
+    "build:wasm-docker:extract:node": "docker cp swipl-wasm:/swipl-devel/build.wasm/src/swipl-web.js dist/swipl/swipl.js",
     "build:wasm-docker:extract": "run-s build:wasm-docker:extract:*",
     "build:wasm-docker": "run-s build:wasm-docker:build build:wasm-docker:create build:wasm-docker:extract build:wasm-docker:remove",
-    "build:tsc:compile": "tsc",
-    "build:tsc:copy": "copyfiles -u 1 \"src/**/*.d.ts\" dist",
-    "build:tsc": "run-s build:tsc:*",
-    "build": "run-s build:*",
-    "prepare": "yarn run build",
+    "build": "run-s build:wasm-docker",
     "test:serve-http": "http-server . -c-1",
-    "test": "yarn run build && jest",
-    "lint": "eslint . --ext .ts"
-  },
-  "jest": {
-    "preset": "ts-jest",
-    "collectCoverage": true,
-    "coverageReporters": [
-      "json-summary",
-      "text",
-      "lcov"
-    ],
-    "coverageThreshold": {
-      "global": {
-        "branches": 10,
-        "functions": 10,
-        "lines": 10,
-        "statements": 10
-      }
-    }
-  },
-  "pre-commit": [
-    "lint",
-    "test"
-  ]
+    "test:node": "mocha tests/node.js --timeout 20000",
+    "test:browser": "mocha tests/browser.js --timeout 20000",
+    "test": "run-s test:node test:browser",
+    "lint:types": "eslint dist --ext .ts",
+    "lint:tests": "eslint tests --ext .js",
+    "lint": "run-s lint:types lint:tests"
+  }
 }

package/dist/index.d.ts

@@ -1,9 +0,0 @@
-import { SwiplOptions, SwiplModule } from './swipl/swipl';
-export default function SWIPLIsomorphic(args: SwiplOptions): Promise<SwiplModule>;
-/**
- * A utility function for executing queries
- * @param str The query
- * @returns The results object
- */
-export declare function query(str: string): Promise<any>;
-export { SwiplOptions, SwiplModule } from './swipl/swipl';

package/dist/index.js

@@ -1,34 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.query = void 0;
-const swipl_1 = __importDefault(require("./swipl/swipl"));
-const locateFile_1 = require("./locateFile");
-function SWIPLIsomorphic(args) {
-    return (0, swipl_1.default)(Object.assign({ locateFile: locateFile_1.locateFile, noInitialRun: true, arguments: ["-q"] }, args));
-}
-exports.default = SWIPLIsomorphic;
-/**
- * A utility function for executing queries
- * @param str The query
- * @returns The results object
- */
-function query(str) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const swipl = yield SWIPLIsomorphic({});
-        // See https://swi-prolog.discourse.group/t/swi-prolog-in-the-browser-using-wasm/5650/1
-        return swipl.prolog.query(str);
-    });
-}
-exports.query = query;

package/dist/locateFile-browser.d.ts

@@ -1 +0,0 @@
-export declare function locateFile(url: string): string;

package/dist/locateFile-browser.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.locateFile = void 0;
-function locateFile(url) {
-    if (url === "swipl-web.data") {
-        return "/dist/swipl/swipl-web.data";
-    }
-    else if (url === "swipl-web.wasm") {
-        return "/dist/swipl/swipl-web.wasm";
-    }
-    return url;
-}
-exports.locateFile = locateFile;

package/dist/locateFile.d.ts

@@ -1 +0,0 @@
-export declare function locateFile(url: string): string;

package/dist/locateFile.js

@@ -1,21 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.locateFile = void 0;
-const path_1 = __importDefault(require("path"));
-// This helps to find the correct locations of the
-// .data and .wasm files.
-const swiplModuleLocation = require.resolve("swipl-wasm/swipl");
-function locateFile(url) {
-    // These are common with the web version.
-    if (url === "swipl-web.data") {
-        return path_1.default.join(path_1.default.dirname(swiplModuleLocation), "swipl-web.data");
-    }
-    else if (url === "swipl-web.wasm") {
-        return path_1.default.join(path_1.default.dirname(swiplModuleLocation), "swipl-web.wasm");
-    }
-    return url;
-}
-exports.locateFile = locateFile;