@malloydata/malloy 0.0.339 → 0.0.340

package/dist/annotation.d.ts

@@ -1,9 +1,8 @@
-import { Tag } from '@malloydata/malloy-tag';
+import type { Tag } from '@malloydata/malloy-tag';
 import type { Annotation } from './model';
 import type { LogMessage } from './lang';
 export interface TagParseSpec {
     prefix?: RegExp;
-    extending?: Tag;
 }
 export declare function annotationToTaglines(annote: Annotation | undefined, prefix?: RegExp): string[];
 export interface MalloyTagParse {

package/dist/annotation.js

@@ -3,32 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.annotationToTaglines = annotationToTaglines;
 exports.annotationToTag = annotationToTag;
 const malloy_tag_1 = require("@malloydata/malloy-tag");
-function annotationToTaglines(annote, prefix) {
-    annote || (annote = {});
-    const tagLines = annote.inherits
-        ? annotationToTaglines(annote.inherits, prefix)
+/**
+ * Collect all matching Notes from an Annotation, walking the inherits
+ * chain. Returns notes in inheritance order (inherited first).
+ */
+function collectNotes(annote, prefix) {
+    const inherited = annote.inherits
+        ? collectNotes(annote.inherits, prefix)
         : [];
-    function prefixed(na) {
-        const ret = [];
-        for (const n of na || []) {
-            if (prefix === undefined || n.text.match(prefix)) {
-                ret.push(n.text);
-            }
-        }
-        return ret;
-    }
-    return tagLines.concat(prefixed(annote.blockNotes), prefixed(annote.notes));
-}
-function annotationToTag(annote, spec = {}) {
-    let extending = spec.extending || new malloy_tag_1.Tag();
-    const prefix = spec.prefix || /^##? /;
-    annote || (annote = {});
-    const allErrs = [];
-    if (annote.inherits) {
-        const inherits = annotationToTag(annote.inherits, spec);
-        allErrs.push(...inherits.log);
-        extending = inherits.tag;
-    }
     const allNotes = [];
     if (annote.blockNotes) {
         allNotes.push(...annote.blockNotes);
@@ -36,19 +18,32 @@ function annotationToTag(annote, spec = {}) {
     if (annote.notes) {
         allNotes.push(...annote.notes);
     }
-    const matchingNotes = [];
-    for (const note of allNotes) {
-        if (note.text.match(prefix)) {
-            matchingNotes.push(note);
-        }
+    if (prefix) {
+        const matching = allNotes.filter(note => note.text.match(prefix));
+        return inherited.concat(matching);
     }
-    for (const note of matchingNotes) {
-        const noteParse = (0, malloy_tag_1.parseTag)(note.text, extending);
-        extending = noteParse.tag;
+    return inherited.concat(allNotes);
+}
+function annotationToTaglines(annote, prefix) {
+    return collectNotes(annote || {}, prefix).map(n => n.text);
+}
+// TODO: Error location mapping currently works by post-hoc mapping
+// parse errors back to source locations using the Note's `at` field.
+// The proper approach is to pass source location information into the
+// MOTLY parser session so that errors come back with correct locations
+// directly, eliminating the need for this remapping step.
+function annotationToTag(annote, spec = {}) {
+    const prefix = spec.prefix || /^##? /;
+    annote || (annote = {});
+    const notes = collectNotes(annote, prefix);
+    const allErrs = [];
+    const session = new malloy_tag_1.TagParser();
+    for (const note of notes) {
+        const noteParse = session.parse(note.text);
         allErrs.push(...noteParse.log.map((e) => mapMalloyError(e, note)));
     }
-    // Validate references and add any warnings
-    const refErrors = extending.validateReferences();
+    const tag = session.finish();
+    const refErrors = tag.validateReferences();
     for (const refError of refErrors) {
         allErrs.push({
             code: 'tag-reference-error',
@@ -56,7 +51,7 @@ function annotationToTag(annote, spec = {}) {
             message: refError,
         });
     }
-    return { tag: extending, log: allErrs };
+    return { tag, log: allErrs };
 }
 function mapMalloyError(e, note) {
     // Calculate prefix length (same logic as parseTagLine)

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export type { Connection, ConnectionConfig, ConnectionParameterValue, FetchSchem
 export { registerConnectionType, getConnectionProperties, getRegisteredConnectionTypes, readConnectionsConfig, writeConnectionsConfig, createConnectionsFromConfig, } from './connection/registry';
 export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, } from './connection/registry';
 export { toAsyncGenerator } from './connection_utils';
-export { modelDefToModelInfo, sourceDefToSourceInfo, writeMalloyObjectToTag, extractMalloyObjectFromTag, } from './to_stable';
+export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
 export * as API from './api';
 export type { SQLSourceRequest } from './lang/translate-response';
 export { sqlKey } from './model/sql_block';

package/dist/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isCompoundArrayData = exports.isBasicAtomic = exports.isAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.makeDigest = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.createConnectionsFromConfig = exports.writeConnectionsConfig = exports.readConnectionsConfig = exports.getRegisteredConnectionTypes = exports.getConnectionProperties = exports.registerConnectionType = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = void 0;
+exports.makeDigest = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.createConnectionsFromConfig = exports.writeConnectionsConfig = exports.readConnectionsConfig = exports.getRegisteredConnectionTypes = exports.getConnectionProperties = exports.registerConnectionType = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -147,8 +147,6 @@ Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: func
 var to_stable_1 = require("./to_stable");
 Object.defineProperty(exports, "modelDefToModelInfo", { enumerable: true, get: function () { return to_stable_1.modelDefToModelInfo; } });
 Object.defineProperty(exports, "sourceDefToSourceInfo", { enumerable: true, get: function () { return to_stable_1.sourceDefToSourceInfo; } });
-Object.defineProperty(exports, "writeMalloyObjectToTag", { enumerable: true, get: function () { return to_stable_1.writeMalloyObjectToTag; } });
-Object.defineProperty(exports, "extractMalloyObjectFromTag", { enumerable: true, get: function () { return to_stable_1.extractMalloyObjectFromTag; } });
 exports.API = __importStar(require("./api"));
 var sql_block_1 = require("./model/sql_block");
 Object.defineProperty(exports, "sqlKey", { enumerable: true, get: function () { return sql_block_1.sqlKey; } });

package/dist/lang/ast/types/annotation-elements.d.ts

@@ -1,6 +1,4 @@
 import type { Note } from '../../../model/malloy_types';
-import type { Tag } from '@malloydata/malloy-tag';
-import type { MessageLogger } from '../../parse-log';
 import type { Document, DocStatement } from './malloy-element';
 import { MalloyElement } from './malloy-element';
 import type { QueryPropertyInterface } from './query-property-interface';
@@ -14,6 +12,6 @@ export declare class ObjectAnnotation extends MalloyElement implements QueryProp
 }
 export declare class ModelAnnotation extends ObjectAnnotation implements DocStatement {
     elementType: string;
-    getCompilerFlags(existing: Tag, logTo: MessageLogger): Tag;
+    getCompilerFlagLines(): string[];
     execute(doc: Document): void;
 }

package/dist/lang/ast/types/annotation-elements.js

@@ -24,7 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelAnnotation = exports.ObjectAnnotation = void 0;
 const malloy_element_1 = require("./malloy-element");
-const annotation_1 = require("../../../annotation");
+const COMPILER_FLAG_PREFIX = /^##! /;
 class ObjectAnnotation extends malloy_element_1.MalloyElement {
     constructor(notes) {
         super();
@@ -41,13 +41,10 @@ class ModelAnnotation extends ObjectAnnotation {
         super(...arguments);
         this.elementType = 'modelAnnotation';
     }
-    getCompilerFlags(existing, logTo) {
-        const tagParse = (0, annotation_1.annotationToTag)({ notes: this.notes }, {
-            prefix: /^##! /,
-            extending: existing,
-        });
-        tagParse.log.forEach(err => logTo.log(err));
-        return tagParse.tag;
+    getCompilerFlagLines() {
+        return this.notes
+            .filter(note => note.text.match(COMPILER_FLAG_PREFIX))
+            .map(note => note.text);
     }
     execute(doc) {
         if (doc.annotation.notes === undefined) {

package/dist/lang/ast/types/malloy-element.js

@@ -273,7 +273,7 @@ class MalloyElement {
     }
     inExperiment(experimentId, silent = false) {
         var _a;
-        const experimental = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.compilerFlags.tag('experimental');
+        const experimental = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.getCompilerFlags().tag('experimental');
         const enabled = experimental && (experimental.bare() || experimental.has(experimentId));
         if (enabled) {
             return true;

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

@@ -30,12 +30,14 @@ type HasAnnotations = ParserRuleContext & {
 export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElement> implements MalloyParserVisitor<ast.MalloyElement> {
     readonly parseInfo: MalloyParseInfo;
     readonly msgLog: MessageLogger;
-    compilerFlags: Tag;
     readonly timer: Timer;
-    constructor(parseInfo: MalloyParseInfo, msgLog: MessageLogger, compilerFlags: Tag);
+    private compilerFlagSrc;
+    private compilerFlagTag?;
+    constructor(parseInfo: MalloyParseInfo, msgLog: MessageLogger, compilerFlagSrc: string[]);
+    getCompilerFlags(): Tag;
     run(): {
         ast: ast.MalloyElement;
-        compilerFlags: Tag;
+        compilerFlagSrc: string[];
         timingInfo: Malloy.TimingInfo;
     };
     /**

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

@@ -88,25 +88,26 @@ const DEFAULT_COMPILER_FLAGS = [];
  * AST from an ANTLR parse tree.
  */
 class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
-    constructor(parseInfo, msgLog, compilerFlags) {
+    constructor(parseInfo, msgLog, compilerFlagSrc) {
         super();
         this.parseInfo = parseInfo;
         this.msgLog = msgLog;
-        this.compilerFlags = compilerFlags;
         this.timer = new timing_1.Timer('generate_ast');
         const parseCompilerFlagsTimer = new timing_1.Timer('parse_compiler_flags');
-        for (const flag of DEFAULT_COMPILER_FLAGS) {
-            const withNewTag = (0, malloy_tag_1.parseTag)(flag, this.compilerFlags);
-            this.compilerFlags = withNewTag.tag;
-        }
+        this.compilerFlagSrc = [...DEFAULT_COMPILER_FLAGS, ...compilerFlagSrc];
         this.timer.contribute([parseCompilerFlagsTimer.stop()]);
     }
+    getCompilerFlags() {
+        if (!this.compilerFlagTag) {
+            this.compilerFlagTag = (0, malloy_tag_1.parseTag)(this.compilerFlagSrc).tag;
+        }
+        return this.compilerFlagTag;
+    }
     run() {
         const ast = this.visit(this.parseInfo.root);
-        const compilerFlags = this.compilerFlags;
         return {
             ast,
-            compilerFlags,
+            compilerFlagSrc: this.compilerFlagSrc,
             timingInfo: this.timer.stop(),
         };
     }
@@ -157,7 +158,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }));
     }
     inExperiment(experimentId, cx) {
-        const experimental = this.compilerFlags.tag('experimental');
+        const experimental = this.getCompilerFlags().tag('experimental');
         if (experimental &&
             (experimental.bare() || experimental.has(experimentId))) {
             return true;
@@ -1289,7 +1290,22 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     updateCompilerFlags(tags) {
         const parseCompilerFlagsTimer = new timing_1.Timer('parse_compiler_flags');
-        this.compilerFlags = tags.getCompilerFlags(this.compilerFlags, this.msgLog);
+        const newLines = tags.getCompilerFlagLines();
+        if (newLines.length > 0) {
+            const oldLength = this.compilerFlagSrc.length;
+            this.compilerFlagSrc.push(...newLines);
+            const { tag, log } = (0, malloy_tag_1.parseTag)(this.compilerFlagSrc);
+            this.compilerFlagTag = tag;
+            for (const err of log) {
+                if (err.line >= oldLength) {
+                    this.msgLog.log({
+                        code: 'tag-parse-error',
+                        severity: 'error',
+                        message: err.message,
+                    });
+                }
+            }
+        }
         this.timer.contribute([parseCompilerFlagsTimer.stop()]);
     }
     visitDocAnnotations(pcx) {

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

@@ -5,7 +5,7 @@ import type { ZoneData } from './zone';
 import { Zone } from './zone';
 import { ReferenceList } from './reference-list';
 import type { ResponseBase, ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse, FatalResponse, FinalResponse, HelpContextResponse, MetadataResponse, ModelDataRequest, NeedURLData, TranslateResponse, ModelAnnotationResponse, TablePathResponse } from './translate-response';
-import { Tag } from '@malloydata/malloy-tag';
+import type { Tag } from '@malloydata/malloy-tag';
 import type { MalloyParseInfo } from './malloy-parse-info';
 import type { EventStream } from '../runtime_types';
 import type { ParserRuleContext } from 'antlr4ts';
@@ -114,7 +114,8 @@ export declare abstract class MalloyTranslation {
     modelDef: ModelDef;
     modelWasModified: boolean;
     imports: ImportLocation[];
-    compilerFlags: Tag;
+    compilerFlagSrc: string[];
+    getCompilerFlags(): Tag;
     readonly parseStep: ParseStep;
     readonly modelAnnotationStep: ModelAnnotationStep;
     readonly importsAndTablesStep: ImportsAndTablesStep;

package/dist/lang/parse-malloy.js

@@ -234,10 +234,10 @@ class ASTStep {
             throw new Error('TRANSLATOR INTERNAL ERROR: Translator parse response had no errors, but also no parser');
         }
         stepTimer.incorporate(parseResponse.timingInfo);
-        const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger, that.compilerFlags);
-        const { ast: newAST, compilerFlags, timingInfo } = secondPass.run();
+        const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger, that.compilerFlagSrc);
+        const { ast: newAST, compilerFlagSrc, timingInfo } = secondPass.run();
         stepTimer.contribute([timingInfo]);
-        that.compilerFlags = compilerFlags;
+        that.compilerFlagSrc = compilerFlagSrc;
         if (newAST.elementType === 'unimplemented') {
             newAST.logError('untranslated-parse-node', 'INTERNAL COMPILER ERROR: Untranslated parse node');
         }
@@ -425,11 +425,8 @@ class TranslateStep {
         // begin with the compiler flags of the model we are extending
         if (extendingModel && !this.importedAnnotations) {
             const parseCompilerFlagsTimer = new timing_1.Timer('parse_compiler_flags');
-            const tagParse = (0, annotation_1.annotationToTag)(extendingModel.annotation, {
-                prefix: /^##! /,
-            });
+            that.compilerFlagSrc = (0, annotation_1.annotationToTaglines)(extendingModel.annotation, /^##! /);
             stepTimer.contribute([parseCompilerFlagsTimer.stop()]);
-            that.compilerFlags = tagParse.tag;
             this.importedAnnotations = true;
         }
         const astResponse = this.astStep.step(that);
@@ -488,6 +485,9 @@ class TranslateStep {
     }
 }
 class MalloyTranslation {
+    getCompilerFlags() {
+        return (0, malloy_tag_1.parseTag)(this.compilerFlagSrc).tag;
+    }
     constructor(sourceURL, importBaseURL = null, grammarRule = 'malloyDocument') {
         this.sourceURL = sourceURL;
         this.importBaseURL = importBaseURL;
@@ -495,7 +495,7 @@ class MalloyTranslation {
         this.sqlSources = [];
         this.modelWasModified = false;
         this.imports = [];
-        this.compilerFlags = new malloy_tag_1.Tag();
+        this.compilerFlagSrc = [];
         this._urlIsFullPath = undefined;
         /*
          Experimental dialect support, not confident this is how this should work.
@@ -753,7 +753,7 @@ class MalloyTranslation {
         if (this.allDialectsEnabled) {
             return true;
         }
-        const experimental = this.compilerFlags.tag('experimental');
+        const experimental = this.getCompilerFlags().tag('experimental');
         return (experimental !== undefined &&
             (experimental.bare() || experimental.has('dialect', dialect)));
     }

package/dist/to_stable.d.ts

@@ -6,15 +6,3 @@ export declare function modelDefToModelInfo(modelDef: ModelDef): Malloy.ModelInf
 export declare function convertFieldInfos(source: SourceDef, fields: FieldDef[]): Malloy.FieldInfo[];
 export declare function writeLiteralToTag(tag: Tag, path: (string | number)[], literal: Malloy.LiteralValue): void;
 export declare function getResultStructMetadataAnnotation(field: SourceDef, resultMetadata: ResultStructMetadataDef): Malloy.Annotation | undefined;
-/**
- * Writes a Malloy interface object to a tag at a given path.
- *
- * E.g. `writeMalloyObjectToTag(tag, ['expr'], 'Expression', {kind: 'field_reference', name: 'carrier'})`
- *
- * produces the tag `#(malloy) expr { kind = field_reference name = carrier }`
- */
-export declare function writeMalloyObjectToTag(tag: Tag, path: (string | number)[], obj: unknown, type: string): void;
-/**
- * Extracts a Malloy interface object from a tag at a given path; the inverse of `writeMalloyObjectToTag`.
- */
-export declare function extractMalloyObjectFromTag(tag: Tag, type: string): unknown;

package/dist/to_stable.js

@@ -44,8 +44,6 @@ exports.modelDefToModelInfo = modelDefToModelInfo;
 exports.convertFieldInfos = convertFieldInfos;
 exports.writeLiteralToTag = writeLiteralToTag;
 exports.getResultStructMetadataAnnotation = getResultStructMetadataAnnotation;
-exports.writeMalloyObjectToTag = writeMalloyObjectToTag;
-exports.extractMalloyObjectFromTag = extractMalloyObjectFromTag;
 const Malloy = __importStar(require("@malloydata/malloy-interfaces"));
 const model_1 = require("./model");
 const annotation_1 = require("./annotation");
@@ -510,6 +508,11 @@ function convertJoinType(type) {
  * E.g. `writeMalloyObjectToTag(tag, ['expr'], 'Expression', {kind: 'field_reference', name: 'carrier'})`
  *
  * produces the tag `#(malloy) expr { kind = field_reference name = carrier }`
+ *
+ * Note: The inverse function `extractMalloyObjectFromTag` lives in the
+ * renderer (malloy-render/src/data_tree/utils.ts) since that is its only
+ * consumer. These two functions are kept separate to avoid the renderer
+ * depending on the malloy core package for deserialization.
  */
 function writeMalloyObjectToTag(tag, path, obj, type) {
     if (type === 'string') {
@@ -571,75 +574,8 @@ function writeMalloyObjectToTag(tag, path, obj, type) {
         writeMalloyObjectToTag(tag, path, obj, unionType);
     }
 }
-/**
- * Extracts a Malloy interface object from a tag at a given path; the inverse of `writeMalloyObjectToTag`.
- */
-function extractMalloyObjectFromTag(tag, type) {
-    if (type === 'string') {
-        return tag.text();
-    }
-    else if (type === 'number') {
-        return tag.numeric();
-    }
-    else if (type === 'boolean') {
-        return tag.text() === 'true';
-    }
-    const typeDef = Malloy.MALLOY_INTERFACE_TYPES[type];
-    if (typeDef === undefined) {
-        throw new Error(`Unknown Malloy interface type ${type}`);
-    }
-    if (typeDef.type === 'enum') {
-        const value = tag.text();
-        if (value === undefined) {
-            throw new Error(`Missing value for enum ${type}`);
-        }
-        if (value in typeDef.values) {
-            return value;
-        }
-        throw new Error(`Unknown value ${value} for enum ${type}`);
-    }
-    else if (typeDef.type === 'struct') {
-        const result = {};
-        for (const [key, type] of Object.entries(typeDef.fields)) {
-            const valueTag = tag.tag(key);
-            if (valueTag === undefined) {
-                if (type.optional)
-                    continue;
-                else {
-                    throw new Error(`Missing value for key ${key} of type ${type}`);
-                }
-            }
-            if (type.array) {
-                const arr = [];
-                const values = valueTag.array();
-                if (values === undefined) {
-                    throw new Error(`Missing array value for key ${key} of type ${type}`);
-                }
-                for (const value of values) {
-                    arr.push(extractMalloyObjectFromTag(value, type.type));
-                }
-                result[key] = arr;
-            }
-            else {
-                const value = extractMalloyObjectFromTag(valueTag, type.type);
-                if (value !== undefined && value !== null) {
-                    result[key] = value;
-                }
-            }
-        }
-        return result;
-    } /* (typeDef.type === 'union') */
-    else {
-        const kind = tag.text('kind');
-        if (kind === undefined) {
-            throw new Error(`Missing kind for union ${type}`);
-        }
-        const unionType = typeDef.options[kind];
-        if (unionType === undefined) {
-            throw new Error(`Unknown kind ${kind} for union ${type}`);
-        }
-        const value = extractMalloyObjectFromTag(tag, unionType);
-        return { kind, ...value };
-    }
-}
+// Note: The inverse function `extractMalloyObjectFromTag` lives in the
+// renderer (malloy-render/src/data_tree/utils.ts) since that is its only
+// consumer. These two functions are kept separate to avoid the renderer
+// depending on the malloy core package for deserialization.
 //# sourceMappingURL=to_stable.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.339";
+export declare const MALLOY_VERSION = "0.0.340";

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.339';
+exports.MALLOY_VERSION = '0.0.340';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.339",
+  "version": "0.0.340",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,9 +45,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.339",
-    "@malloydata/malloy-interfaces": "0.0.339",
-    "@malloydata/malloy-tag": "0.0.339",
+    "@malloydata/malloy-filter": "0.0.340",
+    "@malloydata/malloy-interfaces": "0.0.340",
+    "@malloydata/malloy-tag": "0.0.340",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",