@malloydata/malloy 0.0.56-dev230707210748 → 0.0.56-dev230710162623

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

@@ -165,6 +165,7 @@ import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
+import { StringContext } from "./MalloyParser";
 import { ShortStringContext } from "./MalloyParser";
 import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
@@ -2006,6 +2007,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitCompareOp?: (ctx: CompareOpContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.string`.
+     * @param ctx the parse tree
+     */
+    enterString?: (ctx: StringContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.string`.
+     * @param ctx the parse tree
+     */
+    exitString?: (ctx: StringContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.shortString`.
      * @param ctx the parse tree

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

@@ -165,6 +165,7 @@ import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
+import { StringContext } from "./MalloyParser";
 import { ShortStringContext } from "./MalloyParser";
 import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
@@ -1270,6 +1271,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitCompareOp?: (ctx: CompareOpContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.string`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitString?: (ctx: StringContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.shortString`.
      * @param ctx the parse tree

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

@@ -7,14 +7,12 @@ import * as ast from './ast';
 import { LogSeverity, MessageLogger } from './parse-log';
 import { MalloyParseRoot } from './parse-malloy';
 import { FieldDeclarationConstructor } from './ast';
+import { HasString, HasID } from './parse-utils';
 declare class IgnoredElement extends ast.MalloyElement {
     elementType: string;
     malloySrc: string;
     constructor(src: string);
 }
-declare type ContainsID = ParserRuleContext & {
-    id: () => parse.IdContext;
-};
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -42,8 +40,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected contextError(cx: ParserRuleContext, msg: string, sev?: LogSeverity): 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: ContainsID): ast.FieldName;
-    protected getModelEntryName(cx: ContainsID): ast.ModelEntryReference;
+    protected getFieldName(cx: HasID): ast.FieldName;
+    protected getModelEntryName(cx: HasID): ast.ModelEntryReference;
     defaultResult(): ast.MalloyElement;
     protected astAt<MT extends ast.MalloyElement>(el: MT, cx: ParserRuleContext): MT;
     protected getSourceCode(cx: ParserRuleContext): string;
@@ -53,6 +51,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getSegments(segments: parse.PipeElementContext[]): ast.QOPDesc[];
     protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter;
     protected getExploreSource(pcx: parse.ExploreSourceContext): ast.Source;
+    protected getPlainString(cx: HasString): string;
     protected makeSqlString(pcx: parse.SqlStringContext, sqlStr: ast.SQLString): void;
     /**
      * Parse a time string into an AST TimeLiteral, if the string fails

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

@@ -46,11 +46,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MalloyToAST = void 0;
+const antlr4ts_1 = require("antlr4ts");
 const AbstractParseTreeVisitor_1 = require("antlr4ts/tree/AbstractParseTreeVisitor");
 const ast = __importStar(require("./ast"));
 const Interval_1 = require("antlr4ts/misc/Interval");
 const ast_1 = require("./ast");
-const string_parser_1 = require("./string-parser");
+const parse_utils_1 = require("./parse-utils");
 const ENABLE_M4_WARNINGS = false;
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
@@ -59,64 +60,6 @@ class IgnoredElement extends ast.MalloyElement {
         this.malloySrc = src;
     }
 }
-/**
- * Get all the possibly missing annotations from this parse rule
- * @param cx Any parse context which has an ANNOTATION* rules
- * @returns Array of texts for the annotations
- */
-function getNotes(cx) {
-    return cx.ANNOTATION().map(a => a.text);
-}
-function getIsNotes(cx) {
-    const before = getNotes(cx._beforeIs);
-    return before.concat(getNotes(cx._afterIs));
-}
-/**
- * Take the text of a matched string, including the matching quote
- * characters, and return the actual contents of the string after
- * \ processing.
- * @param cx Any parse context which contains a string
- * @returns Decocded string
- */
-function getShortString(cx) {
-    var _a, _b;
-    const scx = cx.shortString();
-    const str = ((_a = scx.DQ_STRING()) === null || _a === void 0 ? void 0 : _a.text) || ((_b = scx.SQ_STRING()) === null || _b === void 0 ? void 0 : _b.text);
-    if (str) {
-        return (0, string_parser_1.parseString)(str, str[0]);
-    }
-    // shortString: DQ_STRING | SQ_STRING; So this will never happen
-    return '';
-}
-function getOptionalString(cx) {
-    function containsString(cx) {
-        return 'shortString' in cx;
-    }
-    if (containsString(cx) && cx.shortString()) {
-        return getShortString(cx);
-    }
-}
-/**
- * An identifier is either a sequence of id characters or a `quoted`
- * This parses either to simply the resulting text.
- * @param cx A context which has an identifier
- * @returns The indenftifier text
- */
-function getId(cx) {
-    const quoted = cx.id().BQ_STRING();
-    if (quoted) {
-        return (0, string_parser_1.parseString)(quoted.text, '`');
-    }
-    return cx.id().text;
-}
-function getOptionalId(cx) {
-    function containsID(cx) {
-        return 'id' in cx;
-    }
-    if (containsID(cx) && cx.id()) {
-        return getId(cx);
-    }
-}
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -176,10 +119,10 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return Number.parseInt(term.text);
     }
     getFieldName(cx) {
-        return this.astAt(new ast.FieldName(getId(cx)), cx);
+        return this.astAt(new ast.FieldName((0, parse_utils_1.getId)(cx)), cx);
     }
     getModelEntryName(cx) {
-        return this.astAt(new ast.ModelEntryReference(getId(cx)), cx);
+        return this.astAt(new ast.ModelEntryReference((0, parse_utils_1.getId)(cx)), cx);
     }
     defaultResult() {
         return new ast.Unimplemented();
@@ -226,17 +169,40 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         throw this.internalError(pcx, `'${element.elementType}': illegal source`);
     }
