@malloydata/malloy 0.0.117-dev240110184814 → 0.0.117-dev240111173451

package/dist/tags.d.ts

@@ -42,7 +42,7 @@ export declare class Tag implements TagInterface {
     static ids: Map<Tag, number>;
     static nextTagId: number;
     static id(t: Tag): number;
-    peek(): string;
+    peek(indent?: number): string;
     /**
      * Parse a line of Malloy tag language into a Tag which can be queried
      * @param source -- The source line to be parsed. If the string starts with #, then it skips

package/dist/tags.js

@@ -60,22 +60,32 @@ class Tag {
         }
         return thisTagId;
     }
-    peek() {
+    peek(indent = 0) {
+        const spaces = ' '.repeat(indent);
         let str = `#${Tag.id(this)}`;
+        if (this.properties === undefined &&
+            this.eq &&
+            typeof this.eq === 'string') {
+            return str + `=${this.eq}`;
+        }
+        str += ' {';
         if (this.eq) {
             if (typeof this.eq === 'string') {
-                str += `=${this.eq}`;
+                str += `\n${spaces}  =: ${this.eq}`;
             }
             else {
-                str += '=[]';
+                str += `\n${spaces}  =: [\n${spaces}    ${this.eq
+                    .map(el => new Tag(el).peek(indent + 4))
+                    .join(`\n${spaces}    `)}\n${spaces}  ]`;
             }
         }
         if (this.properties) {
-            const propStr = Object.keys(this.properties)
-                .map(k => `${k}:`)
-                .join(', ');
-            str += `{${propStr}}`;
+            for (const k in this.properties) {
+                const val = new Tag(this.properties[k]);
+                str += `\n${spaces}  ${k}: ${val.peek(indent + 2)}`;
+            }
         }
+        str += `\n${spaces}}`;
         return str;
     }
     /**
@@ -283,7 +293,9 @@ function getBuildOn(ctx) {
  * so that the caller can delete the tag with delete parent.tagName
  * or assign to it with parent[tagName] = new_value
  */
-function pathToAccess(buildOn, path) {
+function buildAccessPath(buildOn, path) {
+    var _a;
+    var _b;
     let parentPropertyObject = buildOn.getProperties();
     for (const p of path.slice(0, path.length - 1)) {
         let next;
@@ -292,6 +304,10 @@ function pathToAccess(buildOn, path) {
             parentPropertyObject[p] = next;
         }
         else {
+            // The access that we are performing requires that `.properties` be the
+            // same JS object (not equal, but identical), and `Tag.tagFrom` only copies
+            // the exact object in if it is actually present.
+            (_a = (_b = parentPropertyObject[p]).properties) !== null && _a !== void 0 ? _a : (_b.properties = {});
             next = Tag.tagFrom(parentPropertyObject[p]);
         }
         parentPropertyObject = next.getProperties();
@@ -410,7 +426,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagEq(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = pathToAccess(buildOn, name);
+        const [writeKey, writeInto] = buildAccessPath(buildOn, name);
         const eq = this.visit(ctx.eqValue());
         const propCx = ctx.properties();
         if (propCx) {
@@ -433,7 +449,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagReplaceProperties(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = pathToAccess(buildOn, name);
+        const [writeKey, writeInto] = buildAccessPath(buildOn, name);
         const propCx = ctx.properties();
         const props = this.visitProperties(propCx);
         if (ctx.DOTTY() === undefined) {
@@ -449,7 +465,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagUpdateProperties(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = pathToAccess(buildOn, name);
+        const [writeKey, writeInto] = buildAccessPath(buildOn, name);
         const propCx = ctx.properties();
         propCx['buildOn'] = Tag.tagFrom(writeInto[writeKey]);
         const props = this.visitProperties(propCx);
@@ -461,7 +477,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagDef(ctx) {
         const buildOn = getBuildOn(ctx);
         const path = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = pathToAccess(buildOn, path);
+        const [writeKey, writeInto] = buildAccessPath(buildOn, path);
         if (ctx.MINUS()) {
             delete writeInto[writeKey];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.117-dev240110184814",
+  "version": "0.0.117-dev240111173451",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",