eyeling 1.29.3 → 1.30.1

package/index.d.ts

@@ -169,6 +169,8 @@ declare module 'eyeling' {
     store?: string | StoreOptions;
     storePath?: string;
     storeClear?: boolean;
+    rdf?: boolean;
+    rdfSurfaces?: boolean;
   }
 
   export interface BuiltinRegistrationContext {
@@ -191,6 +193,8 @@ declare module 'eyeling' {
     includeInputFactsInClosure?: boolean;
     enforceHttps?: boolean;
     rdfjs?: boolean;
+    rdf?: boolean;
+    rdfSurfaces?: boolean;
     dataFactory?: RdfJsDataFactory | null;
     skipUnsupportedRdfJs?: boolean;
     builtinModules?: string | string[];

package/index.js

@@ -40,7 +40,8 @@ function reason(opt = {}, input = '') {
     else args.push('--no-proof-comments');
   }
 
-  if (opt.rdf) args.push('--rdf');
+  if (opt.rdf || opt.rdfSurfaces) args.push('--rdf');
+  if (opt.rdfSurfaces) args.push('--rdf-surfaces');
 
   if (typeof opt.store === 'string' && opt.store) args.push('--store', opt.store);
   else if (opt.store && typeof opt.store === 'object') {

package/lib/cli.js

@@ -685,7 +685,7 @@ async function ingestLineBasedRdfSourceToStore(sourceLabel, store, { rdfMode = t
 }
 
 
-async function runStreamMessagesMode(sourceLabels, { rdfMode, storeName = null, storePath = null, storeClear = false } = {}) {
+async function runStreamMessagesMode(sourceLabels, { rdfMode, rdfSurfacesMode = false, storeName = null, storePath = null, storeClear = false } = {}) {
   const ordinarySourceLabels = [];
   const messageSourceLabels = [];
 
@@ -723,6 +723,7 @@ async function runStreamMessagesMode(sourceLabels, { rdfMode, storeName = null,
           keepSourceArtifacts: false,
           sourceLocations: false,
           rdf: rdfMode,
+          rdfSurfaces: rdfSurfacesMode,
         }),
       );
     } catch (e) {
@@ -756,6 +757,7 @@ async function runStreamMessagesMode(sourceLabels, { rdfMode, storeName = null,
               keepSourceArtifacts: false,
               sourceLocations: false,
               rdf: false,
+              rdfSurfaces: false,
             });
           } catch (e) {
             if (e && e.name === 'N3SyntaxError') {
@@ -810,6 +812,7 @@ async function main() {
       `  -h, --help                   Show this help and exit.\n` +
       `  -p, --proof                  Enable proof explanations.\n` +
       `  -r, --rdf                    Enable RDF/TriG input/output compatibility.\n` +
+      `      --rdf-surfaces           Enable RDF Surfaces %not[...%] syntax (implies --rdf).\n` +
       `      --stream-messages        Process RDF Message Logs one message at a time under -r.\n` +
       `      --store <name>           Use an optional persistent fact store.\n` +
       `      --store-clear            Clear the named store before this run.\n` +
@@ -885,7 +888,8 @@ async function main() {
   const showAst = argv.includes('--ast') || argv.includes('-a');
   const streamMode = argv.includes('--stream') || argv.includes('-t');
   const streamMessagesMode = argv.includes('--stream-messages');
-  const rdfMode = argv.includes('--rdf') || argv.includes('-r');
+  const rdfSurfacesMode = argv.includes('--rdf-surfaces');
+  const rdfMode = argv.includes('--rdf') || argv.includes('-r') || rdfSurfacesMode;
   const storeName = argv.__storeName || null;
   const storePath = argv.__storePath || null;
   const storeClear = argv.includes('--store-clear');
@@ -954,7 +958,7 @@ async function main() {
   }
 
   if (streamMessagesMode) {
-    await runStreamMessagesMode(sourceLabels, { rdfMode, storeName, storePath, storeClear });
+    await runStreamMessagesMode(sourceLabels, { rdfMode, rdfSurfacesMode, storeName, storePath, storeClear });
     return;
   }
 
@@ -1008,6 +1012,7 @@ async function main() {
                 keepSourceArtifacts: false,
                 sourceLocations: false,
                 rdf: rdfMode,
+                rdfSurfaces: rdfSurfacesMode,
               }),
             );
           } catch (e) {
@@ -1020,7 +1025,7 @@ async function main() {
         }
 
         const mergedRuleDocument = mergeParsedDocuments(parsedRuleSources);
-        const result = await engine.runStoreBacked(mergedRuleDocument, store, { rdf: rdfMode });
+        const result = await engine.runStoreBacked(mergedRuleDocument, store, { rdf: rdfMode, rdfSurfaces: rdfSurfacesMode });
         const outTriples = result.queryMode ? result.queryTriples || [] : (result.derived || []).map((df) => df.fact);
         if (result.queryMode) {
           const bodyText = engine.prettyPrintQueryTriples(outTriples, result.prefixes);
@@ -1055,6 +1060,7 @@ async function main() {
           keepSourceArtifacts: false,
           sourceLocations: engine.getProofCommentsEnabled(),
           rdf: rdfMode,
+          rdfSurfaces: rdfSurfacesMode,
         }),
       );
     } catch (e) {
@@ -1155,6 +1161,7 @@ function factsContainOutputStrings(triplesForOutput) {
       {
         proof: engine.getProofCommentsEnabled(),
         rdf: rdfMode,
+        rdfSurfaces: rdfSurfacesMode,
         store: { name: storeName, clear: storeClear, path: storePath || undefined },
       },
     );

package/lib/engine.js

@@ -3623,12 +3623,14 @@ function reasonStream(input, opts = {}) {
     skipUnsupportedRdfJs = false,
     builtinModules = null,
     rdf = false,
+    rdfSurfaces = false,
     sourceLabel = '<input>',
   } = opts;
 
-  const useRdfCompatibility = !!rdf;
+  const useRdfCompatibility = !!rdf || !!rdfSurfaces;
+  const useRdfSurfaces = !!rdfSurfaces;
 
-  const parsedSourceList = parseN3SourceList(input, { baseIri, rdf: useRdfCompatibility, sourceLocations: proof });
+  const parsedSourceList = parseN3SourceList(input, { baseIri, rdf: useRdfCompatibility, rdfSurfaces: useRdfSurfaces, sourceLocations: proof });
   const parsedTextInput = (!parsedSourceList && proof && typeof input === 'string')
     ? parseN3Text(input, {
         baseIri: baseIri || '',
@@ -3636,6 +3638,7 @@ function reasonStream(input, opts = {}) {
         keepSourceArtifacts: false,
         sourceLocations: true,
         rdf: useRdfCompatibility,
+        rdfSurfaces: useRdfSurfaces,
       })
     : null;
   const hasInlineN3 = input && typeof input === 'object' && !Array.isArray(input) && typeof input.n3 === 'string';
@@ -3680,6 +3683,7 @@ function reasonStream(input, opts = {}) {
       keepSourceArtifacts: false,
       sourceLocations: proof,
       rdf: useRdfCompatibility,
+      rdfSurfaces: useRdfSurfaces,
     });
     prefixes = directDoc.prefixes;
     triples = directDoc.triples;
@@ -3791,10 +3795,11 @@ async function __parseRunAsyncInput(input, opts) {
     baseIri = null,
     proof = false,
     rdf = false,
+    rdfSurfaces = false,
     sourceLabel = '<input>',
   } = opts || {};
 
-  const parsedSourceList = parseN3SourceList(input, { baseIri, rdf: !!rdf, sourceLocations: !!proof });
+  const parsedSourceList = parseN3SourceList(input, { baseIri, rdf: !!rdf || !!rdfSurfaces, rdfSurfaces: !!rdfSurfaces, sourceLocations: !!proof });
   if (parsedSourceList) return parsedSourceList;
 
   const parsedObject = await normalizeParsedReasonerInputAsync(input);
@@ -3809,7 +3814,8 @@ async function __parseRunAsyncInput(input, opts) {
     label: sourceLabel || '<input>',
     keepSourceArtifacts: false,
     sourceLocations: !!proof,
-    rdf: !!rdf,
+    rdf: !!rdf || !!rdfSurfaces,
+    rdfSurfaces: !!rdfSurfaces,
   });
 }
 
@@ -3885,7 +3891,8 @@ async function __proveGoalsAgainstStore(goals, subst, store, backRules, localFac
 async function runStoreBacked(input, store, opts = {}) {
   const parsed = parseN3SourceList(input, {
     baseIri: opts.baseIri || null,
-    rdf: !!opts.rdf,
+    rdf: !!opts.rdf || !!opts.rdfSurfaces,
+    rdfSurfaces: !!opts.rdfSurfaces,
     sourceLocations: !!opts.proof,
   }) || input;
 
@@ -4002,7 +4009,8 @@ async function runAsync(input, opts = {}) {
   if (!storeConfig) {
     const normalizedInput = parseN3SourceList(input, {
       baseIri: runOpts.baseIri || null,
-      rdf: !!runOpts.rdf,
+      rdf: !!runOpts.rdf || !!runOpts.rdfSurfaces,
+      rdfSurfaces: !!runOpts.rdfSurfaces,
       sourceLocations: !!runOpts.proof,
     }) || (await normalizeReasonerInputAsync(input));
     return reasonStream(normalizedInput, runOpts);

package/lib/lexer.js

@@ -7,6 +7,8 @@
 
 'use strict';
 
+const { normalizeRdfSurfaces } = require('./rdf_surfaces');
+
 class Token {
   constructor(typ, value = null, offset = null) {
     this.typ = typ;
@@ -1347,7 +1349,9 @@ function isNumericLikeIdentifier(word) {
 
 function lex(inputText, opts = {}) {
   const rdf = !!(opts && opts.rdf);
+  const rdfSurfaces = !!(opts && opts.rdfSurfaces);
   if (rdf) inputText = normalizeRdfCompatibility(inputText);
+  if (rdfSurfaces) inputText = normalizeRdfSurfaces(inputText);
   // Avoid copying large ASCII/BMP inputs into an Array.  Array.from() is
   // only needed when the text contains surrogate pairs and we want the old
   // code-point iteration behavior for non-BMP characters.

package/lib/multisource.js

@@ -172,9 +172,10 @@ function parseN3Text(text, opts = {}) {
     collectUsedPrefixes = false,
     sourceLocations = false,
     rdf = false,
+    rdfSurfaces = false,
   } = opts || {};
 
-  if (rdf) {
+  if (rdf && !rdfSurfaces) {
     const fastDoc = tryParseFastRdfText(text, { baseIri, label });
     if (fastDoc) {
       if (sourceLocations) annotateParsedSourceLocations(fastDoc, text, label);
@@ -183,7 +184,7 @@ function parseN3Text(text, opts = {}) {
     }
   }
 
-  const tokens = lex(text, { rdf });
+  const tokens = lex(text, { rdf, rdfSurfaces });
   const parser = new Parser(tokens);
   if (baseIri) parser.prefixes.setBase(baseIri);
   const [prefixes, triples, frules, brules, logQueryRules] = parser.parseDocument();
@@ -382,7 +383,8 @@ function parseN3SourceList(input, opts = {}) {
       collectUsedPrefixes: true,
       keepSourceArtifacts: !!opts.keepSourceArtifacts,
       sourceLocations: !!opts.sourceLocations,
-      rdf: !!opts.rdf,
+      rdf: !!opts.rdf || !!opts.rdfSurfaces,
+      rdfSurfaces: !!opts.rdfSurfaces,
     }),
   );
   return mergeParsedDocuments(parsed, {