@malloydata/malloy 0.0.403 → 0.0.405

package/dist/api/foundation/core.js

@@ -5,6 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreparedResult = exports.PreparedQuery = exports.Given = exports.PersistSource = exports.Model = exports.Reference = exports.ExploreField = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.AtomicField = exports.Explore = exports.JoinRelationship = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicFieldType = exports.SourceRelationship = void 0;
+exports.pseudoModelFor = pseudoModelFor;
 const model_1 = require("../../model");
 const utils_1 = require("../../model/utils");
 const dialect_1 = require("../../dialect");
@@ -22,6 +23,30 @@ function isSourceComponent(source) {
         source.type === 'sql_select' ||
         source.type === 'query_source');
 }
+/**
+ * A synthetic single-source model for an `Explore` that has no real model in
+ * hand — the deserialization (`Explore.fromJSON`) and raw-SQL-block paths.
+ * Wraps just the one struct so SQL generation has something to compile
+ * against.
+ *
+ * `modelID` + `modelAnnotations` reconstitute the model-annotation closure:
+ * `fromJSON` passes the values captured by `toJSON` so a deserialized Explore
+ * folds its model annotations exactly as the live one did. The raw-SQL-block
+ * and default paths pass nothing and get an empty map (the honest answer for a
+ * genuinely detached struct). The default constant `modelID` (rather than
+ * `mkModelDef`'s random one) keeps `fromJSON(x.toJSON())` deep-equal to `x` for
+ * the no-annotations case.
+ */
+const GENERATED_MODEL_ID = 'internal://generated-model';
+function pseudoModelFor(structDef, modelID = GENERATED_MODEL_ID, modelAnnotations = {}) {
+    if (!(0, model_1.isSourceDef)(structDef)) {
+        throw new Error(`Cannot create pseudo model for struct type ${structDef.type}`);
+    }
+    const def = (0, utils_1.mkModelDef)('generated_model', modelID);
+    def.modelAnnotations = modelAnnotations;
+    def.contents[structDef.name] = structDef;
+    return def;
+}
 // =============================================================================
 // Entity - Base class for Explore and Field types
 // =============================================================================
