eyereasoner 1.14.0 → 2.0.0

package/dist/transformers.d.ts

@@ -1,34 +1,12 @@
 /// <reference types="emscripten" />
 import type { SWIPLModule } from 'swipl-wasm/dist/swipl/swipl';
 import { Quad } from '@rdfjs/types';
-import SWIPL from './swipl-bundled.temp';
-export declare function loadEyeImage(swipl: typeof SWIPL): (options?: Partial<EmscriptenModule> | undefined) => any;
+import type SWIPL_TYPE from 'swipl-wasm/dist/common';
+export declare function loadEyeImage(swipl: typeof SWIPL_TYPE): (options?: Partial<EmscriptenModule> | undefined) => Promise<SWIPLModule>;
 /**
  * Creates default SWIPL image loaded with EYE
  */
-export declare function SwiplEye(options?: Partial<EmscriptenModule> | undefined): any;
-/**
- * Writes eye.pl to the Module
- * @param Module A SWIPL Module
- * @returns A SWIPL Module
- * @deprecated
- */
-export declare function writeEye(Module: SWIPLModule): SWIPLModule;
-/**
- * Consults the eye.pl Module
- * @param Module A SWIPL Module
- * @returns A SWIPL Module
- * @deprecated
- */
-export declare function consultEye(Module: SWIPLModule): SWIPLModule;
-/**
- * A SWIPL transformer that loads and consults eye.pl in the
- * given SWIPL module
- * @param Module A SWIPL Module
- * @returns The same SWIPL module with EYE loaded and consulted
- * @deprecated
- */
-export declare function loadEye(Module: SWIPLModule): SWIPLModule;
+export declare function SwiplEye(options?: Partial<EmscriptenModule> | undefined): Promise<SWIPLModule>;
 /**
  * Execute a query over a given data file
  * @param Module A SWIPL Module
@@ -37,28 +15,17 @@ export declare function loadEye(Module: SWIPLModule): SWIPLModule;
  * @returns The same SWIPL module
  */
 export declare function runQuery(Module: SWIPLModule, data: string, queryString: string): SWIPLModule;
-/**
- * @param Module A SWIPL Module
- * @param data The data as N3
- * @param queryString The query as N3
- * @returns
- * @deprecated
- */
-export declare function loadAndRunQuery(Module: SWIPLModule, data: string, queryString: string): SWIPLModule;
 /**
  * @param swipl The base SWIPL module to use
  * @param data The data for the query (in N3 format)
  * @param queryString The query (in N3 format)
  * @returns The result of the query
  */
-export declare function executeBasicEyeQuery(swipl: typeof SWIPL, data: string, queryString: string): Promise<string>;
+export declare function executeBasicEyeQuery(swipl: typeof SWIPL_TYPE, data: string, queryString: string): Promise<string>;
 /**
  * @param swipl The base SWIPL module to use
  * @param data The data for the query (in N3 format)
  * @param queryString The query (in N3 format)
  * @returns The result of the query
  */
-export declare function executeBasicEyeQueryQuads(swipl: typeof SWIPL, data: Quad[], queryString: Quad[]): Promise<{
-    result: Quad[];
-    proof: Quad[];
-}>;
+export declare function executeBasicEyeQueryQuads(swipl: typeof SWIPL_TYPE, data: Quad[], queryString: Quad[]): Promise<Quad[]>;

package/dist/transformers.js

@@ -1,30 +1,23 @@
 "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.executeBasicEyeQueryQuads = exports.executeBasicEyeQuery = exports.loadAndRunQuery = exports.runQuery = exports.loadEye = exports.consultEye = exports.writeEye = exports.SwiplEye = exports.loadEyeImage = void 0;
+exports.executeBasicEyeQueryQuads = exports.executeBasicEyeQuery = exports.runQuery = exports.SwiplEye = exports.loadEyeImage = void 0;
 const n3_1 = require("n3");
 // @ts-ignore
 const swipl_bundled_temp_1 = __importDefault(require("./swipl-bundled.temp"));
 const n3Writer_temp_1 = require("./n3Writer.temp");
