@malloydata/malloy 0.0.95-dev231019211822 → 0.0.95

package/README.md

@@ -14,8 +14,8 @@ const bigquery = require("@malloydata/db-bigquery")
 
 const connection = new bigquery.BigQueryConnection("bigquery");
 const runtime = new malloy.SingleConnectionRuntime(connection);
-const model = runtime.loadModel("source: airports is table('malloytest.airports')")
-const runner = model.loadQuery("query: airports->{aggregate: airport_count is count()}")
+const model = runtime.loadModel("source: airports is bigquery.table('malloytest.airports')")
+const runner = model.loadQuery("run: airports->{aggregate: airport_count is count()}")
 runner.run().then((result) => {
     console.log(result.data.value) // [ { airport_count: 19793 } ]
 })

package/dist/lang/ast/elements/source-query-nodes.d.ts

@@ -8,6 +8,7 @@ import { SourceDesc } from '../types/source-desc';
 import { QOPDesc } from '../query-properties/qop-desc';
 import { FullQuery } from '../query-elements/full-query';
 import { ViewFieldReference } from '../query-items/field-references';
+import { LogSeverity } from '../../parse-log';
 export declare class SQReference extends SourceQueryNode {
     readonly ref: ModelEntryReference;
     elementType: string;
@@ -21,9 +22,9 @@ export declare class SQLegacyModify extends SourceQueryNode {
     readonly sourceQuery: SourceQueryNode;
     readonly plus: MalloyElement[];
     readonly hasPlus: boolean;
-    readonly m4Warnings: boolean;
+    readonly m4Severity: LogSeverity | false;
     elementType: string;
-    constructor(sourceQuery: SourceQueryNode, plus: MalloyElement[], hasPlus: boolean, m4Warnings: boolean);
+    constructor(sourceQuery: SourceQueryNode, plus: MalloyElement[], hasPlus: boolean, m4Severity: LogSeverity | false);
     getQuery(): QueryElement | undefined;
     getSource(): Source | undefined;
     isSource(): boolean;

package/dist/lang/ast/elements/source-query-nodes.js

@@ -92,12 +92,12 @@ class SQReference extends source_query_1.SourceQueryNode {
 }
 exports.SQReference = SQReference;
 class SQLegacyModify extends source_query_1.SourceQueryNode {
-    constructor(sourceQuery, plus, hasPlus, m4Warnings) {
+    constructor(sourceQuery, plus, hasPlus, m4Severity) {
         super({ sourceQuery, plus });
         this.sourceQuery = sourceQuery;
         this.plus = plus;
         this.hasPlus = hasPlus;
-        this.m4Warnings = m4Warnings;
+        this.m4Severity = m4Severity;
         this.elementType = 'sqLogacyModify';
     }
     getQuery() {
@@ -105,8 +105,8 @@ class SQLegacyModify extends source_query_1.SourceQueryNode {
         if (!asQuery) {
             return;
         }
-        if (!this.hasPlus && this.m4Warnings) {
-            this.log('Implicit query refinement is deprecated, use the `+` operator', 'warn');
+        if (!this.hasPlus && this.m4Severity) {
+            this.log('Implicit query refinement is deprecated, use the `+` operator', this.m4Severity);
         }
         const stmts = [];
         for (const stmt of this.plus) {
@@ -127,12 +127,12 @@ class SQLegacyModify extends source_query_1.SourceQueryNode {
         if (!asSource) {
             return;
         }
-        if (this.m4Warnings) {
+        if (this.m4Severity) {
             if (this.hasPlus) {
-                this.log('Source extension with "+" is deprecated, use the "extend" operator', 'warn');
+                this.log('Source extension with "+" is deprecated, use the "extend" operator', this.m4Severity);
             }
             else {
-                this.log('Implicit source extension is deprecated, use the `extend` operator.', 'warn');
+                this.log('Implicit source extension is deprecated, use the `extend` operator.', this.m4Severity);
             }
         }
         const stmts = [];

package/dist/lang/ast/query-builders/project-builder.js

@@ -38,7 +38,7 @@ class ProjectBuilder extends reduce_builder_1.ReduceBuilder {
     }
     execute(qp) {
         if (qp.elementType === 'having' || qp instanceof group_by_1.GroupBy) {
-            qp.log('Illegal statement in a project query operation');
+            qp.log('Illegal statement in a select query operation');
         }
         else {
             super.execute(qp);
@@ -51,7 +51,7 @@ class ProjectBuilder extends reduce_builder_1.ReduceBuilder {
                 from = fromSeg;
             }
             else {
-                this.resultFS.log(`Can't refine project with ${fromSeg.type}`);
+                this.resultFS.log(`Can't refine select with ${fromSeg.type}`);
                 return error_factory_1.ErrorFactory.projectSegment;
             }
         }

package/dist/lang/ast/query-items/typecheck_utils.js

@@ -43,7 +43,7 @@ function typecheckProject(type, logTo) {
         else {
             throw new Error(`Unexpected expression type ${type.expressionType} not handled here`);
         }
-        logTo.log(`Cannot use ${kind} field in a project operation, did you mean to use ${useInstead} operation instead?`);
+        logTo.log(`Cannot use ${kind} field in a select operation, did you mean to use ${useInstead} operation instead?`);
     }
 }
 exports.typecheckProject = typecheckProject;
@@ -117,7 +117,7 @@ function typecheckCalculate(type, logTo) {
             kind = 'an aggregate';
         }
         else if ((0, model_1.expressionIsScalar)(type.expressionType)) {
-            useInstead = 'a group_by or project';
+            useInstead = 'a group_by or select';
             kind = 'a scalar';
         }
         else {
@@ -141,7 +141,7 @@ function typecheckAggregate(type, logTo) {
             kind = 'an analytic';
         }
         else if ((0, model_1.expressionIsScalar)(type.expressionType)) {
-            useInstead = 'a group_by or project';
+            useInstead = 'a group_by or select';
             kind = 'a scalar';
         }
         else {

package/dist/lang/ast/query-properties/nest.js

@@ -67,7 +67,7 @@ class TurtleDeclRoot extends pipeline_desc_1.TurtleHeadedPipe {
             }
         }
         else if (this.withRefinement) {
-            throw this.internalError("Can't refine the head of a turtle in its definition");
+            throw this.internalError("Can't refine the head of a view  in its definition");
         }
         let pipeOutFS = fs;
         if (modelPipe.pipeline.length > 0) {
@@ -193,7 +193,7 @@ class NestReference extends field_references_1.FieldReference {
                 kind = 'an analytic';
             }
             else if ((0, model_1.expressionIsScalar)(type.expressionType)) {
-                useInstead = 'a group_by or project';
+                useInstead = 'a group_by or select';
                 kind = 'a scalar';
             }
             else if ((0, model_1.expressionIsAggregate)(type.expressionType)) {

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

@@ -49,8 +49,9 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
      * Log an error message relative to a parse node
      */
     protected contextError(cx: ParserRuleContext, msg: string, sev?: LogSeverity): void;
+    protected m4Severity(): LogSeverity | false;
+    protected m4advisory(cx: ParserRuleContext, msg: string): void;
     protected only<T extends ast.MalloyElement>(els: ast.MalloyElement[], isGood: (el: ast.MalloyElement) => T | false, desc: string): T[];
-    protected m4WarningsEnabled(): boolean;
     protected getNumber(term: ParseTree): number;
     protected getFieldName(cx: HasID): ast.FieldName;
     protected getModelEntryName(cx: HasID): ast.ModelEntryReference;

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

@@ -67,7 +67,7 @@ class IgnoredElement extends ast.MalloyElement {
         this.malloySrc = src;
     }
 }
-const DEFAULT_COMPILER_FLAGS = ['##! m4warnings'];
+const DEFAULT_COMPILER_FLAGS = ['##! m4warnings=error'];
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -118,6 +118,19 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             severity: sev,
         });
     }
+    m4Severity() {
+        const m4severityTag = this.compilerFlags.tag('m4warnings');
+        if (m4severityTag) {
+            return m4severityTag.text() === 'warn' ? 'warn' : 'error';
+        }
+        return false;
+    }
+    m4advisory(cx, msg) {
+        const m4 = this.m4Severity();
+        if (m4) {
+            this.contextError(cx, msg, m4);
+        }
+    }
     only(els, isGood, desc) {
         const acceptable = [];
         for (const el of els) {
@@ -131,9 +144,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return acceptable;
     }
-    m4WarningsEnabled() {
-        return this.compilerFlags.has('m4warnings');
-    }
     getNumber(term) {
         return Number.parseInt(term.text);
     }
@@ -179,9 +189,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     getFilterShortcut(cx) {
         const el = this.getFilterElement(cx.fieldExpr());
-        if (this.m4WarningsEnabled()) {
-            this.astError(el, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead', 'warn');
-        }
+        this.m4advisory(cx, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
         return new ast.Filter([el]);
     }
     getPlainString(cx) {
@@ -208,8 +216,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     makeSqlString(pcx, sqlStr) {
         for (const part of pcx.sqlInterpolation()) {
-            if (part.CLOSE_CODE() && this.m4WarningsEnabled()) {
-                this.contextError(part, 'Use %{ ... } instead of %{ ... }%', 'warn');
+            if (part.CLOSE_CODE()) {
+                this.m4advisory(part, 'Use %{ ... } instead of %{ ... }%');
             }
         }
         for (const part of (0, parse_utils_1.getStringParts)(pcx)) {
@@ -288,13 +296,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getSourceExtensions(pcx) {
         const extensions = pcx === null || pcx === void 0 ? void 0 : pcx.exploreProperties();
         const sourceDesc = this.astAt(this.visitExploreProperties(extensions), pcx);
-        if (this.m4WarningsEnabled()) {
-            if (pcx.refineOperator()) {
-                this.contextError(pcx, 'Source extension with "+" is deprecated, use the "extend" operator', 'warn');
-            }
-            else if (pcx.EXTEND() === undefined && this.m4WarningsEnabled()) {
-                this.contextError(pcx, 'Implicit source extension is deprecated, use the `extend` operator.', 'warn');
-            }
+        if (pcx.refineOperator()) {
+            this.m4advisory(pcx, 'Source extension with "+" is deprecated, use the "extend" operator');
+        }
+        else if (pcx.EXTEND() === undefined) {
+            this.m4advisory(pcx, 'Implicit source extension is deprecated, use the `extend` operator.');
         }
         return sourceDesc;
     }
@@ -310,9 +316,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 (this.m4WarningsEnabled()) {
-            this.astError(el, "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`", 'warn');
-        }
+        this.m4advisory(pcx, "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`");
         return el;
     }
     visitTableMethod(pcx) {
@@ -324,9 +328,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     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');
-        }
         return res;
     }
     visitSqlSource(pcx) {
@@ -411,9 +412,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitQueryJoinStatement(pcx) {
         const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
-        if (this.m4WarningsEnabled()) {
-            this.astError(result, 'Joins in queries are deprecated, move into an `extend:` block.', 'warn');
-        }
+        this.m4advisory(pcx, 'Joins in queries are deprecated, move into an `extend:` block.');
         return result;
     }
     visitJoinOn(pcx) {
@@ -477,9 +476,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 (this.m4WarningsEnabled()) {
-            this.astError(result, '`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block', 'warn');
-        }
+        this.m4advisory(pcx, '`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
         return result;
     }
     visitExploreRenameDef(pcx) {
@@ -500,9 +497,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitFilterByShortcut(pcx) {
         const el = this.getFilterElement(pcx.fieldExpr());
         const res = this.astAt(new ast.Filter([el]), pcx);
-        if (this.m4WarningsEnabled()) {
-            this.astError(el, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead', 'warn');
-        }
+        this.m4advisory(pcx, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
         return res;
     }
     visitWhereStatement(pcx) {
@@ -525,8 +520,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const queryDefs = this.visitSubQueryDefList(pcx.subQueryDefList());
         const blockNotes = this.getNotes(pcx.tags());
         queryDefs.extendNote({ blockNotes });
-        if (this.m4WarningsEnabled() && pcx.QUERY()) {
-            this.contextError(pcx, 'Use view: inside of a source instead of query:', 'warn');
+        if (pcx.QUERY()) {
+            this.m4advisory(pcx, 'Use view: inside of a source instead of query:');
         }
         return queryDefs;
     }
@@ -647,7 +642,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         throw this.internalError(pcx, 'Unexpected element in fieldCollectionMember');
     }
-    // "FieldCollection" can only mean a project statement today
+    // "FieldCollection" can only mean a select statement today
     visitFieldCollection(pcx) {
         const fields = pcx
             .collectionMember()
@@ -655,8 +650,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(new ast.ProjectStatement(fields), pcx);
     }
     visitProjectStatement(pcx) {
-        if (this.m4WarningsEnabled() && pcx.PROJECT()) {
-            this.contextError(pcx, 'project: keyword is deprecated, use select:', 'warn');
+        if (pcx.PROJECT()) {
+            this.m4advisory(pcx, 'project: keyword is deprecated, use select:');
         }
         const stmt = this.visitFieldCollection(pcx.fieldCollection());
         stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
@@ -724,9 +719,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const topN = this.getNumber(pcx.INTEGER_LITERAL());
         let top;
         if (byCx) {
-            if (this.m4WarningsEnabled()) {
-                this.contextError(byCx, 'by clause of top statement unupported. Use order_by instead', 'warn');
-            }
+            this.m4advisory(byCx, 'by clause of top statement unupported. Use order_by instead');
             const nameCx = byCx.fieldName();
             if (nameCx) {
                 const name = this.getFieldName(nameCx);
@@ -747,8 +740,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     buildPipelineFromName(pipe, pipeCx) {
         const firstCx = pipeCx.firstSegment();
-        if (this.m4WarningsEnabled() && firstCx.ARROW()) {
-            this.contextError(firstCx, "Leading '->' in a view or nest definition is no longer needed.", 'warn');
+        if (firstCx.ARROW()) {
+            this.m4advisory(firstCx, "Leading '->' in a view or nest definition is no longer needed.");
         }
         const nameCx = firstCx.exploreQueryName();
         if (nameCx) {
@@ -794,9 +787,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         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');
-        }
+        this.m4advisory(defCx, 'Anonymous `query:` statements are deprecated, use `run:` instead');
         return this.astAt(theQuery, pcx);
     }
     visitRunStatement(pcx) {
@@ -939,9 +930,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         throw this.internalError(pcx, `untranslatable comparison operator '${op}'`);
     }
     visitExprCountDisinct(pcx) {
-        if (this.m4WarningsEnabled()) {
-            this.contextError(pcx, '`count(distinct expression)` deprecated, use `count(expression)` instead', 'warn');
-        }
+        this.m4advisory(pcx, '`count(distinct expression)` deprecated, use `count(expression)` instead');
         return this.astAt(new ast.ExprCountDistinct(this.getFieldExpr(pcx.fieldExpr())), pcx);
     }
     visitExprUngroup(pcx) {
@@ -1008,10 +997,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const expr = exprDef ? this.getFieldExpr(exprDef) : undefined;
         const source = undefined;
         const aggFunc = pcx.aggregate().text.toLowerCase();
-        if (this.m4WarningsEnabled()) {
-            if (pcx.STAR()) {
-                this.contextError(pcx, `* illegal inside ${aggFunc}()`, 'warn');
-            }
+        if (pcx.STAR()) {
+            this.m4advisory(pcx, `* illegal inside ${aggFunc}()`);
         }
         if (aggFunc === 'count') {
             return this.astAt(expr ? new ast.ExprCountDistinct(expr) : new ast.ExprCount(), pcx);
@@ -1214,9 +1201,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         stmt.is = blockName;
         const result = this.astAt(stmt, pcx);
-        if (this.m4WarningsEnabled()) {
-            this.astError(result, '`sql:` statement is deprecated, use `connection_name.sql(...)` instead', 'warn');
-        }
+        this.m4advisory(pcx, '`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
         return result;
     }
     visitSampleStatement(pcx) {
@@ -1266,11 +1251,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         const sqExpr = this.getSqExpr(pcx.sqExpr());
         const hasPlus = !!pcx.PLUS();
-        return this.astAt(new ast.SQLegacyModify(sqExpr, plus, hasPlus, this.m4WarningsEnabled()), pcx);
+        return this.astAt(new ast.SQLegacyModify(sqExpr, plus, hasPlus, this.m4Severity()), pcx);
     }
     visitSQID(pcx) {
-        if (this.m4WarningsEnabled() && pcx.ARROW()) {
-            this.contextError(pcx, 'Leading arrow (`->`) when referencing a query is deprecated; remove the arrow', 'warn');
+        if (pcx.ARROW()) {
+            this.m4advisory(pcx, 'Leading arrow (`->`) when referencing a query is deprecated; remove the arrow');
         }
         const ref = this.getModelEntryName(pcx);
         return this.astAt(new ast.SQReference(ref), pcx.id());
@@ -1323,16 +1308,16 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     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');
+        if (refine.REFINE()) {
+            this.m4advisory(refine, 'The `refine` keyword is deprecated, use the `+` operator');
         }
         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');
+        if (pcx.FROM()) {
+            this.m4advisory(pcx, '`from(some_query)` is deprecated; use `some_query` directly');
         }
         return this.astAt(new ast.SQFrom(fromThis), pcx);
     }
@@ -1347,6 +1332,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitSQLegacySQLBlock(pcx) {
         const theBlock = this.getLegacySQLSouce(pcx.sqlExploreNameRef());
         const sqExpr = new ast.SQSourceWrapper(theBlock);
+        this.m4advisory(pcx, '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly');
         return this.astAt(sqExpr, pcx);
     }
     visitSQSQL(pcx) {

package/dist/lang/parse-malloy.js

@@ -189,8 +189,8 @@ class ParseStep {
             sourceURL: that.sourceURL,
             importBaseURL: that.importBaseURL || that.sourceURL,
             rangeFromContext: cx => that.rangeFromContext(cx),
-            // TODO put the real version here
-            malloyVersion: '0.0.0-m4',
+            // TODO some way to not forget to update this
+            malloyVersion: '4.0.0',
         };
     }
 }

package/dist/lang/test/document-help-context-walker.spec.js

@@ -29,7 +29,7 @@ function testHelpContext(source, position, type, token) {
     const helpContext = doc.helpContext(position).helpContext;
     expect(helpContext).toEqual({ type, token });
 }
-const source = `source: foo is table('bar') {
+const source = `source: foo is DB.table('bar') extend {
   where: bazz ~ 'biff'
   query: foo is {
     group_by: bazz

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

@@ -61,7 +61,7 @@ function testLens(source, path) {
     expect(current).toMatchObject(expected);
 }
 test('source symbols are included', () => {
-    testSymbol((0, test_translator_1.markSource) `source: ${"flights is table('my.table.flights')"}`, 'flights', 'explore', [0]);
+    testSymbol((0, test_translator_1.markSource) `source: ${"flights is DB.table('my.table.flights')"}`, 'flights', 'explore', [0]);
 });
 test('query symbols are included', () => {
     testSymbol((0, test_translator_1.markSource) `query: ${'flights_by_carrier is flights -> by_carrier'}`, 'flights_by_carrier', 'query', [0]);
@@ -75,56 +75,56 @@ test('run (ref) symbols are included', () => {
 });
 test('expression field defs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         dimension: ${'one is 1'}
       }
     `, 'one', 'field', [0, 0]);
 });
 test('renamed fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         rename: ${'field_two is field_2'}
       }
     `, 'field_two', 'field', [0, 0]);
 });
 test('name only fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         dimension: ${'field_two is field_2'}
       }
     `, 'field_two', 'field', [0, 0]);
 });
 test('turtle fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         query: ${'my_turtle is { group_by: a }'}
       }
     `, 'my_turtle', 'query', [0, 0]);
 });
 test('turtle children fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         query: my_turtle is { group_by: ${'a'} }
       }
     `, 'a', 'field', [0, 0, 0]);
 });
 test('turtle children turtles are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         query: my_turtle is { nest: ${'inner_turtle is { group_by: a }'} }
       }
     `, 'inner_turtle', 'query', [0, 0, 0]);
 });
 test('join withs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         join_one: ${'a is b with c'}
       }
     `, 'a', 'join', [0, 0]);
 });
 test('join ons are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      source: flights is table('my.table.flights') {
+      source: flights is DB.table('my.table.flights') extend {
         join_one: ${'a is b on c'}
       }
     `, 'a', 'join', [0, 0]);
@@ -134,15 +134,15 @@ test('source lenses go before block annotations when one source', () => {
     # tag2
     source:
     # tag3
-    flights is table('my.table.flights')`}`, [0]);
+    flights is DB.table('my.table.flights')`}`, [0]);
 });
 test('source lenses go before individual annotations when more than one source', () => {
     testLens((0, test_translator_1.markSource) `# tag
     source:
       ${`# tag2
-      flights is table('my.table.flights')`}
+      flights is DB.table('my.table.flights')`}
 
-      flights2 is table('my.table.flights')`, [0]);
+      flights2 is DB.table('my.table.flights')`, [0]);
 });
 test('query lenses go before block annotations when one source', () => {
     testLens((0, test_translator_1.markSource) `${`# tag
@@ -174,7 +174,7 @@ test('run lenses go before block annotations', () => {
     flights -> by_carrier`}`, [0]);
 });
 test('(regression) query does not use source block range', () => {
-    testLens((0, test_translator_1.markSource) `source: a is table('b') {
+    testLens((0, test_translator_1.markSource) `source: a is DB.table('b') extend {
       query:
         ${'x is {select: *}'}
         y is {select: *}

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

@@ -152,7 +152,7 @@ describe('expressions', () => {
     });
     test('shortcut filtered measure m4warning', () => {
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       run: a -> {
         group_by: ai
         aggregate: x is avg(ai) {? astr = 'why?' }
@@ -173,43 +173,44 @@ describe('expressions', () => {
     });
     describe('aggregate forms', () => {
         const m = (0, test_translator_1.model) `
-      source: root is a {
+      source: root is a extend {
         rename: column is ai
         rename: nested is astruct
         rename: inline is aninline
         dimension: field is column * 2
         dimension: many_field is many.column * 2
         dimension: many_one_field is many.column + one.column
-        join_one: one is a {
+        join_one: one is a extend {
           rename: column is ai
           dimension: field is column * 2
           dimension: many_field is many.column * 2
-          join_many: many is a {
+          join_many: many is a extend {
             rename: column is ai
             dimension: field is column * 2
             dimension: constant is 1
           } on true
         } on true
-        join_many: many is a {
+        join_many: many is a extend {
           rename: column is ai
           dimension: field is column * 2
           dimension: constant is 1
-          join_one: one is a {
+          join_one: one is a extend {
             rename: column is ai
             dimension: field is column * 2
-            join_one: one is a {
+            join_one: one is a extend {
               rename: column is ai
               dimension: field is column * 2
             } on true
           } on true
         } on true
-        join_cross: cross is a {
+        join_cross: cross is a extend {
           rename: column is ai
           dimension: field is column * 2
         } on true
       }
     `;
         m.translator.translate();
+        expect(m).toTranslate();
         const modelX = (0, test_translator_1.makeModelFunc)({
             model: m.translator.modelDef,
             wrap: x => `run: root -> { aggregate: x is ${x} }`,
@@ -417,7 +418,7 @@ describe('expressions', () => {
         });
         test('lag(sum(output))', () => {
             expect((0, test_translator_1.model) `
-      ##! m4warnings
+      ##! m4warnings=warn
       run: a -> {
         group_by: output is 1
         calculate: bar is lag(sum(output))
@@ -425,7 +426,7 @@ describe('expressions', () => {
         });
         test('count(distinct column)', () => {
             expect((0, test_translator_1.model) `
-      ##! m4warnings
+      ##! m4warnings=warn
       run: a -> {
         aggregate: x is count(distinct astr)
       }`).toTranslateWithWarnings('`count(distinct expression)` deprecated, use `count(expression)` instead');

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

@@ -51,7 +51,7 @@ describe('model statements', () => {
             expect(m).translationToFailWith('a1 is not a connection');
         });
         test('table function is deprecated', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
       source: testA is table('_db_:aTable')
     `).toTranslateWithWarnings("`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`");
         });
@@ -541,7 +541,7 @@ describe('sql expressions', () => {
         }
     });
     test('sql statement deprecation warning', () => {
-        const m = new test_translator_1.TestTranslator(`##! m4warnings
+        const m = new test_translator_1.TestTranslator(`##! m4warnings=warn
       sql: bad_sql is {select: """SELECT 1 as one"""}`);
         const req = m.translate().compileSQL;
         if (req) {
@@ -552,7 +552,7 @@ describe('sql expressions', () => {
         expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
     });
     test('from_sql deprecation warning', () => {
-        const m = new test_translator_1.TestTranslator(`##! m4warnings
+        const m = new test_translator_1.TestTranslator(`##! m4warnings=warn
       sql: bad_sql is {select: """SELECT 1 as one"""}
       source: foo is from_sql(bad_sql)`);
         const req = m.translate().compileSQL;
@@ -812,7 +812,7 @@ describe('extend and refine', () => {
     });
     describe('m4 warnings', () => {
         test('implicit refine in nest', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
       source: c is a extend {
         view: x is { select: * }
       }
@@ -822,20 +822,20 @@ describe('extend and refine', () => {
       }`).toTranslateWithWarnings('Implicit query refinement is deprecated, use the `+` operator');
         });
         test('implicit refine in turtle works', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
       source: c is a extend {
         view: x is { select: * }
         view: y is x { limit: 1 }
       }`).toTranslateWithWarnings('Implicit query refinement is deprecated, use the `+` operator');
         });
         test('implicit query refinement', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
         query: q is a -> { group_by: ai }
         run: q { group_by: three is 3 }
       `).toTranslateWithWarnings('Implicit query refinement is deprecated, use the `+` operator');
         });
         test('implicit source extension', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
         source: s is a { dimension: ai_2 is ai + ai }`).toTranslateWithWarnings('Implicit source extension is deprecated, use the `extend` operator.');
         });
     });
@@ -843,13 +843,13 @@ describe('extend and refine', () => {
 describe('miscellaneous m4 warnings', () => {
     test('from() is deprecated', () => {
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: q is a -> { select: * }
       source: c is from(q) extend {
         dimension: x is 1
     }`).toTranslateWithWarnings('`from(some_query)` is deprecated; use `some_query` directly');
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: q is a -> { select: * }
       source: c is q extend {
         dimension: x is 1
@@ -857,28 +857,28 @@ describe('miscellaneous m4 warnings', () => {
     });
     test('project is deprecated', () => {
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: q is a -> { project: * }
     `).toTranslateWithWarnings('project: keyword is deprecated, use select:');
     });
     test('query leading arrow', () => {
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: x is a -> { select: * }
       run: x
     `).toTranslate();
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: x is a -> { select: * }
       run: x -> { select: * }
     `).toTranslate();
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: x is a -> { select: * }
       run: -> x
     `).toTranslateWithWarnings('Leading arrow (`->`) when referencing a query is deprecated; remove the arrow');
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       query: x is a -> { select: * }
       run: -> x -> { select: * }
     `).toTranslateWithWarnings('Leading arrow (`->`) when referencing a query is deprecated; remove the arrow');

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

@@ -29,7 +29,7 @@ describe('query:', () => {
     describe('basic query syntax', () => {
         test('run:anonymous query', () => expect('run: a -> { group_by: astr }').toTranslate());
         test('query:anonymous query m4 warning', () => {
-            expect((0, test_translator_1.markSource) `##! m4warnings
+            expect((0, test_translator_1.markSource) `##! m4warnings=warn
           query: ${'a  -> { group_by: astr }'}`).toTranslateWithWarnings('Anonymous `query:` statements are deprecated, use `run:` instead');
         });
         test('named query:', () => expect('query: aq is a -> { group_by: astr }').toTranslate());
@@ -67,7 +67,7 @@ describe('query:', () => {
         });
         test('query with shortcut filtered turtle', () => {
             expect(`##! -m4warnings
-        query: allA is ab -> aturtle + {? astr ~ 'a%' }`).toTranslate();
+        query: allA is ab -> aturtle + { where: astr ~ 'a%' }`).toTranslate();
         });
         test('query with filtered turtle', () => {
             expect("query: allA is ab -> aturtle + { where: astr ~ 'a%' }").toTranslate();
@@ -215,24 +215,24 @@ describe('query:', () => {
                 expect('source: a1 is a extend { measure: s is lag(count())}').translationToFailWith('Cannot use an analytic field in a measure declaration');
             });
             test('cannot use scalar in aggregate', () => {
-                expect('run: a -> { aggregate: s is 1}').translationToFailWith('Cannot use a scalar field in an aggregate operation, did you mean to use a group_by or project operation instead?');
+                expect('run: a -> { aggregate: s is 1}').translationToFailWith('Cannot use a scalar field in an aggregate operation, did you mean to use a group_by or select operation instead?');
             });
             test('cannot use analytic in aggregate', () => {
                 expect('run: a -> { aggregate: s is lag(count())}').translationToFailWith('Cannot use an analytic field in an aggregate operation, did you mean to use a calculate operation instead?');
             });
             test('cannot use scalar in calculate', () => {
-                expect('run: a -> { group_by: a is 1; calculate: s is 1 }').translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or project operation instead?');
+                expect('run: a -> { group_by: a is 1; calculate: s is 1 }').translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or select operation instead?');
             });
             test('cannot use aggregate in calculate', () => {
                 expect('run: a -> { group_by: a is 1; calculate: s is count() }').translationToFailWith('Cannot use an aggregate field in a calculate operation, did you mean to use an aggregate operation instead?');
             });
             test('cannot use aggregate in project', () => {
-                expect('run: a -> { select: s is count() }').translationToFailWith('Cannot use an aggregate field in a project operation, did you mean to use an aggregate operation instead?');
+                expect('run: a -> { select: s is count() }').translationToFailWith('Cannot use an aggregate field in a select operation, did you mean to use an aggregate operation instead?');
             });
             test('cannot use analytic in project', () => {
-                expect('run: a -> { select: s is row_number() }').translationToFailWith('Cannot use an analytic field in a project operation, did you mean to use a calculate operation instead?');
+                expect('run: a -> { select: s is row_number() }').translationToFailWith('Cannot use an analytic field in a select operation, did you mean to use a calculate operation instead?');
             });
-            test('cannot use analytic in declare', () => {
+            test('cannot use analytic in extended source', () => {
                 expect(`##! -m4warnings
           run: a -> { group_by: a is 1; declare: s is row_number() }`).translationToFailWith('Analytic expressions can not be used in a declare block');
             });
@@ -254,16 +254,16 @@ describe('query:', () => {
                 expect('run: a extend { view: q is { group_by: x is 1 } } -> { group_by: q }').translationToFailWith('Cannot use a view field in a group_by operation, did you mean to use a nest operation instead?');
             });
             test('cannot use scalar in aggregate', () => {
-                expect('run: a -> { extend: {dimension: aconst is 1} aggregate: aconst }').translationToFailWith('Cannot use a scalar field in an aggregate operation, did you mean to use a group_by or project operation instead?');
+                expect('run: a -> { extend: {dimension: aconst is 1} aggregate: aconst }').translationToFailWith('Cannot use a scalar field in an aggregate operation, did you mean to use a group_by or select operation instead?');
             });
             test('cannot use scalar in calculate', () => {
-                expect('run: a -> { extend: {dimension: aconst is 1} group_by: x is 1; calculate: aconst }').translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or project operation instead?');
+                expect('run: a -> { extend: {dimension: aconst is 1} group_by: x is 1; calculate: aconst }').translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or select operation instead?');
             });
             test('cannot use aggregate in calculate', () => {
                 expect('run: a -> { extend: {measure: acount is count()} group_by: x is 1; calculate: acount }').translationToFailWith('Cannot use an aggregate field in a calculate operation, did you mean to use an aggregate operation instead?');
             });
             test('cannot use query in project', () => {
-                expect('run: a extend { view: q is { group_by: x is 1 } } -> { select: q }').translationToFailWith('Cannot use a view field in a project operation, did you mean to use a nest operation instead?');
+                expect('run: a extend { view: q is { group_by: x is 1 } } -> { select: q }').translationToFailWith('Cannot use a view field in a select operation, did you mean to use a nest operation instead?');
             });
             test('cannot use query in index', () => {
                 expect('run: a extend { view: q is { group_by: x is 1 } } -> { index: q }').translationToFailWith('Cannot use a view field in an index operation');
@@ -288,7 +288,7 @@ describe('query:', () => {
         }
         run: a1 + {
           calculate: b is c
-        }`).translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or project operation instead?');
+        }`).translationToFailWith('Cannot use a scalar field in a calculate operation, did you mean to use a group_by or select operation instead?');
             });
             test('cannot use analytic in group_by, preserved over refinement', () => {
                 expect(`query: a1 is a -> {
@@ -765,11 +765,11 @@ describe('query:', () => {
             expect('run: a->{ top: 5; group_by: astr }').toTranslate();
         });
         test('top N by field', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
         run: a->{top: 5 ${'by astr'}; group_by: astr}`).toTranslateWithWarnings('by clause of top statement unupported. Use order_by instead');
         });
         test('top N by expression', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
         run: ab->{top: 5 by ai + 1; group_by: ai}`).toTranslateWithWarnings('by clause of top statement unupported. Use order_by instead');
         });
         test('limit N', () => {
@@ -895,15 +895,15 @@ describe('query:', () => {
         });
         describe('declare/query join warnings', () => {
             test('declare warning in query', () => {
-                expect((0, test_translator_1.markSource) `##! m4warnings
+                expect((0, test_translator_1.markSource) `##! m4warnings=warn
           run: a -> { ${'declare: x is 1'}; group_by: x }`).toTranslateWithWarnings('`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
             });
             test('declare warning in source', () => {
-                expect((0, test_translator_1.markSource) `##! m4warnings
+                expect((0, test_translator_1.markSource) `##! m4warnings=warn
           source: a2 is a extend { ${'declare: x is 1'} }`).toTranslateWithWarnings('`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
             });
             test('joins in query', () => {
-                expect((0, test_translator_1.markSource) `##! m4warnings
+                expect((0, test_translator_1.markSource) `##! m4warnings=warn
           run: a -> { ${'join_one: b on true'}; ${'join_many: c is b on true'}; ${'join_cross: d is b on true'}; group_by: b.astr }`).toTranslateWithWarnings('Joins in queries are deprecated, move into an `extend:` block.', 'Joins in queries are deprecated, move into an `extend:` block.', 'Joins in queries are deprecated, move into an `extend:` block.');
             });
         });

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

@@ -34,7 +34,7 @@ describe('source:', () => {
     });
     test('shorcut fitlered table m4warning', () => {
         expect(`
-      ##! m4warnings
+      ##! m4warnings=warn
       source: xA is _db_.table('aTable') extend {? astr ~ 'a%' }
     `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
     });
@@ -210,12 +210,12 @@ describe('source:', () => {
             expect('source: c is a extend {view: q is { group_by: astr } }').toTranslate();
         });
         test('turtle in source can be called query with m4 warning', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
           source: c is a extend {query: q is { group_by: astr } }
         `).toTranslateWithWarnings('Use view: inside of a source instead of query:');
         });
         test('turtle in source m4 warning on arrow', () => {
-            expect(`##! m4warnings
+            expect(`##! m4warnings=warn
           source: c is a extend {view: q is -> { group_by: astr } }
         `).toTranslateWithWarnings("Leading '->' in a view or nest definition is no longer needed.");
         });
@@ -228,7 +228,7 @@ describe('source:', () => {
         });
         test('refined explore-query m4warning', () => {
             expect(`
-        ##! m4warnings
+        ##! m4warnings=warn
         source: abNew is ab extend {
           view: for1 is aturtle + {? ai = 1 }
         }

package/dist/lang/test/sql-block.spec.js

@@ -94,7 +94,7 @@ describe('sql:', () => {
         const model = new test_translator_1.TestTranslator(`
       ##! -m4warnings
       sql: users IS { select: """${selStmt}""" }
-      source: malloyUsers is from_sql(users) { primary_key: ai }
+      source: malloyUsers is from_sql(users) extend { primary_key: ai }
     `);
         expect(model).toParse();
         const needReq = model.translate();
@@ -222,7 +222,7 @@ describe('sql:', () => {
         const model = new test_translator_1.TestTranslator(`
       ##! -m4warnings
       sql: sql_block IS { select: """${selStmt}""" }
-      source: malloy_source is from_sql(sql_block) { primary_key: ai }
+      source: malloy_source is from_sql(sql_block) extend { primary_key: ai }
 `);
         const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });

package/dist/malloy.js

@@ -1835,7 +1835,7 @@ class ModelMaterializer extends FluentState {
             indexQuery = 'search_index';
         }
         const searchMapMalloy = `
-      query: ${sourceName}
+      run: ${sourceName}
         -> ${indexQuery}
         -> {
           where: fieldType = 'string'

package/dist/model/malloy_query.js

@@ -1589,7 +1589,7 @@ class QueryQuery extends QueryField {
             const { as, field } = this.expandField(f);
             if (field instanceof QueryTurtle || field instanceof QueryQuery) {
                 if (this.firstSegment.type === 'project') {
-                    throw new Error(`Turtled Queries cannot be used in PROJECT - '${field.fieldDef.name}'`);
+                    throw new Error(`Nested views cannot be used in select - '${field.fieldDef.name}'`);
                 }
                 const fir = new FieldInstanceResult(field.fieldDef, resultStruct);
                 this.expandFields(fir);
@@ -1603,7 +1603,7 @@ class QueryQuery extends QueryField {
                 this.addDependancies(resultStruct, field);
                 if (isAggregateField(field)) {
                     if (this.firstSegment.type === 'project') {
-                        throw new Error(`Aggregate Fields cannot be used in PROJECT - '${field.fieldDef.name}'`);
+                        throw new Error(`Aggregate Fields cannot be used in select - '${field.fieldDef.name}'`);
                     }
                 }
                 // } else if (field instanceof QueryStruct) {

package/dist/tags.js

@@ -272,20 +272,27 @@ function getBuildOn(ctx) {
     }
     return new Tag();
 }
-function parsePath(buildOn, path) {
-    let writeInto = buildOn.getProperties();
+/**
+ * When chasing a path reference, the two interesting gestures are to
+ * find the path-ed tag so it can be extended, or to find the path tag
+ * so it can be deleted. This returns the parent and the final tag
+ * so that the caller can delete the tag with delete parent.tagName
+ * or assign to it with parent[tagName] = new_value
+ */
+function pathToAccess(buildOn, path) {
+    let parentPropertyObject = buildOn.getProperties();
     for (const p of path.slice(0, path.length - 1)) {
         let next;
-        if (writeInto[p] === undefined) {
+        if (parentPropertyObject[p] === undefined) {
             next = new Tag({});
-            writeInto[p] = next;
+            parentPropertyObject[p] = next;
         }
         else {
-            next = Tag.tagFrom(writeInto[p]);
+            next = Tag.tagFrom(parentPropertyObject[p]);
         }
-        writeInto = next.getProperties();
+        parentPropertyObject = next.getProperties();
     }
-    return [path[path.length - 1], writeInto];
+    return [path[path.length - 1], parentPropertyObject];
 }
 function getString(ctx) {
     if (ctx.SQ_STRING() || ctx.DQ_STRING()) {
@@ -399,7 +406,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagEq(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = parsePath(buildOn, name);
+        const [writeKey, writeInto] = pathToAccess(buildOn, name);
         const eq = this.visit(ctx.eqValue());
         const propCx = ctx.properties();
         if (propCx) {
@@ -422,7 +429,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagReplaceProperties(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = parsePath(buildOn, name);
+        const [writeKey, writeInto] = pathToAccess(buildOn, name);
         const propCx = ctx.properties();
         const props = this.visitProperties(propCx);
         if (ctx.DOTTY() === undefined) {
@@ -438,11 +445,11 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagUpdateProperties(ctx) {
         const buildOn = getBuildOn(ctx);
         const name = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = parsePath(buildOn, name);
+        const [writeKey, writeInto] = pathToAccess(buildOn, name);
         const propCx = ctx.properties();
         propCx['buildOn'] = Tag.tagFrom(writeInto[writeKey]);
         const props = this.visitProperties(propCx);
-        const thisObj = writeInto[writeKey] || {};
+        const thisObj = writeInto[writeKey] || new Tag({});
         const properties = { ...thisObj.properties, ...props.dict };
         writeInto[writeKey] = { ...thisObj, properties };
         return buildOn;
@@ -450,12 +457,12 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
     visitTagDef(ctx) {
         const buildOn = getBuildOn(ctx);
         const path = this.getPropName(ctx.propName());
-        const [writeKey, writeInto] = parsePath(buildOn, path);
+        const [writeKey, writeInto] = pathToAccess(buildOn, path);
         if (ctx.MINUS()) {
             delete writeInto[writeKey];
         }
         else {
-            writeInto[writeKey] = {};
+            writeInto[writeKey] = new Tag({});
         }
         return buildOn;
     }

package/package.json

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