eyeling 1.28.7 → 1.28.9

package/lib/lexer.js

@@ -1547,7 +1547,76 @@ function lex(inputText, opts = {}) {
       continue;
     }
 
-    // 5) Single-character punctuation.  Use a switch rather than allocating a
+    // 5) Numeric literal (integer, decimal, or double). Turtle/N3 numeric
+    // literals may have a leading sign and decimals may start with '.', e.g.
+    // '+42' and '.5'.  Reject repeated decimal points so '1.2.3'
+    // cannot be misread as one impossible numeric-like token.
+    if (
+      isAsciiDigit(c) ||
+      ((c === '+' || c === '-') && (isAsciiDigit(peek(1)) || (peek(1) === '.' && isAsciiDigit(peek(2))))) ||
+      (c === '.' && isAsciiDigit(peek(1)) && !isAsciiDigit(peek(-1)))
+    ) {
+      const start = i;
+      const numChars = [];
+
+      if (chars[i] === '+' || chars[i] === '-') {
+        numChars.push(chars[i]);
+        i++;
+      }
+
+      if (chars[i] === '.') {
+        numChars.push('.');
+        i++;
+        while (i < n && isAsciiDigit(chars[i])) {
+          numChars.push(chars[i]);
+          i++;
+        }
+      } else {
+        while (i < n && isAsciiDigit(chars[i])) {
+          numChars.push(chars[i]);
+          i++;
+        }
+        if (i < n && chars[i] === '.' && i + 1 < n && isAsciiDigit(chars[i + 1])) {
+          numChars.push('.');
+          i++;
+          while (i < n && isAsciiDigit(chars[i])) {
+            numChars.push(chars[i]);
+            i++;
+          }
+        }
+      }
+
+      if (i < n && chars[i] === '.' && i + 1 < n && isAsciiDigit(chars[i + 1])) {
+        throw new N3SyntaxError('Malformed numeric literal: multiple decimal points', start);
+      }
+
+      // Optional exponent part: e.g., 1e0, 1.1e-3, .5E+0.
+      if (i < n && (chars[i] === 'e' || chars[i] === 'E')) {
+        let j = i + 1;
+        if (j < n && (chars[j] === '+' || chars[j] === '-')) j++;
+        if (j < n && isAsciiDigit(chars[j])) {
+          numChars.push(chars[i]); // e/E
+          i++;
+          if (i < n && (chars[i] === '+' || chars[i] === '-')) {
+            numChars.push(chars[i]);
+            i++;
+          }
+          while (i < n && isAsciiDigit(chars[i])) {
+            numChars.push(chars[i]);
+            i++;
+          }
+        }
+      }
+
+      if (i < n && chars[i] === '.' && i + 1 < n && isAsciiDigit(chars[i + 1])) {
+        throw new N3SyntaxError('Malformed numeric literal: multiple decimal points', start);
+      }
+
+      tokens.push(new Token('Literal', numChars.join(''), start));
+      continue;
+    }
+
+    // 6) Single-character punctuation.  Use a switch rather than allocating a
     // mapping object for every punctuation token in large inputs.
     switch (c) {
       case '{':
@@ -1668,13 +1737,17 @@ function lex(inputText, opts = {}) {
           }
           continue;
         }
+        if (cc === '\n' || cc === '\r') {
+          throw new N3SyntaxError('Unescaped newline in short string literal', start);
+        }
         if (cc === '"') {
           closed = true;
           break;
         }
         if (sChars !== null) sChars.push(cc);
       }
-      const rawContent = sChars === null ? sliceChars(contentStart, closed ? i - 1 : i) : sChars.join('');
+      if (!closed) throw new N3SyntaxError('Unterminated short string literal "..."', start);
+      const rawContent = sChars === null ? sliceChars(contentStart, i - 1) : sChars.join('');
       const decoded = sChars === null ? rawContent : decodeN3StringEscapes(rawContent, start);
       if (sChars !== null || inputMayContainInvalidStringChar) assertValidStringLiteralValue(decoded, start);
       const s = JSON.stringify(decoded); // canonical short quoted form
