@malloydata/malloy 0.0.39-dev230613161129 → 0.0.39

package/dist/lang/malloy-to-ast.js

@@ -208,22 +208,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const fel = new ast.FilterElement(expr, this.getSourceCode(cx));
         return this.astAt(fel, cx);
     }
-    getFieldDefs(cxList, isAgg) {
-        const visited = [];
-        for (const cx of cxList) {
-            const v = this.visit(cx);
-            if (v instanceof ast.FieldDeclaration) {
-                this.astAt(v, cx);
-                visited.push(v);
-                if (isAgg !== undefined) {
-                    v.isMeasure = isAgg;
-                }
-            }
-            else {
-                this.contextError(cx, 'Expected field definition');
-            }
-        }
-        return visited;
+    getFieldDefs(cxList, makeFieldDef) {
+        return cxList.map(cx => this.getFieldDef(cx, makeFieldDef));
     }
     getFieldExpr(cx) {
         const element = this.visit(cx);
@@ -397,25 +383,25 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const join = new ast.KeyJoin(joinAs, joinFrom, joinOn);
         return this.astAt(join, pcx);
     }
-    visitFieldDef(pcx) {
+    getFieldDef(pcx, makeFieldDef) {
         const defCx = pcx.fieldExpr();
         const fieldName = this.getIdText(pcx.fieldNameDef());
         const valExpr = this.getFieldExpr(defCx);
-        const def = new ast.FieldDeclaration(valExpr, fieldName, this.getSourceCode(defCx));
+        const def = new makeFieldDef(valExpr, fieldName, this.getSourceCode(defCx));
         return this.astAt(def, pcx);
     }
     visitDefExploreDimension(pcx) {
-        const defs = this.getFieldDefs(pcx.dimensionDefList().dimensionDef(), false);
+        const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DimensionFieldDeclaration);
         const stmt = new ast.Dimensions(defs);
         return this.astAt(stmt, pcx);
     }
     visitDefExploreMeasure(pcx) {
-        const defs = this.getFieldDefs(pcx.measureDefList().measureDef(), true);
+        const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.MeasureFieldDeclaration);
         const stmt = new ast.Measures(defs);
         return this.astAt(stmt, pcx);
     }
     visitDeclareStatement(pcx) {
-        const defs = this.getFieldDefs(pcx.fieldDef(), true);
+        const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DeclareFieldDeclaration);
         const stmt = new ast.DeclareFields(defs);
         return this.astAt(stmt, pcx);
     }
@@ -461,7 +447,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitFieldNameList(pcx) {
         const members = pcx
             .fieldName()
-            .map(cx => new ast.FieldReference([this.getFieldName(cx)]));
+            .map(cx => new ast.AcceptExceptFieldReference([this.getFieldName(cx)]));
         return new ast.FieldReferences(members);
     }
     visitDefExploreEditField(pcx) {
@@ -495,17 +481,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return new ast.QOPDesc(qProps);
     }
