@malloydata/malloy 0.0.403 → 0.0.405

package/dist/model/annotation_utils.js

@@ -0,0 +1,85 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.notesInOrder = notesInOrder;
+exports.getModelAnnotations = getModelAnnotations;
+/**
+ * Every Note of an annotation bundle, inherited first, in document order
+ * (`inherits` → `blockNotes` → `notes`). Later notes win when re-parsed.
+ *
+ * Internal helper — not part of the public `model` barrel. The public way to
+ * read notes is the `Annotations` view (`api/foundation/annotation.ts`), which
+ * uses this; the model-annotation fold below uses it too.
+ */
+function* notesInOrder(annote) {
+    if (annote.inherits)
+        yield* notesInOrder(annote.inherits);
+    if (annote.blockNotes)
+        yield* annote.blockNotes;
+    if (annote.notes)
+        yield* annote.notes;
+}
+/**
+ * The model (`##`) annotations for one model, compiled by walking the
+ * annotation-provenance tree: a model's own `##` together with everything it
+ * imports/extends, folded down the lineage into a single ordered bundle.
+ *
+ * `modelID` defaults to `model.modelID` — the common case, "the annotations
+ * this model presents." `##` is model-level, so every object resolved in the
+ * model reports this same one bundle (resolution takes no object). Pass an
+ * explicit `modelID` to compile the bundle for any other model in the closure.
+ *
+ * Mechanism: a post-order DFS over each model's `inheritsFrom` edges
+ * (extend-base is `import₀`, sitting first) emits a model only after its
+ * predecessors and only once (its most-ancestral slot); back-edges are skipped,
+ * so the walk terminates on a cycle. The result is ordered imports-first /
+ * local-last — a consumer that takes "last wins" sees the target model's own
+ * `##` win — and is returned as an {@link AnnotationsDef} whose `inherits` chain
+ * *is* that order (target at the top, most-ancestral import deepest), so the
+ * `Annotations` view / {@link notesInOrder} consume it with no new code.
+ *
+ * A target with no entry contributes nothing (empty) — the honest answer for a
+ * synthetic or detached `ModelDef` (built via `mkModelDef`, a `pseudoModelFor`
+ * struct, a model with no `##` anywhere) that never recorded a self-entry. But
+ * a recorded `inheritsFrom` *edge* to a model with no entry is corruption —
+ * population kept the edge but lost the target — and throws a compiler-bug-class
+ * error: the one place that needs the entry is the one place that detects it.
+ */
+function getModelAnnotations(model, modelID = model.modelID) {
+    var _a, _b;
+    const order = []; // ancestral-first, target last; deduped keep-first
+    const entered = new Set(); // guards both re-folding and cycles
+    const visit = (id, viaEdge) => {
+        if (entered.has(id))
+            return; // already folded (diamond) or a back-edge cycle
+        const entry = model.modelAnnotations[id];
+        if (entry === undefined) {
+            if (viaEdge) {
+                throw new Error(`Internal error: model '${model.modelID}' has an inheritsFrom edge ` +
+                    `to '${id}', which has no entry in its closure (likely a compiler bug)`);
+            }
+            return; // target model has no annotations of its own — contribute nothing
+        }
+        entered.add(id);
+        for (const pred of entry.inheritsFrom)
+            visit(pred, true);
+        order.push(id);
+    };
+    visit(modelID, false);
+    // Build the output `inherits` chain bottom-up: most-ancestral deepest, target
+    // at the top. `notesInOrder` then yields ancestral → local. Models that
+    // contribute no notes of their own add no link — the chain carries only the
+    // notes that exist, not an empty node per model in the lineage.
+    let chain = undefined;
+    for (const id of order) {
+        const own = model.modelAnnotations[id].ownNotes;
+        if (!((_a = own.notes) === null || _a === void 0 ? void 0 : _a.length) && !((_b = own.blockNotes) === null || _b === void 0 ? void 0 : _b.length))
+            continue;
+        chain = { notes: own.notes, blockNotes: own.blockNotes, inherits: chain };
+    }
+    return chain !== null && chain !== void 0 ? chain : {};
+}
+//# sourceMappingURL=annotation_utils.js.map