+    getPlainString(cx) {
+        const shortStr = (0, parse_utils_1.getStringIfShort)(cx);
+        if (shortStr) {
+            return shortStr;
+        }
+        const safeParts = [];
+        const multiLineStr = cx.string().sqlString();
+        if (multiLineStr) {
+            for (const part of (0, parse_utils_1.getStringParts)(multiLineStr)) {
+                if (part instanceof antlr4ts_1.ParserRuleContext) {
+                    this.contextError(part, '%{ query }% illegal in this string');
+                }
+                else {
+                    safeParts.push(part);
+                }
+            }
+            (0, parse_utils_1.unIndent)(safeParts);
+            return safeParts.join('');
+        }
+        // string: shortString | sqlString; So this will never happen
+        return '';
+    }
     makeSqlString(pcx, sqlStr) {
-        var _a;
-        for (const part of pcx.sqlInterpolation()) {
-            const upToOpen = part.OPEN_CODE().text;
-            if (upToOpen.length > 2) {
-                sqlStr.push(upToOpen.slice(0, upToOpen.length - 2));
+        for (const part of (0, parse_utils_1.getStringParts)(pcx)) {
+            if (part instanceof antlr4ts_1.ParserRuleContext) {
+                sqlStr.push(this.visit(part));
+            }
+            else {
+                sqlStr.push(part);
             }
-            sqlStr.push(this.visit(part.query()));
         }
-        const lastChars = (_a = pcx.SQL_END()) === null || _a === void 0 ? void 0 : _a.text.slice(0, -3);
-        sqlStr.push(lastChars || '');
+        // Until SQL writer properly indents turducken, it actually looks better
+        // in the output to NOT de-indent the SQL sources
+        // unIndent(sqlStr.elements);
         sqlStr.complete();
         this.astAt(sqlStr, pcx);
     }
@@ -260,14 +226,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitDefineSourceStatement(pcx) {
         const defsCx = pcx.sourcePropertyList().sourceDefinition();
         const defs = defsCx.map(dcx => this.visitSourceDefinition(dcx));
-        const blockNotes = getNotes(pcx.tags());
+        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
         const defList = new ast.DefineSourceList(defs);
         defList.extendNote({ blockNotes });
         return defList;
     }
     visitSourceDefinition(pcx) {
-        const exploreDef = new ast.DefineSource(getId(pcx.sourceNameDef()), this.visitExplore(pcx.explore()), true, []);
-        const notes = getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine()));
+        const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), this.visitExplore(pcx.explore()), true, []);
+        const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, pcx);
     }