-const eye_pl_1 = __importDefault(require("./eye.pl"));
-const eye_pvm_1 = __importDefault(require("./eye.pvm"));
+const eye_1 = __importDefault(require("./eye"));
 const query_1 = require("./query");
 const strToBuffer_1 = require("./strToBuffer");
 function loadEyeImage(swipl) {
-    return (options) => swipl(Object.assign(Object.assign({}, options), { arguments: ['-q', '-x', 'eye.pvm'], 
+    return (options) => swipl({
+        ...options,
+        arguments: ['-q', '-x', 'eye.pvm'],
         // @ts-ignore
-        preRun: (module) => module.FS.writeFile('eye.pvm', (0, strToBuffer_1.strToBuffer)(eye_pvm_1.default)) }));
+        preRun: (module) => module.FS.writeFile('eye.pvm', (0, strToBuffer_1.strToBuffer)(eye_1.default)),
+    });
 }
 exports.loadEyeImage = loadEyeImage;
 /**
@@ -34,39 +27,6 @@ function SwiplEye(options) {
     return loadEyeImage(swipl_bundled_temp_1.default)(options);
 }
 exports.SwiplEye = SwiplEye;
-/**
- * Writes eye.pl to the Module
- * @param Module A SWIPL Module
- * @returns A SWIPL Module
- * @deprecated
- */
-function writeEye(Module) {
-    Module.FS.writeFile('eye.pl', eye_pl_1.default);
-    return Module;
-}
-exports.writeEye = writeEye;
-/**
- * Consults the eye.pl Module
- * @param Module A SWIPL Module
- * @returns A SWIPL Module
- * @deprecated
- */
-function consultEye(Module) {
-    (0, query_1.queryOnce)(Module, 'consult', 'eye.pl');
-    return Module;
-}
-exports.consultEye = consultEye;
-/**
- * A SWIPL transformer that loads and consults eye.pl in the
- * given SWIPL module
- * @param Module A SWIPL Module
- * @returns The same SWIPL module with EYE loaded and consulted
- * @deprecated
- */
-function loadEye(Module) {
-    return consultEye(writeEye(Module));
-}
-exports.loadEye = loadEye;
 /**
  * Execute a query over a given data file
  * @param Module A SWIPL Module
@@ -77,34 +37,21 @@ exports.loadEye = loadEye;
 function runQuery(Module, data, queryString) {
     Module.FS.writeFile('data.nq', data);
     Module.FS.writeFile('query.nq', queryString);
-    (0, query_1.queryOnce)(Module, 'main', ['--quiet', './data.nq', '--query', './query.nq']);
+    (0, query_1.queryOnce)(Module, 'main', ['--nope', '--quiet', './data.nq', '--query', './query.nq']);
     return Module;
 }
 exports.runQuery = runQuery;
-/**
- * @param Module A SWIPL Module
- * @param data The data as N3
- * @param queryString The query as N3
- * @returns
- * @deprecated
- */
-function loadAndRunQuery(Module, data, queryString) {
-    return runQuery(loadEye(Module), data, queryString);
-}
-exports.loadAndRunQuery = loadAndRunQuery;
 /**
  * @param swipl The base SWIPL module to use
  * @param data The data for the query (in N3 format)
  * @param queryString The query (in N3 format)
  * @returns The result of the query
  */
-function executeBasicEyeQuery(swipl, data, queryString) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let res = '';
-        const Module = yield loadEyeImage(swipl)({ print: (str) => { res += `${str}\n`; }, arguments: ['-q'] });
-        runQuery(Module, data, queryString);
-        return res;
-    });
+async function executeBasicEyeQuery(swipl, data, queryString) {
+    let res = '';
+    const Module = await loadEyeImage(swipl)({ print: (str) => { res += `${str}\n`; }, arguments: ['-q'] });
+    runQuery(Module, data, queryString);
+    return res;
 }
 exports.executeBasicEyeQuery = executeBasicEyeQuery;
 /**
@@ -113,26 +60,9 @@ exports.executeBasicEyeQuery = executeBasicEyeQuery;
  * @param queryString The query (in N3 format)
  * @returns The result of the query
  */
