eyeling 1.28.7 → 1.28.9

package/eyeling.js

@@ -1179,7 +1179,7 @@ function parseIntegerDatatypeValue(lexical, dt) {
 }
 
 function parseDecimalDatatypeValue(lexical) {
-  const parsed = parseXsdDecimalToBigIntScale(String(lexical));
+  const parsed = parseXsdDecimalToBigIntScale(String(lexical), { trim: false });
   if (!parsed) return null;
   const canonicalLex = canonicalDecimalLexFromParts(parsed.num, parsed.scale);
   return {
@@ -1305,58 +1305,93 @@ function parseAnyUriDatatypeValue(lexical) {
   };
 }
 
-function isLeapYearNumber(year) {
-  if (year % 400 === 0) return true;
-  if (year % 100 === 0) return false;
-  return year % 4 === 0;
+function isLeapYearBigInt(year) {
+  if (year % 400n === 0n) return true;
+  if (year % 100n === 0n) return false;
+  return year % 4n === 0n;
 }
 
-function daysInMonthNumber(year, month) {
-  if (month === 2) return isLeapYearNumber(year) ? 29 : 28;
+function daysInMonthBigInt(year, month) {
+  if (month === 2) return isLeapYearBigInt(year) ? 29 : 28;
   return [4, 6, 9, 11].includes(month) ? 30 : 31;
 }
 
-function floorDivNumber(a, b) {
-  return Math.floor(a / b);
+function floorDivBigInt(a, b) {
+  let q = a / b;
+  const r = a % b;
+  if (r !== 0n && ((r > 0n) !== (b > 0n))) q -= 1n;
+  return q;
 }
 
-function daysFromCivilNumber(year, month, day) {
+function daysFromCivilBigInt(year, month, day) {
   let y = year;
-  y -= month <= 2 ? 1 : 0;
-  const era = floorDivNumber(y, 400);
-  const yoe = y - era * 400;
-  const mp = month + (month > 2 ? -3 : 9);
-  const doy = Math.floor((153 * mp + 2) / 5) + day - 1;
-  const doe = yoe * 365 + Math.floor(yoe / 4) - Math.floor(yoe / 100) + doy;
-  return era * 146097 + doe - 719468;
+  if (month <= 2) y -= 1n;
+  const era = floorDivBigInt(y, 400n);
+  const yoe = y - era * 400n;
+  const mp = BigInt(month + (month > 2 ? -3 : 9));
+  const doy = (153n * mp + 2n) / 5n + BigInt(day) - 1n;
+  const doe = yoe * 365n + yoe / 4n - yoe / 100n + doy;
+  return era * 146097n + doe - 719468n;
+}
+
+function civilFromDaysBigInt(days) {
+  const z = days + 719468n;
+  const era = floorDivBigInt(z, 146097n);
+  const doe = z - era * 146097n;
+  const yoe = (doe - doe / 1460n + doe / 36524n - doe / 146096n) / 365n;
+  let year = yoe + era * 400n;
+  const doy = doe - (365n * yoe + yoe / 4n - yoe / 100n);
+  const mp = (5n * doy + 2n) / 153n;
+  const day = doy - (153n * mp + 2n) / 5n + 1n;
+  const month = mp < 10n ? mp + 3n : mp - 9n;
+  if (month <= 2n) year += 1n;
+  return { year, month: Number(month), day: Number(day) };
+}
+
+function isValidXsdYearLex(s) {
+  const body = s.startsWith('-') ? s.slice(1) : s;
+  if (!/^\d{4,}$/.test(body)) return false;
+  return body.length === 4 || body[0] !== '0';
+}
+
+function canonicalYearLex(year) {
+  if (year < 0n) return `-${(-year).toString().padStart(4, '0')}`;
+  return year.toString().padStart(4, '0');
+}
+
+function formatDateTimeLocalKey(year, month, day, hour, minute, second, frac) {
+  return `${canonicalYearLex(year)}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}:${String(second).padStart(2, '0')}${frac ? `.${frac}` : ''}`;
 }
 
 function parseDateTimeDatatypeValue(lexical, dt) {
   const s = String(lexical);
   const m = /^(-?\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:\d{2})?$/.exec(s);
-  if (!m) return null;
+  if (!m || !isValidXsdYearLex(m[1])) return null;
 
-  const year = Number(m[1]);
-  const month = Number(m[2]);
+  const year = BigInt(m[1]);
+  let month = Number(m[2]);
   let day = Number(m[3]);
   let hour = Number(m[4]);
   const minute = Number(m[5]);
   const second = Number(m[6]);
   let frac = m[7] || '';
   const tz = m[8] || null;
-  if (!Number.isSafeInteger(year)) return null;
   if (dt === XSD_DATETIME_STAMP_DT && !tz) return null;
   if (!(month >= 1 && month <= 12)) return null;
-  if (!(day >= 1 && day <= daysInMonthNumber(year, month))) return null;
+  if (!(day >= 1 && day <= daysInMonthBigInt(year, month))) return null;
   if (!(minute >= 0 && minute <= 59)) return null;
   if (!(second >= 0 && second <= 59)) return null;
+
+  let dayCount = daysFromCivilBigInt(year, month, day);
+  let normalizedYear = year;
   if (hour === 24) {
     if (minute !== 0 || second !== 0 || /[1-9]/.test(frac)) return null;
     hour = 0;
-    const d = new Date(Date.UTC(year, month - 1, day));
-    d.setUTCFullYear(year);
-    d.setUTCDate(d.getUTCDate() + 1);
-    day = d.getUTCDate();
+    dayCount += 1n;
+    const civil = civilFromDaysBigInt(dayCount);
+    normalizedYear = civil.year;
+    month = civil.month;
+    day = civil.day;
   } else if (!(hour >= 0 && hour <= 23)) {
     return null;
   }
@@ -1379,11 +1414,10 @@ function parseDateTimeDatatypeValue(lexical, dt) {
     }
   }
 
-  const dayCount = daysFromCivilNumber(year, month, day);
-  let totalSeconds = BigInt(dayCount) * 86400n + BigInt(hour * 3600 + minute * 60 + second);
+  let totalSeconds = dayCount * 86400n + BigInt(hour * 3600 + minute * 60 + second);
   if (offsetMinutes !== null) totalSeconds -= BigInt(offsetMinutes * 60);
 
-  const localKey = `${m[1]}-${m[2]}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${m[5]}:${m[6]}${frac ? `.${frac}` : ''}`;
+  const localKey = formatDateTimeLocalKey(normalizedYear, month, day, hour, minute, second, frac);
   const canonicalLex = canonicalDateTimeLex(totalSeconds, fracNum, fracScale, offsetMinutes !== null, localKey);
   return {
     family: 'dateTime',
@@ -1403,15 +1437,14 @@ function canonicalDateTimeLex(totalSeconds, fracNum, fracScale, hasTimezone, loc
   const frac = fracScale > 0 ? `.${fracNum.toString().padStart(fracScale, '0')}` : '';
   if (!hasTimezone) return localKey;
 
-  const minSafeSeconds = BigInt(Math.ceil(Number.MIN_SAFE_INTEGER / 1000));
-  const maxSafeSeconds = BigInt(Math.floor(Number.MAX_SAFE_INTEGER / 1000));
-  if (totalSeconds < minSafeSeconds || totalSeconds > maxSafeSeconds) return `${localKey}Z`;
-
-  const d = new Date(Number(totalSeconds) * 1000);
-  if (Number.isNaN(d.getTime())) return `${localKey}Z`;
-  let iso = d.toISOString().replace(/\.000Z$/, 'Z');
-  if (frac) iso = iso.replace('Z', `${frac}Z`);
-  return iso;
+  const secondsPerDay = 86400n;
+  const dayCount = floorDivBigInt(totalSeconds, secondsPerDay);
+  const secondOfDay = totalSeconds - dayCount * secondsPerDay;
+  const civil = civilFromDaysBigInt(dayCount);
+  const hour = Number(secondOfDay / 3600n);
+  const minute = Number((secondOfDay % 3600n) / 60n);
+  const second = Number(secondOfDay % 60n);
+  return formatDateTimeLocalKey(civil.year, civil.month, civil.day, hour, minute, second, frac) + 'Z';
 }
 
 function parseLangStringDatatypeValue(t, lexical) {
@@ -1529,7 +1562,31 @@ function evalDatatypeInspectionBuiltin(g, subst, kind) {
   return evalBindBuiltinObject(g.o, valueTerm, subst);
 }
 
+function booleanTermValue(t) {
+  const info = parseBooleanLiteralInfo(t);
+  return info ? info.value : null;
+}
+
+function makeBooleanLiteral(value) {
+  return internLiteral(value ? 'true' : 'false');
+}
+
+function evalDatatypeValidityBooleanResult(outTerm, result, subst) {
+  if (outTerm instanceof Var || outTerm instanceof Blank) return evalBindBuiltinObject(outTerm, makeBooleanLiteral(result), subst);
+  const expected = booleanTermValue(outTerm);
+  return expected === result ? [__cloneSubst(subst)] : [];
+}
+
 function evalDatatypeValidityBuiltin(g, subst, positive) {
+  if (g.s instanceof ListTerm && g.s.elems.length === 2) {
+    const [lit, dtTerm] = g.s.elems;
+    if (!(lit instanceof Literal) || !(dtTerm instanceof Iri)) return [];
+    const dt = dtTerm.value;
+    if (!isSupportedDatatypeIri(dt)) return [];
+    const ok = parseDatatypeValueForDatatype(lit, dt) !== null;
+    return evalDatatypeValidityBooleanResult(g.o, positive ? ok : !ok, subst);
+  }
+
   if (!(g.s instanceof Literal)) return [];
 
   let dt = null;
@@ -1723,8 +1780,9 @@ function formatNum(n) {
   return String(n);
 }
 
-function parseXsdDecimalToBigIntScale(s) {
-  let t = String(s).trim();
+function parseXsdDecimalToBigIntScale(s, options = null) {
+  let t = String(s);
+  if (!options || options.trim !== false) t = t.trim();
   let sign = 1n;
 
   if (t.startsWith('+')) t = t.slice(1);
@@ -13240,7 +13298,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 '{':
@@ -13361,13 +13488,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
@@ -13451,13 +13582,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
@@ -13540,52 +13675,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/lib/builtins.js

@@ -1168,7 +1168,7 @@ function parseIntegerDatatypeValue(lexical, dt) {
 }
 
 function parseDecimalDatatypeValue(lexical) {
-  const parsed = parseXsdDecimalToBigIntScale(String(lexical));
+  const parsed = parseXsdDecimalToBigIntScale(String(lexical), { trim: false });
   if (!parsed) return null;
   const canonicalLex = canonicalDecimalLexFromParts(parsed.num, parsed.scale);
   return {
@@ -1294,58 +1294,93 @@ function parseAnyUriDatatypeValue(lexical) {
   };
 }
 
-function isLeapYearNumber(year) {
-  if (year % 400 === 0) return true;
-  if (year % 100 === 0) return false;
-  return year % 4 === 0;
+function isLeapYearBigInt(year) {
+  if (year % 400n === 0n) return true;
+  if (year % 100n === 0n) return false;
+  return year % 4n === 0n;
 }
 
-function daysInMonthNumber(year, month) {
-  if (month === 2) return isLeapYearNumber(year) ? 29 : 28;
+function daysInMonthBigInt(year, month) {
+  if (month === 2) return isLeapYearBigInt(year) ? 29 : 28;
   return [4, 6, 9, 11].includes(month) ? 30 : 31;
 }
 
-function floorDivNumber(a, b) {
-  return Math.floor(a / b);
+function floorDivBigInt(a, b) {
+  let q = a / b;
+  const r = a % b;
+  if (r !== 0n && ((r > 0n) !== (b > 0n))) q -= 1n;
+  return q;
 }
 
-function daysFromCivilNumber(year, month, day) {
+function daysFromCivilBigInt(year, month, day) {
   let y = year;
-  y -= month <= 2 ? 1 : 0;
-  const era = floorDivNumber(y, 400);
-  const yoe = y - era * 400;
-  const mp = month + (month > 2 ? -3 : 9);
-  const doy = Math.floor((153 * mp + 2) / 5) + day - 1;
-  const doe = yoe * 365 + Math.floor(yoe / 4) - Math.floor(yoe / 100) + doy;
-  return era * 146097 + doe - 719468;
+  if (month <= 2) y -= 1n;
+  const era = floorDivBigInt(y, 400n);
+  const yoe = y - era * 400n;
+  const mp = BigInt(month + (month > 2 ? -3 : 9));
+  const doy = (153n * mp + 2n) / 5n + BigInt(day) - 1n;
+  const doe = yoe * 365n + yoe / 4n - yoe / 100n + doy;
+  return era * 146097n + doe - 719468n;
+}
+
+function civilFromDaysBigInt(days) {
+  const z = days + 719468n;
+  const era = floorDivBigInt(z, 146097n);
+  const doe = z - era * 146097n;
+  const yoe = (doe - doe / 1460n + doe / 36524n - doe / 146096n) / 365n;
+  let year = yoe + era * 400n;
+  const doy = doe - (365n * yoe + yoe / 4n - yoe / 100n);
+  const mp = (5n * doy + 2n) / 153n;
+  const day = doy - (153n * mp + 2n) / 5n + 1n;
+  const month = mp < 10n ? mp + 3n : mp - 9n;
+  if (month <= 2n) year += 1n;
+  return { year, month: Number(month), day: Number(day) };
+}
+
+function isValidXsdYearLex(s) {
+  const body = s.startsWith('-') ? s.slice(1) : s;
+  if (!/^\d{4,}$/.test(body)) return false;
+  return body.length === 4 || body[0] !== '0';
+}
+
+function canonicalYearLex(year) {
+  if (year < 0n) return `-${(-year).toString().padStart(4, '0')}`;
+  return year.toString().padStart(4, '0');
+}
+
+function formatDateTimeLocalKey(year, month, day, hour, minute, second, frac) {
+  return `${canonicalYearLex(year)}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}:${String(second).padStart(2, '0')}${frac ? `.${frac}` : ''}`;
 }
 
 function parseDateTimeDatatypeValue(lexical, dt) {
   const s = String(lexical);
   const m = /^(-?\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:\d{2})?$/.exec(s);
-  if (!m) return null;
+  if (!m || !isValidXsdYearLex(m[1])) return null;
 
-  const year = Number(m[1]);
-  const month = Number(m[2]);
+  const year = BigInt(m[1]);
+  let month = Number(m[2]);
   let day = Number(m[3]);
   let hour = Number(m[4]);
   const minute = Number(m[5]);
   const second = Number(m[6]);
   let frac = m[7] || '';
   const tz = m[8] || null;
-  if (!Number.isSafeInteger(year)) return null;
   if (dt === XSD_DATETIME_STAMP_DT && !tz) return null;
   if (!(month >= 1 && month <= 12)) return null;
-  if (!(day >= 1 && day <= daysInMonthNumber(year, month))) return null;
+  if (!(day >= 1 && day <= daysInMonthBigInt(year, month))) return null;
   if (!(minute >= 0 && minute <= 59)) return null;
   if (!(second >= 0 && second <= 59)) return null;
+
+  let dayCount = daysFromCivilBigInt(year, month, day);
+  let normalizedYear = year;
   if (hour === 24) {
     if (minute !== 0 || second !== 0 || /[1-9]/.test(frac)) return null;
     hour = 0;
-    const d = new Date(Date.UTC(year, month - 1, day));
-    d.setUTCFullYear(year);
-    d.setUTCDate(d.getUTCDate() + 1);
-    day = d.getUTCDate();
+    dayCount += 1n;
+    const civil = civilFromDaysBigInt(dayCount);
+    normalizedYear = civil.year;
+    month = civil.month;
+    day = civil.day;
   } else if (!(hour >= 0 && hour <= 23)) {
     return null;
   }
@@ -1368,11 +1403,10 @@ function parseDateTimeDatatypeValue(lexical, dt) {
     }
   }
 
-  const dayCount = daysFromCivilNumber(year, month, day);
-  let totalSeconds = BigInt(dayCount) * 86400n + BigInt(hour * 3600 + minute * 60 + second);
+  let totalSeconds = dayCount * 86400n + BigInt(hour * 3600 + minute * 60 + second);
   if (offsetMinutes !== null) totalSeconds -= BigInt(offsetMinutes * 60);
 
-  const localKey = `${m[1]}-${m[2]}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${m[5]}:${m[6]}${frac ? `.${frac}` : ''}`;
+  const localKey = formatDateTimeLocalKey(normalizedYear, month, day, hour, minute, second, frac);
   const canonicalLex = canonicalDateTimeLex(totalSeconds, fracNum, fracScale, offsetMinutes !== null, localKey);
   return {
     family: 'dateTime',
@@ -1392,15 +1426,14 @@ function canonicalDateTimeLex(totalSeconds, fracNum, fracScale, hasTimezone, loc
   const frac = fracScale > 0 ? `.${fracNum.toString().padStart(fracScale, '0')}` : '';
   if (!hasTimezone) return localKey;
 
-  const minSafeSeconds = BigInt(Math.ceil(Number.MIN_SAFE_INTEGER / 1000));
-  const maxSafeSeconds = BigInt(Math.floor(Number.MAX_SAFE_INTEGER / 1000));
-  if (totalSeconds < minSafeSeconds || totalSeconds > maxSafeSeconds) return `${localKey}Z`;
-
-  const d = new Date(Number(totalSeconds) * 1000);
-  if (Number.isNaN(d.getTime())) return `${localKey}Z`;
-  let iso = d.toISOString().replace(/\.000Z$/, 'Z');
-  if (frac) iso = iso.replace('Z', `${frac}Z`);
-  return iso;
+  const secondsPerDay = 86400n;
+  const dayCount = floorDivBigInt(totalSeconds, secondsPerDay);
+  const secondOfDay = totalSeconds - dayCount * secondsPerDay;
+  const civil = civilFromDaysBigInt(dayCount);
+  const hour = Number(secondOfDay / 3600n);
+  const minute = Number((secondOfDay % 3600n) / 60n);
+  const second = Number(secondOfDay % 60n);
+  return formatDateTimeLocalKey(civil.year, civil.month, civil.day, hour, minute, second, frac) + 'Z';
 }
 
 function parseLangStringDatatypeValue(t, lexical) {
@@ -1518,7 +1551,31 @@ function evalDatatypeInspectionBuiltin(g, subst, kind) {
   return evalBindBuiltinObject(g.o, valueTerm, subst);
 }
 
+function booleanTermValue(t) {
+  const info = parseBooleanLiteralInfo(t);
+  return info ? info.value : null;
+}
+
+function makeBooleanLiteral(value) {
+  return internLiteral(value ? 'true' : 'false');
+}
+
+function evalDatatypeValidityBooleanResult(outTerm, result, subst) {
+  if (outTerm instanceof Var || outTerm instanceof Blank) return evalBindBuiltinObject(outTerm, makeBooleanLiteral(result), subst);
+  const expected = booleanTermValue(outTerm);
+  return expected === result ? [__cloneSubst(subst)] : [];
+}
+
 function evalDatatypeValidityBuiltin(g, subst, positive) {
+  if (g.s instanceof ListTerm && g.s.elems.length === 2) {
+    const [lit, dtTerm] = g.s.elems;
+    if (!(lit instanceof Literal) || !(dtTerm instanceof Iri)) return [];
+    const dt = dtTerm.value;
+    if (!isSupportedDatatypeIri(dt)) return [];
+    const ok = parseDatatypeValueForDatatype(lit, dt) !== null;
+    return evalDatatypeValidityBooleanResult(g.o, positive ? ok : !ok, subst);
+  }
+
   if (!(g.s instanceof Literal)) return [];
 
   let dt = null;
@@ -1712,8 +1769,9 @@ function formatNum(n) {
   return String(n);
 }
 
-function parseXsdDecimalToBigIntScale(s) {
-  let t = String(s).trim();
+function parseXsdDecimalToBigIntScale(s, options = null) {
+  let t = String(s);
+  if (!options || options.trim !== false) t = t.trim();
   let sign = 1n;
 
   if (t.startsWith('+')) t = t.slice(1);