@@ -289,7 +255,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return propList;
     }
     visitTableFunction(pcx) {
-        const tableURI = getShortString(pcx.tableURI());
+        const tableURI = this.getPlainString(pcx.tableURI());
         const el = this.astAt(new ast.TableFunctionSource(tableURI), pcx);
         if (ENABLE_M4_WARNINGS) {
             this.astError(el, "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`", 'warn');
@@ -299,7 +265,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitTableMethod(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
-        const tablePath = getShortString(pcx.tablePath());
+        const tablePath = this.getPlainString(pcx.tablePath());
         return this.astAt(new ast.TableMethodSource(connectionName, tablePath), pcx);
     }
     visitTableSource(pcx) {
@@ -321,9 +287,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (selCx) {
             this.makeSqlString(selCx, sqlStr);
         }
-        const shortSelect = getOptionalString(pcx);
-        if (shortSelect) {
-            sqlStr.push(shortSelect);
+        const shortCX = pcx.shortString();
+        if (shortCX) {
+            sqlStr.push((0, parse_utils_1.getShortString)(shortCX));
         }
         const expr = new ast.SQLSource(connectionName, sqlStr);
         return this.astAt(expr, pcx);
@@ -353,7 +319,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinMany = new ast.Joins(joins);
-        joinMany.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        joinMany.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return joinMany;
     }
     visitDefJoinOne(pcx) {
@@ -368,7 +334,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinOne = new ast.Joins(joins);
-        joinOne.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        joinOne.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return joinOne;
     }
     visitDefJoinCross(pcx) {
@@ -386,7 +352,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinCross = new ast.Joins(joins);
-        joinCross.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        joinCross.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return joinCross;
     }
     getJoinList(pcx) {
@@ -395,7 +361,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getJoinSource(name, ecx) {
         if (ecx) {
             const joinSrc = this.visitExplore(ecx.explore());
-            const notes = getNotes(ecx._before_is).concat(getNotes(ecx._after_is));
+            const notes = (0, parse_utils_1.getNotes)(ecx._before_is).concat((0, parse_utils_1.getNotes)(ecx._after_is));
             return { joinFrom: joinSrc, notes };
         }
         return { joinFrom: new ast.NamedSource(name), notes: [] };
@@ -415,7 +381,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (onCx) {
             join.joinOn = this.getFieldExpr(onCx);
         }
-        join.extendNote({ notes: getNotes(pcx).concat(notes) });
+        join.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx).concat(notes) });
         return this.astAt(join, pcx);
     }
     visitJoinWith(pcx) {
@@ -423,28 +389,28 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const { joinFrom, notes } = this.getJoinSource(joinAs, pcx.isExplore());
         const joinOn = this.getFieldExpr(pcx.fieldExpr());
         const join = new ast.KeyJoin(joinAs, joinFrom, joinOn);
-        join.extendNote({ notes: getNotes(pcx).concat(notes) });
+        join.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx).concat(notes) });
         return this.astAt(join, pcx);
     }
     getFieldDef(pcx, makeFieldDef) {
         const defCx = pcx.fieldExpr();
-        const fieldName = getId(pcx.fieldNameDef());
+        const fieldName = (0, parse_utils_1.getId)(pcx.fieldNameDef());
         const valExpr = this.getFieldExpr(defCx);
         const def = new makeFieldDef(valExpr, fieldName, this.getSourceCode(defCx));
-        const notes = getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine()));
+        const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
         def.extendNote({ notes });
         return this.astAt(def, pcx);
     }
     visitDefDimensions(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DimensionFieldDeclaration);
         const stmt = new ast.Dimensions(defs);
-        stmt.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     visitDefMeasures(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.MeasureFieldDeclaration);
         const stmt = new ast.Measures(defs);