-function executeBasicEyeQueryQuads(swipl, data, queryString) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const parser = new n3_1.Parser({ format: 'text/n3' });
-        const queryResult = yield executeBasicEyeQuery(swipl, (0, n3Writer_temp_1.write)(data), (0, n3Writer_temp_1.write)(queryString));
-        const proof = parser.parse(queryResult);
-        const store = new n3_1.Store(proof);
-        const proofNode = store.getSubjects('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/2000/10/swap/reason#Proof', n3_1.DataFactory.defaultGraph());
-        if (proofNode.length !== 1) {
-            throw new Error(`Expected exactly one proof: received ${proofNode.length}`);
-        }
-        const results = store.getObjects(proofNode[0], 'http://www.w3.org/2000/10/swap/reason#gives', n3_1.DataFactory.defaultGraph());
-        if (results.length !== 1) {
-            throw new Error(`Expected exactly one triple giving inference results from proof: received ${results.length}`);
-        }
-        const result = store.getQuads(null, null, null, results[0])
-            .map((res) => n3_1.DataFactory.quad(res.subject, res.predicate, res.object));
-        return {
-            proof,
-            result,
-        };
-    });
+async function executeBasicEyeQueryQuads(swipl, data, queryString) {
+    const parser = new n3_1.Parser({ format: 'text/n3' });
+    const queryResult = await executeBasicEyeQuery(swipl, (0, n3Writer_temp_1.write)(data), (0, n3Writer_temp_1.write)(queryString));
+    return parser.parse(queryResult);
 }
 exports.executeBasicEyeQueryQuads = executeBasicEyeQueryQuads;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyereasoner",
-  "version": "1.14.0",
+  "version": "2.0.0",
   "description": "Distributing the [EYE](https://github.com/josd/eye) reasoner for browser and node using WebAssembly.",
   "main": "dist/index.js",
   "types": "dist/index.d.js",
@@ -19,14 +19,11 @@
     "build": "npm run eye:prepare && tsc",
     "prepare": "npm run build",
     "semantic-release": "semantic-release",
-    "eye:fetch": "ts-node scripts/fetch-eye",
     "eye:pvm": "ts-node scripts/generate-pvm",
     "eye:pvm:test": "ts-node scripts/run-pvm",
-    "eye:build:pl": "rollup --config rollup.config.mjs",
-    "eye:build:pvm": "rollup --config rollup.config.pvm.mjs",
-    "eye:prepare": "npm run eye:fetch && npm run eye:build:pl && npm run eye:pvm && npm run eye:build:pvm",
+    "eye:prepare": "npm run eye:pvm",
     "eye:update": "ts-node scripts/update",
-    "perf": "ts-node perf/socrates && ts-node perf/socrates-pvm"
+    "perf": "ts-node perf/socrates"
   },
   "repository": {
     "type": "git",
@@ -67,9 +64,6 @@
     "jest-environment-jsdom": "^29.3.1",
     "jest-rdf": "^1.8.0",
     "pre-commit": "^1.2.2",
-    "rollup": "^3.9.1",
-    "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-typescript2": "^0.34.1",
     "semantic-release": "^20.0.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
@@ -109,6 +103,10 @@
     "swipl-wasm": "^3.0.0"
   },
   "peerDependencies": {
-    "@rdfjs/types": "^1.1.0"
+    "@rdfjs/types": "^1.1.0",
+    "@types/emscripten": "^1.39.6"
+  },
+  "bin": {
+    "eyereasoner": "dist/bin/index.js"
   }
 }

package/dist/eye.pl.d.ts

@@ -1,2 +0,0 @@
-declare var eye: string;
-export { eye as default };