@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

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

@@ -54,6 +54,12 @@ 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");
+class ErrorNode extends ast.SourceQueryNode {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'parseErrorSourceQuery';
+    }
+}
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
         super();
@@ -71,6 +77,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         this.parseInfo = parseInfo;
         this.msgLog = msgLog;
         this.compilerFlags = new tags_1.Tag();
+        // for (const flag of DEFAULT_COMPILER_FLAGS) {
+        //   const withNewTag = Tag.fromTagline(flag, this.compilerFlags);
+        //   this.compilerFlags = withNewTag.tag;
+        // }
+        this.compilerFlags = new tags_1.Tag();
     }
     /**
      * Mostly used to flag a case where the grammar and the type system are
@@ -115,7 +126,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 acceptable.push(checked);
             }
             else if (!(el instanceof IgnoredElement)) {
-                this.astError(el, `Expected ${desc}, not '${el.elementType}'`);
+                this.astError(el, `Parser enountered unexpected statement type '${el.elementType}' when it needed '${desc}'`);
             }
         }
         return acceptable;
@@ -195,13 +206,6 @@ 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 pcx.sqlInterpolation()) {
             if (part.CLOSE_CODE() && this.m4WarningsEnabled()) {
@@ -265,93 +269,34 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return defList;
     }
     visitSourceDefinition(pcx) {
-        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), this.getSource(pcx.explore()), true, []);
+        const exploreExpr = this.visit(pcx.sqExplore());
+        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), exploreExpr instanceof ast.SourceQueryNode ? exploreExpr : undefined, true, []);
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, 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');
+        if (pcx.REFINE()) {
+            this.contextError(pcx, 'The experimental "refine" operator is deprecated, use the "+" 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.refineWith(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);
-        const res = this.astAt(query, pcx);
-        if (this.m4WarningsEnabled() && pcx.ARROW()) {
-            this.astError(res, 'Leading arrow (`->`) when referencing a query is deprecated; remove the arrow', 'warn');
+        else if (!pcx.refineOperator()) {
+            this.contextError(pcx, 'Implicit query refinement is deprecated, use the `+` operator', 'warn');
         }
-        return res;
+        return properties;
     }
     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);
+        if (this.m4WarningsEnabled()) {
+            if (pcx.refineOperator()) {
+                this.contextError(pcx, 'Source extension with "+" is deprecated, use the "extend" operator', 'warn');
             }
-            else {
-                return unextendedSource;
+            else if (pcx.EXTEND() === undefined && this.m4WarningsEnabled()) {
+                this.contextError(pcx, 'Implicit source extension is deprecated, use the `extend` operator.', 'warn');
             }
         }
-        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`);
-        }
-        const source = new ast.QuerySource(query);
-        const sourceDesc = this.getSourceExtensions(pcx.sourceExtension());
-        return this.astAt(new ast.RefinedSource(source, sourceDesc), pcx);
+        return sourceDesc;
     }
     visitExploreProperties(pcx) {
         const filterCx = pcx.filterShortcut();
@@ -376,15 +321,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const tablePath = this.getPlainString(pcx.tablePath());
         return this.astAt(new ast.TableMethodSource(connectionName, tablePath), pcx);
     }
-    visitTableSource(pcx) {
-        const result = this.visit(pcx.exploreTable());
-        if (result instanceof ast_1.TableSource) {
-            return result;
-        }
-        throw this.internalError(pcx, `Table source matched, but ${result.elementType} found`);
-    }
-    visitSQLSourceName(pcx) {
-        const name = this.getModelEntryName(pcx.sqlExploreNameRef());
+    getLegacySQLSouce(pcx) {
+        const name = this.getModelEntryName(pcx);
         const res = this.astAt(new ast.FromSQLSource(name), pcx);
         if (this.m4WarningsEnabled()) {
             this.astError(res, '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly', 'warn');
@@ -406,17 +344,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const expr = new ast.SQLSource(connectionName, sqlStr);
         return this.astAt(expr, pcx);
     }
-    visitQuerySource(pcx) {
-        const query = this.visit(pcx.query());
-        if (ast.isQueryElement(query)) {
-            const el = this.astAt(new ast.QuerySource(query), pcx);
-            if (this.m4WarningsEnabled()) {
-                this.astError(el, '`from(some_query)` is deprecated; use `some_query` directly', 'warn');
-            }
-            return el;
-        }
-        throw this.internalError(pcx, `Expect query definition, got a '${query.elementType}'`);
-    }
     visitDefJoinMany(pcx) {
         const joinList = this.getJoinList(pcx.joinList());
         const joins = [];
@@ -476,11 +403,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     getJoinSource(name, ecx) {
         if (ecx) {
-            const joinSrc = this.getSource(ecx.explore());
+            const joinSrc = this.getSqExpr(ecx.sqExpr());
             const notes = this.getNotes(ecx._before_is).concat(this.getNotes(ecx._after_is));
             return { joinFrom: joinSrc, notes };
         }
-        return { joinFrom: new ast.NamedSource(name), notes: [] };
+        return { joinFrom: new ast.SQReference(name), notes: [] };
     }
     visitQueryJoinStatement(pcx) {
         const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
@@ -660,7 +587,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             .queryFieldEntry()
             .map(e => this.getQueryFieldEntry(e, makeFieldDef, makeFieldRef)), x => x instanceof ast.FieldReference || x instanceof ast.FieldDeclaration
             ? x
-            : false, 'query field');
+            : false, 'view field');
     }
     visitAggregateStatement(pcx) {
         const agStmt = new ast.Aggregate(this.getQueryItems(pcx.queryFieldList(), ast.AggregateFieldDeclaration, ast.AggregateFieldReference));
@@ -851,9 +778,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitTopLevelQueryDef(pcx) {
         const queryName = (0, parse_utils_1.getId)(pcx.queryName());
-        const queryExpr = this.visit(pcx.query());
-        if (ast.isQueryElement(queryExpr)) {
-            const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
+        const queryExpr = this.visit(pcx.sqExpr());
+        const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
+        if (queryExpr instanceof ast.SourceQueryNode) {
             const queryDef = new ast.DefineQuery(queryName, queryExpr);
             queryDef.extendNote({ notes });
             return this.astAt(queryDef, pcx);
@@ -862,28 +789,24 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitAnonymousQuery(pcx) {
         const defCx = pcx.topLevelAnonQueryDef();
-        const query = this.visit(defCx.query());
-        if (ast.isQueryElement(query)) {
-            const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
-            const notes = this.getNotes(pcx.topLevelAnonQueryDef().tags());
-            const blockNotes = this.getNotes(pcx.tags());
-            theQuery.extendNote({ notes, blockNotes });
-            if (this.m4WarningsEnabled()) {
-                this.astError(theQuery, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
-            }
-            return this.astAt(theQuery, pcx);
+        const query = this.getSqExpr(defCx.sqExpr());
+        const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
+        const notes = this.getNotes(pcx.topLevelAnonQueryDef().tags());
+        const blockNotes = this.getNotes(pcx.tags());
+        theQuery.extendNote({ notes, blockNotes });
+        if (this.m4WarningsEnabled()) {
+            this.contextError(defCx, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
         }
-        throw this.internalError(pcx, `Anonymous query matched, but ${query.elementType} found`);
+        return this.astAt(theQuery, pcx);
     }
     visitRunStatement(pcx) {
-        const query = this.visit(pcx.topLevelAnonQueryDef().query());
-        if (ast.isQueryElement(query)) {
-            const el = new ast.RunQuery(query);
-            el.extendNote({ blockNotes: this.getNotes(pcx._blockTags) });
-            el.extendNote({ notes: this.getNotes(pcx._noteTags) });
-            return this.astAt(el, pcx);
-        }
-        throw this.internalError(pcx, `Run query matched, but ${query.elementType} found`);
+        const defCx = pcx.topLevelAnonQueryDef();
+        const query = this.getSqExpr(defCx.sqExpr());
+        const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
+        const notes = this.getNotes(pcx.topLevelAnonQueryDef().tags());
+        const blockNotes = this.getNotes(pcx.tags());
+        theQuery.extendNote({ notes, blockNotes });
+        return this.astAt(theQuery, pcx);
     }
     visitNestStatement(pcx) {
         const nests = this.visitNestedQueryList(pcx.nestedQueryList());
@@ -1221,22 +1144,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return new ast.Pick(picks);
     }
-    visitSourceFromNamedModelEntry(pcx) {
-        const name = this.getModelEntryName(pcx.sourceID());
-        // Parameters ... coming ...
-        // const paramListCx = pcx.isParam();
-        // if (paramListCx) {
-        //   const paramInit: Record<string, ast.ConstantSubExpression> = {};
-        //   for (const cx of paramListCx) {
-        //     const pName = this.identifer(cx.id());
-        //     const pVal = this.getFieldExpr(cx.isExpr().partialAllowedFieldExpr());
-        //     paramInit[pName] = new ast.ConstantSubExpression(pVal);
-        //   }
-        //   return this.astAt(new ast.NamedSource(name, paramInit), pcx);
-        // }
-        const source = new ast.NamedSourceOrQuery(name);
-        return this.astAt(source, pcx);
-    }
     visitExprFilter(pcx) {
         const filters = this.visit(pcx.filteredBy());
         return new ast.ExprFilter(this.getFieldExpr(pcx.fieldExpr()), filters);
@@ -1347,6 +1254,105 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const allNotes = this.getNotes(pcx);
         return new ast.ObjectAnnotation(allNotes);
     }
+    visitSQAmbiguous(pcx) {
+        const addCx = pcx.ambiguousModification();
+        const plus = [];
+        const filterCx = addCx.filterShortcut();
+        if (filterCx) {
+            plus.push(this.getFilterShortcut(filterCx));
+        }
+        for (const modifier of addCx.modEither()) {
+            plus.push(this.visit(modifier));
+        }
+        const sqExpr = this.getSqExpr(pcx.sqExpr());
+        const hasPlus = !!pcx.PLUS();
+        return this.astAt(new ast.SQLegacyModify(sqExpr, plus, hasPlus, this.m4WarningsEnabled()), pcx);
+    }
+    visitSQID(pcx) {
+        if (this.m4WarningsEnabled() && pcx.ARROW()) {
+            this.contextError(pcx, 'Leading arrow (`->`) when referencing a query is deprecated; remove the arrow', 'warn');
+        }
+        const ref = this.getModelEntryName(pcx);
+        return this.astAt(new ast.SQReference(ref), pcx.id());
+    }
+    getSqExpr(cx) {
+        const result = this.visit(cx);
+        if (result instanceof ast.SourceQueryNode) {
+            return result;
+        }
+        this.contextError(cx, `Expected a source/query expression, not '${result.elementType}'`);
+        return new ErrorNode();
+    }
+    visitSQExtendedSource(pcx) {
+        const extendSrc = this.getSqExpr(pcx.sqExpr());
+        const src = new ast.SQExtendedSource(extendSrc, this.getSourceExtensions(pcx.sourceExtension()));
+        return this.astAt(src, pcx);
+    }
+    visitSQArrow(pcx) {
+        const applyTo = this.getSqExpr(pcx.sqExpr());
+        const viewParts = [];
+        const headCx = pcx.leadSeg();
+        const headId = (0, parse_utils_1.getOptionalId)(headCx);
+        const headIdCx = headCx.id();
+        if (headIdCx && headId) {
+            viewParts.push(new ast.ViewFieldReference([
+                this.astAt(new ast.FieldName(headId), headIdCx),
+            ]));
+            const andRefined = headCx.queryRefinement();
+            if (andRefined) {
+                viewParts.push(this.getQueryRefinements(andRefined));
+            }
+        }
+        const qopCx = headCx.queryProperties();
+        if (qopCx) {
+            viewParts.push(this.visitQueryProperties(qopCx));
+        }
+        for (const seg of pcx.qSeg()) {
+            const asQop = seg.queryProperties();
+            if (asQop) {
+                viewParts.push(this.visitQueryProperties(asQop));
+            }
+            const viewName = (0, parse_utils_1.getOptionalId)(seg);
+            if (viewName) {
+                viewParts.push(new ast.ViewFieldReference([new ast.FieldName(viewName)]));
+            }
+        }
+        const sqExpr = new ast.SQAppendView(applyTo, viewParts);
+        return this.astAt(sqExpr, pcx);
+    }
+    visitSQRefinedQuery(pcx) {
+        const refineThis = this.getSqExpr(pcx.sqExpr());
+        const refine = pcx.queryRefinement();
+        if (this.m4WarningsEnabled() && refine.REFINE()) {
+            this.contextError(refine, 'The `refine` keyword is deprecated, use the `+` operator', 'warn');
+        }
+        const refined = new ast.SQRefinedQuery(refineThis, this.getQueryRefinements(refine));
+        return this.astAt(refined, pcx);
+    }
+    visitSQFrom(pcx) {
+        const fromThis = this.getSqExpr(pcx.sqExpr());
+        if (pcx.FROM() && this.m4WarningsEnabled()) {
+            this.contextError(pcx, '`from(some_query)` is deprecated; use `some_query` directly', 'warn');
+        }
+        return this.astAt(new ast.SQFrom(fromThis), pcx);
+    }
+    visitSQTable(pcx) {
+        const theTable = this.visit(pcx.exploreTable());
+        if (theTable instanceof ast_1.TableSource) {
+            const sqTable = new ast.SQSourceWrapper(theTable);
+            return this.astAt(sqTable, pcx);
+        }
+        return new ErrorNode();
+    }
+    visitSQLegacySQLBlock(pcx) {
+        const theBlock = this.getLegacySQLSouce(pcx.sqlExploreNameRef());
+        const sqExpr = new ast.SQSourceWrapper(theBlock);
+        return this.astAt(sqExpr, pcx);
+    }
+    visitSQSQL(pcx) {
+        const sqExpr = new ast.SQSourceWrapper(this.visitSqlSource(pcx.sqlSource()));
+        return this.astAt(sqExpr, pcx);
+    }
 }
 exports.MalloyToAST = MalloyToAST;
 //# sourceMappingURL=malloy-to-ast.js.map

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

@@ -65,7 +65,7 @@ class DocumentSymbolWalker {
     }
     enterAnonymousQuery(pcx) {
         this.symbols.push({
-            range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef().query()),
+            range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef().sqExpr()),
             name: 'unnamed_query',
             type: 'unnamed_query',
             children: [],

package/dist/lang/parse-utils.js

@@ -55,8 +55,8 @@ function* getStringParts(cx) {
             if (upToOpen.length > 2) {
                 yield upToOpen.slice(0, upToOpen.length - 2);
             }
-            if (part.query()) {
-                yield part.query();
+            if (part.sqExpr()) {
+                yield part.sqExpr();
             }
         }
         const lastChars = (_a = cx.SQL_END()) === null || _a === void 0 ? void 0 : _a.text.slice(0, -3);

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

@@ -58,15 +58,15 @@ const defaultTags = {
     notes: ['# note\n', '# b4-is\n', '# after-is\n'],
 };
 const turtleDef = `
-source: na is a {
+source: na is a extend {
   # blockNote
-  query:
+  view:
   # note
     note_a
     # b4-is
     is
     # after-is
-    {project: *}
+    {select: *}
 }
 `;
 describe('document annotation', () => {
@@ -118,7 +118,7 @@ describe('document annotation', () => {
       # note0
       source: note_b is a
       # note1
-      source: note_a is note_b { primary_key: ai }
+      source: note_a is note_b extend { primary_key: ai }
     `);
         expect(m).toTranslate();
         const note_a = m.getSourceDef('note_a');
@@ -139,7 +139,7 @@ describe('document annotation', () => {
       # b4-is
       is
       # after-is
-      a -> {project: *}
+      a -> {select: *}
     `);
         expect(m).toTranslate();
         const note_a = m.getQuery('note_a');
@@ -148,29 +148,12 @@ describe('document annotation', () => {
             expect(note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
-    test('anonymous query annotation points', () => {
-        const m = new test_translator_1.TestTranslator(`
-      # note1
-      query:
-        # note2
-        a -> {project: *}
-    `);
-        expect(m).toTranslate();
-        const note_a = m.getQuery(0);
-        expect(note_a).toBeDefined();
-        if (note_a) {
-            expect(note_a.annotation).matchesAnnotation({
-                blockNotes: ['# note1\n'],
-                notes: ['# note2\n'],
-            });
-        }
-    });
     test('run statement annotation points', () => {
         const m = new test_translator_1.TestTranslator(`
       # note1
       run:
         # note2
-        a -> {project: *}
+        a -> {select: *}
     `);
         expect(m).toTranslate();
         const note_a = m.getQuery(0);
@@ -186,7 +169,7 @@ describe('document annotation', () => {
         const m = new test_translator_1.TestTranslator(`
       # note1
       # note2
-      query: note_a is a -> {project: *}
+      query: note_a is a -> {select: *}
     `);
         expect(m).toTranslate();
         const note_a = m.getQuery('note_a');
@@ -202,9 +185,9 @@ describe('document annotation', () => {
     # noteb0
       query:
     # noteb1
-        note_b is a -> { project: * }
+        note_b is a -> { select: * }
     # note1
-      query: note_a is -> note_b { where: astr = 'a' }
+      query: note_a is note_b + { where: astr = 'a' }
     `);
         expect(m).toTranslate();
         const note_a = m.getQuery('note_a');
@@ -217,14 +200,20 @@ describe('document annotation', () => {
         }
     });
     test('query from turtle inherits turtle annotation', () => {
-        const m = new test_translator_1.TestTranslator(`
+        const m = (0, test_translator_1.model) `
       ${turtleDef}
-      query: na->note_a
-    `);
+      # run_block
+      run: # run_note
+       na -> note_a
+    `;
         expect(m).toTranslate();
-        const note_a = m.getQuery(0);
+        const note_a = m.translator.getQuery(0);
         expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toBeDefined();
-        expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation({ inherits: defaultTags });
+        expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation({
+            blockNotes: ['# run_block\n'],
+            notes: ['# run_note\n'],
+            inherits: { inherits: defaultTags },
+        });
     });
     test('model annotations', () => {
         var _a;
@@ -273,8 +262,8 @@ describe('source definition annotations', () => {
     test('refined turtle inherits annotation', () => {
         const m = new test_translator_1.TestTranslator(`
       ${turtleDef}
-      source: new_na is na + {
-        query: new_note_a is note_a
+      source: new_na is na extend {
+        view: new_note_a is note_a
       }
     `);
         expect(m).toTranslate();
@@ -288,7 +277,7 @@ describe('source definition annotations', () => {
     });
     test('dimension block annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: na is a {
+      source: na is a extend {
         # blockNote
         dimension:
           # note
@@ -309,7 +298,7 @@ describe('source definition annotations', () => {
     });
     test('measure block annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: na is a {
+      source: na is a extend {
         # blockNote
         measure:
           # note
@@ -330,7 +319,7 @@ describe('source definition annotations', () => {
     });
     test('join_one-with block annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: na is a {
+      source: na is a extend {
         # blockNote
         join_one:
           # note
@@ -351,7 +340,7 @@ describe('source definition annotations', () => {
     });
     test('join_many-on block annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: na is a {
+      source: na is a extend {
         # blockNote
         join_many:
         # note
@@ -372,7 +361,7 @@ describe('source definition annotations', () => {
     });
     test('ignores model annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: na is a {
+      source: na is a extend {
         ## model1
       }
     `);
@@ -382,9 +371,9 @@ describe('source definition annotations', () => {
 describe('query operation annotations', () => {
     test('ignores model annotation', () => {
         expect(`
-      query: a -> {
+      run: a -> {
         ## model1
-        project: *
+        select: *
       }
     `).translationToFailWith('Model annotations not allowed at this scope');
     });
@@ -392,7 +381,7 @@ describe('query operation annotations', () => {
         const m = new test_translator_1.TestTranslator(`
       query: findme is a -> {
         # blockNote
-        project:
+        select:
           # note
           note_a
           # b4-is
@@ -411,7 +400,7 @@ describe('query operation annotations', () => {
     });
     test('project ref inherits annotation', () => {
         const m = new test_translator_1.TestTranslator(`
-      query: a + {
+      run: a extend {
         # blockNote
         dimension:
           # note
@@ -422,7 +411,7 @@ describe('query operation annotations', () => {
           astr
       } -> {
         # note1
-        project:
+        select:
           # note2
           note_a
       }
@@ -484,7 +473,7 @@ describe('query operation annotations', () => {
     });
     test('group_by ref inherits', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: aa is a + {
+      source: aa is a extend {
         # blockNote
         dimension:
           # note
@@ -536,7 +525,7 @@ describe('query operation annotations', () => {
     });
     test('aggregate ref inherits', () => {
         const m = new test_translator_1.TestTranslator(`
-      source: aa is a + {
+      source: aa is a extend {
         # blockNote
         measure:
           # note
@@ -589,7 +578,7 @@ describe('query operation annotations', () => {
     test('nest from existing inherits annotation', () => {
         const m = new test_translator_1.TestTranslator(`
       ${turtleDef}
-      query: na -> {
+      run: na -> {
         nest: note_b is note_a
       }
     `);

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

@@ -176,8 +176,8 @@ test('run lenses go before block annotations', () => {
 test('(regression) query does not use source block range', () => {
     testLens((0, test_translator_1.markSource) `source: a is table('b') {
       query:
-        ${'x is {project: *}'}
-        y is {project: *}
+        ${'x is {select: *}'}
+        y is {select: *}
     }`, [0, 0]);
 });
 //# sourceMappingURL=document-symbol-walker.spec.js.map