-    visitFieldPath(pcx) {
+    getFieldPath(pcx, makeFieldRef) {
         const names = pcx.fieldName().map(nameCx => this.getFieldName(nameCx));
-        return this.astAt(new ast.FieldReference(names), pcx);
-    }
-    visitQueryFieldDef(pcx) {
-        const defCx = pcx.dimensionDef().fieldDef();
-        const dim = this.visitFieldDef(defCx);
-        return this.astAt(dim, defCx);
+        return this.astAt(new makeFieldRef(names), pcx);
     }
-    visitQueryFieldRef(pcx) {
-        return this.visitFieldPath(pcx.fieldPath());
+    getQueryFieldDef(pcx, makeFieldDef) {
+        const dim = this.getFieldDef(pcx, makeFieldDef);
+        return this.astAt(dim, pcx);
     }
     // visitQueryFieldNameless(
     //   pcx: parse.QueryFieldNamelessContext
@@ -515,33 +497,60 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     //   noItem.reported = true;
     //   return noItem;
     // }
-    getQueryItems(pcx) {
-        const itemList = pcx.queryFieldEntry().map(e => this.visit(e));
+    getQueryFieldEntry(ctx, makeFieldDef, makeFieldRef) {
+        const fieldPath = ctx.fieldPath();
+        if (fieldPath) {
+            return this.getFieldPath(fieldPath, makeFieldRef);
+        }
+        const def = ctx.fieldDef();
+        if (def) {
+            return this.getQueryFieldDef(def, makeFieldDef);
+        }
+        throw new Error('Expected query field entry to be a field reference or definition');
+    }
+    getQueryItems(pcx, makeFieldDef, makeFieldRef) {
+        const itemList = pcx
+            .queryFieldEntry()
+            .map(e => this.getQueryFieldEntry(e, makeFieldDef, makeFieldRef));
         return this.onlyQueryRefs(itemList);
     }
     visitAggregateStatement(pcx) {
-        return new ast.Aggregate(this.getQueryItems(pcx.queryFieldList()));
+        return new ast.Aggregate(this.getQueryItems(pcx.queryFieldList(), ast.AggregateFieldDeclaration, ast.AggregateFieldReference));
     }
     visitGroupByStatement(pcx) {
-        return new ast.GroupBy(this.getQueryItems(pcx.queryFieldList()));
+        return new ast.GroupBy(this.getQueryItems(pcx.queryFieldList(), ast.GroupByFieldDeclaration, ast.GroupByFieldReference));
     }
-    visitFieldCollection(pcx) {
-        const fields = [];
-        for (const elCx of pcx.collectionMember()) {
-            const el = this.visit(elCx);
-            if (ast.isFieldCollectionMember(el)) {
-                fields.push(el);
-            }
-            else {
-                throw this.internalError(elCx, `${el.elementType} is not a query field`);
-            }
+    visitCalculateStatement(pcx) {
+        return new ast.Calculate(this.getQueryItems(pcx.queryFieldList(), ast.CalculateFieldDeclaration, ast.CalculateFieldReference));
+    }
+    getFieldCollectionMember(pcx, makeFieldDef, makeFieldRef) {
+        const fieldDef = pcx.fieldDef();
+        if (fieldDef) {
+            return this.getFieldDef(fieldDef, makeFieldDef);
+        }
+        const fieldPath = pcx.fieldPath();
+        if (fieldPath) {
+            return this.getFieldPath(fieldPath, makeFieldRef);
+        }
+        const collectionWildcard = pcx.collectionWildCard();
+        if (collectionWildcard) {
+            return this.visitCollectionWildCard(collectionWildcard);
         }
+        throw this.internalError(pcx, 'Unexpected element in fieldCollectionMember');
+    }
+    // "FieldCollection" can only mean a project statement today
+    visitFieldCollection(pcx) {
+        const fields = pcx
+            .collectionMember()
+            .map(c => this.getFieldCollectionMember(c, ast.ProjectFieldDeclaration, ast.ProjectFieldReference));
         return this.astAt(new ast.ProjectStatement(fields), pcx);
     }
-    visitWildMember(pcx) {
+    visitCollectionWildCard(pcx) {
         const nameCx = pcx.fieldPath();
         const stars = pcx.STAR() ? '*' : '**';
-        const join = nameCx ? this.visitFieldPath(nameCx) : undefined;
+        const join = nameCx
+            ? this.getFieldPath(nameCx, ast.ProjectFieldReference)
+            : undefined;
         return new ast.WildcardFieldReference(join, stars);
     }
     visitIndexFields(pcx) {
@@ -551,7 +560,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             if (!pathCx) {
                 return new ast.WildcardFieldReference(undefined, '*');
             }
-            const path = this.visitFieldPath(pathCx);
+            const path = this.getFieldPath(pathCx, ast.IndexFieldReference);
             if (!hasStar) {
                 return this.astAt(path, pcx);
             }
@@ -772,7 +781,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
     }
     visitExprFieldPath(pcx) {
-        const idRef = new ast.ExprIdReference(this.visitFieldPath(pcx.fieldPath()));
+        const idRef = new ast.ExprIdReference(this.getFieldPath(pcx.fieldPath(), ast.ExpressionFieldReference));
         return this.astAt(idRef, pcx);
     }
     visitExprNULL(_pcx) {
@@ -811,7 +820,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitExprAggregate(pcx) {
         const pathCx = pcx.fieldPath();
-        const path = pathCx ? this.visitFieldPath(pathCx) : undefined;
+        const path = pathCx
+            ? this.getFieldPath(pathCx, ast.ExpressionFieldReference)
+            : undefined;
         const source = pathCx && path ? this.astAt(path, pathCx) : undefined;
         const exprDef = pcx.fieldExpr();
         if (pcx.aggregate().COUNT()) {
@@ -891,9 +902,37 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const units = this.visitTimeframe(pcx.timeframe());
         return new ast.ForRange(begin, duration, units);
     }
+    visitExprAggFunc(pcx) {
+        const argsCx = pcx.argumentList();
+        const args = argsCx ? this.allFieldExpressions(argsCx.fieldExpr()) : [];
+        const idCx = pcx.id();
+        const fn = this.getIdText(idCx);
+        const pathCx = pcx.fieldPath();
+        const path = pathCx
+            ? this.getFieldPath(pathCx, ast.ExpressionFieldReference)
+            : undefined;
+        const source = pathCx && path ? this.astAt(path, pathCx) : undefined;
+        if (ast.ExprTimeExtract.extractor(fn)) {
+            return this.astAt(new ast.ExprTimeExtract(fn, args), pcx);
+        }
+        return this.astAt(new ast.ExprFunc(fn, args, false, undefined, source), pcx);
+    }
     visitExprFunc(pcx) {
+        var _a;
         const argsCx = pcx.argumentList();
         const args = argsCx ? this.allFieldExpressions(argsCx.fieldExpr()) : [];
+        const isRaw = pcx.EXCLAM() !== undefined;
+        const rawRawType = (_a = pcx.malloyType()) === null || _a === void 0 ? void 0 : _a.text;
+        let rawType = undefined;
+        if (rawRawType) {
+            if (ast.isCastType(rawRawType)) {
+                rawType = rawRawType;
+            }
+            else {
+                this.contextError(pcx, `'#' assertion for unknown type '${rawRawType}'`);
+                rawType = undefined;
+            }
+        }
         const idCx = pcx.id();
         const dCx = pcx.timeframe();
         let fn;
@@ -910,7 +949,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (ast.ExprTimeExtract.extractor(fn)) {
             return this.astAt(new ast.ExprTimeExtract(fn, args), pcx);
         }
-        return this.astAt(new ast.ExprFunc(fn, args), pcx);
+        return this.astAt(new ast.ExprFunc(fn, args, isRaw, rawType), pcx);
     }
     visitExprDuration(pcx) {
         return new ast.ExprDuration(this.getFieldExpr(pcx.fieldExpr()), this.visitTimeframe(pcx.timeframe()).text);

package/dist/lang/parse-tree-walkers/document-symbol-walker.js

@@ -118,10 +118,13 @@ class DocumentSymbolWalker {
             parent.children.push(symbol);
         }
     }
-    enterQueryFieldRef(pcx) {
+    enterQueryFieldEntry(pcx) {
+        const fieldRef = pcx.fieldPath();
+        if (fieldRef === undefined)
+            return;
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: pcx.fieldPath().text,
+            name: fieldRef.text,
             type: 'field',
             children: [],
         };