@@ -130,12 +155,20 @@ var JoinRelationship;
 // Explore
 // =============================================================================
 class Explore extends Entity {
-    constructor(structDef, parentExplore, source) {
-        super(structDef.as || structDef.name, parentExplore, source);
+    constructor(modelDef, structDef, parentExplore, source) {
+        super((0, model_1.activeName)(structDef), parentExplore, source);
+        this._ownerModelDef = modelDef;
         this._structDef = structDef;
         this._parentExplore = parentExplore;
         this.sourceExplore = source;
     }
+    /** The model this Explore was resolved in. For detached Explores
+     *  (`fromJSON`, raw SQL block) this is a synthetic single-source model
+     *  with no model annotations. Read by child fields to resolve their own
+     *  model annotations. */
+    get _modelDef() {
+        return this._ownerModelDef;
+    }
     get source() {
         return this.sourceExplore;
     }
@@ -159,22 +192,29 @@ class Explore extends Entity {
     get annotations() {
         return new annotation_1.Annotations(this._structDef.annotations);
     }
+    /** The model annotations resolved for this object. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this._ownerModelDef));
+    }
+    /**
+     * @deprecated Use `.modelAnnotations.parseAsTag(route)`.
+     */
     get modelTag() {
-        this.parsedModelTag || (this.parsedModelTag = new annotation_1.Annotations(this._structDef.modelAnnotations).parseAsTag().tag);
+        this.parsedModelTag || (this.parsedModelTag = this.modelAnnotations.parseAsTag().tag);
         return this.parsedModelTag;
     }
     /**
      * @return The name of the entity.
      */
     get name() {
-        return this.structDef.as || this.structDef.name;
+        return (0, model_1.activeName)(this.structDef);
     }
     getQueryByName(name) {
         const structRef = this.sourceStructDef;
         if (!structRef) {
             throw new Error(`Cannot get query by name from a struct of type ${this.structDef.type}`);
         }
-        const view = structRef.fields.find(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === name; });
+        const view = structRef.fields.find(f => (0, model_1.activeName)(f) === name);
         if (view === undefined) {
             throw new Error(`No such view named \`${name}\``);
         }
@@ -188,23 +228,15 @@ class Explore extends Entity {
         };
         return new PreparedQuery(internalQuery, this.getSingleExploreModel(), [], name);
     }
-    get modelDef() {
-        if (!(0, model_1.isSourceDef)(this.structDef)) {
-            throw new Error(`Cannot create pseudo model for struct type ${this.structDef.type}`);
-        }
-        const def = (0, utils_1.mkModelDef)('generated_model');
-        def.contents[this.structDef.name] = this.structDef;
-        return def;
-    }
     getSingleExploreModel() {
-        return new Model(this.modelDef, [], []);
+        return new Model(this._ownerModelDef, [], []);
     }
     get fieldMap() {
         var _a;
         if (this._fieldMap === undefined) {
             const sourceFields = ((_a = this.source) === null || _a === void 0 ? void 0 : _a.fieldMap) || new Map();
             this._fieldMap = new Map(this.structDef.fields.map(fieldDef => {
-                const name = fieldDef.as || fieldDef.name;
+                const name = (0, model_1.activeName)(fieldDef);
                 const sourceField = sourceFields.get(fieldDef.name);
                 if ((0, model_1.isJoined)(fieldDef)) {
                     return [name, new ExploreField(fieldDef, this, sourceField)];
@@ -336,6 +368,8 @@ class Explore extends Entity {
         var _a, _b;
         return {
             _structDef: this._structDef,
+            modelID: this._ownerModelDef.modelID,
+            modelAnnotations: this._ownerModelDef.modelAnnotations,
             sourceExplore: (_a = this.sourceExplore) === null || _a === void 0 ? void 0 : _a.toJSON(),
             _parentExplore: (_b = this._parentExplore) === null || _b === void 0 ? void 0 : _b.toJSON(),
         };
@@ -347,7 +381,7 @@ class Explore extends Entity {
         const sourceExplore = main_explore.sourceExplore !== undefined
             ? Explore.fromJSON(main_explore.sourceExplore)
             : undefined;
-        return new Explore(main_explore._structDef, parentExplore, sourceExplore);
+        return new Explore(pseudoModelFor(main_explore._structDef, main_explore.modelID, main_explore.modelAnnotations), main_explore._structDef, parentExplore, sourceExplore);
     }
     get location() {
         return this.structDef.location;
@@ -431,7 +465,7 @@ exports.Explore = Explore;
 // =============================================================================
 class AtomicField extends Entity {
     constructor(fieldTypeDef, parent, source) {
-        super(fieldTypeDef.as || fieldTypeDef.name, parent, source);
+        super((0, model_1.activeName)(fieldTypeDef), parent, source);
         this.fieldTypeDef = fieldTypeDef;
         this.parent = parent;
     }
@@ -475,6 +509,10 @@ class AtomicField extends Entity {
     get annotations() {
         return new annotation_1.Annotations(this.fieldTypeDef.annotations);
     }
+    /** The model annotations resolved for this field, via its parent. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this.parent._modelDef));
+    }
     isIntrinsic() {
         return (0, model_1.fieldIsIntrinsic)(this.fieldTypeDef);
     }
@@ -651,7 +689,7 @@ exports.StringField = StringField;
 // =============================================================================
 class Query extends Entity {
     constructor(turtleDef, parent, source) {
-        super(turtleDef.as || turtleDef.name, parent, source);
+        super((0, model_1.activeName)(turtleDef), parent, source);
         this.turtleDef = turtleDef;
     }
     get source() {
@@ -674,6 +712,13 @@ class Query extends Entity {
     get annotations() {
         return new annotation_1.Annotations(this.turtleDef.annotations);
     }
+    /** The model annotations resolved for this view, via its parent
+     *  explore. A bare `Query` with no parent has none. */
+    get modelAnnotations() {
+        var _a;
+        const modelDef = (_a = this._parent) === null || _a === void 0 ? void 0 : _a._modelDef;
+        return new annotation_1.Annotations(modelDef && (0, model_1.getModelAnnotations)(modelDef));
+    }
 }
 exports.Query = Query;
 class QueryField extends Query {
@@ -710,7 +755,7 @@ exports.QueryField = QueryField;
 // =============================================================================
 class ExploreField extends Explore {
     constructor(structDef, parentExplore, source) {
-        super(structDef, parentExplore, source);
+        super(parentExplore._modelDef, structDef, parentExplore, source);
         this._parentExplore = parentExplore;
     }
     get joinRelationship() {
@@ -874,21 +919,30 @@ class Model {
                 continue;
             const decl = givens[entry.id];
             if (decl && !decl.inline) {
-                out.set(surfaceName, new Given(surfaceName, entry.id, decl));
+                out.set(surfaceName, new Given(surfaceName, entry.id, decl, this.modelDef));
             }
         }
         return out;
     }
+    /** This model's own `##` bundle (its self-entry's `ownNotes`). */
+    get _ownModelAnnotations() {
+        var _a;
+        return (_a = this.modelDef.modelAnnotations[this.modelDef.modelID]) === null || _a === void 0 ? void 0 : _a.ownNotes;
+    }
     /** @deprecated Use `.annotations.parseAsTag(route)`. */
     tagParse(spec) {
-        return (0, annotation_1.annotationToTag)(this.modelDef.annotations, spec);
+        return (0, annotation_1.annotationToTag)(this._ownModelAnnotations, spec);
     }
     /** @deprecated Use `.annotations.texts(route)`. */
     getTaglines(prefix) {
-        return (0, annotation_1.annotationToTaglines)(this.modelDef.annotations, prefix);
+        return (0, annotation_1.annotationToTaglines)(this._ownModelAnnotations, prefix);
     }
     get annotations() {
-        return new annotation_1.Annotations(this.modelDef.annotations);
+        return new annotation_1.Annotations(this._ownModelAnnotations);
+    }
+    /** The model annotations resolved across this model's import/extend lineage. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this.modelDef));
     }
     /**
      * Retrieve a reference for the token at the given position within the
@@ -976,7 +1030,7 @@ class Model {
     getExploreByName(name) {
         const struct = this.getContent(name);
         if (struct && (0, model_1.isSourceDef)(struct)) {
-            return new Explore(struct);
+            return new Explore(this.modelDef, struct);
         }
         throw new Error("'name' is not an explore");
     }
@@ -988,7 +1042,7 @@ class Model {
     get explores() {
         return Object.values(this.modelDef.contents)
             .filter(model_1.isSourceDef)
-            .map(structDef => new Explore(structDef));
+            .map(structDef => new Explore(this.modelDef, structDef));
     }
     /**
      * Enumerate the model's top-level queries by identifier.
@@ -1040,8 +1094,10 @@ class Model {
      * @return BuildPlan with graphs and sources map
      */
     getBuildPlan() {
-        // Require experimental.persistence compiler flag
-        const modelTag = this.annotations.parseAsTag('!').tag;
+        // Require experimental.persistence compiler flag. Read the resolved model
+        // annotations (`.modelAnnotations`, the import/extend fold) rather than this
+        // model's own `##` so the flag carries across extend.
+        const modelTag = this.modelAnnotations.parseAsTag('!').tag;
         if (!modelTag.has('experimental', 'persistence')) {
             throw new Error('Model must have ##! experimental.persistence to use getBuildPlan()');
         }
@@ -1069,7 +1125,7 @@ class Model {
                 if (!(node.sourceID in sourcesMap)) {
                     const sourceDef = (0, source_def_utils_1.resolveSourceID)(this.modelDef, node.sourceID);
                     if (sourceDef) {
-                        sourcesMap[node.sourceID] = new PersistSource(new Explore(sourceDef), this);
+                        sourcesMap[node.sourceID] = new PersistSource(new Explore(this.modelDef, sourceDef), this);
                     }
                 }
                 collectSources(node.dependsOn);
@@ -1167,6 +1223,10 @@ class PersistSource {
     get annotations() {
         return this.explore.annotations;
     }
+    /** The model annotations resolved for this source. */
+    get modelAnnotations() {
+        return this.explore.modelAnnotations;
+    }
     /**
      * The connection name for this source.
      */
@@ -1247,11 +1307,14 @@ class Given {
      *                    value to `.run({givens: {[name]: ...}})`.
      * @param id          Global GivenID. Stable across imports and renames.
      * @param _internal   The internal Given declaration record.
+     * @param _modelDef   The model this given is declared in, for resolving
+     *                    its model annotations.
      */
-    constructor(name, id, _internal) {
+    constructor(name, id, _internal, _modelDef) {
         this.name = name;
         this.id = id;
         this._internal = _internal;
+        this._modelDef = _modelDef;
     }
     get type() {
         return this._internal.type;
@@ -1274,6 +1337,10 @@ class Given {
     get annotations() {
         return new annotation_1.Annotations(this._internal.annotations);
     }
+    /** The model annotations resolved for this given. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this._modelDef));
+    }
 }
 exports.Given = Given;
 /**
@@ -1314,6 +1381,10 @@ class PreparedQuery extends PipelineBase {
     get _modelDef() {
         return this._model._modelDef;
     }
+    /** The model annotations resolved for this query's head. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this._modelDef));
+    }
     /**
      * Generate the SQL for this query.
      *
@@ -1423,6 +1494,10 @@ class PreparedResult {
     get annotations() {
         return new annotation_1.Annotations(this.inner.annotations);
     }
+    /** The model annotations resolved for this query's run-head. */
+    get modelAnnotations() {
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this.modelDef));
+    }
     /**
      * @deprecated Hands out raw IR (`AnnotationsDef`). Use `.annotations`
      * (returns the {@link Annotations} view) for read access. Internal
@@ -1433,15 +1508,15 @@ class PreparedResult {
         return this.inner.annotations;
     }
     /**
-     * @deprecated Hands out raw IR (`AnnotationsDef`). Internal code that
-     * needs the model-level IR shape should read `._modelDef.annotations`
+     * @deprecated Hands out raw IR (`AnnotationsDef`). Internal code that needs
+     * the model-level IR shape should call `getModelAnnotations(this.modelDef)`
      * directly. Slated for removal once external consumers migrate.
      */
     get modelAnnotation() {
-        return this.modelDef.annotations;
+        return (0, model_1.getModelAnnotations)(this.modelDef);
     }
     get modelTag() {
-        return new annotation_1.Annotations(this.modelDef.annotations).parseAsTag().tag;
+        return new annotation_1.Annotations((0, model_1.getModelAnnotations)(this.modelDef)).parseAsTag().tag;
     }
     /**
      * @return The name of the connection this query should be run against.
@@ -1476,17 +1551,17 @@ class PreparedResult {
             name: this.inner.queryName || explore.name,
         };
         try {
-            return new Explore(namedExplore, this.sourceExplore);
+            return new Explore(this.modelDef, namedExplore, this.sourceExplore);
         }
         catch (error) {
-            return new Explore(namedExplore);
+            return new Explore(this.modelDef, namedExplore);
         }
     }
     get sourceExplore() {
         const name = this.inner.sourceExplore;
         const explore = (0, model_1.safeRecordGet)(this.modelDef.contents, name);
         if (explore && (0, model_1.isSourceDef)(explore)) {
-            return new Explore(explore);
+            return new Explore(this.modelDef, explore);
         }
     }
     get _sourceExploreName() {
@@ -1543,7 +1618,7 @@ class PreparedResult {
                 .set(['query_name'], this.inner.queryName || struct.name)
                 .toString(),
         });
-        const modelAnnotations = (0, to_stable_1.toStableAnnotations)(this.modelDef.annotations);
+        const modelAnnotations = (0, to_stable_1.toStableAnnotations)((0, model_1.getModelAnnotations)(this.modelDef));
         return {
             schema,
             data,

package/dist/api/foundation/result.js

@@ -412,10 +412,9 @@ function walkQueryData(data, structDef, normalizers) {
  * Walk a QueryRecord and normalize values according to the given normalizers.
  */
 function walkQueryRecord(row, structDef, normalizers) {
-    var _a;
     const result = {};
     for (const fieldDef of structDef.fields) {
-        const fieldName = (_a = fieldDef.as) !== null && _a !== void 0 ? _a : fieldDef.name;
+        const fieldName = (0, model_1.activeName)(fieldDef);
         const value = row[fieldName];
         result[fieldName] = walkValue(value, fieldDef, normalizers);
     }

package/dist/api/foundation/runtime.js

@@ -666,6 +666,7 @@ class ModelMaterializer extends FluentState {
             const queryModel = await compile_1.Malloy.compile({
                 source: text,
                 restrictedMode: true,
+                method: 'query',
                 urlReader,
                 connections,
                 model,
@@ -701,6 +702,7 @@ class ModelMaterializer extends FluentState {
                 urlReader,
                 connections,
                 model,
+                method: 'extendModel',
                 refreshSchemaCache: options === null || options === void 0 ? void 0 : options.refreshSchemaCache,
                 noThrowOnError: options === null || options === void 0 ? void 0 : options.noThrowOnError,
                 importBaseURL: options === null || options === void 0 ? void 0 : options.importBaseURL,
@@ -868,16 +870,6 @@ class ModelMaterializer extends FluentState {
     }
 }
 exports.ModelMaterializer = ModelMaterializer;
-// =============================================================================
-// QueryMaterializer
-// =============================================================================
-function runSQLOptionsWithAnnotations(preparedResult, givenOptions) {
-    return {
-        queryAnnotations: preparedResult._rawQuery.annotations,
-        modelAnnotations: preparedResult._modelDef.annotations,
-        ...givenOptions,
-    };
-}
 class QueryMaterializer extends FluentState {
     constructor(runtime, materialize, options) {
         super(runtime, materialize);
@@ -958,17 +950,15 @@ class QueryMaterializer extends FluentState {
     async run(options) {
         const connections = this.runtime.connections;
         const preparedResult = await this.getPreparedResult(options);
-        const finalOptions = runSQLOptionsWithAnnotations(preparedResult, options);
-        return compile_1.Malloy.run({ connections, preparedResult, options: finalOptions });
+        return compile_1.Malloy.run({ connections, preparedResult, options });
     }
     async *runStream(options) {
         const preparedResult = await this.getPreparedResult(options);
         const connections = this.runtime.connections;
-        const finalOptions = runSQLOptionsWithAnnotations(preparedResult, options);
         const stream = compile_1.Malloy.runStream({
             connections,
             preparedResult,
-            options: finalOptions,
+            options,
         });
         for await (const row of stream) {
             yield row;
@@ -1010,7 +1000,9 @@ class QueryMaterializer extends FluentState {
                 buildManifest = undefined;
             }
             if (buildManifest) {
-                const modelTag = preparedQuery.model.annotations.parseAsTag('!').tag;
+                // Resolved model annotations (the import/extend fold), so the
+                // `experimental.persistence` flag carries across extend.
+                const modelTag = preparedQuery.model.modelAnnotations.parseAsTag('!').tag;
                 if (!modelTag.has('experimental', 'persistence')) {
                     if (explicitManifest) {
                         // Explicitly passed non-empty manifest requires persistence support
@@ -1177,21 +1169,19 @@ class PreparedResultMaterializer extends FluentState {
     async run(options) {
         const preparedResult = await this.getPreparedResult();
         const connections = this.runtime.connections;
-        const finalOptions = runSQLOptionsWithAnnotations(preparedResult, options);
         return compile_1.Malloy.run({
             connections,
             preparedResult,
-            options: finalOptions,
+            options,
         });
     }
     async *runStream(options) {
         const preparedResult = await this.getPreparedResult();
         const connections = this.runtime.connections;
-        const finalOptions = runSQLOptionsWithAnnotations(preparedResult, options);
         const stream = compile_1.Malloy.runStream({
             connections,
             preparedResult,
-            options: finalOptions,
+            options,
         });
         for await (const row of stream) {
             yield row;

package/dist/api/foundation/taggable.d.ts

@@ -11,6 +11,11 @@ export interface Taggable {
      * `tagParse`/`getTaglines`, this sees multi-line annotations (`#|`…`|#`).
      */
     readonly annotations: Annotations;
+    /**
+     * The model annotations for this object, resolved across its import/extend
+     * lineage. Empty for an object with no model in hand.
+     */
+    readonly modelAnnotations: Annotations;
     /**
      * @deprecated The RegExp form cannot see multi-line annotations
      * (`#|`…`|#`) and cannot report content offsets for error mapping. Use

package/dist/api/foundation/types.d.ts

@@ -21,7 +21,22 @@ export interface ParseOptions {
     testEnvironment?: boolean;
     /** Reject language constructs that reach outside the trusted model. */
     restrictedMode?: boolean;
+    /**
+     * Diagnostic label for the synthetic URL minted when compiling inline
+     * source that has no URL of its own: `internal://<method>/<uuid>`. Each
+     * such compile still gets a unique id regardless; this just makes the
+     * originating operation legible in error locations and annotation
+     * provenance. Read solely to build that URL — never branched on.
+     */
+    method?: CompileMethod;
 }
+/**
+ * The operation behind a URL-less (inline-source) compile, used only to
+ * label its synthetic `internal://` URL. `query` covers both the stable
+ * query-compile path and `loadRestrictedQuery`; `loadQuery` is a `loadModel`
+ * under the hood and carries that label.
+ */
+export type CompileMethod = 'loadModel' | 'extendModel' | 'query';
 /** Options for how to run the Malloy semantic checker/translator */
 export interface CompileOptions {
     refreshSchemaCache?: boolean | number;

package/dist/api/index.js

@@ -1,4 +1,8 @@
 "use strict";
+/*
+ * 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;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -37,12 +41,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.util = exports.asynchronous = exports.stateless = exports.sessioned = void 0;
-/*
- * 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.
- */
 exports.sessioned = __importStar(require("./sessioned"));
 exports.stateless = __importStar(require("./stateless"));
 exports.asynchronous = __importStar(require("./asynchronous"));

package/dist/api/sessioned.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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/api/stateless.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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/api/util.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.DEFAULT_LOG_RANGE = void 0;

package/dist/connection/base_connection.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.BaseConnection = void 0;

package/dist/connection/types.d.ts

@@ -1,13 +1,11 @@
 import type { RunSQLOptions } from '../run_sql_options';
-import type { AnnotationsDef, MalloyQueryData, QueryRecord, QueryRunStats, SQLSourceDef, TableSourceDef } from '../model/malloy_types';
+import type { MalloyQueryData, QueryRecord, QueryRunStats, SQLSourceDef, TableSourceDef } from '../model/malloy_types';
 import type { SQLSourceRequest } from '../lang/translate-response';
 /**
  * Options passed to fetchSchema methods.
  */
 export interface FetchSchemaOptions {
     refreshTimestamp?: number;
-    /** Model annotations forwarded to the adapter (e.g. `##!` dialect flags). */
-    modelAnnotations?: AnnotationsDef;
 }
 /**
  * An object capable of reading schemas for given table names.

package/dist/connection_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.toAsyncGenerator = toAsyncGenerator;

package/dist/dialect/dialect.d.ts

@@ -230,6 +230,13 @@ export declare abstract class Dialect {
      * - `EscapeStyle.Unset` (default): base method throws if reached.
      */
     identifierEscapeStyle: EscapeStyleValue;
+    /**
+     * Escape the body of a backslash-style quoted token (`EscapeStyle.Backslash`
+     * dialects) — the backslash, the closing `delim`, and newline/CR/tab. The
+     * newline matters: BigQuery rejects a raw one ("Unclosed string literal").
+     * `\0` / U+2028 / U+2029 are passed through (no evidence they break a lexer).
+     */
+    protected escapeBackslashStyle(body: string, delim: string): string;
     /**
      * Wrap an identifier in the dialect's quote character, escaping any
      * embedded quote characters per the dialect's `identifierEscapeStyle`.
@@ -446,10 +453,8 @@ export declare abstract class Dialect {
      */
     sqlLiteralString(literal: string): string;
     /**
-     * Render a Malloy regex literal as a SQL string literal. Defaults to
-     * `sqlLiteralString` — the regex engine receives whatever bytes the
-     * SQL parser decodes, and `sqlLiteralString` already produces a
-     * correctly decoding literal for both escape styles.
+     * Render a Malloy regex literal. Defaults to `sqlLiteralString`: the regex
+     * engine receives whatever the SQL parser decodes, which is already correct.
      */
     sqlLiteralRegexp(literal: string): string;
     abstract sqlLiteralArray(lit: ArrayLiteralNode): string;