@malloydata/malloy 0.0.117-dev240110181238 → 0.0.117-dev240110202509

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DuckDBDialect, StandardSQLDialect, PostgresDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, sqlFragment, param, spread, Dialect, FUNCTIONS, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, } from './dialect';
-export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, QueryValue, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldAtomicDef, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, TypecastFragment, Annotation, FieldAtomicTypeDef, SQLBlockStructDef, } from './model';
+export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, QueryValue, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldAtomicDef, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, TypecastFragment, Annotation, FieldAtomicTypeDef, SQLBlockStructDef, } from './model';
 export { Segment, isFilteredAliasedName, isSamplingEnable, isSamplingPercent, isSamplingRows, mkExpr, expressionIsCalculation, indent, } from './model';
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';

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;
     }
     /**

package/package.json

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