@malloydata/malloy 0.0.404 → 0.0.406

package/dist/lang/zone.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
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zone = void 0;

package/dist/model/annotation_utils.d.ts

@@ -0,0 +1,37 @@
+import type { AnnotationsDef, ModelDef, ModelID, Note } from './malloy_types';
+/**
+ * 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.
+ */
+export declare function notesInOrder(annote: AnnotationsDef): Generator<Note>;
+/**
+ * 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.
+ */
+export declare function getModelAnnotations(model: ModelDef, modelID?: ModelID): AnnotationsDef;

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/expression_compiler.js

@@ -30,6 +30,7 @@ const filter_compilers_1 = require("./filter_compilers");
 const utils_1 = require("./utils");
 const query_node_1 = require("./query_node");
 const malloy_compile_error_1 = require("./malloy_compile_error");
+const given_binding_1 = require("./given_binding");
 const NUMERIC_DECIMAL_PRECISION = 9;
 function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
     const precision = 9;
@@ -628,13 +629,10 @@ function generateParameterFragment(resultSet, context, expr, state) {
  * and the `'inGiven'` SQL-emit case ($ARR in `expr in $ARR`).
  */
 function resolveGivenBoundExpr(context, ref) {
-    var _a, _b;
-    const supplied = (_b = (_a = context.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.resolvedGivens) === null || _b === void 0 ? void 0 : _b.get(ref.id);
-    if (supplied !== undefined)
-        return supplied;
-    const decl = context.getModel().givens[ref.id];
-    if ((decl === null || decl === void 0 ? void 0 : decl.default) !== undefined)
-        return decl.default;
+    var _a;
+    const value = (0, given_binding_1.lookupGivenValue)((_a = context.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.resolvedGivens, context.getModel().givens, ref.id);
+    if (value !== undefined)
+        return value;
     throw new malloy_compile_error_1.MalloyCompileError(unsatisfiedGivenMessage(ref.refName), 'compiler-given-no-value', ref.at);
 }
 function generateGivenFragment(resultSet, context, expr, state) {

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/given_binding.d.ts

@@ -1,4 +1,13 @@
-import type { Expr, GivenID, GivenValue, ModelDef } from './malloy_types';
+import type { Expr, Given, GivenID, GivenValue, ModelDef } from './malloy_types';
+/**
+ * The one definition of "what value does a given reference stand for":
+ * the caller-supplied value if one is bound, otherwise the declaration
+ * default. Returns undefined when neither exists — callers decide how to
+ * report that, since the right diagnostic differs by site (a bind-time
+ * inline fold vs. SQL emission). Shared by `evaluateInlineGivens` here
+ * and `resolveGivenBoundExpr` in the compiler.
+ */
+export declare function lookupGivenValue(bound: Map<GivenID, Expr> | undefined, givens: Record<GivenID, Given> | undefined, id: GivenID): Expr | undefined;
 export declare function resolveSuppliedGivens(supplied: Record<string, GivenValue> | undefined, modelDef: ModelDef | undefined): Map<GivenID, Expr>;
 /**
  * Evaluate every `inline` given's default to a literal Expr and add it
@@ -10,8 +19,11 @@ export declare function resolveSuppliedGivens(supplied: Record<string, GivenValu
  * `inline-no-default` error at declaration time.
  *
  * Iteration follows `modelDef.contents` insertion order, which (by
- * Malloy's no-forward-refs rule) is also topological order: if inline
- * A's default references inline B, B's declaration came first and is
- * already in the map by the time A runs.
+ * Malloy's no-forward-refs rule) is also topological order. An inline
+ * default that references another inline given relies on this: the
+ * referenced one was declared first, so it is already folded into
+ * `bound` by the time this one reads it. A reference to a regular given
+ * resolves straight to its supplied value or declaration default (see
+ * `resolveGiven`), which needs no ordering.
  */
 export declare function evaluateInlineGivens(bound: Map<GivenID, Expr>, modelDef: ModelDef | undefined): Map<GivenID, Expr>;

package/dist/model/given_binding.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.lookupGivenValue = lookupGivenValue;
 exports.resolveSuppliedGivens = resolveSuppliedGivens;
 exports.evaluateInlineGivens = evaluateInlineGivens;
 const luxon_1 = require("luxon");
@@ -11,6 +12,18 @@ const closest_match_1 = require("../util/closest_match");
 const inline_expr_1 = require("./inline_expr");
 const malloy_types_1 = require("./malloy_types");
 const malloy_compile_error_1 = require("./malloy_compile_error");
+/**
+ * The one definition of "what value does a given reference stand for":
+ * the caller-supplied value if one is bound, otherwise the declaration
+ * default. Returns undefined when neither exists — callers decide how to
+ * report that, since the right diagnostic differs by site (a bind-time
+ * inline fold vs. SQL emission). Shared by `evaluateInlineGivens` here
+ * and `resolveGivenBoundExpr` in the compiler.
+ */
+function lookupGivenValue(bound, givens, id) {
+    var _a, _b;
+    return (_a = bound === null || bound === void 0 ? void 0 : bound.get(id)) !== null && _a !== void 0 ? _a : (_b = givens === null || givens === void 0 ? void 0 : givens[id]) === null || _b === void 0 ? void 0 : _b.default;
+}
 function resolveSuppliedGivens(supplied, modelDef) {
     var _a;
     const out = new Map();
@@ -57,15 +70,28 @@ function resolveSuppliedGivens(supplied, modelDef) {
  * `inline-no-default` error at declaration time.
  *
  * Iteration follows `modelDef.contents` insertion order, which (by
- * Malloy's no-forward-refs rule) is also topological order: if inline
- * A's default references inline B, B's declaration came first and is
- * already in the map by the time A runs.
+ * Malloy's no-forward-refs rule) is also topological order. An inline
+ * default that references another inline given relies on this: the
+ * referenced one was declared first, so it is already folded into
+ * `bound` by the time this one reads it. A reference to a regular given
+ * resolves straight to its supplied value or declaration default (see
+ * `resolveGiven`), which needs no ordering.
  */
 function evaluateInlineGivens(bound, modelDef) {
     var _a;
     if (!modelDef)
         return bound;
     const givens = (_a = modelDef.givens) !== null && _a !== void 0 ? _a : {};
+    // A `$REF` in an inline default resolves to its supplied value, else
+    // its declaration default; a reference with neither is a caller error.
+    // `bound` is read live, so a given folded earlier in the loop is
+    // visible to one folded later.
+    const resolveGiven = (id, refName) => {
+        const v = lookupGivenValue(bound, givens, id);
+        if (v !== undefined)
+            return v;
+        throw new malloy_compile_error_1.MalloyCompileError(`Inline given depends on '${refName}', which has no supplied value and no default. Supply a value for '${refName}' or give it a declaration default.`, 'runtime-given-unsatisfied-inline', undefined);
+    };
     for (const [, entry] of Object.entries(modelDef.contents)) {
         if (entry.type !== 'given')
             continue;
@@ -76,7 +102,7 @@ function evaluateInlineGivens(bound, modelDef) {
             continue;
         if (decl.default === undefined)
             continue;
-        bound.set(entry.id, (0, inline_expr_1.inlineExpr)(decl.default, bound));
+        bound.set(entry.id, (0, inline_expr_1.inlineExpr)(decl.default, resolveGiven));
     }
     return bound;
 }

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/inline_expr.d.ts

@@ -18,13 +18,19 @@ export declare const INLINE_OPS: ReadonlySet<string>;
  */
 export declare const INLINE_LEAVES: ReadonlySet<string>;
 /**
- * Bind-time evaluator for `inline` given defaults. Walks the Expr tree,
- * recursing on bound values for given-refs, and returns a literal Expr
- * (string/number/boolean/null/arrayLiteral).
+ * Bind-time evaluator for `inline` given defaults. Walks the Expr tree
+ * and returns a literal Expr (string/number/boolean/null/arrayLiteral).
+ *
+ * A pure folder: it does not know how given references get their values.
+ * `resolveGiven` is handed a given reference's id and surface name (both
+ * a `$NAME` ref and the array of an `expr in $NAME`) and returns the Expr
+ * that reference stands for — caller-supplied value, declaration default,
+ * or a thrown error if neither. That policy lives with the caller
+ * (`given_binding.ts`), not here — see `lookupGivenValue`.
  *
  * Throws on any node outside `INLINE_OPS ∪ INLINE_LEAVES`. The
  * translator's pre-flight check should have rejected such defaults
  * already, so a throw here flags a compiler bug rather than a caller
  * error.
  */
-export declare function inlineExpr(e: Expr, bound: Map<GivenID, Expr>): Expr;
+export declare function inlineExpr(e: Expr, resolveGiven: (id: GivenID, refName: string) => Expr): Expr;

package/dist/model/inline_expr.js

@@ -45,16 +45,22 @@ exports.INLINE_LEAVES = new Set([
     'given',
 ]);
 /**
- * Bind-time evaluator for `inline` given defaults. Walks the Expr tree,
- * recursing on bound values for given-refs, and returns a literal Expr
- * (string/number/boolean/null/arrayLiteral).
+ * Bind-time evaluator for `inline` given defaults. Walks the Expr tree
+ * and returns a literal Expr (string/number/boolean/null/arrayLiteral).
+ *
+ * A pure folder: it does not know how given references get their values.
+ * `resolveGiven` is handed a given reference's id and surface name (both
+ * a `$NAME` ref and the array of an `expr in $NAME`) and returns the Expr
+ * that reference stands for — caller-supplied value, declaration default,
+ * or a thrown error if neither. That policy lives with the caller
+ * (`given_binding.ts`), not here — see `lookupGivenValue`.
  *
  * Throws on any node outside `INLINE_OPS ∪ INLINE_LEAVES`. The
  * translator's pre-flight check should have rejected such defaults
  * already, so a throw here flags a compiler bug rather than a caller
  * error.
  */
-function inlineExpr(e, bound) {
+function inlineExpr(e, resolveGiven) {
     switch (e.node) {
         case 'stringLiteral':
         case 'numberLiteral':
@@ -63,23 +69,18 @@ function inlineExpr(e, bound) {
         case 'null':
         case 'arrayLiteral':
             return e;
-        case 'given': {
-            const v = bound.get(e.id);
-            if (v === undefined) {
-                throw new Error(`inlineExpr: given '${e.refName}' has no bound value and no default — translator should have caught this earlier`);
-            }
-            return inlineExpr(v, bound);
-        }
+        case 'given':
+            return inlineExpr(resolveGiven(e.id, e.refName), resolveGiven);
         case '()':
-            return inlineExpr(e.e, bound);
+            return inlineExpr(e.e, resolveGiven);
         case 'not': {
-            const inner = inlineExpr(e.e, bound);
+            const inner = inlineExpr(e.e, resolveGiven);
             return toBoolLiteral(!exprAsBool(inner));
         }
         case 'and':
         case 'or': {
-            const left = exprAsBool(inlineExpr(e.kids.left, bound));
-            const right = exprAsBool(inlineExpr(e.kids.right, bound));
+            const left = exprAsBool(inlineExpr(e.kids.left, resolveGiven));
+            const right = exprAsBool(inlineExpr(e.kids.right, resolveGiven));
             return toBoolLiteral(e.node === 'and' ? left && right : left || right);
         }
         case '=':
@@ -88,23 +89,20 @@ function inlineExpr(e, bound) {
         case '<':
         case '>=':
         case '<=': {
-            const left = inlineExpr(e.kids.left, bound);
-            const right = inlineExpr(e.kids.right, bound);
+            const left = inlineExpr(e.kids.left, resolveGiven);
+            const right = inlineExpr(e.kids.right, resolveGiven);
             return toBoolLiteral(compareLiterals(e.node, left, right));
         }
         case 'inGiven': {
-            const lhs = inlineExpr(e.e, bound);
-            const arrBound = bound.get(e.givenRef.id);
-            if (arrBound === undefined) {
-                throw new Error(`inlineExpr: given '${e.givenRef.refName}' has no bound value and no default — translator should have caught this earlier`);
-            }
-            if (arrBound.node === 'null') {
+            const lhs = inlineExpr(e.e, resolveGiven);
+            const arr = inlineExpr(resolveGiven(e.givenRef.id, e.givenRef.refName), resolveGiven);
+            if (arr.node === 'null') {
                 return toBoolLiteral(e.not);
             }
-            if (arrBound.node !== 'arrayLiteral') {
-                throw new Error(`inlineExpr: 'inGiven' bound to '${arrBound.node}', expected 'arrayLiteral'`);
+            if (arr.node !== 'arrayLiteral') {
+                throw new Error(`inlineExpr: 'inGiven' resolved to '${arr.node}', expected 'arrayLiteral'`);
             }
-            const found = arrBound.kids.values.some(v => compareLiterals('=', lhs, inlineExpr(v, bound)));
+            const found = arr.kids.values.some(v => compareLiterals('=', lhs, inlineExpr(v, resolveGiven)));
             return toBoolLiteral(e.not ? !found : found);
         }
         default:

package/dist/model/malloy_types.d.ts

@@ -671,7 +671,6 @@ export interface Query extends Pipeline, Filtered {
     name?: string;
     structRef: StructRef;
     sourceArguments?: SafeRecord<Argument>;
-    modelAnnotations?: AnnotationsDef;
     compositeResolvedSourceDef?: SourceDef;
     givenUsage?: GivenUsage;
 }
@@ -839,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;
@@ -886,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.
@@ -1115,6 +1120,7 @@ export interface DependencyTree {
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;
+    modelID: ModelID;
     exports: string[];
     contents: SafeRecord<NamedModelObject>;
     /**
@@ -1125,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[];
@@ -1136,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[];
@@ -1155,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;

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 } 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;

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 {
@@ -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;