-        stmt.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     visitQueryExtend(pcx) {
@@ -476,7 +442,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitExploreRenameDef(pcx) {
         const newName = pcx.fieldName(0);
         const oldName = pcx.fieldName(1);
-        const rename = new ast.RenameField(getId(newName), this.getFieldName(oldName));
+        const rename = new ast.RenameField((0, parse_utils_1.getId)(newName), this.getFieldName(oldName));
         return this.astAt(rename, pcx);
     }
     visitDefExploreRename(pcx) {
@@ -510,7 +476,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitDefExploreQuery(pcx) {
         const queryDefs = this.visitSubQueryDefList(pcx.subQueryDefList());
-        const blockNotes = getNotes(pcx.tags());
+        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
         queryDefs.extendNote({ blockNotes });
         return queryDefs;
     }
@@ -532,7 +498,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.visitTimezoneStatement(cx.timezoneStatement());
     }
     visitTimezoneStatement(cx) {
-        const timezoneStatement = this.astAt(new ast.TimezoneStatement(getShortString(cx)), cx.shortString());
+        const timezone = this.getPlainString(cx);
+        const timezoneStatement = this.astAt(new ast.TimezoneStatement(timezone), cx.string());
         if (!timezoneStatement.isValid) {
             this.astError(timezoneStatement, `Invalid timezone: ${timezoneStatement.tz}`);
         }
@@ -574,22 +541,22 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitAggregateStatement(pcx) {
         const agStmt = new ast.Aggregate(this.getQueryItems(pcx.queryFieldList(), ast.AggregateFieldDeclaration, ast.AggregateFieldReference));
-        agStmt.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        agStmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return agStmt;
     }
     visitGroupByStatement(pcx) {
         const groupBy = new ast.GroupBy(this.getQueryItems(pcx.queryFieldList(), ast.GroupByFieldDeclaration, ast.GroupByFieldReference));
-        groupBy.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        groupBy.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return groupBy;
     }
     visitCalculateStatement(pcx) {
         const stmt = new ast.Calculate(this.getQueryItems(pcx.queryFieldList(), ast.CalculateFieldDeclaration, ast.CalculateFieldReference));
-        stmt.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return stmt;
     }
     getTaggedRef(pcx, makeFieldRef) {
         const ref = this.getFieldPath(pcx.fieldPath(), makeFieldRef);
-        ref.extendNote({ notes: getNotes(pcx.tags()) });
+        ref.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return ref;
     }
     getFieldCollectionMember(pcx, makeFieldDef, makeFieldRef) {
@@ -616,7 +583,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitProjectStatement(pcx) {
         const stmt = this.visitFieldCollection(pcx.fieldCollection());
-        stmt.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return stmt;
     }
     visitCollectionWildCard(pcx) {
@@ -691,7 +658,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(top, pcx);
     }
     visitSourceID(pcx) {
-        return this.astAt(new ast.NamedSource(getId(pcx)), pcx);
+        return this.astAt(new ast.NamedSource((0, parse_utils_1.getId)(pcx)), pcx);
     }
     buildPipelineFromName(pipe, pipeCx) {
         const firstCx = pipeCx.firstSegment();
@@ -732,16 +699,16 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const stmts = pcx
             .topLevelQueryDef()
             .map(cx => this.visitTopLevelQueryDef(cx));
-        const blockNotes = getNotes(pcx.tags());
+        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
         const queryDefs = new ast.DefineQueryList(stmts);
         queryDefs.extendNote({ blockNotes });
         return queryDefs;
     }
     visitTopLevelQueryDef(pcx) {
-        const queryName = getId(pcx.queryName());
+        const queryName = (0, parse_utils_1.getId)(pcx.queryName());
         const queryExpr = this.visit(pcx.query());
         if (ast.isQueryElement(queryExpr)) {
-            const notes = getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine()));
+            const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
             const queryDef = new ast.DefineQuery(queryName, queryExpr);
             queryDef.extendNote({ notes });
             return this.astAt(queryDef, pcx);
@@ -753,8 +720,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const query = this.visit(defCx.query());
         if (ast.isQueryElement(query)) {
             const theQuery = new ast.AnonymousQuery(query);
-            const notes = getNotes(pcx.topLevelAnonQueryDef().tags());
-            const blockNotes = getNotes(pcx.tags());
+            const notes = (0, parse_utils_1.getNotes)(pcx.topLevelAnonQueryDef().tags());
+            const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
             theQuery.extendNote({ notes, blockNotes });
             if (ENABLE_M4_WARNINGS) {
                 this.astError(theQuery, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
@@ -767,8 +734,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const query = this.visit(pcx.topLevelAnonQueryDef().query());
         if (ast.isQueryElement(query)) {
             const el = new ast.RunQueryDef(query);
-            el.extendNote({ blockNotes: getNotes(pcx._blockTags) });
-            el.extendNote({ notes: getNotes(pcx._noteTags) });
+            el.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx._blockTags) });
+            el.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx._noteTags) });
             return this.astAt(el, pcx);
         }
         throw this.internalError(pcx, `Run query matched, but ${query.elementType} found`);
