@agentshouse/mdmodel 0.1.0-c0bdbbc92d020 → 0.1.0-c2224db91aaa3

package/dist/yaml.js

@@ -84,6 +84,30 @@ export function interpretPlain(text) {
         return Number(text);
     return text;
 }
+const ESCAPES = {
+    b: '\b',
+    f: '\f',
+    n: '\n',
+    r: '\r',
+    t: '\t',
+    '"': '"',
+    '/': '/',
+    '\\': '\\',
+};
+function parseEscape(c) {
+    c.i += 1;
+    const escaped = peek(c);
+    const held = ESCAPES[escaped];
+    if (held !== undefined) {
+        c.i += 1;
+        return held;
+    }
+    const hex = c.text.slice(c.i + 1, c.i + 5);
+    if (escaped !== 'u' || c.i + 5 > c.end || !/^[0-9A-Fa-f]{4}$/.test(hex))
+        throw new YamlError(c.i);
+    c.i += 5;
+    return String.fromCharCode(Number.parseInt(hex, 16));
+}
 function parseQuoted(c) {
     const quote = peek(c);
     const start = c.i;
@@ -91,31 +115,19 @@ function parseQuoted(c) {
     let out = '';
     while (c.i < c.end) {
         const ch = peek(c);
+        if (quote === "'" && ch === "'" && c.i + 1 < c.end && c.text[c.i + 1] === "'") {
+            out += "'";
+            c.i += 2;
+            continue;
+        }
         if (ch === quote) {
             c.i += 1;
             return scalar(out, start, c.i);
         }
         if (ch === '\n' || ch === '\r')
             throw new YamlError(c.i);
-        if (quote === "'" && ch === "'" && c.text[c.i + 1] === "'") {
-            out += "'";
-            c.i += 2;
-            continue;
-        }
         if (quote === '"' && ch === '\\') {
-            c.i += 1;
-            const escaped = peek(c);
-            if (escaped === 'n')
-                out += '\n';
-            else if (escaped === 't')
-                out += '\t';
-            else if (escaped === '"')
-                out += '"';
-            else if (escaped === '\\')
-                out += '\\';
-            else
-                throw new YamlError(c.i);
-            c.i += 1;
+            out += parseEscape(c);
             continue;
         }
         out += ch;
@@ -208,11 +220,12 @@ function parseFlowMap(c) {
         if (peek(c) !== ':')
             throw new YamlError(c.i);
         c.i += 1;
+        const after = c.i;
         const value = parseFlowValue(c);
         if (seen.has(key.name))
             throw new YamlError(key.start);
         seen.add(key.name);
-        entries.push({ key: key.name, keyStart: key.start, keyEnd: key.end, value });
+        entries.push({ key: key.name, after, value });
         skipFlowSpace(c);
         if (peek(c) === ',') {
             c.i += 1;
@@ -254,6 +267,7 @@ function parseFlowSeq(c) {
     throw new YamlError(c.i);
 }
 function parseValue(c, parentKeyIndent) {
+    const at = c.i;
     skipSpaces(c);
     if (peek(c) === '#')
         skipToEol(c);
@@ -262,12 +276,12 @@ function parseValue(c, parentKeyIndent) {
         skipEol(c);
         skipBlankAndComments(c);
         if (c.i >= c.end)
-            return scalar(null, c.i, c.i);
+            return scalar(null, at, at);
         const nextIndent = indentAt(c);
         if (nextIndent === parentKeyIndent && seqAhead(c))
             return parseBlockSeq(c, nextIndent);
         if (nextIndent <= parentKeyIndent)
-            return scalar(null, c.i, c.i);
+            return scalar(null, at, at);
         if (peek(c) === '-')
             return parseBlockSeq(c, nextIndent);
         if (peek(c) === '[')
@@ -315,9 +329,6 @@ function lineStartOf(c) {
         j -= 1;
     return j;
 }
-function valueEnd(value, marked) {
-    return value.kind === 'scalar' && value.start === value.end ? marked : value.end;
-}
 function parseSeqItem(c, indent) {
     skipSpaces(c);
     if (peek(c) !== '#' && peek(c) !== '\n' && peek(c) !== '\r' && c.i < c.end && mappingAhead(c))
@@ -337,10 +348,9 @@ function parseBlockSeq(c, indent) {
         if (peek(c) !== '-')
             break;
         c.i += 1;
-        const marked = c.i;
         const item = parseSeqItem(c, indent);
         items.push(item);
-        end = valueEnd(item, marked);
+        end = item.end;
     }
     return { kind: 'seq', items, start, end };
 }
@@ -366,13 +376,13 @@ function parseBlockMap(c, indent, inline = false) {
         if (peek(c) !== ':')
             throw new YamlError(c.i);
         c.i += 1;
-        const marked = c.i;
+        const after = c.i;
         const value = parseValue(c, indent);
         if (seen.has(key.name))
             throw new YamlError(key.start);
         seen.add(key.name);
-        entries.push({ key: key.name, keyStart: key.start, keyEnd: key.end, value });
-        end = valueEnd(value, marked);
+        entries.push({ key: key.name, after, value });
+        end = value.end;
     }
     return { kind: 'map', entries, start, end };
 }
@@ -418,24 +428,42 @@ export function isPlainSafe(text) {
         return false;
     return true;
 }
+export function plain(value) {
+    if (!isRecord(value))
+        return false;
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}
+function listed(value) {
+    const keys = Object.keys(value);
+    return keys.length === value.length && keys.every((key, index) => key === String(index));
+}
+function heldWithin(value, within) {
+    if (value === null || typeof value === 'string' || typeof value === 'boolean')
+        return true;
+    if (typeof value === 'number')
+        return Number.isFinite(value);
+    if (typeof value !== 'object' || within.includes(value))
+        return false;
+    const path = [...within, value];
+    const held = (item) => heldWithin(item, path);
+    if (Array.isArray(value))
+        return listed(value) && value.every(held);
+    return plain(value) && Object.values(value).every(held);
+}
+export function frontmatterValue(value) {
+    return heldWithin(value, []);
+}
 export function serializeJs(value) {
-    if (value === null)
-        return 'null';
-    if (value === true)
-        return 'true';
-    if (value === false)
-        return 'false';
-    if (typeof value === 'number' && Number.isFinite(value))
-        return JSON.stringify(value);
     if (typeof value === 'string')
         return isPlainSafe(value) ? value : JSON.stringify(value);
+    if (value === null || typeof value !== 'object')
+        return JSON.stringify(value);
     if (Array.isArray(value))
         return `[${value.map(serializeJs).join(', ')}]`;
-    if (isRecord(value))
-        return `{${Object.entries(value)
-            .map(([key, held]) => `${serializeKey(key)}: ${serializeJs(held)}`)
-            .join(', ')}}`;
-    throw new YamlError(0);
+    return `{${Object.entries(value)
+        .map(([key, held]) => `${serializeKey(key)}: ${serializeJs(held)}`)
+        .join(', ')}}`;
 }
 export function isRecord(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value);
@@ -485,7 +513,8 @@ export function equalValue(left, right) {
     if (left === right)
         return true;
     if (Array.isArray(left) && Array.isArray(right)) {
-        return (left.length === right.length && left.every((item, index) => equalValue(item, right[index])));
+        return (left.length === right.length &&
+            Array.from(left).every((item, index) => equalValue(item, right[index])));
     }
     if (isRecord(left) && isRecord(right)) {
         const keys = Object.keys(left);

package/fixtures/README.md

@@ -136,6 +136,6 @@ Library is accepted too, so `unresolved-link` never names it and
 ## YAML subset
 
 Frontmatter and a schema text are each a mapping in a closed YAML subset: block and flow mappings,
-block and flow sequences, a block sequence item that opens a mapping, plain and quoted scalars, `true`, `false`, `null`,
+block and flow sequences, a block sequence item that opens a mapping, plain and quoted scalars (a single-quoted scalar doubles its apostrophe, a double-quoted one takes JSON's escapes), `true`, `false`, `null`,
 and decimal numbers. It does not take YAML 1.1 boolean or timestamp aliases,
 octal numbers, anchors, tags, or block scalars. A mapping carries each key once.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdmodel",
-  "version": "0.1.0-c0bdbbc92d020",
+  "version": "0.1.0-c2224db91aaa3",
   "description": "MD Type language, parser, validator, structured change application, Markdown syntax profile, and conformance fixtures",
   "license": "MIT",
   "type": "module",
@@ -26,6 +26,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@cfworker/json-schema": "4.1.1"
+    "@cfworker/json-schema": "4.1.1",
+    "decode-named-character-reference": "1.3.0",
+    "micromark-util-decode-numeric-character-reference": "2.0.2"
   }
 }