@malloydata/malloy 0.0.70 → 0.0.71-dev230811214318

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

@@ -5,7 +5,6 @@ import { ParserRuleContext } from "antlr4ts/ParserRuleContext";
 import { TerminalNode } from "antlr4ts/tree/TerminalNode";
 import { TokenStream } from "antlr4ts/TokenStream";
 import { Vocabulary } from "antlr4ts/Vocabulary";
-import { MalloyTagListener } from "./MalloyTagListener";
 import { MalloyTagVisitor } from "./MalloyTagVisitor";
 export declare class MalloyTagParser extends Parser {
     static readonly DOTTY = 1;
@@ -21,10 +20,11 @@ export declare class MalloyTagParser extends Parser {
     static readonly AR_END = 11;
     static readonly SQ_STRING = 12;
     static readonly DQ_STRING = 13;
-    static readonly BARE_STRING = 14;
-    static readonly COMMENT = 15;
-    static readonly WHITE_SPACE = 16;
-    static readonly UNEXPECTED_CHAR = 17;
+    static readonly NUMERIC_LITERAL = 14;
+    static readonly BARE_STRING = 15;
+    static readonly COMMENT = 16;
+    static readonly WHITE_SPACE = 17;
+    static readonly UNEXPECTED_CHAR = 18;
     static readonly RULE_tagLine = 0;
     static readonly RULE_tagSpec = 1;
     static readonly RULE_string = 2;
@@ -63,8 +63,6 @@ export declare class TagLineContext extends ParserRuleContext {
     tagSpec(i: number): TagSpecContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class TagSpecContext extends ParserRuleContext {
@@ -78,8 +76,6 @@ export declare class TagEqContext extends TagSpecContext {
     eqValue(): EqValueContext;
     properties(): PropertiesContext | undefined;
     constructor(ctx: TagSpecContext);
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class TagReplacePropertiesContext extends TagSpecContext {
@@ -88,34 +84,27 @@ export declare class TagReplacePropertiesContext extends TagSpecContext {
     properties(): PropertiesContext;
     DOTTY(): TerminalNode | undefined;
     constructor(ctx: TagSpecContext);
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class TagUpdatePropertiesContext extends TagSpecContext {
     propName(): PropNameContext;
     properties(): PropertiesContext;
     constructor(ctx: TagSpecContext);
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class TagDefContext extends TagSpecContext {
     propName(): PropNameContext;
     MINUS(): TerminalNode | undefined;
     constructor(ctx: TagSpecContext);
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class StringContext extends ParserRuleContext {
     SQ_STRING(): TerminalNode | undefined;
+    NUMERIC_LITERAL(): TerminalNode | undefined;
     DQ_STRING(): TerminalNode | undefined;
     BARE_STRING(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class PropNameContext extends ParserRuleContext {
@@ -125,8 +114,6 @@ export declare class PropNameContext extends ParserRuleContext {
     DOT(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class EqValueContext extends ParserRuleContext {
@@ -135,8 +122,6 @@ export declare class EqValueContext extends ParserRuleContext {
     reference(): ReferenceContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class ArrayElementContext extends ParserRuleContext {
@@ -146,8 +131,6 @@ export declare class ArrayElementContext extends ParserRuleContext {
     reference(): ReferenceContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class ReferenceContext extends ParserRuleContext {
@@ -156,8 +139,6 @@ export declare class ReferenceContext extends ParserRuleContext {
     RF_END(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class ArrayValueContext extends ParserRuleContext {
@@ -169,8 +150,6 @@ export declare class ArrayValueContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }
 export declare class PropertiesContext extends ParserRuleContext {
@@ -181,7 +160,5 @@ export declare class PropertiesContext extends ParserRuleContext {
     tagSpec(i: number): TagSpecContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyTagListener): void;
-    exitRule(listener: MalloyTagListener): void;
     accept<Result>(visitor: MalloyTagVisitor<Result>): Result;
 }

package/dist/lang/lib/Malloy/MalloyTagParser.js

@@ -67,7 +67,7 @@ class MalloyTagParser extends Parser_1.Parser {
                 this.state = 21;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
                     {
                         {
                             this.state = 18;
@@ -202,7 +202,7 @@ class MalloyTagParser extends Parser_1.Parser {
             {
                 this.state = 48;
                 _la = this._input.LA(1);
-                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.BARE_STRING))) !== 0))) {
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -282,6 +282,7 @@ class MalloyTagParser extends Parser_1.Parser {
             switch (this._input.LA(1)) {
                 case MalloyTagParser.SQ_STRING:
                 case MalloyTagParser.DQ_STRING:
+                case MalloyTagParser.NUMERIC_LITERAL:
                 case MalloyTagParser.BARE_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
@@ -333,6 +334,7 @@ class MalloyTagParser extends Parser_1.Parser {
             switch (this._input.LA(1)) {
                 case MalloyTagParser.SQ_STRING:
                 case MalloyTagParser.DQ_STRING:
+                case MalloyTagParser.NUMERIC_LITERAL:
                 case MalloyTagParser.BARE_STRING:
                     this.enterOuterAlt(_localctx, 1);
                     {
@@ -501,13 +503,14 @@ class MalloyTagParser extends Parser_1.Parser {
                     case MalloyTagParser.PR_END:
                     case MalloyTagParser.SQ_STRING:
                     case MalloyTagParser.DQ_STRING:
+                    case MalloyTagParser.NUMERIC_LITERAL:
                     case MalloyTagParser.BARE_STRING:
                         {
                             {
                                 this.state = 95;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
+                                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << MalloyTagParser.MINUS) | (1 << MalloyTagParser.SQ_STRING) | (1 << MalloyTagParser.DQ_STRING) | (1 << MalloyTagParser.NUMERIC_LITERAL) | (1 << MalloyTagParser.BARE_STRING))) !== 0)) {
                                     {
                                         {
                                             this.state = 92;
@@ -564,10 +567,11 @@ MalloyTagParser.COMMA = 10;
 MalloyTagParser.AR_END = 11;
 MalloyTagParser.SQ_STRING = 12;
 MalloyTagParser.DQ_STRING = 13;
-MalloyTagParser.BARE_STRING = 14;
-MalloyTagParser.COMMENT = 15;
-MalloyTagParser.WHITE_SPACE = 16;
-MalloyTagParser.UNEXPECTED_CHAR = 17;
+MalloyTagParser.NUMERIC_LITERAL = 14;
+MalloyTagParser.BARE_STRING = 15;
+MalloyTagParser.COMMENT = 16;
+MalloyTagParser.WHITE_SPACE = 17;
+MalloyTagParser.UNEXPECTED_CHAR = 18;
 MalloyTagParser.RULE_tagLine = 0;
 MalloyTagParser.RULE_tagSpec = 1;
 MalloyTagParser.RULE_string = 2;
@@ -588,11 +592,11 @@ MalloyTagParser._LITERAL_NAMES = [
 ];
 MalloyTagParser._SYMBOLIC_NAMES = [
     undefined, "DOTTY", "DOT", "MINUS", "EQ", "RF_BEG", "RF_END", "PR_BEG",
-    "PR_END", "AR_BEG", "COMMA", "AR_END", "SQ_STRING", "DQ_STRING", "BARE_STRING",
-    "COMMENT", "WHITE_SPACE", "UNEXPECTED_CHAR",
+    "PR_END", "AR_BEG", "COMMA", "AR_END", "SQ_STRING", "DQ_STRING", "NUMERIC_LITERAL",
+    "BARE_STRING", "COMMENT", "WHITE_SPACE", "UNEXPECTED_CHAR",
 ];
 MalloyTagParser.VOCABULARY = new VocabularyImpl_1.VocabularyImpl(MalloyTagParser._LITERAL_NAMES, MalloyTagParser._SYMBOLIC_NAMES, []);
-MalloyTagParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x13i\x04\x02" +
+MalloyTagParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\x14i\x04\x02" +
     "\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
     "\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x03\x02\x07\x02\x16\n\x02\f\x02\x0E" +
     "\x02\x19\v\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x05\x03" +
@@ -604,7 +608,7 @@ MalloyTagParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B
     "\t\x03\t\x03\t\x07\tS\n\t\f\t\x0E\tV\v\t\x03\t\x05\tY\n\t\x03\t\x03\t" +
     "\x03\n\x03\n\x03\n\x07\n`\n\n\f\n\x0E\nc\v\n\x05\ne\n\n\x03\n\x03\n\x03" +
     "\n\x02\x02\x02\v\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10" +
-    "\x02\x12\x02\x02\x03\x03\x02\x0E\x10\x02q\x02\x17\x03\x02\x02\x02\x04" +
+    "\x02\x12\x02\x02\x03\x03\x02\x0E\x11\x02q\x02\x17\x03\x02\x02\x02\x04" +
     "0\x03\x02\x02\x02\x062\x03\x02\x02\x02\b4\x03\x02\x02\x02\n?\x03\x02\x02" +
     "\x02\fH\x03\x02\x02\x02\x0EJ\x03\x02\x02\x02\x10N\x03\x02\x02\x02\x12" +
     "\\\x03\x02\x02\x02\x14\x16\x05\x04\x03\x02\x15\x14\x03\x02\x02\x02\x16" +
@@ -651,18 +655,6 @@ class TagLineContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_tagLine; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterTagLine) {
-            listener.enterTagLine(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitTagLine) {
-            listener.exitTagLine(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitTagLine) {
             return visitor.visitTagLine(this);
@@ -700,18 +692,6 @@ class TagEqContext extends TagSpecContext {
         this.copyFrom(ctx);
     }
     // @Override
-    enterRule(listener) {
-        if (listener.enterTagEq) {
-            listener.enterTagEq(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitTagEq) {
-            listener.exitTagEq(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitTagEq) {
             return visitor.visitTagEq(this);
@@ -736,18 +716,6 @@ class TagReplacePropertiesContext extends TagSpecContext {
         this.copyFrom(ctx);
     }
     // @Override
-    enterRule(listener) {
-        if (listener.enterTagReplaceProperties) {
-            listener.enterTagReplaceProperties(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitTagReplaceProperties) {
-            listener.exitTagReplaceProperties(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitTagReplaceProperties) {
             return visitor.visitTagReplaceProperties(this);
@@ -770,18 +738,6 @@ class TagUpdatePropertiesContext extends TagSpecContext {
         this.copyFrom(ctx);
     }
     // @Override
-    enterRule(listener) {
-        if (listener.enterTagUpdateProperties) {
-            listener.enterTagUpdateProperties(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitTagUpdateProperties) {
-            listener.exitTagUpdateProperties(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitTagUpdateProperties) {
             return visitor.visitTagUpdateProperties(this);
@@ -802,18 +758,6 @@ class TagDefContext extends TagSpecContext {
         this.copyFrom(ctx);
     }
     // @Override
-    enterRule(listener) {
-        if (listener.enterTagDef) {
-            listener.enterTagDef(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitTagDef) {
-            listener.exitTagDef(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitTagDef) {
             return visitor.visitTagDef(this);
@@ -826,6 +770,7 @@ class TagDefContext extends TagSpecContext {
 exports.TagDefContext = TagDefContext;
 class StringContext extends ParserRuleContext_1.ParserRuleContext {
     SQ_STRING() { return this.tryGetToken(MalloyTagParser.SQ_STRING, 0); }
+    NUMERIC_LITERAL() { return this.tryGetToken(MalloyTagParser.NUMERIC_LITERAL, 0); }
     DQ_STRING() { return this.tryGetToken(MalloyTagParser.DQ_STRING, 0); }
     BARE_STRING() { return this.tryGetToken(MalloyTagParser.BARE_STRING, 0); }
     constructor(parent, invokingState) {
@@ -834,18 +779,6 @@ class StringContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_string; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterString) {
-            listener.enterString(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitString) {
-            listener.exitString(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitString) {
             return visitor.visitString(this);
@@ -879,18 +812,6 @@ class PropNameContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_propName; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterPropName) {
-            listener.enterPropName(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitPropName) {
-            listener.exitPropName(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitPropName) {
             return visitor.visitPropName(this);
@@ -917,18 +838,6 @@ class EqValueContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_eqValue; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterEqValue) {
-            listener.enterEqValue(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitEqValue) {
-            listener.exitEqValue(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitEqValue) {
             return visitor.visitEqValue(this);
@@ -958,18 +867,6 @@ class ArrayElementContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_arrayElement; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterArrayElement) {
-            listener.enterArrayElement(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitArrayElement) {
-            listener.exitArrayElement(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitArrayElement) {
             return visitor.visitArrayElement(this);
@@ -992,18 +889,6 @@ class ReferenceContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_reference; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterReference) {
-            listener.enterReference(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitReference) {
-            listener.exitReference(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitReference) {
             return visitor.visitReference(this);
@@ -1039,18 +924,6 @@ class ArrayValueContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_arrayValue; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterArrayValue) {
-            listener.enterArrayValue(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitArrayValue) {
-            listener.exitArrayValue(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitArrayValue) {
             return visitor.visitArrayValue(this);
@@ -1079,18 +952,6 @@ class PropertiesContext extends ParserRuleContext_1.ParserRuleContext {
     // @Override
     get ruleIndex() { return MalloyTagParser.RULE_properties; }
     // @Override
-    enterRule(listener) {
-        if (listener.enterProperties) {
-            listener.enterProperties(this);
-        }
-    }
-    // @Override
-    exitRule(listener) {
-        if (listener.exitProperties) {
-            listener.exitProperties(this);
-        }
-    }
-    // @Override
     accept(visitor) {
         if (visitor.visitProperties) {
             return visitor.visitProperties(this);

package/dist/malloy.js

@@ -469,7 +469,10 @@ class PreparedQuery {
         return new tags_1.Tags(this._query.annotation);
     }
     tagParse(spec) {
-        // mtoy todo spec.scopes ||= [Model.getTag(somehow.find.modelDef)] ;
+        if (spec === undefined) {
+            const modelScope = tags_1.Tag.annotationToTag(this._modelDef.annotation);
+            spec = { scopes: [modelScope.tag] };
+        }
         return tags_1.Tag.annotationToTag(this._query.annotation, spec);
     }
     getTaglines(prefix) {
@@ -719,7 +722,10 @@ class PreparedResult {
         return new tags_1.Tags(this.inner.annotation);
     }
     tagParse(spec) {
-        // mtoy todo spec.scopes ||= [Model.getTag(somehow.find.modelDef)] ;
+        if (spec === undefined) {
+            const modelScope = tags_1.Tag.annotationToTag(this.modelDef.annotation);
+            spec = { scopes: [modelScope.tag] };
+        }
         return tags_1.Tag.annotationToTag(this.inner.annotation, spec);
     }
     getTaglines(prefix) {

package/dist/tags.d.ts

@@ -2,7 +2,7 @@ import { LogMessage } from './lang';
 import { Annotation } from './model';
 export declare type TagDict = Record<string, TagInterface>;
 declare type TagValue = string | TagInterface[];
-interface TagInterface {
+export interface TagInterface {
     eq?: TagValue;
     properties?: TagDict;
 }
@@ -55,10 +55,10 @@ export declare class Tag implements TagInterface {
     private find;
     tag(...at: string[]): Tag | undefined;
     has(...at: string[]): boolean;
-    text(...at: string[]): string;
-    numeric(...at: string[]): number;
+    text(...at: string[]): string | undefined;
+    numeric(...at: string[]): number | undefined;
     get dict(): Record<string, Tag>;
-    array(...at: string[]): Tag[];
+    array(...at: string[]): Tag[] | undefined;
     getProperties(): TagDict;
     clone(): Tag;
 }

package/dist/tags.js

@@ -162,15 +162,16 @@ class Tag {
         if (typeof str === 'string') {
             return str;
         }
-        return '';
     }
     numeric(...at) {
         var _a;
         const str = (_a = this.find(at)) === null || _a === void 0 ? void 0 : _a.eq;
         if (typeof str === 'string') {
-            return Number.parseFloat(str);
+            const num = Number.parseFloat(str);
+            if (!Number.isNaN(num)) {
+                return num;
+            }
         }
-        return NaN;
     }
     get dict() {
         const newDict = {};
@@ -185,7 +186,7 @@ class Tag {
         var _a;
         const array = (_a = this.find(at)) === null || _a === void 0 ? void 0 : _a.eq;
         if (array === undefined || typeof array === 'string') {
-            return [];
+            return undefined;
         }
         return array.map(el => typeof el === 'string' ? new Tag({ eq: el }) : Tag.tagFrom(el));
     }
@@ -382,7 +383,10 @@ function parsePath(buildOn, path) {
     return [path[path.length - 1], writeInto];
 }
 function getString(ctx) {
-    return ctx.BARE_STRING() ? ctx.text : (0, parse_utils_1.parseString)(ctx.text, ctx.text[0]);
+    if (ctx.SQ_STRING() || ctx.DQ_STRING()) {
+        return (0, parse_utils_1.parseString)(ctx.text, ctx.text[0]);
+    }
+    return ctx.text;
 }
 function parseTagline(source, extending, outerScope, sourceURL, onLine, atChar) {
     if (source[0] === '#') {

package/package.json

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