@@ -1758,13 +1831,17 @@ function lex(inputText, opts = {}) {
           }
           continue;
         }
+        if (cc === '\n' || cc === '\r') {
+          throw new N3SyntaxError('Unescaped newline in short string literal', start);
+        }
         if (cc === "'") {
           closed = true;
           break;
         }
         if (sChars !== null) sChars.push(cc);
       }
-      const rawContent = sChars === null ? sliceChars(contentStart, closed ? i - 1 : i) : sChars.join('');
+      if (!closed) throw new N3SyntaxError("Unterminated short string literal '...'", start);
+      const rawContent = sChars === null ? sliceChars(contentStart, i - 1) : sChars.join('');
       const decoded = sChars === null ? rawContent : decodeN3StringEscapes(rawContent, start);
       if (sChars !== null || inputMayContainInvalidStringChar) assertValidStringLiteralValue(decoded, start);
       const s = JSON.stringify(decoded); // canonical short quoted form
@@ -1847,52 +1924,6 @@ function lex(inputText, opts = {}) {
       continue;
     }
 
-    // 6) Numeric literal (integer or float)
-    if (isAsciiDigit(c) || (c === '-' && peek(1) !== null && isAsciiDigit(peek(1)))) {
-      const start = i;
-      const numChars = [c];
-      i++;
-      while (i < n) {
-        const cc = chars[i];
-        if (isAsciiDigit(cc)) {
-          numChars.push(cc);
-          i++;
-          continue;
-        }
-        if (cc === '.') {
-          if (i + 1 < n && isAsciiDigit(chars[i + 1])) {
-            numChars.push('.');
-            i++;
-            continue;
-          } else {
-            break;
-          }
-        }
-        break;
-      }
-
-      // Optional exponent part: e.g., 1e0, 1.1e-3, 1.1E+0
-      if (i < n && (chars[i] === 'e' || chars[i] === 'E')) {
-        let j = i + 1;
-        if (j < n && (chars[j] === '+' || chars[j] === '-')) j++;
-        if (j < n && isAsciiDigit(chars[j])) {
-          numChars.push(chars[i]); // e/E
-          i++;
-          if (i < n && (chars[i] === '+' || chars[i] === '-')) {
-            numChars.push(chars[i]);
-            i++;
-          }
-          while (i < n && isAsciiDigit(chars[i])) {
-            numChars.push(chars[i]);
-            i++;
-          }
-        }
-      }
-
-      tokens.push(new Token('Literal', numChars.join(''), start));
-      continue;
-    }
-
     // 7) Identifiers / keywords / QNames
     const start = i;
     const word = readIdentText(start);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.28.7",