@@ -780,7 +747,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitNestStatement(pcx) {
         const nests = this.visitNestedQueryList(pcx.nestedQueryList());
-        nests.extendNote({ blockNotes: getNotes(pcx.tags()) });
+        nests.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
         return nests;
     }
     visitNestedQueryList(pcx) {
@@ -789,7 +756,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitNestExisting(pcx) {
         const name = this.getFieldName(pcx.queryName());
         const propsCx = pcx.queryProperties();
-        const notes = getNotes(pcx.tags());
+        const notes = (0, parse_utils_1.getNotes)(pcx.tags());
         if (propsCx) {
             const nestRefine = new ast.NestRefinement(name);
             const queryDesc = this.visitQueryProperties(propsCx);
@@ -802,18 +769,18 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return nestRef;
     }
     visitNestDef(pcx) {
-        const name = getId(pcx.queryName());
+        const name = (0, parse_utils_1.getId)(pcx.queryName());
         const nestDef = new ast.NestDefinition(name);
         this.buildPipelineFromName(nestDef, pcx.pipelineFromName());
         nestDef.extendNote({
-            notes: getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine())),
+            notes: (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine())),
         });
         return this.astAt(nestDef, pcx);
     }
     visitExploreQueryDef(pcx) {
-        const name = getId(pcx.exploreQueryNameDef());
+        const name = (0, parse_utils_1.getId)(pcx.exploreQueryNameDef());
         const queryDef = new ast.TurtleDecl(name);
-        const notes = getNotes(pcx).concat(getIsNotes(pcx.isDefine()));
+        const notes = (0, parse_utils_1.getNotes)(pcx).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
         queryDef.extendNote({ notes });
         this.buildPipelineFromName(queryDef, pcx.pipelineFromName());
         return this.astAt(queryDef, pcx);
@@ -865,7 +832,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return fieldExpr;
     }
     visitExprString(pcx) {
-        return new ast.ExprString(getShortString(pcx));
+        const str = this.getPlainString(pcx);
+        return new ast.ExprString(str);
     }
     visitExprRegex(pcx) {
         const malloyRegex = pcx.HACKY_REGEX().text;
@@ -1002,7 +970,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitExprAggFunc(pcx) {
         const argsCx = pcx.argumentList();
         const args = argsCx ? this.allFieldExpressions(argsCx.fieldExpr()) : [];
-        const fn = getId(pcx);
+        const fn = (0, parse_utils_1.getId)(pcx);
         const pathCx = pcx.fieldPath();
         const path = pathCx
             ? this.getFieldPath(pathCx, ast.ExpressionFieldReference)
@@ -1029,7 +997,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 rawType = undefined;
             }
         }
-        let fn = getOptionalId(pcx) || ((_b = pcx.timeframe()) === null || _b === void 0 ? void 0 : _b.text);
+        let fn = (0, parse_utils_1.getOptionalId)(pcx) || ((_b = pcx.timeframe()) === null || _b === void 0 ? void 0 : _b.text);
         if (fn === undefined) {
             this.contextError(pcx, 'Function name error');
             fn = 'FUNCTION_NAME_ERROR';
@@ -1096,7 +1064,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.parseTime(pcx, ast.LiteralYear.parse);
     }
     visitImportStatement(pcx) {
-        const url = getShortString(pcx.importURL());
+        const url = this.getPlainString(pcx.importURL());
         return this.astAt(new ast.ImportStatement(url, this.parse.subTranslator.sourceURL), pcx);
     }
     visitJustExpr(pcx) {
@@ -1115,7 +1083,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                     this.contextError(nmCx, 'Cannot redefine connection');
                 }
                 else {
-                    connectionName = getShortString(nmCx);
+                    connectionName = this.getPlainString(nmCx);
                 }
             }
             const selCx = blockEnt.sqlString();

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

@@ -24,6 +24,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findReferences = exports.deprecatedParseTableURI = exports.constructTableKey = void 0;
 const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
