@malloydata/malloy 0.0.56-dev230710182711 → 0.0.56-dev230710205111

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

@@ -52,7 +52,6 @@ const ast = __importStar(require("./ast"));
 const Interval_1 = require("antlr4ts/misc/Interval");
 const ast_1 = require("./ast");
 const parse_utils_1 = require("./parse-utils");
-const ENABLE_M4_WARNINGS = false;
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
         super();
@@ -69,6 +68,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         super();
         this.parse = parse;
         this.msgLog = msgLog;
+        this.compilerFlags = {};
     }
     /**
      * Mostly used to flag a case where the grammar and the type system are
@@ -115,14 +115,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return acceptable;
     }
+    m4WarningsEnabled() {
+        return !!this.compilerFlags['m4warnings'];
+    }
     getNumber(term) {
         return Number.parseInt(term.text);
     }
     getFieldName(cx) {
-        return this.astAt(new ast.FieldName((0, parse_utils_1.getId)(cx)), cx);
+        return this.astAt(new ast.FieldName((0, parse_utils_1.getId)(cx)), cx.id());
     }
     getModelEntryName(cx) {
-        return this.astAt(new ast.ModelEntryReference((0, parse_utils_1.getId)(cx)), cx);
+        return this.astAt(new ast.ModelEntryReference((0, parse_utils_1.getId)(cx)), cx.id());
     }
     defaultResult() {
         return new ast.Unimplemented();
@@ -162,13 +165,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const el = this.getFilterElement(cx.fieldExpr());
         return new ast.Filter([el]);
     }
-    getExploreSource(pcx) {
-        const element = this.visit(pcx);
-        if (element instanceof ast.Source) {
-            return element;
-        }
-        throw this.internalError(pcx, `'${element.elementType}': illegal source`);
-    }
     getPlainString(cx) {
         const shortStr = (0, parse_utils_1.getStringIfShort)(cx);
         if (shortStr) {
@@ -191,6 +187,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         // string: shortString | sqlString; So this will never happen
         return '';
     }
+    getSource(pcx) {
+        const source = this.visit(pcx);
+        if (source instanceof ast.Source) {
+            return source;
+        }
+        throw this.internalError(pcx, `Source expected, but ${source.elementType} found`);
+    }
     makeSqlString(pcx, sqlStr) {
         for (const part of (0, parse_utils_1.getStringParts)(pcx)) {
             if (part instanceof antlr4ts_1.ParserRuleContext) {
@@ -232,18 +235,89 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return defList;
     }
     visitSourceDefinition(pcx) {
-        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), this.visitExplore(pcx.explore()), true, []);
+        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), this.getSource(pcx.explore()), true, []);
         const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, pcx);
     }
-    visitExplore(pcx) {
-        const source = this.getExploreSource(pcx.exploreSource());
-        const refineCx = pcx.exploreProperties();
-        if (refineCx) {
-            return this.astAt(new ast.RefinedSource(source, this.visitExploreProperties(refineCx)), pcx);
+    visitQueryFromSQLSource(pcx) {
+        const query = new ast.FullQuery(this.visitSqlSource(pcx.sqlSource()));
+        return this.astAt(query, pcx);
+    }
+    visitQueryFromSource(pcx) {
+        const root = this.visitUnextendableSource(pcx.unextendableSource());
+        const query = new ast.FullQuery(root);
+        query.addSegments(...this.getSegments(pcx.pipeElement()));
+        return this.astAt(query, pcx);
+    }
+    getQueryRefinements(pcx) {
+        const properties = this.astAt(this.visitQueryProperties(pcx.queryProperties()), pcx);
+        if (this.m4WarningsEnabled() && pcx.REFINE() === undefined) {
+            this.astError(properties, 'Implicit query refinement is deprecated, use the `refine` operator.', 'warn');
+        }
+        return properties;
+    }
+    visitRefinedQuery(pcx) {
+        const base = this.visit(pcx.refinableQuery());
+        if (ast.isQueryElement(base)) {
+            const rcx = pcx.queryRefinement();
+            if (rcx) {
+                const properties = this.getQueryRefinements(rcx);
+                base.refineHead(properties);
+            }
+            return base;
+        }
+        throw this.internalError(pcx, `Query expected, but ${base.elementType} found`);
+    }
+    visitQueryByTurtleName(pcx) {
+        const source = this.visitUnextendableSource(pcx.unextendableSource());
+        const query = new ast.FullQuery(source);
+        query.turtleName = this.getFieldName(pcx);
+        return this.astAt(query, pcx);
+    }
+    visitQueryByName(pcx) {
+        const query = new ast.ExistingQuery();
+        query.head = this.getModelEntryName(pcx);
+        return this.astAt(query, pcx);
+    }
+    getSourceExtensions(pcx) {
+        const extensions = pcx === null || pcx === void 0 ? void 0 : pcx.exploreProperties();
+        const sourceDesc = this.astAt(this.visitExploreProperties(extensions), pcx);
+        if (this.m4WarningsEnabled() && pcx.EXTEND() === undefined) {
+            this.astError(sourceDesc, 'Implicit source extension is deprecated, use the `extend` operator.', 'warn');
+        }
+        return sourceDesc;
+    }
+    visitUnextendableSource(pcx) {
+        const unextendedSource = this.visit(pcx.extendableSource());
+        if (unextendedSource instanceof ast.Source) {
+            const ecx = pcx.sourceExtension();
+            if (ecx) {
+                const sourceDesc = this.getSourceExtensions(ecx);
+                return new ast.RefinedSource(unextendedSource, sourceDesc);
+            }
+            else {
+                return unextendedSource;
+            }
+        }
+        throw this.internalError(pcx, `Source expected, but ${unextendedSource.elementType} found`);
+    }
+    visitNormalQuery(pcx) {
+        const query = this.visit(pcx.unrefinableQuery());
+        if (ast.isQueryElement(query)) {
+            query.addSegments(...this.getSegments(pcx.pipeElement()));
+            return this.astAt(query, pcx);
+        }
+        throw this.internalError(pcx, `Expected query, but ${query.elementType} found`);
+    }
+    visitExtendedQuery(pcx) {
+        const query = this.visit(pcx.query());
+        if (!ast.isQueryElement(query)) {
+            throw this.internalError(pcx, `Query expected, but ${query.elementType} found`);
         }
-        return source;
+        const source = new ast.QuerySource(query);
+        const sourceDesc = this.getSourceExtensions(pcx.sourceExtension());
+        return this.astAt(new ast.RefinedSource(source, sourceDesc), pcx);
     }
     visitExploreProperties(pcx) {
         const filterCx = pcx.filterShortcut();
@@ -257,7 +331,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitTableFunction(pcx) {
         const tableURI = this.getPlainString(pcx.tableURI());
         const el = this.astAt(new ast.TableFunctionSource(tableURI), pcx);
-        if (ENABLE_M4_WARNINGS) {
+        if (this.m4WarningsEnabled()) {
             this.astError(el, "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`", 'warn');
         }
         return el;
@@ -279,7 +353,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const name = this.getModelEntryName(pcx.sqlExploreNameRef());
         return this.astAt(new ast.FromSQLSource(name), pcx);
     }
-    visitSQLSource(pcx) {
+    visitSqlSource(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
         const sqlStr = new ast.SQLString();
@@ -360,7 +434,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     getJoinSource(name, ecx) {
         if (ecx) {
-            const joinSrc = this.visitExplore(ecx.explore());
+            const joinSrc = this.getSource(ecx.explore());
             const notes = (0, parse_utils_1.getNotes)(ecx._before_is).concat((0, parse_utils_1.getNotes)(ecx._after_is));
             return { joinFrom: joinSrc, notes };
         }
@@ -368,7 +442,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitQueryJoinStatement(pcx) {
         const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
-        if (ENABLE_M4_WARNINGS) {
+        if (this.m4WarningsEnabled()) {
             this.astError(result, 'Joins in queries are deprecated, move into an `extend:` block.', 'warn');
         }
         return result;
@@ -434,7 +508,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DeclareFieldDeclaration);
         const stmt = new ast.DeclareFields(defs);
         const result = this.astAt(stmt, pcx);
-        if (ENABLE_M4_WARNINGS) {
+        if (this.m4WarningsEnabled()) {
             this.astError(result, '`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block', 'warn');
         }
         return result;
@@ -669,32 +743,16 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const propsCx = firstCx.queryProperties();
         if (propsCx) {
             const queryDesc = this.visitQueryProperties(propsCx);
-            if (nameCx) {
-                pipe.refineHead(queryDesc);
-            }
-            else {
-                pipe.addSegments(queryDesc);
-            }
+            pipe.addSegments(queryDesc);
+        }
+        const rcx = firstCx.queryRefinement();
+        if (rcx) {
+            const queryDesc = this.getQueryRefinements(rcx);
+            pipe.refineHead(queryDesc);
         }
         const tail = this.getSegments(pipeCx.pipeElement());
         pipe.addSegments(...tail);
     }
-    visitExploreArrowQuery(pcx) {
-        const root = this.visitExplore(pcx.explore());
-        const query = new ast.FullQuery(root);
-        this.buildPipelineFromName(query, pcx.pipelineFromName());
-        return this.astAt(query, pcx);
-    }
-    visitArrowQuery(pcx) {
-        const query = new ast.ExistingQuery();
-        query.head = this.getModelEntryName(pcx.queryName());
-        const refCx = pcx.queryProperties();
-        if (refCx) {
-            query.refineHead(this.visitQueryProperties(refCx));
-        }
-        query.addSegments(...this.getSegments(pcx.pipeElement()));
-        return this.astAt(query, pcx);
-    }
     visitTopLevelQueryDefs(pcx) {
         const stmts = pcx
             .topLevelQueryDef()
@@ -719,32 +777,27 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const defCx = pcx.topLevelAnonQueryDef();
         const query = this.visit(defCx.query());
         if (ast.isQueryElement(query)) {
-            const theQuery = new ast.AnonymousQuery(query);
+            const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
             const notes = (0, parse_utils_1.getNotes)(pcx.topLevelAnonQueryDef().tags());
             const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
             theQuery.extendNote({ notes, blockNotes });
-            if (ENABLE_M4_WARNINGS) {
+            if (this.m4WarningsEnabled()) {
                 this.astError(theQuery, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
             }
             return this.astAt(theQuery, pcx);
         }
         throw this.internalError(pcx, `Anonymous query matched, but ${query.elementType} found`);
     }
-    visitRunStatementDef(pcx) {
+    visitRunStatement(pcx) {
         const query = this.visit(pcx.topLevelAnonQueryDef().query());
         if (ast.isQueryElement(query)) {
-            const el = new ast.RunQueryDef(query);
+            const el = new ast.RunQuery(query);
             el.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx._blockTags) });
             el.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx._noteTags) });
             return this.astAt(el, pcx);
         }
         throw this.internalError(pcx, `Run query matched, but ${query.elementType} found`);
     }
-    visitRunStatementRef(pcx) {
-        const name = this.getModelEntryName(pcx.queryName());
-        const el = this.astAt(new ast.RunQueryRef(name), pcx.queryName());
-        return this.astAt(el, pcx);
-    }
     visitNestStatement(pcx) {
         const nests = this.visitNestedQueryList(pcx.nestedQueryList());
         nests.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
@@ -755,11 +808,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitNestExisting(pcx) {
         const name = this.getFieldName(pcx.queryName());
-        const propsCx = pcx.queryProperties();
+        const rcx = pcx.queryRefinement();
         const notes = (0, parse_utils_1.getNotes)(pcx.tags());
-        if (propsCx) {
+        if (rcx) {
             const nestRefine = new ast.NestRefinement(name);
-            const queryDesc = this.visitQueryProperties(propsCx);
+            const queryDesc = this.getQueryRefinements(rcx);
             nestRefine.refineHead(queryDesc);
             nestRefine.extendNote({ notes });
             return this.astAt(nestRefine, pcx);
@@ -1023,7 +1076,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return new ast.Pick(picks);
     }
-    visitNamedSource(pcx) {
+    visitSourceFromNamedModelEntry(pcx) {
         const name = this.getModelEntryName(pcx.sourceID());
         // Parameters ... coming ...
         // const paramListCx = pcx.isParam();
@@ -1036,7 +1089,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         //   }
         //   return this.astAt(new ast.NamedSource(name, paramInit), pcx);
         // }
-        return this.astAt(new ast.NamedSource(name), pcx);
+        const source = new ast.NamedSourceOrQuery(name);
+        return this.astAt(source, pcx);
     }
     visitExprFilter(pcx) {
         const filters = this.visit(pcx.filteredBy());
@@ -1097,7 +1151,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         stmt.is = blockName;
         const result = this.astAt(stmt, pcx);
-        if (ENABLE_M4_WARNINGS) {
+        if (this.m4WarningsEnabled()) {
             this.astError(result, '`sql:` statement is deprecated, use `connection_name.sql(...)` instead', 'warn');
         }
         return result;
@@ -1116,7 +1170,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitDocAnnotations(pcx) {
         const allNotes = pcx.DOC_ANNOTATION().map(note => note.text);
-        return new ast.ModelAnnotation(allNotes);
+        const tags = new ast.ModelAnnotation(allNotes);
+        this.compilerFlags = tags.getCompilerFlags(this.compilerFlags);
+        return tags;
     }
     visitIgnoredObjectAnnotations(pcx) {
         return new IgnoredElement(pcx.text);

package/dist/lang/parse-malloy.d.ts

@@ -5,6 +5,7 @@ import { LogMessage, MessageLog } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
 import { ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse, FatalResponse, FinalResponse, HelpContextResponse, MetadataResponse, ModelDataRequest, NeedURLData, TranslateResponse } from './translate-response';
+import { MalloyTagProperties } from '../tags';
 export declare type StepResponses = DataRequestResponse | ASTResponse | TranslateResponse | ParseResponse | MetadataResponse;
 /**
  * A Translation is a series of translation steps. Each step can depend
@@ -170,6 +171,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
     importZone: Zone<string>;
     sqlQueryZone: Zone<SQLBlockStructDef>;
     logger: MessageLog;
+    compilerFlags: MalloyTagProperties;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, preload?: ParseUpdate | null);
     update(dd: ParseUpdate): void;

package/dist/lang/parse-malloy.js

@@ -291,6 +291,7 @@ class ASTStep {
         }
         const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger);
         const newAst = secondPass.visit(parse.root);
+        that.root.compilerFlags = secondPass.compilerFlags;
         if (that.root.logger.hasErrors()) {
             this.response = that.fatalResponse();
             return this.response;
@@ -750,6 +751,7 @@ class MalloyTranslator extends MalloyTranslation {
         this.importZone = new zone_1.Zone();
         this.sqlQueryZone = new zone_1.Zone();
         this.logger = new parse_log_1.MessageLog();
+        this.compilerFlags = {};
         this.root = this;
         if (preload) {
             this.update(preload);

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

@@ -54,7 +54,7 @@ class DocumentSymbolWalker {
         });
         this.blockRange = undefined;
     }
-    enterRunStatementDef(pcx) {
+    enterRunStatement(pcx) {
         this.symbols.push({
             range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef()),
             name: 'unnamed_query',
@@ -63,15 +63,6 @@ class DocumentSymbolWalker {
             lensRange: this.translator.rangeFromContext(pcx),
         });
     }
-    enterRunStatementRef(pcx) {
-        this.symbols.push({
-            range: this.translator.rangeFromContext(pcx.queryName()),
-            name: pcx.queryName().id().text,
-            type: 'query',
-            children: [],
-            lensRange: this.translator.rangeFromContext(pcx),
-        });
-    }
     enterAnonymousQuery(pcx) {
         this.symbols.push({
             range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef().query()),

package/dist/lang/test/document-symbol-walker.spec.js

@@ -71,7 +71,7 @@ test('run (def) symbols are included', () => {
 });
 test('run (ref) symbols are included', () => {
     testSymbol((0, test_translator_1.markSource) `query: by_carrier is flights -> by_carrier
-    run: ${'by_carrier'}`, 'by_carrier', 'query', [1]);
+    run: ${'by_carrier'}`, 'unnamed_query', 'unnamed_query', [1]);
 });
 test('expression field defs are included', () => {
     testSymbol((0, test_translator_1.markSource) `