@malloydata/malloy 0.0.248 → 0.0.249-dev250326193717

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

@@ -4,7 +4,6 @@ import { RecordExprContext } from "./MalloyParser";
 import { VSegContext } from "./MalloyParser";
 import { VArrowContext } from "./MalloyParser";
 import { Use_top_level_query_defsContext } from "./MalloyParser";
-import { AnonymousQueryContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralHourContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
@@ -21,8 +20,6 @@ import { ExprBoolContext } from "./MalloyParser";
 import { ExprRegexContext } from "./MalloyParser";
 import { FilterString_stubContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
-import { TableFunctionContext } from "./MalloyParser";
-import { TableMethodContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
@@ -66,7 +63,6 @@ import { DefJoinManyContext } from "./MalloyParser";
 import { DefJoinCrossContext } from "./MalloyParser";
 import { DefExploreDimension_stubContext } from "./MalloyParser";
 import { DefExploreMeasure_stubContext } from "./MalloyParser";
-import { DefDeclare_stubContext } from "./MalloyParser";
 import { DefJoin_stubContext } from "./MalloyParser";
 import { DefExploreWhere_stubContext } from "./MalloyParser";
 import { DefExplorePrimaryKeyContext } from "./MalloyParser";
@@ -307,18 +303,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitUse_top_level_query_defs?: (ctx: Use_top_level_query_defsContext) => void;
-    /**
-     * Enter a parse tree produced by the `anonymousQuery`
-     * labeled alternative in `MalloyParser.defineQuery`.
-     * @param ctx the parse tree
-     */
-    enterAnonymousQuery?: (ctx: AnonymousQueryContext) => void;
-    /**
-     * Exit a parse tree produced by the `anonymousQuery`
-     * labeled alternative in `MalloyParser.defineQuery`.
-     * @param ctx the parse tree
-     */
-    exitAnonymousQuery?: (ctx: AnonymousQueryContext) => void;
     /**
      * Enter a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.
@@ -511,30 +495,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprNow?: (ctx: ExprNowContext) => void;
-    /**
-     * Enter a parse tree produced by the `tableFunction`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     */
-    enterTableFunction?: (ctx: TableFunctionContext) => void;
-    /**
-     * Exit a parse tree produced by the `tableFunction`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     */
-    exitTableFunction?: (ctx: TableFunctionContext) => void;
-    /**
-     * Enter a parse tree produced by the `tableMethod`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     */
-    enterTableMethod?: (ctx: TableMethodContext) => void;
-    /**
-     * Exit a parse tree produced by the `tableMethod`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     */
-    exitTableMethod?: (ctx: TableMethodContext) => void;
     /**
      * Enter a parse tree produced by the `nestDef`
      * labeled alternative in `MalloyParser.nestEntry`.
@@ -1051,18 +1011,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitDefExploreMeasure_stub?: (ctx: DefExploreMeasure_stubContext) => void;
-    /**
-     * Enter a parse tree produced by the `defDeclare_stub`
-     * labeled alternative in `MalloyParser.exploreStatement`.
-     * @param ctx the parse tree
-     */
-    enterDefDeclare_stub?: (ctx: DefDeclare_stubContext) => void;
-    /**
-     * Exit a parse tree produced by the `defDeclare_stub`
-     * labeled alternative in `MalloyParser.exploreStatement`.
-     * @param ctx the parse tree
-     */
-    exitDefDeclare_stub?: (ctx: DefDeclare_stubContext) => void;
     /**
      * Enter a parse tree produced by the `defJoin_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.

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

@@ -4,7 +4,6 @@ import { RecordExprContext } from "./MalloyParser";
 import { VSegContext } from "./MalloyParser";
 import { VArrowContext } from "./MalloyParser";
 import { Use_top_level_query_defsContext } from "./MalloyParser";
-import { AnonymousQueryContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralHourContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
@@ -21,8 +20,6 @@ import { ExprBoolContext } from "./MalloyParser";
 import { ExprRegexContext } from "./MalloyParser";
 import { FilterString_stubContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
-import { TableFunctionContext } from "./MalloyParser";
-import { TableMethodContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
@@ -66,7 +63,6 @@ import { DefJoinManyContext } from "./MalloyParser";
 import { DefJoinCrossContext } from "./MalloyParser";
 import { DefExploreDimension_stubContext } from "./MalloyParser";
 import { DefExploreMeasure_stubContext } from "./MalloyParser";
-import { DefDeclare_stubContext } from "./MalloyParser";
 import { DefJoin_stubContext } from "./MalloyParser";
 import { DefExploreWhere_stubContext } from "./MalloyParser";
 import { DefExplorePrimaryKeyContext } from "./MalloyParser";
@@ -285,13 +281,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitUse_top_level_query_defs?: (ctx: Use_top_level_query_defsContext) => Result;
-    /**
-     * Visit a parse tree produced by the `anonymousQuery`
-     * labeled alternative in `MalloyParser.defineQuery`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitAnonymousQuery?: (ctx: AnonymousQueryContext) => Result;
     /**
      * Visit a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.
@@ -404,20 +393,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprNow?: (ctx: ExprNowContext) => Result;
-    /**
-     * Visit a parse tree produced by the `tableFunction`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTableFunction?: (ctx: TableFunctionContext) => Result;
-    /**
-     * Visit a parse tree produced by the `tableMethod`
-     * labeled alternative in `MalloyParser.exploreTable`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTableMethod?: (ctx: TableMethodContext) => Result;
     /**
      * Visit a parse tree produced by the `nestDef`
      * labeled alternative in `MalloyParser.nestEntry`.
@@ -719,13 +694,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitDefExploreMeasure_stub?: (ctx: DefExploreMeasure_stubContext) => Result;
-    /**
-     * Visit a parse tree produced by the `defDeclare_stub`
-     * labeled alternative in `MalloyParser.exploreStatement`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitDefDeclare_stub?: (ctx: DefDeclare_stubContext) => Result;
     /**
      * Visit a parse tree produced by the `defJoin_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.

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

@@ -4,7 +4,7 @@ import { AbstractParseTreeVisitor } from 'antlr4ts/tree/AbstractParseTreeVisitor
 import type { MalloyParserVisitor } from './lib/Malloy/MalloyParserVisitor';
 import type * as parse from './lib/Malloy/MalloyParser';
 import * as ast from './ast';
-import type { LogMessageOptions, LogSeverity, MessageCode, MessageLogger, MessageParameterType } from './parse-log';
+import type { LogMessageOptions, MessageCode, MessageLogger, MessageParameterType } from './parse-log';
 import type { MalloyParseInfo } from './malloy-parse-info';
 import type { FieldDeclarationConstructor } from './ast';
 import type { HasString, HasID } from './parse-utils';
@@ -53,8 +53,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected contextError<T extends MessageCode>(cx: ParserRuleContext, code: T, data: MessageParameterType<T>, options?: LogMessageOptions): void;
     protected warnWithReplacement<T extends MessageCode>(code: T, data: MessageParameterType<T>, range: DocumentRange, replacement: string): void;
     protected inExperiment(experimentId: string, cx: ParserRuleContext): boolean;
-    protected m4Severity(): LogSeverity | false;
-    protected m4advisory<T extends MessageCode>(cx: ParserRuleContext, code: T, data: MessageParameterType<T>): void;
     protected only<T extends ast.MalloyElement>(els: ast.MalloyElement[], isGood: (el: ast.MalloyElement) => T | false, desc: string): T[];
     protected getNumber(term: ParseTree): number;
     protected getFieldName(cx: HasID): ast.FieldName;
@@ -86,8 +84,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
     protected getSourceExtensions(extensions: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
-    visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;
-    visitTableMethod(pcx: parse.TableMethodContext): ast.TableSource;
+    visitExploreTable(pcx: parse.ExploreTableContext): ast.TableSource;
     visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.JoinStatement;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.JoinStatement;
@@ -107,7 +104,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     getAccessLabelProp(pcx: parse.AccessLabelPropContext | undefined): AccessModifierLabel | undefined;
     visitDefMeasures(pcx: parse.DefMeasuresContext): ast.Measures;
     visitQueryExtend(pcx: parse.QueryExtendContext): ast.ExtendBlock;
-    visitDeclareStatement(pcx: parse.DeclareStatementContext): ast.DeclareFields;
     visitExploreRenameDef(pcx: parse.ExploreRenameDefContext): ast.RenameField;
     visitDefExploreRename(pcx: parse.DefExploreRenameContext): ast.Renames;
     visitFilterClauseList(pcx: parse.FilterClauseListContext): ast.Filter;
@@ -145,7 +141,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTopStatement(pcx: parse.TopStatementContext): ast.Limit;
     visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DefineQueryList;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
-    visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
     visitRunStatement(pcx: parse.RunStatementContext): ast.AnonymousQuery;
     visitNestStatement(pcx: parse.NestStatementContext): ast.Nests;
     visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.Nests;

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

@@ -71,7 +71,7 @@ class IgnoredElement extends ast.MalloyElement {
         this.malloySrc = src;
     }
 }
-const DEFAULT_COMPILER_FLAGS = ['##! m4warnings=error'];
+const DEFAULT_COMPILER_FLAGS = [];
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -142,19 +142,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         this.contextError(cx, 'experiment-not-enabled', { experimentId });
         return false;
     }
-    m4Severity() {
-        const m4severityTag = this.compilerFlags.tag('m4warnings');
-        if (m4severityTag) {
-            return m4severityTag.text() === 'warn' ? 'warn' : 'error';
-        }
-        return false;
-    }
-    m4advisory(cx, code, data) {
-        const m4 = this.m4Severity();
-        if (m4) {
-            this.contextError(cx, code, data, { severity: m4 });
-        }
-    }
     only(els, isGood, desc) {
         const acceptable = [];
         for (const el of els) {
@@ -218,11 +205,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return result || '';
     }
     makeSqlString(pcx, sqlStr) {
-        for (const part of pcx.sqlInterpolation()) {
-            if (part.CLOSE_CODE()) {
-                this.m4advisory(part, 'percent-terminated-query-interpolation', 'Use %{ ... } instead of %{ ... }%');
-            }
-        }
         for (const part of (0, parse_utils_1.getStringParts)(pcx)) {
             if (part instanceof antlr4ts_1.ParserRuleContext) {
                 sqlStr.push(this.visit(part));
@@ -314,13 +296,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const propList = new ast.SourceDesc(visited);
         return propList;
     }
-    visitTableFunction(pcx) {
-        const tableURI = this.getPlainStringFrom(pcx.tableURI());
-        const el = this.astAt(new ast.TableFunctionSource(tableURI), pcx);
-        this.m4advisory(pcx, 'table-function', "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`");
-        return el;
-    }
-    visitTableMethod(pcx) {
+    visitExploreTable(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
         const tablePath = this.getPlainStringFrom(pcx.tablePath());
@@ -506,14 +482,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const el = new ast.ExtendBlock(extensions);
         return this.astAt(el, pcx);
     }
-    visitDeclareStatement(pcx) {
-        const accessLabel = this.getAccessLabel(pcx.accessLabel());
-        const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DeclareFieldDeclaration);
-        const stmt = new ast.DeclareFields(defs, accessLabel);
-        const result = this.astAt(stmt, pcx);
-        this.m4advisory(pcx, 'declare', '`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
-        return result;
-    }
     visitExploreRenameDef(pcx) {
         const newName = pcx.fieldName(0);
         const oldName = pcx.fieldName(1);
@@ -549,9 +517,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const queryDefs = new ast.Views(babyTurtles, accessLabel);
         const blockNotes = this.getNotes(pcx.tags());
         queryDefs.extendNote({ blockNotes });
-        if (pcx.QUERY()) {
-            this.m4advisory(pcx, 'query-in-source', 'Use view: inside of a source instead of query:');
-        }
         return queryDefs;
     }
     visitDefExplorePrimaryKey(pcx) {
@@ -688,9 +653,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(new ast.ProjectStatement(fields), pcx);
     }
     visitProjectStatement(pcx) {
-        if (pcx.PROJECT()) {
-            this.m4advisory(pcx, 'project', 'project: keyword is deprecated, use select:');
-        }
         const stmt = this.visitFieldCollection(pcx.fieldCollection());
         stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return stmt;
@@ -795,16 +757,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         throw this.internalError(pcx, `Expected query definition, got a '${queryExpr.elementType}'`);
     }
-    visitAnonymousQuery(pcx) {
-        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 });
-        this.m4advisory(defCx, 'anonymous-query', 'Anonymous `query:` statements are deprecated, use `run:` instead');
-        return this.astAt(theQuery, pcx);
-    }
     visitRunStatement(pcx) {
         const defCx = pcx.topLevelAnonQueryDef();
         const query = this.getSqExpr(defCx.sqExpr());
@@ -1041,9 +993,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const expr = exprDef ? this.getFieldExpr(exprDef) : undefined;
         const source = undefined;
         const aggFunc = pcx.aggregate().text.toLowerCase();
-        if (pcx.STAR()) {
-            this.m4advisory(pcx, 'wildcard-in-aggregate', `* illegal inside ${aggFunc}()`);
-        }
         if (aggFunc === 'count') {
             return this.astAt(expr ? new ast.ExprCountDistinct(expr) : new ast.ExprCount(), pcx);
         }

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

@@ -64,15 +64,6 @@ class DocumentSymbolWalker {
             lensRange: this.translator.rangeFromContext(pcx),
         });
     }
-    enterAnonymousQuery(pcx) {
-        this.symbols.push({
-            range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef().sqExpr()),
-            name: 'unnamed_query',
-            type: 'unnamed_query',
-            children: [],
-            lensRange: this.translator.rangeFromContext(pcx),
-        });
-    }
     enterDefineSourceStatement(pcx) {
         const blockRange = this.translator.rangeFromContext(pcx);
         const sourcePl = pcx.sourcePropertyList();

package/dist/lang/parse-tree-walkers/find-external-references.js

@@ -62,20 +62,12 @@ class FindExternalReferences {
             };
         }
     }
-    enterTableMethod(pcx) {
+    enterExploreTable(pcx) {
         const connId = (0, parse_utils_1.getId)(pcx.connectionId());
         const tablePath = getPlainString(pcx.tablePath());
         const reference = this.trans.rangeFromContext(pcx);
         this.registerTableReference(connId, tablePath, reference);
     }
-    enterTableFunction(pcx) {
-        const tableURI = getPlainString(pcx.tableURI());
-        // This use of `deprecatedParseTableURI` is ok because it is for handling the
-        // old, soon-to-be-deprecated table syntax.
-        const { connectionName, tablePath } = deprecatedParseTableURI(tableURI);
-        const reference = this.trans.rangeFromContext(pcx);
-        this.registerTableReference(connectionName, tablePath, reference);
-    }
     enterImportURL(pcx) {
         const url = getPlainString(pcx);
         if (!this.needImports[url]) {

package/dist/lang/parse-tree-walkers/find-table-path-walker.js

@@ -31,7 +31,7 @@ class FindTablePathWalker {
         this.tokens = tokens;
         this.pathInfos = [];
     }
-    enterTableMethod(pcx) {
+    enterExploreTable(pcx) {
         const connectionId = (0, parse_utils_1.getId)(pcx.connectionId());
         const [tablePath, _errorList] = (0, parse_utils_1.getPlainString)(pcx.tablePath(), true);
         if (tablePath !== undefined) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.248";
+export declare const MALLOY_VERSION = "0.0.249";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.248';
+exports.MALLOY_VERSION = '0.0.249';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.248",
+  "version": "0.0.249-dev250326193717",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "^0.0.248",
-    "@malloydata/malloy-interfaces": "^0.0.248",
-    "@malloydata/malloy-tag": "^0.0.248",
+    "@malloydata/malloy-filter": "^0.0.249-dev250326193717",
+    "@malloydata/malloy-interfaces": "^0.0.249-dev250326193717",
+    "@malloydata/malloy-tag": "^0.0.249-dev250326193717",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jest-diff": "^29.6.2",