package/dist/model/field_instance.js

@@ -59,7 +59,7 @@ class FieldInstanceField {
         var _a;
         if (this.f.parent.primaryKey()) {
             const pk = this.f.parent.getPrimaryKeyField(this.f.fieldDef);
-            const pkName = pk.fieldDef.as || pk.fieldDef.name;
+            const pkName = (0, malloy_types_1.activeName)(pk.fieldDef);
             const pkField = this.parent.getField(pkName);
             return pkField.generateExpression();
         }

package/dist/model/filter_compilers.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemporalFilterCompiler = exports.FilterCompilers = void 0;

package/dist/model/index.d.ts

@@ -4,7 +4,8 @@ import { QueryQuery } from './query_query';
 import { QueryModelImpl } from './query_model_impl';
 export { QueryField, QueryStruct, QueryQuery, QueryModelImpl as QueryModel };
 export { getResultStructDefForQuery, getResultStructDefForView, } from './query_model_impl';
-export { indent, composeSQLExpr, makeDigest, mkModelDef, pathToKey, typeDefToString, } from './utils';
+export { indent, composeSQLExpr, makeDigest, mkModelDef, mkModelID, pathToKey, typeDefToString, } from './utils';
+export { getModelAnnotations } from './annotation_utils';
 export { constantExprToSQL } from './constant_expression_compiler';
 export { getCompiledSQL } from './sql_compiled';
 export { MalloyCompileError } from './malloy_compile_error';

package/dist/model/index.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -36,7 +18,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasSourceRegistryEntry = exports.registerSource = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.MalloyCompileError = exports.getCompiledSQL = exports.constantExprToSQL = exports.typeDefToString = exports.pathToKey = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
+exports.hasSourceRegistryEntry = exports.registerSource = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.MalloyCompileError = exports.getCompiledSQL = exports.constantExprToSQL = exports.getModelAnnotations = exports.typeDefToString = exports.pathToKey = exports.mkModelID = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
 __exportStar(require("./malloy_types"), exports);
 const query_node_1 = require("./query_node");
 Object.defineProperty(exports, "QueryField", { enumerable: true, get: function () { return query_node_1.QueryField; } });
@@ -60,8 +42,11 @@ Object.defineProperty(exports, "indent", { enumerable: true, get: function () {
 Object.defineProperty(exports, "composeSQLExpr", { enumerable: true, get: function () { return utils_1.composeSQLExpr; } });
 Object.defineProperty(exports, "makeDigest", { enumerable: true, get: function () { return utils_1.makeDigest; } });
 Object.defineProperty(exports, "mkModelDef", { enumerable: true, get: function () { return utils_1.mkModelDef; } });
+Object.defineProperty(exports, "mkModelID", { enumerable: true, get: function () { return utils_1.mkModelID; } });
 Object.defineProperty(exports, "pathToKey", { enumerable: true, get: function () { return utils_1.pathToKey; } });
 Object.defineProperty(exports, "typeDefToString", { enumerable: true, get: function () { return utils_1.typeDefToString; } });
+var annotation_utils_1 = require("./annotation_utils");
+Object.defineProperty(exports, "getModelAnnotations", { enumerable: true, get: function () { return annotation_utils_1.getModelAnnotations; } });
 var constant_expression_compiler_1 = require("./constant_expression_compiler");
 Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: function () { return constant_expression_compiler_1.constantExprToSQL; } });
 var sql_compiled_1 = require("./sql_compiled");

package/dist/model/malloy_types.d.ts

@@ -444,6 +444,13 @@ export interface AliasedName {
     name: string;
     as?: string;
 }
+/**
+ * The name an `AliasedName` goes by in its current context: its `as` binding
+ * if it has one, otherwise its intrinsic `name`. This is the only correct way
+ * to ask "what is this called here" — see the `name`/`as` invariant in
+ * model/CONTEXT.md.
+ */
+export declare function activeName(an: AliasedName): string;
 /** all named objects have a type an a name (optionally aliased) */
 export interface NamedObject extends AliasedName, HasLocation {
     type: string;
@@ -664,7 +671,6 @@ export interface Query extends Pipeline, Filtered {
     name?: string;
     structRef: StructRef;
     sourceArguments?: SafeRecord<Argument>;
-    modelAnnotations?: AnnotationsDef;
     compositeResolvedSourceDef?: SourceDef;
     givenUsage?: GivenUsage;
 }
@@ -832,7 +838,6 @@ export interface TurtleDefPlusFilters extends TurtleDef, Filtered {
 }
 interface StructDefBase extends HasLocation, NamedObject, HasAnnotations {
     type: string;
-    modelAnnotations?: ModelAnnotationsDef;
     fields: FieldDef[];
     /** Marker for error placeholder structs created by ErrorFactory */
     errorFactory?: boolean;
@@ -879,6 +884,13 @@ export type SourceID = string;
 export type GivenID = string;
 /** Hash of (connectionDigest, sql) - uniquely identifies a built artifact */
 export type BuildID = string;
+/**
+ * Identifies the model a definition came from. Either a real model URL or a
+ * synthetic `"internal <uuid>"` for URL-less models. The space makes the
+ * synthetic form an illegal URL, so it can never collide with a real model
+ * URL. Created with `mkModelID`.
+ */
+export type ModelID = string;
 /**
  * Reference to a source in modelDef.contents by name.
  * Used in sourceRegistry to avoid duplicating SourceDefs that are in the namespace.
@@ -1092,8 +1104,6 @@ export interface RefToField extends HasAnnotations {
 }
 export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;
-/** Get the output name for a NamedObject */
-export declare function getIdentifier(n: AliasedName): string;
 export interface UserTypeFieldDef extends HasAnnotations {
     name: string;
     typeDef: AtomicTypeDef;
@@ -1110,6 +1120,7 @@ export interface DependencyTree {
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;
+    modelID: ModelID;
     exports: string[];
     contents: SafeRecord<NamedModelObject>;
     /**
@@ -1120,7 +1131,17 @@ export interface ModelDef {
      */
     sourceRegistry: Record<SourceID, SourceRegistryValue>;
     givens?: Record<GivenID, Given>;
-    annotations?: ModelAnnotationsDef;
+    /**
+     * Model (`##`) annotations of every model involved in this compile, keyed by
+     * {@link ModelID} — this model plus everything it imported or extended (the
+     * whole closure, so any model's annotations are answerable from this
+     * `ModelDef` alone, even after it crosses the wire). Each entry carries that
+     * model's own `##` (`ownNotes`) and its direct import/extend predecessors
+     * (`inheritsFrom`, the DAG of edges, extend-base prepended as `import₀`).
+     * {@link getModelAnnotations} folds `inheritsFrom` from any model to produce
+     * that model's deduped, ordered annotation set.
+     */
+    modelAnnotations: Record<ModelID, ModelAnnotationEntry>;
     queryList: Query[];
     dependencies: DependencyTree;
     references?: DocumentReference[];
@@ -1131,7 +1152,16 @@ export type NamedSourceDefs = SafeRecord<SourceDef>;
 export type NamedModelObjects = SafeRecord<NamedModelObject>;
 /** Bundle of source annotations attached to one object: the `notes` and
  *  `blockNotes` written on it, plus the bundle from the spiritual parent
- *  via `inherits`. The IR shape paired with the `Annotations` view class. */
+ *  via `inherits`. The IR shape paired with the `Annotations` view class.
+ *
+ *  This is the one annotation bundle type for both `#` object annotations (on
+ *  fields, views, sources, queries, …) and `##` model annotations. Object
+ *  annotations carry no model provenance: `##` is model-level, resolved by
+ *  folding {@link ModelDef.modelAnnotations} keyed by {@link ModelID}, not by
+ *  per-object stamping. A model's own `##` is just an `AnnotationsDef` whose
+ *  `inherits` chain is unused as stored (`ModelAnnotationEntry.ownNotes`) and,
+ *  when returned by {@link getModelAnnotations}, *is* the folded order (local at the
+ *  top) so the `Annotations` view / `notesInOrder` read it with no new code. */
 export interface AnnotationsDef {
     inherits?: AnnotationsDef;
     blockNotes?: Note[];
@@ -1150,9 +1180,13 @@ export interface Note {
      */
     indentStripped?: number;
 }
-/** Annotations bundle with a uuid to make it easier to stream. */
-export interface ModelAnnotationsDef extends AnnotationsDef {
-    id: string;
+/** One model's entry in {@link ModelDef.modelAnnotations}: its own `##`
+ *  (`ownNotes`) plus its **direct** import/extend predecessors (`inheritsFrom`),
+ *  in fold order with the extend-base prepended as `import₀`. Direct edges only
+ *  — the lineage DAG, not the resolved order; {@link getModelAnnotations} resolves. */
+export interface ModelAnnotationEntry {
+    ownNotes: AnnotationsDef;
+    inheritsFrom: ModelID[];
 }
 export type QueryScalar = string | boolean | number | bigint | Date | Buffer | null;
 /** One value in one column of returned data. */

package/dist/model/malloy_types.js

@@ -1,26 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TD = exports.ValueType = void 0;
@@ -36,6 +17,7 @@ exports.isFilterExprType = isFilterExprType;
 exports.isTimeLiteral = isTimeLiteral;
 exports.isParameterType = isParameterType;
 exports.paramHasValue = paramHasValue;
+exports.activeName = activeName;
 exports.expressionIsScalar = expressionIsScalar;
 exports.expressionIsAggregate = expressionIsAggregate;
 exports.expressionIsUngroupedAggregate = expressionIsUngroupedAggregate;
@@ -93,7 +75,6 @@ exports.isBaseTable = isBaseTable;
 exports.isLiteral = isLiteral;
 exports.mergeEvalSpaces = mergeEvalSpaces;
 exports.isBasicAtomic = isBasicAtomic;
-exports.getIdentifier = getIdentifier;
 exports.isUserTypeDef = isUserTypeDef;
 exports.isCompoundArrayData = isCompoundArrayData;
 exports.isTurtle = isTurtle;
@@ -183,6 +164,16 @@ function isParameterType(t) {
 function paramHasValue(p) {
     return p.value !== null;
 }
+/**
+ * The name an `AliasedName` goes by in its current context: its `as` binding
+ * if it has one, otherwise its intrinsic `name`. This is the only correct way
+ * to ask "what is this called here" — see the `name`/`as` invariant in
+ * model/CONTEXT.md.
+ */
+function activeName(an) {
+    var _a;
+    return (_a = an.as) !== null && _a !== void 0 ? _a : an.name;
+}
 function expressionIsScalar(e) {
     return e === undefined || e === 'scalar';
 }
@@ -580,13 +571,6 @@ function isBasicAtomic(fd) {
         fd.type === 'sql native' ||
         fd.type === 'error');
 }
-/** Get the output name for a NamedObject */
-function getIdentifier(n) {
-    if (n.as !== undefined) {
-        return n.as;
-    }
-    return n.name;
-}
 function isUserTypeDef(sd) {
     return sd.type === 'userType';
 }

package/dist/model/query_model_impl.d.ts

@@ -12,7 +12,6 @@ export declare class QueryModelImpl implements QueryModel, ModelRootInterface {
     structs: Map<string, QueryStruct>;
     get givens(): Record<string, Given>;
     constructor(modelDef: ModelDef | undefined);
-    getFinalOutputStruct(query: Query, options: PrepareResultOptions | undefined): SourceDef | undefined;
     loadModelFromDef(modelDef: ModelDef): void;
     getStructByName(name: string): QueryStruct;
     getStructFromRef(structRef: StructRef, sourceArguments: Record<string, Argument> | undefined, prepareResultOptions?: PrepareResultOptions): QueryStruct;

package/dist/model/query_model_impl.js

@@ -33,31 +33,17 @@ class QueryModelImpl {
             this.loadModelFromDef(modelDef);
         }
     }
-    // Another circularity breaking method ... call into QueryQuery
-    // to find the output shape of a query
-    getFinalOutputStruct(query, options) {
-        const result = this.loadQuery(query, undefined, options, false, false);
-        return result.structs.pop();
-    }
     loadModelFromDef(modelDef) {
         this.modelDef = modelDef;
         for (const s of Object.values(this.modelDef.contents)) {
-            let qs;
+            // Only sources become QueryStructs. query/userType/given are namespace
+            // metadata, not queryable, and are skipped.
             if ((0, malloy_types_1.isSourceDef)(s)) {
-                qs = new query_node_1.QueryStruct(s, undefined, { model: this }, {});
-                this.structs.set((0, malloy_types_1.getIdentifier)(s), qs);
-                qs.resolveQueryFields((query, options) => this.getFinalOutputStruct(query, options));
-            }
-            else if (s.type === 'query') {
-                /* TODO */
-            }
-            else if (s.type === 'userType') {
-                // User type definitions are metadata only, not queryable
+                this.structs.set((0, malloy_types_1.activeName)(s), new query_node_1.QueryStruct(s, undefined, { model: this }, {}));
             }
-            else if (s.type === 'given') {
-                // Givens are metadata in the namespace, not queryable structures.
-            }
-            else {
+            else if (s.type !== 'query' &&
+                s.type !== 'userType' &&
+                s.type !== 'given') {
                 throw new Error('Internal Error: Unknown structure type');
             }
         }
@@ -73,10 +59,7 @@ class QueryModelImpl {
         prepareResultOptions !== null && prepareResultOptions !== void 0 ? prepareResultOptions : (prepareResultOptions = {});
         if (typeof structRef === 'string') {
             const ret = this.getStructByName(structRef);
-            if (sourceArguments !== undefined) {
-                return new query_node_1.QueryStruct(ret.structDef, sourceArguments, ret.parent ? { struct: ret.parent } : { model: this }, prepareResultOptions);
-            }
-            return ret;
+            return new query_node_1.QueryStruct(ret.structDef, sourceArguments !== null && sourceArguments !== void 0 ? sourceArguments : ret.sourceArguments, ret.parent ? { struct: ret.parent } : { model: this }, prepareResultOptions);
         }
         return new query_node_1.QueryStruct(structRef, sourceArguments, { model: this }, prepareResultOptions);
     }
@@ -103,7 +86,7 @@ class QueryModelImpl {
         if (emitFinalStage && q.parent.dialect.hasFinalStage) {
             // const fieldNames: string[] = [];
             // for (const f of ret.outputStruct.fields) {
-            //   fieldNames.push(getIdentifier(f));
+            //   fieldNames.push(activeName(f));
             // }
             const fieldNames = [];
             for (const f of ret.outputStruct.fields) {
@@ -156,9 +139,7 @@ class QueryModelImpl {
         const addedDefaultRowLimit = addDefaultRowLimit.addedDefaultRowLimit;
         const ret = this.loadQuery(query, undefined, prepareResultOptions, finalize, false);
         const structRef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : query.structRef;
-        const sourceExplore = typeof structRef === 'string'
-            ? structRef
-            : structRef.as || structRef.name;
+        const sourceExplore = typeof structRef === 'string' ? structRef : (0, malloy_types_1.activeName)(structRef);
         const sourceArguments = (_b = query.sourceArguments) !== null && _b !== void 0 ? _b : (typeof structRef === 'string' ? undefined : structRef.arguments);
         // LTNote:  I don't understand why this might be here.  It should have happened in loadQuery...
         if (finalize && this.dialect.hasFinalStage) {

package/dist/model/query_node.d.ts

@@ -1,6 +1,5 @@
-import type { FieldDef, BooleanFieldDef, DateFieldDef, DocumentLocation, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters, SourceDef, Query } from './malloy_types';
+import type { FieldDef, BooleanFieldDef, DateFieldDef, DocumentLocation, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters } from './malloy_types';
 import type { EventStream } from '../runtime_types';
-import type { Tag } from '@malloydata/malloy-tag';
 import type { Dialect } from '../dialect';
 declare abstract class QueryNode {
     readonly referenceId: string;
@@ -91,8 +90,6 @@ export declare class QueryStruct {
     constructor(structDef: StructDef, sourceArguments: Record<string, Argument> | undefined, parent: ParentQueryStruct | ParentQueryModel, prepareResultOptions: PrepareResultOptions);
     private static turtleFieldMaker;
     static registerTurtleFieldMaker(maker: (field: TurtleDef, parent: QueryStruct) => QueryField): void;
-    private _modelTag;
-    modelCompilerFlags(): Tag;
     protected findFirstDialect(): string;
     maybeEmitParameterizedSourceUsage(): void;
     private resolveParentParameterReferences;
@@ -109,15 +106,6 @@ export declare class QueryStruct {
     addFieldToNameMap(as: string, n: QueryField, at?: DocumentLocation): void;
     /** the the primary key or throw an error. */
     getPrimaryKeyField(fieldDef: FieldDef): QueryBasicField;
-    /**
-     * called after all structure has been loaded.  Examine this structure to see
-     * if if it is based on a query and if it is, add the output fields (unless
-     * they exist) to the structure.
-     *
-     * finalOutputStruct exists so that query_node doesn't need to
-     * to import query_query
-     */
-    resolveQueryFields(finalOutputStruct: (query: Query, options: PrepareResultOptions | undefined) => SourceDef | undefined): void;
     getModel(): ModelRootInterface;
     get eventStream(): EventStream | undefined;
     /** makes a new queryable field object from a fieldDef */

package/dist/model/query_node.js

@@ -14,7 +14,6 @@ exports.isBasicScalar = isBasicScalar;
 const uuid_1 = require("uuid");
 const malloy_compile_error_1 = require("./malloy_compile_error");
 const malloy_types_1 = require("./malloy_types");
-const annotation_1 = require("../api/foundation/annotation");
 const dialect_1 = require("../dialect");
 const utils_1 = require("./utils");
 class QueryNode {
@@ -33,7 +32,7 @@ class QueryField extends QueryNode {
         this.fieldDef = fieldDef;
     }
     getIdentifier() {
-        return (0, malloy_types_1.getIdentifier)(this.fieldDef);
+        return (0, malloy_types_1.activeName)(this.fieldDef);
     }
     getJoinableParent() {
         const parent = this.parent;
@@ -179,7 +178,6 @@ class QueryStruct {
         this.sourceArguments = sourceArguments;
         this.prepareResultOptions = prepareResultOptions;
         this.nameMap = new Map();
-        this._modelTag = undefined;
         this._arguments = undefined;
         if ('model' in parent) {
             this.model = parent.model;
@@ -203,14 +201,6 @@ class QueryStruct {
     static registerTurtleFieldMaker(maker) {
         QueryStruct.turtleFieldMaker = maker;
     }
-    modelCompilerFlags() {
-        if (this._modelTag === undefined) {
-            const annotation = this.structDef.modelAnnotations;
-            const { tag } = new annotation_1.Annotations(annotation).parseAsTag('!');
-            this._modelTag = tag;
-        }
-        return this._modelTag;
-    }
     findFirstDialect() {
         if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
             return this.structDef.dialect;
@@ -281,7 +271,7 @@ class QueryStruct {
     }
     addFieldsFromFieldList(fields) {
         for (const field of fields) {
-            const as = (0, malloy_types_1.getIdentifier)(field);
+            const as = (0, malloy_types_1.activeName)(field);
             if (field.type === 'turtle') {
                 if (!QueryStruct.turtleFieldMaker) {
                     throw new Error('INTERNAL ERROR: QueryQuery must initialize QueryStruct nested factory method');
@@ -313,7 +303,7 @@ class QueryStruct {
         // make a unique alias name
         if (ret === undefined) {
             const aliases = Array.from(this.pathAliasMap.values());
-            const base = identifierNormalize((0, malloy_types_1.getIdentifier)(this.structDef));
+            const base = identifierNormalize((0, malloy_types_1.activeName)(this.structDef));
             let name = `${base}_0`;
             let n = 1;
             while (aliases.includes(name) && n < 1000) {
@@ -338,7 +328,7 @@ class QueryStruct {
         if (this.unnestWithNumbers() && this.parent !== undefined) {
             const x = this.parent.getSQLIdentifier() +
                 '.' +
-                (0, malloy_types_1.getIdentifier)(this.structDef) +
+                (0, malloy_types_1.activeName)(this.structDef) +
                 `[${this.getIdentifier()}.__row_id]`;
             return x;
         }
@@ -386,7 +376,7 @@ class QueryStruct {
         }
         // if this is an inline object, include the parents alias.
         if (this.structDef.type === 'record' && this.parent) {
-            return this.parent.sqlSimpleChildReference((0, malloy_types_1.getIdentifier)(this.structDef));
+            return this.parent.sqlSimpleChildReference((0, malloy_types_1.activeName)(this.structDef));
         }
         // we are somewhere in the join tree.  Make sure the alias is unique.
         return this.getAliasIdentifier();
@@ -394,7 +384,7 @@ class QueryStruct {
     // return the name of the field in Malloy
     getFullOutputName() {
         if (this.parent) {
-            return (this.parent.getFullOutputName() + (0, malloy_types_1.getIdentifier)(this.structDef) + '.');
+            return this.parent.getFullOutputName() + (0, malloy_types_1.activeName)(this.structDef) + '.';
         }
         else {
             return '';
@@ -428,45 +418,11 @@ class QueryStruct {
             return pk;
         }
         else {
-            throw new malloy_compile_error_1.MalloyCompileError(`Source '${(0, malloy_types_1.getIdentifier)(this.structDef)}' has no primary key; ` +
-                `cannot compute a unique key for field '${(0, malloy_types_1.getIdentifier)(fieldDef)}'. ` +
+            throw new malloy_compile_error_1.MalloyCompileError(`Source '${(0, malloy_types_1.activeName)(this.structDef)}' has no primary key; ` +
+                `cannot compute a unique key for field '${(0, malloy_types_1.activeName)(fieldDef)}'. ` +
                 'Add `primary_key: <field>` to the source definition.', 'compiler-missing-primary-key', fieldDef.location);
         }
     }
-    /**
-     * called after all structure has been loaded.  Examine this structure to see
-     * if if it is based on a query and if it is, add the output fields (unless
-     * they exist) to the structure.
-     *
-     * finalOutputStruct exists so that query_node doesn't need to
-     * to import query_query
-     */
-    resolveQueryFields(finalOutputStruct) {
-        if (this.structDef.type === 'query_source' && finalOutputStruct) {
-            const resultStruct = finalOutputStruct(this.structDef.query, this.prepareResultOptions);
-            // should never happen.
-            if (!resultStruct) {
-                throw new Error("Internal Error, query didn't produce a struct");
-            }
-            const structDef = { ...this.structDef };
-            for (const f of resultStruct.fields) {
-                const as = (0, malloy_types_1.getIdentifier)(f);
-                if (!this.nameMap.has(as)) {
-                    structDef.fields.push(f);
-                    this.nameMap.set(as, this.makeQueryField(f));
-                }
-            }
-            this.structDef = structDef;
-            if (!this.structDef.primaryKey && resultStruct.primaryKey) {
-                this.structDef.primaryKey = resultStruct.primaryKey;
-            }
-        }
-        for (const [, v] of this.nameMap) {
-            if (v instanceof QueryFieldStruct) {
-                v.queryStruct.resolveQueryFields(finalOutputStruct);
-            }
-        }
-    }
     getModel() {
         if (this.model) {
             return this.model;