@malloydata/motly-ts-parser 0.0.2 → 0.2.1

package/build/{parser.js → parser/src/parser.js}

@@ -7,9 +7,6 @@ class Parser {
         this.pos = 0;
     }
     // ── Helpers ──────────────────────────────────────────────────────
-    remaining() {
-        return this.input.substring(this.pos);
-    }
     peekChar() {
         return this.pos < this.input.length ? this.input[this.pos] : undefined;
     }
@@ -118,87 +115,40 @@ class Parser {
         const path = this.parsePropName();
         this.skipWs();
         const ch = this.peekChar();
+        // Check := first (MUST check before : alone)
+        if (ch === ":" && this.startsWith(":=")) {
+            this.advance(2);
+            this.skipWs();
+            const value = this.parseEqValue();
+            this.skipWs();
+            if (this.peekChar() === "{") {
+                const props = this.parsePropertiesBlock();
+                return { kind: "assignBoth", path, value, properties: props };
+            }
+            return { kind: "assignBoth", path, value, properties: null };
+        }
         if (ch === "=") {
             this.advance(1);
             this.skipWs();
-            // Check for `= ... {` (replaceProperties with preserveValue)
-            if (this.startsWith("...")) {
-                const saved = this.pos;
-                this.advance(3);
-                this.skipWs();
-                if (this.peekChar() === "{") {
-                    const props = this.parsePropertiesBlock();
-                    return {
-                        kind: "replaceProperties",
-                        path,
-                        properties: props,
-                        preserveValue: true,
-                    };
-                }
-                this.pos = saved;
-            }
-            // Check for `= {` (replaceProperties without preserveValue)
+            // = { is now a parse error (= requires a value)
             if (this.peekChar() === "{") {
-                const props = this.parsePropertiesBlock();
-                return {
-                    kind: "replaceProperties",
-                    path,
-                    properties: props,
-                    preserveValue: false,
-                };
+                throw this.errorPoint("'=' requires a value; use ': { ... }' to replace properties");
             }
-            // `= value` (setEq)
+            // = value
             const value = this.parseEqValue();
             this.skipWs();
-            // Optionally followed by `{ ... }` or `{ statements }`
+            // Optional { props } block (MERGE semantics)
             if (this.peekChar() === "{") {
-                const saved = this.pos;
-                this.advance(1);
-                this.skipWs();
-                if (this.startsWith("...")) {
-                    const saved2 = this.pos;
-                    this.advance(3);
-                    this.skipWs();
-                    if (this.peekChar() === "}") {
-                        this.advance(1);
-                        return {
-                            kind: "setEq",
-                            path,
-                            value,
-                            properties: null,
-                            preserveProperties: true,
-                        };
-                    }
-                    this.pos = saved2;
-                }
-                this.pos = saved;
                 const props = this.parsePropertiesBlock();
-                return {
-                    kind: "setEq",
-                    path,
-                    value,
-                    properties: props,
-                    preserveProperties: false,
-                };
+                return { kind: "setEq", path, value, properties: props };
             }
-            return {
-                kind: "setEq",
-                path,
-                value,
-                properties: null,
-                preserveProperties: false,
-            };
+            return { kind: "setEq", path, value, properties: null };
         }
         if (ch === ":") {
             this.advance(1);
             this.skipWs();
             const props = this.parsePropertiesBlock();
-            return {
-                kind: "replaceProperties",
-                path,
-                properties: props,
-                preserveValue: false,
-            };
+            return { kind: "replaceProperties", path, properties: props };
         }
         if (ch === "{") {
             const props = this.parsePropertiesBlock();
@@ -223,55 +173,16 @@ class Parser {
         return this.parseBareString();
     }
     // ── Values ──────────────────────────────────────────────────────
-    parseEqValue() {
+    parseEqValue(allowArrays = true) {
         const ch = this.peekChar();
-        if (ch === "[")
+        if (allowArrays && ch === "[")
             return { kind: "array", elements: this.parseArray() };
-        if (ch === "@")
-            return { kind: "scalar", value: this.parseAtValue() };
-        if (ch === "$")
-            return { kind: "scalar", value: this.parseReference() };
-        if (ch === '"') {
-            if (this.startsWith('"""')) {
-                return {
-                    kind: "scalar",
-                    value: { kind: "string", value: this.parseTripleString() },
-                };
-            }
+        if (this.startsWith("<<<")) {
             return {
                 kind: "scalar",
-                value: { kind: "string", value: this.parseDoubleQuotedString() },
+                value: { kind: "string", value: this.parseHeredoc() },
             };
         }
-        if (ch === "'") {
-            if (this.startsWith("'''")) {
-                return {
-                    kind: "scalar",
-                    value: {
-                        kind: "string",
-                        value: this.parseTripleSingleQuotedString(),
-                    },
-                };
-            }
-            return {
-                kind: "scalar",
-                value: { kind: "string", value: this.parseSingleQuotedString() },
-            };
-        }
-        if (ch !== undefined &&
-            (ch === "-" || (ch >= "0" && ch <= "9") || ch === ".")) {
-            return this.parseNumberOrString();
-        }
-        if (ch !== undefined && isBareChar(ch)) {
-            return {
-                kind: "scalar",
-                value: { kind: "string", value: this.parseBareString() },
-            };
-        }
-        throw this.errorPoint("Expected a value");
-    }
-    parseScalarValue() {
-        const ch = this.peekChar();
         if (ch === "@")
             return { kind: "scalar", value: this.parseAtValue() };
         if (ch === "$")
@@ -304,7 +215,7 @@ class Parser {
             };
         }
         if (ch !== undefined &&
-            ((ch >= "0" && ch <= "9") || ch === "." || ch === "-")) {
+            (ch === "-" || (ch >= "0" && ch <= "9") || ch === ".")) {
             return this.parseNumberOrString();
         }
         if (ch !== undefined && isBareChar(ch)) {
@@ -315,7 +226,7 @@ class Parser {
         }
         throw this.errorPoint("Expected a value");
     }
-    /** Parse `@true`, `@false`, or `@date` */
+    /** Parse `@true`, `@false`, `@none`, `@env.NAME`, or `@date` */
     parseAtValue() {
         const begin = this.position();
         this.expectChar("@");
@@ -327,6 +238,15 @@ class Parser {
             this.advance(5);
             return { kind: "boolean", value: false };
         }
+        if (this.startsWith("none") && !this.isBareCharAt(4)) {
+            this.advance(4);
+            return { kind: "none" };
+        }
+        if (this.startsWith("env.")) {
+            this.advance(4);
+            const name = this.parseBareString();
+            return { kind: "env", name };
+        }
         const ch = this.peekChar();
         if (ch !== undefined && ch >= "0" && ch <= "9") {
             return this.parseDate(begin);
@@ -337,11 +257,11 @@ class Parser {
             this.pos++;
         }
         const token = this.pos > tokenStart ? this.input.substring(tokenStart, this.pos) : "";
-        throw this.errorSpan(`Illegal constant @${token}; expected @true, @false, or @date`, begin);
+        throw this.errorSpan(`Illegal constant @${token}; expected @true, @false, @none, @env.NAME, or @date`, begin);
     }
     isBareCharAt(offset) {
-        const rem = this.remaining();
-        return offset < rem.length && isBareChar(rem[offset]);
+        const absPos = this.pos + offset;
+        return absPos < this.input.length && isBareChar(this.input[absPos]);
     }
     parseDate(begin) {
         const start = this.pos;
@@ -722,6 +642,79 @@ class Parser {
                 return ch;
         }
     }
+    // ── Heredoc ─────────────────────────────────────────────────────
+    parseHeredoc() {
+        const begin = this.position();
+        this.advance(3); // past <<<
+        // Skip spaces/tabs on the same line
+        while (this.pos < this.input.length) {
+            const ch = this.input[this.pos];
+            if (ch === " " || ch === "\t") {
+                this.pos++;
+            }
+            else {
+                break;
+            }
+        }
+        // Allow \r before \n
+        if (this.pos < this.input.length && this.input[this.pos] === "\r") {
+            this.advance(1);
+        }
+        // Expect newline
+        if (this.pos >= this.input.length || this.input[this.pos] !== "\n") {
+            throw this.errorSpan("Expected newline after <<<", begin);
+        }
+        this.advance(1);
+        // Collect lines until we find >>> on its own line
+        const lines = [];
+        let foundClose = false;
+        while (this.pos < this.input.length) {
+            // Read a line (break only on \n)
+            const lineStart = this.pos;
+            while (this.pos < this.input.length && this.input[this.pos] !== "\n") {
+                this.pos++;
+            }
+            // Strip trailing \r for CRLF compatibility
+            let lineContent = this.input.substring(lineStart, this.pos);
+            if (lineContent.endsWith("\r")) {
+                lineContent = lineContent.substring(0, lineContent.length - 1);
+            }
+            // Consume the \n
+            if (this.pos < this.input.length && this.input[this.pos] === "\n") {
+                this.advance(1);
+            }
+            // Check if this is the closing >>> line
+            if (lineContent.trim() === ">>>") {
+                foundClose = true;
+                break;
+            }
+            lines.push(lineContent);
+        }
+        if (!foundClose) {
+            throw this.errorSpan("Unterminated heredoc (expected >>>)", begin);
+        }
+        if (lines.length === 0) {
+            return "";
+        }
+        // Determine strip amount from first line containing a non-space character
+        let strip = 0;
+        for (const line of lines) {
+            const trimmed = line.trimStart();
+            if (trimmed.length > 0) {
+                strip = line.length - trimmed.length;
+                break;
+            }
+        }
+        // Strip indentation and join; whitespace-only lines become empty
+        const stripped = lines.map((line) => {
+            if (line.trimStart().length === 0)
+                return "";
+            if (strip <= line.length)
+                return line.substring(strip);
+            return line;
+        });
+        return stripped.join("\n") + "\n";
+    }
     // ── Arrays ──────────────────────────────────────────────────────
     parseArray() {
         const begin = this.position();
@@ -762,7 +755,7 @@ class Parser {
             const elements = this.parseArray();
             return { value: { kind: "array", elements }, properties: null };
         }
-        const value = this.parseScalarValue();
+        const value = this.parseEqValue(false);
         this.skipWs();
         if (this.peekChar() === "{") {
             const props = this.parsePropertiesBlock();
@@ -774,17 +767,6 @@ class Parser {
     parsePropertiesBlock() {
         const begin = this.position();
         this.expectChar("{");
-        this.skipWs();
-        if (this.startsWith("...")) {
-            const saved = this.pos;
-            this.advance(3);
-            this.skipWs();
-            if (this.peekChar() === "}") {
-                this.advance(1);
-                return [];
-            }
-            this.pos = saved;
-        }
         const stmts = [];
         for (;;) {
             this.skipWsAndCommas();

package/build/{session.d.ts → parser/src/session.d.ts}

@@ -1,4 +1,4 @@
-import { MOTLYValue, MOTLYError, MOTLYSchemaError, MOTLYValidationError } from "motly-ts-interface";
+import { MOTLYValue, MOTLYError, MOTLYSchemaError, MOTLYValidationError } from "../../interface/src/types";
 /**
  * A stateful MOTLY parsing session.
  *

package/build/{session.js → parser/src/session.js}

@@ -4,6 +4,7 @@ exports.MOTLYSession = void 0;
 const parser_1 = require("./parser");
 const interpreter_1 = require("./interpreter");
 const validate_1 = require("./validate");
+const clone_1 = require("./clone");
 /**
  * A stateful MOTLY parsing session.
  *
@@ -24,8 +25,8 @@ class MOTLYSession {
         this.ensureAlive();
         try {
             const stmts = (0, parser_1.parse)(source);
-            this.value = (0, interpreter_1.execute)(stmts, this.value);
-            return [];
+            const errors = (0, interpreter_1.execute)(stmts, this.value);
+            return errors;
         }
         catch (e) {
             if (isMotlyError(e))
@@ -41,8 +42,10 @@ class MOTLYSession {
         this.ensureAlive();
         try {
             const stmts = (0, parser_1.parse)(source);
-            this.schema = (0, interpreter_1.execute)(stmts, {});
-            return [];
+            const fresh = {};
+            const errors = (0, interpreter_1.execute)(stmts, fresh);
+            this.schema = fresh;
+            return errors;
         }
         catch (e) {
             if (isMotlyError(e))
@@ -62,7 +65,7 @@ class MOTLYSession {
      */
     getValue() {
         this.ensureAlive();
-        return deepClone(this.value);
+        return (0, clone_1.cloneValue)(this.value);
     }
     /**
      * Validate the session's value against its stored schema.
@@ -103,33 +106,3 @@ function isMotlyError(e) {
         "begin" in e &&
         "end" in e);
 }
-function deepClone(value) {
-    const result = {};
-    if (value.deleted)
-        result.deleted = true;
-    if (value.eq !== undefined) {
-        if (value.eq instanceof Date) {
-            result.eq = new Date(value.eq.getTime());
-        }
-        else if (Array.isArray(value.eq)) {
-            result.eq = value.eq.map(cloneNode);
-        }
-        else {
-            result.eq = value.eq;
-        }
-    }
-    if (value.properties) {
-        const props = {};
-        for (const key of Object.keys(value.properties)) {
-            props[key] = cloneNode(value.properties[key]);
-        }
-        result.properties = props;
-    }
-    return result;
-}
-function cloneNode(node) {
-    if ("linkTo" in node) {
-        return { linkTo: node.linkTo };
-    }
-    return deepClone(node);
-}

package/build/{validate.d.ts → parser/src/validate.d.ts}

@@ -1,3 +1,3 @@
-import { MOTLYValue, MOTLYSchemaError, MOTLYValidationError } from "motly-ts-interface";
+import { MOTLYValue, MOTLYSchemaError, MOTLYValidationError } from "../../interface/src/types";
 export declare function validateReferences(root: MOTLYValue): MOTLYValidationError[];
 export declare function validateSchema(tag: MOTLYValue, schema: MOTLYValue): MOTLYSchemaError[];