@malloydata/malloy 0.0.403 → 0.0.405

package/dist/lang/parse-malloy.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;
@@ -57,6 +39,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MalloyTranslator = exports.MalloyChildTranslator = exports.MalloyTranslation = void 0;
 const utils_1 = require("../model/utils");
+const annotation_utils_1 = require("../model/annotation_utils");
 const ast = __importStar(require("./ast"));
 const malloy_to_ast_1 = require("./malloy-to-ast");
 const parse_log_1 = require("./parse-log");
@@ -70,7 +53,6 @@ const reference_list_1 = require("./reference-list");
 const translate_response_1 = require("./translate-response");
 const utils_2 = require("./utils");
 const malloy_tag_1 = require("@malloydata/malloy-tag");
-const model_annotation_walker_1 = require("./parse-tree-walkers/model-annotation-walker");
 const find_table_path_walker_1 = require("./parse-tree-walkers/find-table-path-walker");
 const annotation_1 = require("../api/foundation/annotation");
 const run_malloy_parser_1 = require("./run-malloy-parser");
@@ -409,29 +391,6 @@ class HelpContextStep {
         }
     }
 }
-class ModelAnnotationStep {
-    constructor(parseStep) {
-        this.parseStep = parseStep;
-    }
-    step(that, extendingModel) {
-        if (!this.response) {
-            const tryParse = this.parseStep.step(that);
-            if (!tryParse.parse || tryParse.final) {
-                return tryParse;
-            }
-            else {
-                const modelAnnotations = (0, model_annotation_walker_1.walkForModelAnnotation)(that, tryParse.parse.tokenStream, tryParse.parse);
-                this.response = {
-                    modelAnnotations: {
-                        ...modelAnnotations,
-                        inherits: extendingModel === null || extendingModel === void 0 ? void 0 : extendingModel.annotations,
-                    },
-                };
-            }
-        }
-        return this.response;
-    }
-}
 class TablePathInfoStep {
     constructor(parseStep) {
         this.parseStep = parseStep;
@@ -478,7 +437,10 @@ class TranslateStep {
         // seeding (e.g. TestTranslator's compilerFlags option) survive.
         if (extendingModel && !this.importedAnnotations) {
             const parseCompilerFlagsTimer = new timing_1.Timer('parse_compiler_flags');
-            that.compilerFlagSrc.push(...new annotation_1.Annotations(extendingModel.annotations).texts('!'));
+            // Compiler flags from the extending base's `##` annotations. NOTE: `##!`
+            // flag semantics are still to be settled; this keeps the existing
+            // behavior (flags from the base model) green and is not the final design.
+            that.compilerFlagSrc.push(...new annotation_1.Annotations((0, annotation_utils_1.getModelAnnotations)(extendingModel)).texts('!'));
             stepTimer.contribute([parseCompilerFlagsTimer.stop()]);
             this.importedAnnotations = true;
         }
@@ -563,7 +525,7 @@ class MalloyTranslation {
         this.dialectAlreadyChecked = {};
         this.allDialectsEnabled = false;
         this.childTranslators = new Map();
-        this.modelDef = (0, utils_1.mkModelDef)(sourceURL);
+        this.modelDef = (0, utils_1.mkModelDef)(sourceURL, (0, utils_1.mkModelID)(sourceURL));
         /**
          * This is sort of the makefile for the translation, all the steps
          * and the dependencies of the steps are declared here. Then when
@@ -572,7 +534,6 @@ class MalloyTranslation {
          * things will happen automatically.
          */
         this.parseStep = new ParseStep();
-        this.modelAnnotationStep = new ModelAnnotationStep(this.parseStep);
         this.metadataStep = new MetadataStep(this.parseStep);
         this.completionsStep = new CompletionsStep(this.parseStep);
         this.helpContextStep = new HelpContextStep(this.parseStep);
@@ -771,9 +732,6 @@ class MalloyTranslation {
     metadata() {
         return this.metadataStep.step(this);
     }
-    modelAnnotation(extendingModel) {
-        return this.modelAnnotationStep.step(this, extendingModel);
-    }
     tablePathInfo() {
         return this.tablePathInfoStep.step(this);
     }

package/dist/lang/parse-tree-walkers/document-completion-walker.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.walkForDocumentCompletions = walkForDocumentCompletions;

package/dist/lang/parse-tree-walkers/document-help-context-walker.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.walkForDocumentHelpContext = walkForDocumentHelpContext;

package/dist/lang/parse-tree-walkers/document-symbol-walker.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.walkForDocumentSymbols = walkForDocumentSymbols;

package/dist/lang/parse-tree-walkers/explore-query-walker.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.ExploreQueryWalker = void 0;

package/dist/lang/parse-tree-walkers/find-external-references.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.constructTableKey = constructTableKey;

package/dist/lang/parse-tree-walkers/find-table-path-walker.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.walkForTablePath = walkForTablePath;

package/dist/lang/parse-utils.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.getShortString = getShortString;

package/dist/lang/reference-list.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.ReferenceList = void 0;

package/dist/lang/run-malloy-parser.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.makeMalloyParser = makeMalloyParser;

package/dist/lang/syntax-errors/custom-error-messages.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
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };

package/dist/lang/syntax-errors/malloy-error-strategy.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.MalloyErrorStrategy = void 0;

package/dist/lang/syntax-errors/malloy-parser-error-listener.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.MalloyParserErrorListener = exports.malloyCustomErrorCases = void 0;

package/dist/lang/test/expr-to-str.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.exprToStr = exprToStr;

package/dist/lang/test/parse-expects.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 });
 const model_1 = require("../../model");

package/dist/lang/test/test-translator.js

@@ -1,26 +1,8 @@
 "use strict";
 /* eslint-disable no-console */
 /*
- * 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.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.bqTableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
@@ -49,6 +31,7 @@ const parse_malloy_1 = require("../parse-malloy");
 const static_space_1 = require("../ast/field-space/static-space");
 const global_name_space_1 = require("../ast/types/global-name-space");
 const sql_block_1 = require("../../model/sql_block");
+const utils_1 = require("../../model/utils");
 function pretty(thing) {
     return (0, util_1.inspect)(thing, { breakLength: 100, depth: Infinity });
 }
@@ -363,11 +346,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
          *
          */
         this.internalModel = {
-            name: testURI,
-            exports: [],
-            queryList: [],
-            sourceRegistry: {},
-            dependencies: {},
+            ...(0, utils_1.mkModelDef)(testURI, testURI),
             contents: {
                 _db_: { type: 'connection', name: '_db_' },
                 _bq_: { type: 'connection', name: '_bq_' },
@@ -583,16 +562,14 @@ function getModelQuery(modelDef, name) {
     return modelDef.contents[name];
 }
 function getFieldDef(source, name) {
-    var _a;
     for (const f of source.fields) {
-        if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+        if ((0, malloy_types_1.activeName)(f) === name) {
             return f;
         }
     }
     throw new Error(`Compiled source did not contain expected field '${name}'`);
 }
 function getQueryFieldDef(query, name) {
-    var _a;
     if ((0, malloy_types_1.isQuerySegment)(query)) {
         for (const f of query.queryFields) {
             if (f.type === 'fieldref') {
@@ -600,7 +577,7 @@ function getQueryFieldDef(query, name) {
                     return f;
                 }
             }
-            else if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+            else if ((0, malloy_types_1.activeName)(f) === name) {
                 return f;
             }
         }

package/dist/lang/translate-response.d.ts

@@ -1,5 +1,5 @@
 import type * as Malloy from '@malloydata/malloy-interfaces';
-import type { AnnotationsDef, ModelDef } from '../model/malloy_types';
+import type { ModelDef } from '../model/malloy_types';
 import type { MalloyElement } from './ast';
 import type { LogMessage } from './parse-log';
 import type { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';
@@ -54,10 +54,6 @@ interface Metadata extends ResponseBase, NeededData, ProblemResponse, FinalRespo
     symbols: DocumentSymbol[];
 }
 export type MetadataResponse = Partial<Metadata>;
-interface ModelAnnotationData extends ResponseBase, NeededData, ProblemResponse, FinalResponse {
-    modelAnnotations: AnnotationsDef;
-}
-export type ModelAnnotationResponse = Partial<ModelAnnotationData>;
 interface Completions extends ResponseBase, NeededData, ProblemResponse, FinalResponse {
     completions: DocumentCompletion[];
 }

package/dist/lang/translate-response.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.isNeedResponse = isNeedResponse;

package/dist/lang/utils.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.locationContainsPosition = locationContainsPosition;

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;