@malloydata/malloy 0.0.194-dev241001154534 → 0.0.194-dev241001231135

package/dist/malloy.d.ts

@@ -61,15 +61,13 @@ export declare class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, replaceMaterializedReferences, }: {
+    static compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, replaceMaterializedReferences, materializedTablePrefix, }: {
         urlReader: URLReader;
         connections: LookupConnection<InfoConnection>;
         parse: Parse;
         model?: Model;
     } & CompileOptions & PrepareResultOptions): Promise<Model>;
-    static compileSQLBlock(partialModel: ModelDef | undefined, toCompile: SQLBlockSource, options?: {
-        replaceMaterializedReferences?: boolean;
-    }): SQLBlock;
+    static compileSQLBlock(partialModel: ModelDef | undefined, toCompile: SQLBlockSource, options?: PrepareResultOptions): SQLBlock;
     /**
      * Run a fully-prepared query.
      *
@@ -621,6 +619,11 @@ export declare class AtomicField extends Entity implements Taggable {
     isCalculation(): boolean;
     get sourceField(): Field;
     get sourceClasses(): string[];
+    /**
+     * A unique ID of this field within the context of a result; undefined
+     * for fields that are not derived from a Result.
+     */
+    get referenceId(): string | undefined;
     sourceWasMeasure(): boolean;
     sourceWasMeasureLike(): boolean;
     sourceWasDimension(): boolean;
