@malloydata/malloy 0.0.157 → 0.0.158-dev240805161224

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -106,8 +106,10 @@ import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
 import { SqExploreContext } from "./MalloyParser";
+import { SourceParametersContext } from "./MalloyParser";
+import { SourceParameterContext } from "./MalloyParser";
+import { ParameterNameDefContext } from "./MalloyParser";
 import { SourceNameDefContext } from "./MalloyParser";
-import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
 import { DefMeasuresContext } from "./MalloyParser";
@@ -122,6 +124,9 @@ import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
 import { QueryExtendContext } from "./MalloyParser";
 import { ModEitherContext } from "./MalloyParser";
+import { SourceArgumentsContext } from "./MalloyParser";
+import { ArgumentIdContext } from "./MalloyParser";
+import { SourceArgumentContext } from "./MalloyParser";
 import { SqExprContext } from "./MalloyParser";
 import { SegExprContext } from "./MalloyParser";
 import { VExprContext } from "./MalloyParser";
@@ -1434,25 +1439,45 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitSqExplore?: (ctx: SqExploreContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.sourceNameDef`.
+     * Enter a parse tree produced by `MalloyParser.sourceParameters`.
      * @param ctx the parse tree
      */
-    enterSourceNameDef?: (ctx: SourceNameDefContext) => void;
+    enterSourceParameters?: (ctx: SourceParametersContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.sourceNameDef`.
+     * Exit a parse tree produced by `MalloyParser.sourceParameters`.
      * @param ctx the parse tree
      */
-    exitSourceNameDef?: (ctx: SourceNameDefContext) => void;
+    exitSourceParameters?: (ctx: SourceParametersContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sourceParameter`.
+     * @param ctx the parse tree
+     */
+    enterSourceParameter?: (ctx: SourceParameterContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sourceParameter`.
+     * @param ctx the parse tree
+     */
+    exitSourceParameter?: (ctx: SourceParameterContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.sourceID`.
+     * Enter a parse tree produced by `MalloyParser.parameterNameDef`.
      * @param ctx the parse tree
      */
-    enterSourceID?: (ctx: SourceIDContext) => void;
+    enterParameterNameDef?: (ctx: ParameterNameDefContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.sourceID`.
+     * Exit a parse tree produced by `MalloyParser.parameterNameDef`.
+     * @param ctx the parse tree
+     */
+    exitParameterNameDef?: (ctx: ParameterNameDefContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sourceNameDef`.
+     * @param ctx the parse tree
+     */
+    enterSourceNameDef?: (ctx: SourceNameDefContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sourceNameDef`.
      * @param ctx the parse tree
      */
-    exitSourceID?: (ctx: SourceIDContext) => void;
+    exitSourceNameDef?: (ctx: SourceNameDefContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.exploreProperties`.
      * @param ctx the parse tree
@@ -1593,6 +1618,36 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitModEither?: (ctx: ModEitherContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sourceArguments`.
+     * @param ctx the parse tree
+     */
+    enterSourceArguments?: (ctx: SourceArgumentsContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sourceArguments`.
+     * @param ctx the parse tree
+     */
+    exitSourceArguments?: (ctx: SourceArgumentsContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.argumentId`.
+     * @param ctx the parse tree
+     */
+    enterArgumentId?: (ctx: ArgumentIdContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.argumentId`.
+     * @param ctx the parse tree
+     */
+    exitArgumentId?: (ctx: ArgumentIdContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sourceArgument`.
+     * @param ctx the parse tree
+     */
+    enterSourceArgument?: (ctx: SourceArgumentContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sourceArgument`.
+     * @param ctx the parse tree
+     */
+    exitSourceArgument?: (ctx: SourceArgumentContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.sqExpr`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -106,8 +106,10 @@ import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
 import { SqExploreContext } from "./MalloyParser";
+import { SourceParametersContext } from "./MalloyParser";
+import { SourceParameterContext } from "./MalloyParser";
+import { ParameterNameDefContext } from "./MalloyParser";
 import { SourceNameDefContext } from "./MalloyParser";
-import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
 import { DefMeasuresContext } from "./MalloyParser";
@@ -122,6 +124,9 @@ import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
 import { QueryExtendContext } from "./MalloyParser";
 import { ModEitherContext } from "./MalloyParser";
+import { SourceArgumentsContext } from "./MalloyParser";
+import { ArgumentIdContext } from "./MalloyParser";
+import { SourceArgumentContext } from "./MalloyParser";
 import { SqExprContext } from "./MalloyParser";
 import { SegExprContext } from "./MalloyParser";
 import { VExprContext } from "./MalloyParser";
@@ -932,17 +937,29 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitSqExplore?: (ctx: SqExploreContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.sourceNameDef`.
+     * Visit a parse tree produced by `MalloyParser.sourceParameters`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSourceNameDef?: (ctx: SourceNameDefContext) => Result;
+    visitSourceParameters?: (ctx: SourceParametersContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceParameter`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceParameter?: (ctx: SourceParameterContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.sourceID`.
+     * Visit a parse tree produced by `MalloyParser.parameterNameDef`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSourceID?: (ctx: SourceIDContext) => Result;
+    visitParameterNameDef?: (ctx: ParameterNameDefContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceNameDef`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceNameDef?: (ctx: SourceNameDefContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.exploreProperties`.
      * @param ctx the parse tree
@@ -1027,6 +1044,24 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitModEither?: (ctx: ModEitherContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceArguments`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceArguments?: (ctx: SourceArgumentsContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.argumentId`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitArgumentId?: (ctx: ArgumentIdContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceArgument`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceArgument?: (ctx: SourceArgumentContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sqExpr`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -79,6 +79,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getIsNotes(cx: parse.IsDefineContext): Note[];
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
+    getSourceParameter(pcx: parse.SourceParameterContext): ast.HasParameter;
+    getSourceParameters(pcx: parse.SourceParametersContext | undefined): ast.HasParameter[];
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
     protected getSourceExtensions(extensions: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
@@ -136,7 +138,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitOrderBySpec(pcx: parse.OrderBySpecContext): ast.OrderBy;
     visitOrdering(pcx: parse.OrderingContext): ast.Ordering;
     visitTopStatement(pcx: parse.TopStatementContext): ast.Top;
-    visitSourceID(pcx: parse.SourceIDContext): ast.NamedSource;
     visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DefineQueryList;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
     visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
@@ -174,6 +175,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprApply(pcx: parse.ExprApplyContext): ast.Apply;
     visitExprRange(pcx: parse.ExprRangeContext): ast.Range;
     visitExprCast(pcx: parse.ExprCastContext): ast.ExpressionDef;
+    getMalloyType(pcx: parse.MalloyTypeContext): CastType;
     getMalloyOrSQLType(pcx: parse.MalloyOrSQLTypeContext): CastType | {
         raw: string;
     };
@@ -201,6 +203,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitIgnoredObjectAnnotations(pcx: parse.IgnoredObjectAnnotationsContext): IgnoredElement;
     visitIgnoredModelAnnotations(pcx: parse.IgnoredModelAnnotationsContext): IgnoredElement;
     visitDefExploreAnnotation(pcx: parse.DefExploreAnnotationContext): ast.ObjectAnnotation;
+    getSQArgument(pcx: parse.SourceArgumentContext): ast.Argument;
+    getSQArguments(pcx: parse.SourceArgumentsContext | undefined): ast.Argument[] | undefined;
     visitSQID(pcx: parse.SQIDContext): ast.SQReference;
     protected getSqExpr(cx: parse.SqExprContext): ast.SourceQueryElement;
     visitSQExtendedSource(pcx: parse.SQExtendedSourceContext): ast.SQExtend;

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

@@ -1,6 +1,7 @@
 "use strict";
 /*
  * Copyright 2023 Google LLC
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
@@ -54,6 +55,7 @@ const ast_1 = require("./ast");
 const parse_utils_1 = require("./parse-utils");
 const malloy_types_1 = require("../model/malloy_types");
 const tags_1 = require("../tags");
+const constant_expression_1 = require("./ast/expressions/constant-expression");
 class ErrorNode extends ast.SourceQueryElement {
     constructor() {
         super(...arguments);
@@ -282,9 +284,29 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         defList.extendNote({ blockNotes });
         return defList;
     }
+    getSourceParameter(pcx) {
+        const defaultCx = pcx.fieldExpr();
+        const defaultValue = defaultCx
+            ? this.astAt(new constant_expression_1.ConstantExpression(this.getFieldExpr(defaultCx)), defaultCx)
+            : undefined;
+        const typeCx = pcx.malloyType();
+        const type = typeCx ? this.getMalloyType(typeCx) : undefined;
+        return this.astAt(new ast.HasParameter({
+            name: (0, parse_utils_1.getId)(pcx.parameterNameDef()),
+            type,
+            default: defaultValue,
+        }), pcx);
+    }
+    getSourceParameters(pcx) {
+        if (pcx === undefined)
+            return [];
+        this.inExperiment('parameters', pcx);
+        return pcx.sourceParameter().map(param => this.getSourceParameter(param));
+    }
     visitSourceDefinition(pcx) {
         const exploreExpr = this.visit(pcx.sqExplore());
-        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), exploreExpr instanceof ast.SourceQueryElement ? exploreExpr : undefined, true, []);
+        const params = this.getSourceParameters(pcx.sourceParameters());
+        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), exploreExpr instanceof ast.SourceQueryElement ? exploreExpr : undefined, true, params);
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, pcx);
@@ -740,9 +762,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return this.astAt(top, pcx);
     }
-    visitSourceID(pcx) {
-        return this.astAt(new ast.NamedSource((0, parse_utils_1.getId)(pcx)), pcx);
-    }
     visitTopLevelQueryDefs(pcx) {
         const stmts = pcx
             .topLevelQueryDef()
@@ -1023,14 +1042,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const type = this.getMalloyOrSQLType(pcx.malloyOrSQLType());
         return new ast.ExprCast(this.getFieldExpr(pcx.fieldExpr()), type);
     }
+    getMalloyType(pcx) {
+        const type = pcx.text;
+        if ((0, malloy_types_1.isCastType)(type)) {
+            return type;
+        }
+        throw this.internalError(pcx, `unknown type '${type}'`);
+    }
     getMalloyOrSQLType(pcx) {
         const mtcx = pcx.malloyType();
         if (mtcx) {
-            const type = mtcx.text;
-            if ((0, malloy_types_1.isCastType)(type)) {
-                return type;
-            }
-            throw this.internalError(pcx, `unknown type '${type}'`);
+            return this.getMalloyType(mtcx);
         }
         const rtcx = pcx.string();
         if (rtcx) {
@@ -1198,9 +1220,28 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const allNotes = this.getNotes(pcx);
         return new ast.ObjectAnnotation(allNotes);
     }
+    getSQArgument(pcx) {
+        const id = pcx.argumentId();
+        const ref = id
+            ? this.astAt(new ast.PartitionByFieldReference([
+                this.astAt(new ast.FieldName((0, parse_utils_1.idToStr)(id.id())), id),
+            ]), id)
+            : undefined;
+        return this.astAt(new ast.Argument({
+            id: ref,
+            value: this.getFieldExpr(pcx.fieldExpr()),
+        }), pcx);
+    }
+    getSQArguments(pcx) {
+        if (pcx === undefined)
+            return undefined;
+        this.inExperiment('parameters', pcx);
+        return pcx.sourceArgument().map(arg => this.getSQArgument(arg));
+    }
     visitSQID(pcx) {
         const ref = this.getModelEntryName(pcx);
-        return this.astAt(new ast.SQReference(ref), pcx.id());
+        const args = this.getSQArguments(pcx.sourceArguments());
+        return this.astAt(new ast.SQReference(ref, args), pcx.id());
     }
     getSqExpr(cx) {
         const result = this.visit(cx);

package/dist/lang/test/expressions.spec.js

@@ -899,7 +899,27 @@ describe('sql native fields in schema', () => {
     });
     describe('sql functions', () => {
         test('can aggregate a sql_ function', () => {
-            expect((0, test_translator_1.expr) `sum(sql_number("\${a} * 2"))`).toTranslate();
+            expect(`
+        ##! experimental.sql_functions
+        run: a -> {
+          aggregate: x is sum(sql_number("\${ai} * 2"))
+        }
+      `).toTranslate();
+        });
+        test('error when interpolating field that does not exist', () => {
+            expect(`
+        ##! experimental.sql_functions
+        run: a -> {
+          group_by: x is sql_number("\${asdfasdf} * 2")
+        }
+      `).translationToFailWith("Invalid interpolation: 'asdfasdf' is not defined");
+        });
+        test('error when using sql_ function without experiment', () => {
+            expect(`
+        run: a -> {
+          group_by: x is sql_number("\${asdfasdf} * 2")
+        }
+      `).translationToFailWith('Cannot use sql_function `sql_number`; use `sql_functions` experiment to enable this behavior');
         });
     });
     describe('cast', () => {

package/dist/lang/test/field-symbols.spec.js

@@ -183,13 +183,11 @@ describe('structdef comprehension', () => {
                 name: 'cReqStr',
                 type: 'string',
                 value: null,
-                constant: false,
             },
             cOptStr: {
                 name: 'cOptStr',
                 type: 'string',
                 value: ['value'],
-                constant: false,
             },
         };
         const space = new static_space_1.StaticSpace(struct);

package/dist/lang/test/locations.spec.js

@@ -37,6 +37,9 @@ describe('source locations', () => {
         expect(m).toParse();
         expect((0, test_translator_1.getExplore)(m.modelDef, 'na').location).toMatchObject(source.locations[0]);
     });
+    // TODO make parameters have locations, and make references to them work
+    // with existing jump-to-definition system
+    test.todo('location of parameter');
     test('location of defined dimension', () => {
         const source = (0, test_translator_1.markSource) `source: na is a extend { dimension: ${'x is 1'} }`;
         const m = new test_translator_1.TestTranslator(source.code);

package/dist/lang/test/parameters.spec.d.ts

@@ -0,0 +1 @@
+import './parse-expects';