@malloydata/malloy 0.0.192-dev240927231204 → 0.0.192-dev241001142343

package/dist/model/malloy_query.js

@@ -27,7 +27,7 @@ const dialect_1 = require("../dialect");
 const standardsql_1 = require("../dialect/standardsql/standardsql");
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
-const tags_1 = require("../tags");
+const utils_2 = require("./materialization/utils");
 function pathToCol(path) {
     return path.map(el => encodeURIComponent(el)).join('/');
 }
@@ -117,18 +117,10 @@ 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 queryRep = {
-            path: path,
-            source: undefined,
-            queryName: name,
-        };
-        const id = (0, utils_1.generateHash)(JSON.stringify(queryRep));
-        const uniqueName = `${name}-${id}`;
-        this.root().dependenciesToMaterialize[uniqueName] = {
-            ...queryRep,
-            id,
-        };
-        return uniqueName;
+        const queryMaterializationSpec = (0, utils_2.buildQueryMaterializationSpec)(path, name);
+        this.root().dependenciesToMaterialize[queryMaterializationSpec.id] =
+            queryMaterializationSpec;
+        return queryMaterializationSpec.id;
     }
     addPDT(baseName, dialect) {
         const sql = this.combineStages(false).sql + this.withs[this.withs.length - 1];
@@ -3286,13 +3278,8 @@ class QueryStruct extends QueryNode {
                 return '';
             case 'query': {
                 // cache derived table.
-                const clonedAnnotation = structuredClone(this.fieldDef.structSource.query.annotation);
-                if (clonedAnnotation) {
-                    clonedAnnotation.inherits = undefined;
-                }
-                const sourceTag = tags_1.Tag.annotationToTag(clonedAnnotation).tag;
                 if (((_a = this.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.replaceMaterializedReferences) &&
-                    sourceTag.has('materialize')) {
+                    (0, utils_2.shouldMaterialize)(this.fieldDef.structSource.query.annotation)) {
                     return stageWriter.addMaterializedQuery((0, malloy_types_1.getIdentifier)(this.fieldDef), this.fieldDef.structSource.query);
                 }
                 else {
@@ -3502,6 +3489,7 @@ class QueryModel {
         };
     }
     compileQuery(query, prepareResultOptions, finalize = true) {
+        var _a;
         let newModel;
         const m = newModel || this;
         const ret = m.loadQuery(query, undefined, prepareResultOptions, finalize, false);
@@ -3523,6 +3511,9 @@ class QueryModel {
             malloy: ret.malloy,
             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)
+                : undefined,
             structs: ret.structs,
             sourceExplore,
             sourceFilters: query.filterList,

package/dist/model/malloy_types.d.ts

@@ -735,6 +735,7 @@ export interface CompiledQuery extends DrillSource {
     queryTimezone?: string;
     annotation?: Annotation;
     dependenciesToMaterialize?: Record<string, QueryToMaterialize>;
+    materialization?: QueryToMaterialize;
 }
 /** Result type for running a Malloy query. */
 export interface QueryResult extends CompiledQuery {

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

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

package/dist/model/materialization/utils.js

@@ -0,0 +1,42 @@
+"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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildQueryMaterializationSpec = exports.shouldMaterialize = void 0;
+const tags_1 = require("../../tags");
+const utils_1 = require("../utils");
+function shouldMaterialize(annotation) {
+    const clonedAnnotation = structuredClone(annotation);
+    if (clonedAnnotation) {
+        clonedAnnotation.inherits = undefined;
+    }
+    const sourceTag = tags_1.Tag.annotationToTag(clonedAnnotation).tag;
+    return sourceTag.has('materialize');
+}
+exports.shouldMaterialize = shouldMaterialize;
+function buildQueryMaterializationSpec(path, queryName) {
+    if (!queryName) {
+        throw new Error(`Query tagged to materialize, but its name is not specified. ${path}`);
+    }
+    if (!path) {
+        throw new Error(`Query tagged to materialize, but its path is not specified: ${queryName}`);
+    }
+    // Creating an object that should uniquely identify a query within a Malloy model repo.
+    const queryRep = {
+        path: path,
+        source: undefined,
+        queryName,
+    };
+    const objectHash = (0, utils_1.generateHash)(JSON.stringify(queryRep));
+    const id = `${queryName}-${objectHash}`;
+    return {
+        ...queryRep,
+        id,
+    };
+}
+exports.buildQueryMaterializationSpec = buildQueryMaterializationSpec;
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.192-dev240927231204",
+  "version": "0.0.192-dev241001142343",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",