+  "version": "1.28.9",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [

package/test/api.test.js

@@ -769,6 +769,132 @@ bad.:example a bad.:Person.
 `,
     expectError: true,
   },
+  {
+    name: '12k2 invalid syntax: raw newline in short string literal should throw',
+    opt: { proofComments: false },
+    input: `
+@prefix : <http://example.org/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:my :value "
+123".
+
+{
+    :my :value "\n123".
+}
+=>
+{
+    :result :has :crash-syntax-11.
+}.
+
+{} => {
+    :test :contains :crash-syntax-11.
+}.
+
+{
+    :result :has :crash-syntax-11.
+}
+=>
+{
+    :test :is false.
+}.
+`,
+    expectError: true,
+  },
+  {
+    name: '12k3 invalid syntax: repeated dots in numeric-looking literal should throw',
+    opt: { proofComments: false },
+    input: `
+@prefix : <http://example.org/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:my :value 1.2.3.4.5.
+
+{
+    :my :value 1.2.3.4.5.
+}
+=>
+{
+    :result :has :crash-syntax-12.
+}.
+
+{} => {
+    :test :contains :crash-syntax-12.
+}.
+
+{
+    :result :has :crash-syntax-12.
+}
+=>
+{
+    :test :is false.
+}.
+`,
+    expectError: true,
+  },
+  {
+    name: '12k4 success literal: signed integer shorthand parses',
+    opt: { proofComments: false },
+    input: `
+@prefix : <http://example.org/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:my :value +42.
+
+{
+    :my :value +42.
+}
+=>
+{
+    :result :has :success-literal-32.
+}.
+
+{} => {
+    :test :contains :success-literal-32.
+}.
+
+{
+    :result :has :success-literal-32.
+}
+=>
+{
+    :test :is true.
+}.
+`,
+    expect: [/:result\s+:has\s+:success-literal-32\s*\./, /:test\s+:is\s+true\s*\./],
+  },
+  {
+    name: '12k5 success literal: leading-dot decimal shorthand parses',
+    opt: { proofComments: false },
+    input: `
+@prefix : <http://example.org/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:my :value .5.
+
+{
+    :my :value .5.
+}
+=>
+{
+    :result :has :success-literal-33.
+}.
+
+{} => {
+    :test :contains :success-literal-33.
+}.
+
+{
+    :result :has :success-literal-33.
+}
+=>
+{
+    :test :is true.
+}.
+`,
+    expect: [/:result\s+:has\s+:success-literal-33\s*\./, /:test\s+:is\s+true\s*\./],
+  },
+
   {
     name: '12l regression: IRIREF \\u escape decodes before log:uri comparison (mismatch stays falsey)',
     opt: { proofComments: false },
@@ -1360,7 +1486,7 @@ _:l2 rdf:rest rdf:nil.
       odrl:action ?Ignore ;
       odrl:duty [ odrl:action ?A ]
   ].
-  ( "%% Duty_(a,t)(action:%s)\n%% => ~Possible_(a,t)(~action:%s)\n" ?A ?A ) string:format ?Str.
+  ( "%% Duty_(a,t)(action:%s)\\n%% => ~Possible_(a,t)(~action:%s)\\n" ?A ?A ) string:format ?Str.
 }
 =>
 {

package/test/builtins.test.js

@@ -170,17 +170,25 @@ const cases = [
 { "2147483648"^^xsd:int dt:invalidForDatatype xsd:int . } => { :invalid :int true } .
 { "2"^^xsd:boolean dt:invalidForDatatype xsd:boolean . } => { :invalid :boolean true } .
 { "2026-02-31T00:00:00Z"^^xsd:dateTime dt:invalidForDatatype xsd:dateTime . } => { :invalid :dateTime true } .
+{ " 1.0 "^^xsd:decimal dt:invalidForDatatype xsd:decimal . } => { :invalid :decimalWhitespace true } .
+{ "02026-06-10T12:00:00Z"^^xsd:dateTime dt:invalidForDatatype xsd:dateTime . } => { :invalid :dateTimeYear true } .
 
 { "01"^^xsd:integer dt:sameValueAs "1.0"^^xsd:decimal . } => { :same :numeric true } .
 { "true"^^xsd:boolean dt:sameValueAs "1"^^xsd:boolean . } => { :same :boolean true } .
 { "2026-06-10T12:00:00Z"^^xsd:dateTime dt:sameValueAs "2026-06-10T14:00:00+02:00"^^xsd:dateTime . } => { :same :dateTime true } .
+{ "2026-12-31T24:00:00Z"^^xsd:dateTime dt:sameValueAs "2027-01-01T00:00:00Z"^^xsd:dateTime . } => { :same :midnightRollover true } .
 { "AQID"^^xsd:base64Binary dt:sameValueAs "010203"^^xsd:hexBinary . } => { :same :binary true } .
 { "11"^^xsd:integer dt:differentValueFrom "12"^^xsd:integer . } => { :different :numeric true } .
 
+{ ("1"^^xsd:integer xsd:integer) dt:validForDatatype true . } => { :tuple :valid true } .
+{ ("abc"^^xsd:integer xsd:integer) dt:validForDatatype false . } => { :tuple :invalidBoolean true } .
+{ ("abc"^^xsd:integer xsd:integer) dt:invalidForDatatype ?invalid . } => { :tuple :invalidResult ?invalid } .
+
 { "01"^^xsd:integer dt:canonicalLiteral ?ci . } => { :canonical :integer ?ci } .
 { "1"^^xsd:boolean dt:canonicalLiteral ?cb . } => { :canonical :boolean ?cb } .
 { " a\t b "^^xsd:token dt:canonicalLiteral ?ct . } => { :canonical :token ?ct } .
 { "2026-06-10T14:00:00+02:00"^^xsd:dateTime dt:canonicalLiteral ?cd . } => { :canonical :dateTime ?cd } .
+{ "2026-12-31T24:00:00Z"^^xsd:dateTime dt:canonicalLiteral ?cm . } => { :canonical :midnightRollover ?cm } .
 `);
 
       assert.match(out, /:integer :datatype xsd:integer \./);