+const parse_utils_1 = require("../parse-utils");
+// Copy of the version in the parser which also errors on each non-string in a
+// multi-line string collection. No need to error here, which is well, because
+// we don't have access to the error log.
+function getPlainString(cx) {
+    const shortStr = (0, parse_utils_1.getStringIfShort)(cx);
+    if (shortStr) {
+        return shortStr;
+    }
+    const safeParts = [];
+    const multiLineStr = cx.string().sqlString();
+    if (multiLineStr) {
+        for (const part of (0, parse_utils_1.getStringParts)(multiLineStr)) {
+            if (typeof part === 'string') {
+                safeParts.push(part);
+            }
+        }
+        return safeParts.join('');
+    }
+    return '';
+}
 class FindExternalReferences {
     constructor(trans, tokens) {
         this.trans = trans;
@@ -42,13 +63,13 @@ class FindExternalReferences {
         }
     }
     enterTableMethod(pcx) {
-        const connectionName = this.stripIdQuotes(pcx.connectionId().text);
-        const tablePath = this.tokens.getText(pcx.tablePath()).slice(1, -1);
+        const connId = (0, parse_utils_1.getId)(pcx.connectionId());
+        const tablePath = getPlainString(pcx.tablePath());
         const reference = this.trans.rangeFromContext(pcx);
-        this.registerTableReference(connectionName, tablePath, reference);
+        this.registerTableReference(connId, tablePath, reference);
     }
     enterTableFunction(pcx) {
-        const tableURI = this.tokens.getText(pcx.tableURI()).slice(1, -1);
+        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);
@@ -56,17 +77,11 @@ class FindExternalReferences {
         this.registerTableReference(connectionName, tablePath, reference);
     }
     enterImportURL(pcx) {
-        const url = JSON.parse(pcx.shortString().text);
+        const url = getPlainString(pcx);
         if (!this.needImports[url]) {
             this.needImports[url] = this.trans.rangeFromContext(pcx);
         }
     }
-    stripIdQuotes(id) {
-        if (id[0] === '`' && id[id.length - 1] === '`') {
-            return id.slice(1, -1);
-        }
-        return id;
-    }
 }
 function constructTableKey(connectionName, tablePath) {
     return connectionName === undefined

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

@@ -0,0 +1,51 @@
+import { ParserRuleContext } from 'antlr4ts';
+import { StringContext, ShortStringContext, SqlStringContext, IsDefineContext, IdContext } from './lib/Malloy/MalloyParser';
+import { TerminalNode } from 'antlr4ts/tree/TerminalNode';
+/**
+ * Take the text of a matched string, including the matching quote
+ * characters, and return the actual contents of the string after
+ * \ processing.
+ * @param cx Any parse context which contains a string
+ * @returns Decocded string
+ */
+export declare function getShortString(scx: ShortStringContext): string;
+export declare function getStringIfShort(cx: HasString): string | undefined;
+export declare type HasString = ParserRuleContext & {
+    string: () => StringContext;
+};
+declare type StringPart = ParserRuleContext | string;
+export declare function getStringParts(cx: SqlStringContext): Generator<StringPart>;
+/**
+ * Parses the interior of a string, doing all \ substitutions. In most cases
+ * a lexical analyzer has already recognized this as a string. As a convenience,
+ * strip off the quoting outer chartacters if asked, then parse the interior of
+ * the string. The intention is to be compatible with JSON strings, in terms
+ * of which \X substitutions are processed.
+ * @param str is the string to parse
+ * @param surround is the quoting character, default means quotes already stripped
+ * @returns a string with the \ processing completed
+ */
+export declare function parseString(str: string, surround?: string): string;
+declare type HasAnnotations = ParserRuleContext & {
+    ANNOTATION: () => TerminalNode[];
+};
+/**
+ * Get all the possibly missing annotations from this parse rule
+ * @param cx Any parse context which has an ANNOTATION* rules
+ * @returns Array of texts for the annotations
+ */
+export declare function getNotes(cx: HasAnnotations): string[];
+export declare function getIsNotes(cx: IsDefineContext): string[];
+export declare type HasID = ParserRuleContext & {
+    id: () => IdContext;
+};
+/**
+ * An identifier is either a sequence of id characters or a `quoted`
+ * This parses either to simply the resulting text.
+ * @param cx A context which has an identifier
+ * @returns The indenftifier text
+ */
+export declare function getId(cx: HasID): string;
+export declare function getOptionalId(cx: ParserRuleContext): string | undefined;
+export declare function unIndent(parts: (string | unknown)[]): void;
+export {};