@malloydata/malloy 0.0.335 → 0.0.336

package/dist/model/stage_writer.js

@@ -5,8 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StageWriter = void 0;
-const utils_1 = require("./materialization/utils");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 class StageWriter {
     constructor(useCTE = true, parent) {
         this.parent = parent;
@@ -14,7 +13,6 @@ class StageWriter {
         this.stageNames = [];
         this.udfs = [];
         this.pdts = [];
-        this.dependenciesToMaterialize = {};
         this.stagePrefix = '__stage';
         this.stageNumber = 0;
         this.useCTE = useCTE;
@@ -43,7 +41,7 @@ class StageWriter {
         }
         else {
             this.withs[0] = sql;
-            return (0, utils_2.indent)(`\n(${sql})\n`);
+            return (0, utils_1.indent)(`\n(${sql})\n`);
         }
     }
     addUDF(stageWriter, dialect, structDef) {
@@ -53,31 +51,15 @@ class StageWriter {
         if (lastStageName === undefined) {
             throw new Error('Internal Error: no stage to combine');
         }
-        sql += dialect.sqlCreateFunctionCombineLastStage(lastStageName, (0, utils_2.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
+        sql += dialect.sqlCreateFunctionCombineLastStage(lastStageName, (0, utils_1.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
         const id = `${dialect.udfPrefix}${this.root().udfs.length}`;
         sql = dialect.sqlCreateFunction(id, sql);
         this.root().udfs.push(sql);
         return id;
     }
-    addMaterializedQuery(fieldName, query, materializatedTablePrefix) {
-        var _a;
-        const name = query.name;
-        if (!name) {
-            throw new Error(`Source ${fieldName} on a unnamed query that is tagged as materialize, only named queries can be materialized.`);
-        }
-        const path = (_a = query.location) === null || _a === void 0 ? void 0 : _a.url;
-        if (!path) {
-            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_1.buildQueryMaterializationSpec)(path, name, materializatedTablePrefix);
-        this.root().dependenciesToMaterialize[queryMaterializationSpec.id] =
-            queryMaterializationSpec;
-        return queryMaterializationSpec.id;
-    }
     addPDT(baseName, dialect) {
         const sql = this.combineStages(false).sql + this.withs[this.withs.length - 1];
-        const name = baseName + (0, utils_2.generateHash)(sql);
+        const name = baseName + (0, utils_1.generateHash)(sql);
         const tableName = `scratch.${name}`;
         this.root().pdts.push(dialect.sqlCreateTableAsSelect(tableName, sql));
         return tableName;
@@ -97,7 +79,7 @@ class StageWriter {
             if (sql === undefined) {
                 throw new Error(`Expected sql WITH to be present for stage ${lastStageName}.`);
             }
-            w += `${prefix}${lastStageName} AS (\n${(0, utils_2.indent)(sql)})\n`;
+            w += `${prefix}${lastStageName} AS (\n${(0, utils_1.indent)(sql)})\n`;
             prefix = ', ';
         }
         return { sql: w, lastStageName };
@@ -116,11 +98,11 @@ class StageWriter {
     generateCoorelatedSubQuery(dialect, structDef) {
         var _a, _b;
         if (!this.useCTE) {
-            return dialect.sqlCreateFunctionCombineLastStage(`(${this.withs[0]})`, (0, utils_2.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
+            return dialect.sqlCreateFunctionCombineLastStage(`(${this.withs[0]})`, (0, utils_1.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
         }
         else {
             return (this.combineStages(true).sql +
-                dialect.sqlCreateFunctionCombineLastStage(this.getName(this.withs.length - 1), (0, utils_2.getDialectFieldList)(structDef), (_b = structDef.resultMetadata) === null || _b === void 0 ? void 0 : _b.orderBy));
+                dialect.sqlCreateFunctionCombineLastStage(this.getName(this.withs.length - 1), (0, utils_1.getDialectFieldList)(structDef), (_b = structDef.resultMetadata) === null || _b === void 0 ? void 0 : _b.orderBy));
         }
     }
 }

package/dist/model/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Expr, GenericSQLExpr, StructDef } from './malloy_types';
+import type { Expr, GenericSQLExpr, ModelDef, StructDef } from './malloy_types';
 import type { DialectFieldList } from '../dialect';
 /** simple indent function */
 export declare function indent(s: string): string;
@@ -22,6 +22,20 @@ export declare class AndChain {
     sql(whereOrHaving?: 'where' | 'having'): string;
 }
 export declare function generateHash(input: string): string;
+/**
+ * Compute a digest for lookup/identity purposes (not cryptographic).
+ *
+ * Uses blueimp-md5 for these reasons:
+ * - Works in both Node.js and browsers (no native crypto dependency)
+ * - Synchronous API (unlike Web Crypto which is async)
+ * - Well-maintained by Sebastian Tschan (blueimp), a known maintainer
+ * - High adoption (~1.7M weekly downloads)
+ * - MD5 is fast and produces short hex strings - perfect for cache keys
+ *
+ * Takes variable string arguments and combines them in a collision-resistant
+ * way by including the length of each string (similar to pathToKey pattern).
+ */
+export declare function makeDigest(...parts: string[]): string;
 export declare function joinWith<T>(els: T[][], sep: T): T[];
 export declare function range(start: number, end: number): number[];
 export declare function exprKids(eNode: Expr): IterableIterator<Expr>;
@@ -49,3 +63,8 @@ export declare class GenerateState {
     withApply(s: string): GenerateState;
     withTotal(groupSet: number): GenerateState;
 }
+/**
+ * Create an empty ModelDef with the given name.
+ * Use this factory to ensure all required fields are present.
+ */
+export declare function mkModelDef(name: string): ModelDef;

package/dist/model/utils.js

@@ -21,11 +21,15 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateState = exports.AndChain = void 0;
 exports.indent = indent;
 exports.generateSQLStringLiteral = generateSQLStringLiteral;
 exports.generateHash = generateHash;
+exports.makeDigest = makeDigest;
 exports.joinWith = joinWith;
 exports.range = range;
 exports.exprKids = exprKids;
@@ -36,7 +40,9 @@ exports.getDialectFieldList = getDialectFieldList;
 exports.pathToKey = pathToKey;
 exports.groupingKey = groupingKey;
 exports.caseGroup = caseGroup;
+exports.mkModelDef = mkModelDef;
 const uuid_1 = require("uuid");
+const blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 const malloy_types_1 = require("./malloy_types");
 /** simple indent function */
 function indent(s) {
@@ -108,6 +114,26 @@ function generateHash(input) {
     const MALLOY_UUID = '76c17e9d-f3ce-5f2d-bfde-98ad3d2a37f6';
     return (0, uuid_1.v5)(input, MALLOY_UUID);
 }
+/**
+ * Compute a digest for lookup/identity purposes (not cryptographic).
+ *
+ * Uses blueimp-md5 for these reasons:
+ * - Works in both Node.js and browsers (no native crypto dependency)
+ * - Synchronous API (unlike Web Crypto which is async)
+ * - Well-maintained by Sebastian Tschan (blueimp), a known maintainer
+ * - High adoption (~1.7M weekly downloads)
+ * - MD5 is fast and produces short hex strings - perfect for cache keys
+ *
+ * Takes variable string arguments and combines them in a collision-resistant
+ * way by including the length of each string (similar to pathToKey pattern).
+ */
+function makeDigest(...parts) {
+    // Combine parts with length prefix to avoid collisions
+    // e.g., ("ab", "c") vs ("a", "bc") both concat to "abc"
+    // but with lengths: "2:ab/1:c" vs "1:a/2:bc"
+    const combined = parts.map(p => `${p.length}:${p}`).join('/');
+    return (0, blueimp_md5_1.default)(combined);
+}
 function joinWith(els, sep) {
     const result = [];
     for (let i = 0; i < els.length; i++) {
@@ -260,4 +286,18 @@ class GenerateState {
     }
 }
 exports.GenerateState = GenerateState;
+/**
+ * Create an empty ModelDef with the given name.
+ * Use this factory to ensure all required fields are present.
+ */
+function mkModelDef(name) {
+    return {
+        name,
+        exports: [],
+        contents: {},
+        sourceRegistry: {},
+        queryList: [],
+        dependencies: {},
+    };
+}
 //# sourceMappingURL=utils.js.map

package/dist/run_sql_options.d.ts

@@ -8,7 +8,6 @@ export interface RunSQLOptions {
     abortSignal?: AbortSignal;
     modelAnnotation?: Annotation;
     queryAnnotation?: Annotation;
-    replaceMaterializedReferences?: boolean;
     clientMetadata?: {
         sourceRefWithMetadata?: SourceRefWithMetadata;
     };

package/dist/taggable.d.ts

@@ -0,0 +1,10 @@
+import type { TagParseSpec, MalloyTagParse } from './annotation';
+/**
+ * Interface for objects that have Malloy tag annotations.
+ * This is part of the runtime API - objects returned from the Malloy
+ * runtime implement this interface to expose their tag metadata.
+ */
+export interface Taggable {
+    tagParse: (spec?: TagParseSpec) => MalloyTagParse;
+    getTaglines: (prefix?: RegExp) => string[];
+}

package/dist/taggable.js

@@ -0,0 +1,7 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=taggable.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.335";
+export declare const MALLOY_VERSION = "0.0.336";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.335';
+exports.MALLOY_VERSION = '0.0.336';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.335",
+  "version": "0.0.336",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,11 +45,12 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.335",
-    "@malloydata/malloy-interfaces": "0.0.335",
-    "@malloydata/malloy-tag": "0.0.335",
+    "@malloydata/malloy-filter": "0.0.336",
+    "@malloydata/malloy-interfaces": "0.0.336",
+    "@malloydata/malloy-tag": "0.0.336",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
+    "blueimp-md5": "^2.19.0",
     "jaro-winkler": "^0.2.8",
     "jest-diff": "^29.6.2",
     "lodash": "^4.17.20",
@@ -57,6 +58,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@types/blueimp-md5": "^2.18.2",
     "@types/jaro-winkler": "^0.2.3",
     "@types/lodash": "^4.14.165",
     "@types/luxon": "^3.5.0",