@@ -192,15 +200,22 @@ const cases = [
       assert.match(out, /:invalid :int true \./);
       assert.match(out, /:invalid :boolean true \./);
       assert.match(out, /:invalid :dateTime true \./);
+      assert.match(out, /:invalid :decimalWhitespace true \./);
+      assert.match(out, /:invalid :dateTimeYear true \./);
       assert.match(out, /:same :numeric true \./);
       assert.match(out, /:same :boolean true \./);
       assert.match(out, /:same :dateTime true \./);
+      assert.match(out, /:same :midnightRollover true \./);
       assert.match(out, /:same :binary true \./);
       assert.match(out, /:different :numeric true \./);
+      assert.match(out, /:tuple :valid true \./);
+      assert.match(out, /:tuple :invalidBoolean true \./);
+      assert.match(out, /:tuple :invalidResult true \./);
       assert.match(out, /:canonical :integer "1"\^\^xsd:integer \./);
       assert.match(out, /:canonical :boolean true \./);
       assert.match(out, /:canonical :token "a b"\^\^xsd:token \./);
       assert.match(out, /:canonical :dateTime "2026-06-10T12:00:00Z"\^\^xsd:dateTime \./);
+      assert.match(out, /:canonical :midnightRollover "2027-01-01T00:00:00Z"\^\^xsd:dateTime \./);
     },
   },
 

package/test/playground.test.js

@@ -906,16 +906,30 @@ ${JSON.stringify(last, null, 2)}`);
     const fuseProgram = fs.readFileSync(path.join(ROOT, 'examples', 'fuse.n3'), 'utf8');
     const outputStringProgram = `@prefix : <#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
-:report log:outputString "## Hello from output string\n\nLine 2 with **bold** and [Eyeling](https://example.org/eyeling)\n" .
+:report log:outputString """## Hello from output string
+
+Line 2 with **bold** and [Eyeling](https://example.org/eyeling)
+""" .
 `;
     const riskMarkdownOutputStringProgram = `@prefix : <#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
-:report log:outputString "# Risk report\n\n### Clause H1 — score 100\n\nRisk: secondary use is permitted without a safeguard. Clause H1: Hospital may provide electronic health data for secondary use.\n\n- **Mitigation for clause H1:** Require a permit before secondary use.\n" .
+:report log:outputString """# Risk report
+
+### Clause H1 — score 100
+
+Risk: secondary use is permitted without a safeguard. Clause H1: Hospital may provide electronic health data for secondary use.
+
+- **Mitigation for clause H1:** Require a permit before secondary use.
+""" .
 `;
     const baseOnlyMarkdownProgram = `@base <https://raw.githubusercontent.com/eyereasoner/eyeling/refs/heads/main/examples/smoke-arithmetic.n3> .
 @prefix : <#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
-:report log:outputString "# stateurl link base\n\n[N3 rules](../smoke-arithmetic.n3)\n[Input TriG](../input/smoke-arithmetic.trig)\n" .
+:report log:outputString """# stateurl link base
+
+[N3 rules](../smoke-arithmetic.n3)
+[Input TriG](../input/smoke-arithmetic.trig)
+""" .
 `;
     const logQueryTurtleProgram = `@prefix : <#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .