@malloydata/malloy 0.0.55-dev230707013046 → 0.0.55-dev230707183945

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

@@ -160,12 +160,13 @@ import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
 import { TimezoneStatementContext } from "./MalloyParser";
-import { TimezoneNameContext } from "./MalloyParser";
 import { QueryAnnotationContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
+import { ShortStringContext } from "./MalloyParser";
+import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
 import { DateLiteralContext } from "./MalloyParser";
 import { TablePathContext } from "./MalloyParser";
@@ -187,11 +188,6 @@ import { FieldPathContext } from "./MalloyParser";
 import { JoinNameContext } from "./MalloyParser";
 import { FieldNameContext } from "./MalloyParser";
 import { JustExprContext } from "./MalloyParser";
-import { JsonContext } from "./MalloyParser";
-import { JsonValueContext } from "./MalloyParser";
-import { JsonObjectContext } from "./MalloyParser";
-import { JsonPropertyContext } from "./MalloyParser";
-import { JsonArrayContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
 import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
@@ -1960,16 +1956,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitTimezoneStatement?: (ctx: TimezoneStatementContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.timezoneName`.
-     * @param ctx the parse tree
-     */
-    enterTimezoneName?: (ctx: TimezoneNameContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.timezoneName`.
-     * @param ctx the parse tree
-     */
-    exitTimezoneName?: (ctx: TimezoneNameContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.queryAnnotation`.
      * @param ctx the parse tree
@@ -2020,6 +2006,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitCompareOp?: (ctx: CompareOpContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.shortString`.
+     * @param ctx the parse tree
+     */
+    enterShortString?: (ctx: ShortStringContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.shortString`.
+     * @param ctx the parse tree
+     */
+    exitShortString?: (ctx: ShortStringContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.numericLiteral`.
+     * @param ctx the parse tree
+     */
+    enterNumericLiteral?: (ctx: NumericLiteralContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.numericLiteral`.
+     * @param ctx the parse tree
+     */
+    exitNumericLiteral?: (ctx: NumericLiteralContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.literal`.
      * @param ctx the parse tree
@@ -2230,56 +2236,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitJustExpr?: (ctx: JustExprContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.json`.
-     * @param ctx the parse tree
-     */
-    enterJson?: (ctx: JsonContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.json`.
-     * @param ctx the parse tree
-     */
-    exitJson?: (ctx: JsonContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.jsonValue`.
-     * @param ctx the parse tree
-     */
-    enterJsonValue?: (ctx: JsonValueContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.jsonValue`.
-     * @param ctx the parse tree
-     */
-    exitJsonValue?: (ctx: JsonValueContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.jsonObject`.
-     * @param ctx the parse tree
-     */
-    enterJsonObject?: (ctx: JsonObjectContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.jsonObject`.
-     * @param ctx the parse tree
-     */
-    exitJsonObject?: (ctx: JsonObjectContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.jsonProperty`.
-     * @param ctx the parse tree
-     */
-    enterJsonProperty?: (ctx: JsonPropertyContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.jsonProperty`.
-     * @param ctx the parse tree
-     */
-    exitJsonProperty?: (ctx: JsonPropertyContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.jsonArray`.
-     * @param ctx the parse tree
-     */
-    enterJsonArray?: (ctx: JsonArrayContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.jsonArray`.
-     * @param ctx the parse tree
-     */
-    exitJsonArray?: (ctx: JsonArrayContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.sqlExploreNameRef`.
      * @param ctx the parse tree

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

@@ -160,12 +160,13 @@ import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
 import { TimezoneStatementContext } from "./MalloyParser";
-import { TimezoneNameContext } from "./MalloyParser";
 import { QueryAnnotationContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
+import { ShortStringContext } from "./MalloyParser";
+import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
 import { DateLiteralContext } from "./MalloyParser";
 import { TablePathContext } from "./MalloyParser";
@@ -187,11 +188,6 @@ import { FieldPathContext } from "./MalloyParser";
 import { JoinNameContext } from "./MalloyParser";
 import { FieldNameContext } from "./MalloyParser";
 import { JustExprContext } from "./MalloyParser";
-import { JsonContext } from "./MalloyParser";
-import { JsonValueContext } from "./MalloyParser";
-import { JsonObjectContext } from "./MalloyParser";
-import { JsonPropertyContext } from "./MalloyParser";
-import { JsonArrayContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
 import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
@@ -1244,12 +1240,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitTimezoneStatement?: (ctx: TimezoneStatementContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.timezoneName`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTimezoneName?: (ctx: TimezoneNameContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.queryAnnotation`.
      * @param ctx the parse tree
@@ -1280,6 +1270,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitCompareOp?: (ctx: CompareOpContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.shortString`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitShortString?: (ctx: ShortStringContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.numericLiteral`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitNumericLiteral?: (ctx: NumericLiteralContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.literal`.
      * @param ctx the parse tree
@@ -1406,36 +1408,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitJustExpr?: (ctx: JustExprContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.json`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJson?: (ctx: JsonContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.jsonValue`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJsonValue?: (ctx: JsonValueContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.jsonObject`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJsonObject?: (ctx: JsonObjectContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.jsonProperty`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJsonProperty?: (ctx: JsonPropertyContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.jsonArray`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJsonArray?: (ctx: JsonArrayContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sqlExploreNameRef`.
      * @param ctx the parse tree

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

@@ -12,6 +12,9 @@ declare class IgnoredElement extends ast.MalloyElement {
     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.
@@ -39,12 +42,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 optionalString(fromTerm: ParseTree | undefined): string | undefined;
-    protected getIdText(fromTerm: ParseTree): string;
-    protected getFieldName(cx: ParserRuleContext): ast.FieldName;
-    protected getModelEntryName(cx: ParserRuleContext): ast.ModelEntryReference;
-    protected stripQuotes(s: string): string;
-    protected optionalText(idCx: ParseTree | undefined): string | undefined;
+    protected getFieldName(cx: ContainsID): ast.FieldName;
+    protected getModelEntryName(cx: ContainsID): ast.ModelEntryReference;
     defaultResult(): ast.MalloyElement;
     protected astAt<MT extends ast.MalloyElement>(el: MT, cx: ParserRuleContext): MT;
     protected getSourceCode(cx: ParserRuleContext): string;

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

@@ -50,6 +50,7 @@ const AbstractParseTreeVisitor_1 = require("antlr4ts/tree/AbstractParseTreeVisit
 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 ENABLE_M4_WARNINGS = false;
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
@@ -70,6 +71,52 @@ 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.
@@ -128,34 +175,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getNumber(term) {
         return Number.parseInt(term.text);
     }
-    optionalString(fromTerm) {
-        if (fromTerm) {
-            return this.stripQuotes(fromTerm.text);
-        }
-        return undefined;
-    }
-    getIdText(fromTerm) {
-        return this.stripQuotes(fromTerm.text);
-    }
     getFieldName(cx) {
-        return this.astAt(new ast.FieldName(this.getIdText(cx)), cx);
+        return this.astAt(new ast.FieldName(getId(cx)), cx);
     }
     getModelEntryName(cx) {
-        return this.astAt(new ast.ModelEntryReference(this.getIdText(cx)), cx);
-    }
-    stripQuotes(s) {
-        if (s[0] === '`' || s[0] === "'" || s[0] === '"') {
-            if (s[0] === s[s.length - 1]) {
-                return s.slice(1, -1);
-            }
-        }
-        return s;
-    }
-    optionalText(idCx) {
-        if (idCx) {
-            return this.getIdText(idCx);
-        }
-        return undefined;
+        return this.astAt(new ast.ModelEntryReference(getId(cx)), cx);
     }
     defaultResult() {
         return new ast.Unimplemented();
@@ -242,7 +266,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return defList;
     }
     visitSourceDefinition(pcx) {
-        const exploreDef = new ast.DefineSource(this.getIdText(pcx.sourceNameDef()), this.visitExplore(pcx.explore()), true, []);
+        const exploreDef = new ast.DefineSource(getId(pcx.sourceNameDef()), this.visitExplore(pcx.explore()), true, []);
         const notes = getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, pcx);
@@ -265,7 +289,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return propList;
     }
     visitTableFunction(pcx) {
-        const tableURI = this.stripQuotes(pcx.tableURI().text);
+        const tableURI = getShortString(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');
@@ -275,7 +299,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitTableMethod(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
-        const tablePath = this.stripQuotes(pcx.tablePath().text);
+        const tablePath = getShortString(pcx.tablePath());
         return this.astAt(new ast.TableMethodSource(connectionName, tablePath), pcx);
     }
     visitTableSource(pcx) {
@@ -294,7 +318,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
         const sqlStr = new ast.SQLString();
         const selCx = pcx.sqlString();
-        this.makeSqlString(selCx, sqlStr);
+        if (selCx) {
+            this.makeSqlString(selCx, sqlStr);
+        }
+        const shortSelect = getOptionalString(pcx);
+        if (shortSelect) {
+            sqlStr.push(shortSelect);
+        }
         const expr = new ast.SQLSource(connectionName, sqlStr);
         return this.astAt(expr, pcx);
     }
@@ -398,7 +428,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     getFieldDef(pcx, makeFieldDef) {
         const defCx = pcx.fieldExpr();
-        const fieldName = this.getIdText(pcx.fieldNameDef());
+        const fieldName = 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()));
@@ -444,9 +474,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return result;
     }
     visitExploreRenameDef(pcx) {
-        const newName = pcx.fieldName(0).id();
-        const oldName = pcx.fieldName(1).id();
-        const rename = new ast.RenameField(this.getIdText(newName), this.getFieldName(oldName));
+        const newName = pcx.fieldName(0);
+        const oldName = pcx.fieldName(1);
+        const rename = new ast.RenameField(getId(newName), this.getFieldName(oldName));
         return this.astAt(rename, pcx);
     }
     visitDefExploreRename(pcx) {
@@ -502,8 +532,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.visitTimezoneStatement(cx.timezoneStatement());
     }
     visitTimezoneStatement(cx) {
-        const tz = cx.timezoneName();
-        const timezoneStatement = this.astAt(new ast.TimezoneStatement(this.stripQuotes(tz.STRING_LITERAL().text)), tz);
+        const timezoneStatement = this.astAt(new ast.TimezoneStatement(getShortString(cx)), cx.shortString());
         if (!timezoneStatement.isValid) {
             this.astError(timezoneStatement, `Invalid timezone: ${timezoneStatement.tz}`);
         }
@@ -662,8 +691,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(top, pcx);
     }
     visitSourceID(pcx) {
-        const name = this.getModelEntryName(pcx.id());
-        return this.astAt(new ast.NamedSource(name), pcx);
+        return this.astAt(new ast.NamedSource(getId(pcx)), pcx);
     }
     buildPipelineFromName(pipe, pipeCx) {
         const firstCx = pipeCx.firstSegment();
@@ -710,7 +738,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return queryDefs;
     }
     visitTopLevelQueryDef(pcx) {
-        const queryName = this.getIdText(pcx.queryName());
+        const queryName = getId(pcx.queryName());
         const queryExpr = this.visit(pcx.query());
         if (ast.isQueryElement(queryExpr)) {
             const notes = getNotes(pcx.tags()).concat(getIsNotes(pcx.isDefine()));
@@ -774,7 +802,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return nestRef;
     }
     visitNestDef(pcx) {
-        const name = this.getIdText(pcx.queryName());
+        const name = getId(pcx.queryName());
         const nestDef = new ast.NestDefinition(name);
         this.buildPipelineFromName(nestDef, pcx.pipelineFromName());
         nestDef.extendNote({
@@ -783,7 +811,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(nestDef, pcx);
     }
     visitExploreQueryDef(pcx) {
-        const name = this.getIdText(pcx.exploreQueryNameDef());
+        const name = getId(pcx.exploreQueryNameDef());
         const queryDef = new ast.TurtleDecl(name);
         const notes = getNotes(pcx).concat(getIsNotes(pcx.isDefine()));
         queryDef.extendNote({ notes });
@@ -837,29 +865,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return fieldExpr;
     }
     visitExprString(pcx) {
-        return new ast.ExprString(pcx.STRING_LITERAL().text);
+        return new ast.ExprString(getShortString(pcx));
     }
     visitExprRegex(pcx) {
         const malloyRegex = pcx.HACKY_REGEX().text;
-        return new ast.ExprRegEx(this.stripQuotes(malloyRegex.slice(1)));
+        return new ast.ExprRegEx(malloyRegex.slice(2, -1));
     }
     visitExprNow(_pcx) {
         return new ast.ExprNow();
     }
     visitExprNumber(pcx) {
-        var _a, _b;
-        const number = ((_a = pcx.INTEGER_LITERAL()) === null || _a === void 0 ? void 0 : _a.text) || ((_b = pcx.NUMERIC_LITERAL()) === null || _b === void 0 ? void 0 : _b.text);
-        /*
-         * I "know" one of these is true because grammar, but Typescript
-         * rightly points out that grammvisitExprFieldPathar can change in unexpected ways
-         */
-        if (number) {
-            return new ast.ExprNumber(number);
-        }
-        else {
-            this.contextError(pcx, `'${pcx.text}' is not a number`);
-            return new ast.ExprNumber('42');
-        }
+        return new ast.ExprNumber(pcx.text);
     }
     visitExprFieldPath(pcx) {
         const idRef = new ast.ExprIdReference(this.getFieldPath(pcx.fieldPath(), ast.ExpressionFieldReference));
@@ -896,7 +912,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitExprUngroup(pcx) {
         const flist = pcx.fieldName().map(fcx => this.getFieldName(fcx));
-        const kw = this.getIdText(pcx.ungroup()).toLocaleLowerCase();
+        const kw = pcx.ungroup().text.toLowerCase();
         return this.astAt(new ast.ExprUngroup(kw === 'all' ? kw : 'exclude', this.getFieldExpr(pcx.fieldExpr()), flist), pcx);
     }
     visitExprAggregate(pcx) {
@@ -986,8 +1002,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitExprAggFunc(pcx) {
         const argsCx = pcx.argumentList();
         const args = argsCx ? this.allFieldExpressions(argsCx.fieldExpr()) : [];
-        const idCx = pcx.id();
-        const fn = this.getIdText(idCx);
+        const fn = getId(pcx);
         const pathCx = pcx.fieldPath();
         const path = pathCx
             ? this.getFieldPath(pathCx, ast.ExpressionFieldReference)
@@ -999,7 +1014,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(new ast.ExprFunc(fn, args, false, undefined, source), pcx);
     }
     visitExprFunc(pcx) {
-        var _a;
+        var _a, _b;
         const argsCx = pcx.argumentList();
         const args = argsCx ? this.allFieldExpressions(argsCx.fieldExpr()) : [];
         const isRaw = pcx.EXCLAM() !== undefined;
@@ -1014,17 +1029,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 rawType = undefined;
             }
         }
-        const idCx = pcx.id();
-        const dCx = pcx.timeframe();
-        let fn;
-        if (idCx) {
-            fn = this.getIdText(idCx);
-        }
-        else if (dCx) {
-            fn = dCx.text;
-        }
-        else {
-            this.contextError(pcx, 'Funciton name error');
+        let fn = 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';
         }
         if (ast.ExprTimeExtract.extractor(fn)) {
@@ -1089,7 +1096,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.parseTime(pcx, ast.LiteralYear.parse);
     }
     visitImportStatement(pcx) {
-        const url = this.stripQuotes(pcx.importURL().text);
+        const url = getShortString(pcx.importURL());
         return this.astAt(new ast.ImportStatement(url, this.parse.subTranslator.sourceURL), pcx);
     }
     visitJustExpr(pcx) {
@@ -1108,7 +1115,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                     this.contextError(nmCx, 'Cannot redefine connection');
                 }
                 else {
-                    connectionName = this.getIdText(nmCx);
+                    connectionName = getShortString(nmCx);
                 }
             }
             const selCx = blockEnt.sqlString();

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

@@ -210,8 +210,8 @@ function passForHighlights(tokens) {
             case MalloyParser_1.MalloyParser.FROM_SQL:
                 register(token, exports.HighlightType.Call.FromSQL);
                 break;
-            case MalloyParser_1.MalloyParser.STRING_LITERAL:
-            case MalloyParser_1.MalloyParser.JSON_STRING:
+            case MalloyParser_1.MalloyParser.SQ_STRING:
+            case MalloyParser_1.MalloyParser.DQ_STRING:
                 register(token, exports.HighlightType.Literal.String);
                 break;
             case MalloyParser_1.MalloyParser.NUMERIC_LITERAL:
@@ -298,7 +298,7 @@ function passForHighlights(tokens) {
                 register(token, exports.HighlightType.Call.Aggregate);
                 break;
             case MalloyParser_1.MalloyParser.IDENTIFIER:
-            case MalloyParser_1.MalloyParser.OBJECT_NAME_LITERAL:
+            case MalloyParser_1.MalloyParser.BQ_STRING:
                 register(token, exports.HighlightType.Identifier);
                 break;
             case MalloyParser_1.MalloyParser.STRING:

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

@@ -56,7 +56,7 @@ class FindExternalReferences {
         this.registerTableReference(connectionName, tablePath, reference);
     }
     enterImportURL(pcx) {
-        const url = JSON.parse(pcx.JSON_STRING().text);
+        const url = JSON.parse(pcx.shortString().text);
         if (!this.needImports[url]) {
             this.needImports[url] = this.trans.rangeFromContext(pcx);
         }

package/dist/lang/string-parser.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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;