@@ -887,7 +890,7 @@ declare class FluentState<T> {
  */
 export declare class ModelMaterializer extends FluentState<Model> {
     protected runtime: Runtime;
-    private readonly replaceMaterializedReferences;
+    private readonly prepareResultOptions;
     constructor(runtime: Runtime, materialize: () => Promise<Model>, options?: PrepareResultOptions);
     /**
      * Load the final (unnamed) Malloy query contained within this loaded `Model`.
@@ -1021,7 +1024,7 @@ export declare class ModelMaterializer extends FluentState<Model> {
  */
 export declare class QueryMaterializer extends FluentState<PreparedQuery> {
     protected runtime: Runtime;
-    private readonly replaceMaterializedReferences;
+    private readonly prepareResultOptions;
     constructor(runtime: Runtime, materialize: () => Promise<PreparedQuery>, options?: PrepareResultOptions);
     /**
      * Run this loaded `Query`.

package/dist/malloy.js

@@ -80,7 +80,7 @@ class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static async compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, replaceMaterializedReferences, }) {
+    static async compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, replaceMaterializedReferences, materializedTablePrefix, }) {
         var _a, _b, _c, _d;
         let refreshTimestamp;
         if (refreshSchemaCache) {
@@ -177,7 +177,7 @@ class Malloy {
                     const connectionName = toCompile.connection;
                     try {
                         const conn = await connections.lookupConnection(connectionName);
-                        const expanded = Malloy.compileSQLBlock(result.partialModel, toCompile, { replaceMaterializedReferences });
+                        const expanded = Malloy.compileSQLBlock(result.partialModel, toCompile, { replaceMaterializedReferences, materializedTablePrefix });
                         const resolved = await conn.fetchSchemaForSQLBlock(expanded, {
                             refreshTimestamp,
                             modelAnnotation,
@@ -1268,6 +1268,14 @@ class AtomicField extends Entity {
         const sourceField = this.fieldTypeDef.name || this.fieldTypeDef.as;
         return sourceField ? [sourceField] : [];
     }
+    /**
+     * A unique ID of this field within the context of a result; undefined
+     * for fields that are not derived from a Result.
+     */
+    get referenceId() {
+        var _a;
+        return (_a = this.fieldTypeDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.referenceId;
+    }
     // was the field generated from a measure in the previous query
     sourceWasMeasure() {
         var _a;
@@ -1621,6 +1629,7 @@ class Runtime {
                 refreshSchemaCache,
                 noThrowOnError,
                 replaceMaterializedReferences: options === null || options === void 0 ? void 0 : options.replaceMaterializedReferences,
+                materializedTablePrefix: options === null || options === void 0 ? void 0 : options.materializedTablePrefix,
             });
         }, options);
     }
@@ -1834,11 +1843,9 @@ class FluentState {
  */
 class ModelMaterializer extends FluentState {
     constructor(runtime, materialize, options) {
-        var _a;
         super(runtime, materialize);
         this.runtime = runtime;
-        this.replaceMaterializedReferences =
-            (_a = options === null || options === void 0 ? void 0 : options.replaceMaterializedReferences) !== null && _a !== void 0 ? _a : false;
+        this.prepareResultOptions = options;
     }
     /**
      * Load the final (unnamed) Malloy query contained within this loaded `Model`.
@@ -1850,7 +1857,7 @@ class ModelMaterializer extends FluentState {
         return this.makeQueryMaterializer(async () => {
             return (await this.materialize()).getPreparedQuery();
         }, {
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
     }
@@ -1865,7 +1872,7 @@ class ModelMaterializer extends FluentState {
         return this.makeQueryMaterializer(async () => {
             return (await this.materialize()).getPreparedQueryByIndex(index);
         }, {
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
     }
@@ -1880,7 +1887,7 @@ class ModelMaterializer extends FluentState {
         return this.makeQueryMaterializer(async () => {
             return (await this.materialize()).getPreparedQueryByName(name);
         }, {
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
     }
@@ -1894,7 +1901,6 @@ class ModelMaterializer extends FluentState {
     loadQuery(query, options) {
         const { refreshSchemaCache, noThrowOnError } = options || {};
         return this.makeQueryMaterializer(async () => {
-            var _a;
             const urlReader = this.runtime.urlReader;
             const connections = this.runtime.connections;
             if (this.runtime.isTestRuntime) {
@@ -1923,7 +1929,7 @@ class ModelMaterializer extends FluentState {
                 model,
                 refreshSchemaCache,
                 noThrowOnError,
-                replaceMaterializedReferences: (_a = options === null || options === void 0 ? void 0 : options.replaceMaterializedReferences) !== null && _a !== void 0 ? _a : this.replaceMaterializedReferences,
+                ...this.prepareResultOptions,
             });
             return queryModel.preparedQuery;
         });
@@ -1945,7 +1951,6 @@ class ModelMaterializer extends FluentState {
             }
         }
         return new ModelMaterializer(this.runtime, async () => {
-            var _a;
             const urlReader = this.runtime.urlReader;
             const connections = this.runtime.connections;
             const parse = query instanceof URL
@@ -1966,7 +1971,7 @@ class ModelMaterializer extends FluentState {
                 model,
                 refreshSchemaCache: options === null || options === void 0 ? void 0 : options.refreshSchemaCache,
                 noThrowOnError: options === null || options === void 0 ? void 0 : options.noThrowOnError,
-                replaceMaterializedReferences: (_a = options === null || options === void 0 ? void 0 : options.replaceMaterializedReferences) !== null && _a !== void 0 ? _a : this.replaceMaterializedReferences,
+                ...this.prepareResultOptions,
             });
             return queryModel;
         }, options);
@@ -2102,7 +2107,7 @@ class ModelMaterializer extends FluentState {
             const model = await this.materialize();
             return new PreparedQuery(query, model._modelDef, model.problems);
         }, {
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
     }
@@ -2116,9 +2121,7 @@ class ModelMaterializer extends FluentState {
     loadExploreByName(name) {
         return this.makeExploreMaterializer(async () => {
             return (await this.materialize()).getExploreByName(name);
-        }, {
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
-        });
+        }, this.prepareResultOptions);
     }
     /**
      * Materialize an explore contained within this loaded `Model` by its name.
@@ -2146,11 +2149,9 @@ exports.ModelMaterializer = ModelMaterializer;
  */
 class QueryMaterializer extends FluentState {
     constructor(runtime, materialize, options) {
-        var _a;
         super(runtime, materialize);
         this.runtime = runtime;
-        this.replaceMaterializedReferences =
-            (_a = options === null || options === void 0 ? void 0 : options.replaceMaterializedReferences) !== null && _a !== void 0 ? _a : false;
+        this.prepareResultOptions = options;
     }
     /**
      * Run this loaded `Query`.
@@ -2160,7 +2161,7 @@ class QueryMaterializer extends FluentState {
     async run(options) {
         const connections = this.runtime.connections;
         const preparedResult = await this.getPreparedResult({
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
         const finalOptions = runSQLOptionsWithAnnotations(preparedResult, options);
@@ -2168,7 +2169,7 @@ class QueryMaterializer extends FluentState {
     }
     async *runStream(options) {
         const preparedResult = await this.getPreparedResult({
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
         const connections = this.runtime.connections;
@@ -2191,7 +2192,7 @@ class QueryMaterializer extends FluentState {
     loadPreparedResult(options) {
         return this.makePreparedResultMaterializer(async () => {
             return (await this.materialize()).getPreparedResult({
-                replaceMaterializedReferences: this.replaceMaterializedReferences,
+                ...this.prepareResultOptions,
                 ...options,
             });
         });
@@ -2203,7 +2204,7 @@ class QueryMaterializer extends FluentState {
      */
     getPreparedResult(options) {
         return this.loadPreparedResult({
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         }).getPreparedResult();
     }
@@ -2214,7 +2215,7 @@ class QueryMaterializer extends FluentState {
      */
     async getSQL(options) {
         return (await this.getPreparedResult({
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         })).sql;
     }
@@ -2234,7 +2235,7 @@ class QueryMaterializer extends FluentState {
     async estimateQueryCost(options) {
         const connections = this.runtime.connections;
         const preparedResult = await this.getPreparedResult({
-            replaceMaterializedReferences: this.replaceMaterializedReferences,
+            ...this.prepareResultOptions,
             ...options,
         });
         return Malloy.estimateQueryCost({ connections, preparedResult });

package/dist/model/malloy_query.d.ts

@@ -35,7 +35,7 @@ declare class StageWriter {
     root(): StageWriter;
     addStage(sql: string): string;
     addUDF(stageWriter: StageWriter, dialect: Dialect, structDef: StructDef): string;
-    addMaterializedQuery(fieldName: string, query: Query): string;
+    addMaterializedQuery(fieldName: string, query: Query, materializatedTablePrefix?: string): string;
     addPDT(baseName: string, dialect: Dialect): string;
     combineStages(includeLastStage: boolean): {
         sql: string;
@@ -63,7 +63,8 @@ declare abstract class QueryNode {
 declare class QueryField extends QueryNode {
     fieldDef: FieldDef;
     parent: QueryStruct;
-    constructor(fieldDef: FieldDef, parent: QueryStruct);
+    readonly referenceId: string;
+    constructor(fieldDef: FieldDef, parent: QueryStruct, referenceId?: string);
     uniqueKeyPossibleUse(): UniqueKeyPossibleUse | undefined;
     getJoinableParent(): QueryStruct;
     caseGroup(groupSets: number[], s: string): string;
@@ -300,6 +301,7 @@ declare class QueryStruct extends QueryNode {
     pathAliasMap: Map<string, string>;
     dialect: Dialect;
     connectionName: string;
+    readonly stacki: string;
     constructor(fieldDef: StructDef, sourceArguments: Record<string, Argument> | undefined, parent: ParentQueryStruct | ParentQueryModel, prepareResultOptions?: PrepareResultOptions | undefined);
     resolveParentParameterReferences(param: Parameter): Parameter;
     private _arguments;
@@ -324,7 +326,7 @@ declare class QueryStruct extends QueryNode {
     getModel(): QueryModel;
     setParent(parent: ParentQueryStruct | ParentQueryModel): void;
     /** makes a new queryable field object from a fieldDef */
-    makeQueryField(field: FieldDef): QueryField;
+    makeQueryField(field: FieldDef, referenceId?: string): QueryField;
     structSourceSQL(stageWriter: StageWriter): string;
     root(): QueryStruct;
     primaryKey(): QueryAtomicField | undefined;

package/dist/model/malloy_query.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryModel = exports.Segment = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -21,8 +23,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryModel = exports.Segment = void 0;
+const uuid_1 = require("uuid");
 const dialect_1 = require("../dialect");
 const standardsql_1 = require("../dialect/standardsql/standardsql");
 const malloy_types_1 = require("./malloy_types");
@@ -106,7 +107,7 @@ class StageWriter {
         this.root().udfs.push(sql);
         return id;
     }
-    addMaterializedQuery(fieldName, query) {
+    addMaterializedQuery(fieldName, query, materializatedTablePrefix) {
         var _a;
         const name = query.name;
         if (!name) {
@@ -117,7 +118,7 @@ class StageWriter {
             throw new Error(`Trying to materialize query ${name}, but its path is not set.`);
         }
         // Creating an object that should uniquely identify a query within a Malloy model repo.
-        const queryMaterializationSpec = (0, utils_2.buildQueryMaterializationSpec)(path, name);
+        const queryMaterializationSpec = (0, utils_2.buildQueryMaterializationSpec)(path, name, materializatedTablePrefix);
         this.root().dependenciesToMaterialize[queryMaterializationSpec.id] =
             queryMaterializationSpec;
         return queryMaterializationSpec.id;
@@ -215,10 +216,11 @@ class QueryNode {
     }
 }
 class QueryField extends QueryNode {
-    constructor(fieldDef, parent) {
+    constructor(fieldDef, parent, referenceId) {
         super(fieldDef);
         this.parent = parent;
         this.fieldDef = fieldDef;
+        this.referenceId = referenceId !== null && referenceId !== void 0 ? referenceId : (0, uuid_1.v4)();
     }
     uniqueKeyPossibleUse() {
         return undefined;
@@ -1822,22 +1824,25 @@ class QueryQuery extends QueryField {
                     (fieldDef.name || fieldDef.as || 'undefined');
                 const sourceExpression = fieldDef.code;
                 const sourceClasses = [sourceField];
+                const referenceId = fi.f.referenceId;
+                const base = {
+                    sourceField,
+                    sourceExpression,
+                    sourceClasses,
+                    referenceId,
+                };
                 if (isCalculatedField(fi.f)) {
                     filterList = fi.f.getFilterList();
                     return {
-                        sourceField,
-                        sourceExpression,
+                        ...base,
                         filterList,
-                        sourceClasses,
                         fieldKind: 'measure',
                     };
                 }
                 if (isScalarField(fi.f)) {
                     return {
-                        sourceField,
-                        sourceExpression,
+                        ...base,
                         filterList,
-                        sourceClasses,
                         fieldKind: 'dimension',
                     };
                 }
@@ -2979,6 +2984,7 @@ class QueryStruct extends QueryNode {
         this.prepareResultOptions = prepareResultOptions;
         this.nameMap = new Map();
         this._arguments = undefined;
+        this.stacki = new Error('').stack;
         this.setParent(parent);
         if ('model' in parent) {
             this.model = parent.model;
@@ -3229,33 +3235,33 @@ class QueryStruct extends QueryNode {
         }
     }
     /** makes a new queryable field object from a fieldDef */
-    makeQueryField(field) {
+    makeQueryField(field, referenceId) {
         switch (field.type) {
             case 'string':
-                return new QueryFieldString(field, this);
+                return new QueryFieldString(field, this, referenceId);
             case 'date':
-                return new QueryFieldDate(field, this);
+                return new QueryFieldDate(field, this, referenceId);
             case 'timestamp':
-                return new QueryFieldTimestamp(field, this);
+                return new QueryFieldTimestamp(field, this, referenceId);
             case 'number':
-                return new QueryFieldNumber(field, this);
+                return new QueryFieldNumber(field, this, referenceId);
             case 'boolean':
-                return new QueryFieldBoolean(field, this);
+                return new QueryFieldBoolean(field, this, referenceId);
             case 'json':
-                return new QueryFieldJSON(field, this);
+                return new QueryFieldJSON(field, this, referenceId);
             case 'sql native':
-                return new QueryFieldUnsupported(field, this);
+                return new QueryFieldUnsupported(field, this, referenceId);
             // case "reduce":
             // case "project":
             // case "index":
             case 'turtle':
-                return new QueryTurtle(field, this);
+                return new QueryTurtle(field, this, referenceId);
             default:
                 throw new Error(`unknown field definition ${JSON.stringify(field)}`);
         }
     }
     structSourceSQL(stageWriter) {
-        var _a;
+        var _a, _b;
         switch (this.fieldDef.structSource.type) {
             case 'table': {
                 const tablePath = this.fieldDef.structSource.tablePath;
@@ -3280,7 +3286,7 @@ class QueryStruct extends QueryNode {
                 // cache derived table.
                 if (((_a = this.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.replaceMaterializedReferences) &&
                     (0, utils_2.shouldMaterialize)(this.fieldDef.structSource.query.annotation)) {
-                    return stageWriter.addMaterializedQuery((0, malloy_types_1.getIdentifier)(this.fieldDef), this.fieldDef.structSource.query);
+                    return stageWriter.addMaterializedQuery((0, malloy_types_1.getIdentifier)(this.fieldDef), this.fieldDef.structSource.query, (_b = this.prepareResultOptions) === null || _b === void 0 ? void 0 : _b.materializedTablePrefix);
                 }
                 else {
                     // returns the stage name.
@@ -3339,10 +3345,13 @@ class QueryStruct extends QueryNode {
             if (field.parent === undefined) {
                 throw new Error('Expected field to have a parent');
             }
+            if (!(field instanceof QueryField)) {
+                throw new Error('Expected fieldref to reference a QueryField');
+            }
             return field.parent.makeQueryField({
                 ...field.fieldDef,
                 annotation: refAnnoatation,
-            });
+            }, field.referenceId);
         }
         return field;
     }
@@ -3512,7 +3521,7 @@ class QueryModel {
             sql: ret.stageWriter.generateSQLStages(),
             dependenciesToMaterialize: ret.stageWriter.dependenciesToMaterialize,
             materialization: (0, utils_2.shouldMaterialize)(query.annotation)
-                ? (0, utils_2.buildQueryMaterializationSpec)((_a = query.location) === null || _a === void 0 ? void 0 : _a.url, query.name)
+                ? (0, utils_2.buildQueryMaterializationSpec)((_a = query.location) === null || _a === void 0 ? void 0 : _a.url, query.name, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.materializedTablePrefix)
                 : undefined,
             structs: ret.structs,
             sourceExplore,

package/dist/model/malloy_types.d.ts

@@ -285,6 +285,7 @@ export interface ResultMetadataDef {
     sourceClasses: string[];
     filterList?: FilterCondition[];
     fieldKind: 'measure' | 'dimension' | 'struct';
+    referenceId?: string;
 }
 export interface ResultStructMetadataDef extends ResultMetadataDef {
     limit?: number;
@@ -783,5 +784,6 @@ export interface SearchValueMapResult {
 }
 export interface PrepareResultOptions {
     replaceMaterializedReferences?: boolean;
+    materializedTablePrefix?: string;
 }
 export {};

package/dist/model/materialization/utils.d.ts

@@ -1,3 +1,3 @@
 import { Annotation, QueryToMaterialize } from '../malloy_types';
 export declare function shouldMaterialize(annotation?: Annotation): boolean;
-export declare function buildQueryMaterializationSpec(path?: string, queryName?: string): QueryToMaterialize;
+export declare function buildQueryMaterializationSpec(path?: string, queryName?: string, materializatedTablePrefix?: string): QueryToMaterialize;

package/dist/model/materialization/utils.js

@@ -18,7 +18,7 @@ function shouldMaterialize(annotation) {
     return sourceTag.has('materialize');
 }
 exports.shouldMaterialize = shouldMaterialize;
-function buildQueryMaterializationSpec(path, queryName) {
+function buildQueryMaterializationSpec(path, queryName, materializatedTablePrefix) {
     if (!queryName) {
         throw new Error(`Query tagged to materialize, but its name is not specified. ${path}`);
     }
@@ -31,8 +31,8 @@ function buildQueryMaterializationSpec(path, queryName) {
         source: undefined,
         queryName,
     };
-    const objectHash = (0, utils_1.generateHash)(JSON.stringify(queryRep));
-    const id = `${queryName}-${objectHash}`;
+    const objectHash = (0, utils_1.generateHash)(JSON.stringify(queryRep)).replace(/-/g, '_');
+    const id = `${materializatedTablePrefix ? `${materializatedTablePrefix}_` : ''}${queryName}_${objectHash}`;
     return {
         ...queryRep,
         id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.194-dev241001154534",
+  "version": "0.0.194-dev241001231135",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",