@malloydata/malloy 0.0.334 → 0.0.336

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

@@ -0,0 +1,54 @@
+import type { EventStream } from '../../runtime_types';
+import type { BuildManifest } from '../../model';
+export type { Taggable } from '../../taggable';
+export interface Loggable {
+    debug: (message?: any, ...optionalParams: any[]) => void;
+    info: (message?: any, ...optionalParams: any[]) => void;
+    warn: (message?: any, ...optionalParams: any[]) => void;
+    error: (message?: any, ...optionalParams: any[]) => void;
+}
+export interface ParseOptions {
+    importBaseURL?: URL;
+    testEnvironment?: boolean;
+}
+/** Options for how to run the Malloy semantic checker/translator */
+export interface CompileOptions {
+    refreshSchemaCache?: boolean | number;
+    noThrowOnError?: boolean;
+}
+/** Options given to the Malloy compiler (QueryModel) */
+export interface CompileQueryOptions {
+    eventStream?: EventStream;
+    defaultRowLimit?: number;
+    /** Manifest of built tables (BuildID → entry) for persist substitution */
+    buildManifest?: BuildManifest;
+    /** Map from connectionName to connectionDigest (from Connection.getDigest()) */
+    connectionDigests?: Record<string, string>;
+    /** If true, throw when a persist source's BuildID is not in the manifest */
+    strictPersist?: boolean;
+}
+/**
+ * A node in the build graph (recursive DAG structure).
+ * Uses sourceID (sourceName@modelURL) for identity.
+ */
+export interface BuildNode {
+    /** Source identity: "sourceName@modelURL" */
+    sourceID: string;
+    /** Dependencies as nested BuildNodes (recursive DAG) */
+    dependsOn: BuildNode[];
+}
+/**
+ * An ordered build plan for sources on a single connection.
+ *
+ * The leveled array structure determines build order: sources in the same
+ * level can be built in parallel, levels must be built sequentially.
+ *
+ * Builders can group graphs by `connectionName` to parallelize across
+ * different database connections.
+ */
+export interface BuildGraph {
+    /** The connection all sources in this graph run on */
+    connectionName: string;
+    /** The leveled build nodes */
+    nodes: BuildNode[][];
+}

package/dist/api/foundation/types.js

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

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

@@ -0,0 +1,42 @@
+import type { DataRecord } from './result';
+export interface WriteStream {
+    write: (text: string) => void;
+    close: () => void;
+}
+export declare abstract class DataWriter {
+    protected readonly stream: WriteStream;
+    constructor(stream: WriteStream);
+    abstract process(data: AsyncIterableIterator<DataRecord>): Promise<void>;
+}
+export declare class JSONWriter extends DataWriter {
+    process(data: AsyncIterableIterator<DataRecord>): Promise<void>;
+}
+/**
+ * CSV writer class that handles nested data.
+ * This writer creates CSV using a DFS traversal of the result dataset.
+ * Each trivial column value is converted to a CSV of 1x1 matrix and all the
+ * columns are merged together to create a CSV that represents 1 QueryDataRow.
+ * Since this follows DFS, each non trivial data is rendered into a NxM matrix
+ * where N is the number of rows in the nested data and M is the number of
+ * columns it has.
+ * For any row with X number of columns, we end up with X number of NxM matrices
+ * where the value of N,M pair may be different for each column.
+ * We then merge the matrices so that we end up with a larger matrix of size
+ * Max(N)xSum(M) by taking one row of csv from each matric at a time. For any
+ * matrix with N<Max(N), we add a row of empty CSV cells of size N.
+ */
+export declare class CSVWriter extends DataWriter {
+    private readonly columnSeparator;
+    private readonly rowSeparator;
+    private readonly quoteCharacter;
+    private readonly includeHeader;
+    private readonly emptyCell;
+    private escape;
+    private stringify;
+    private getColWeight;
+    private getHeaderRow;
+    private mergeMatrices;
+    private getChildMatrix;
+    private getRowMatrix;
+    process(data: AsyncIterableIterator<DataRecord>): Promise<void>;
+}

package/dist/api/foundation/writers.js

@@ -0,0 +1,230 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CSVWriter = exports.JSONWriter = exports.DataWriter = void 0;
+// =============================================================================
+// DataWriter Base Class
+// =============================================================================
+class DataWriter {
+    constructor(stream) {
+        this.stream = stream;
+    }
+}
+exports.DataWriter = DataWriter;
+// =============================================================================
+// JSONWriter
+// =============================================================================
+class JSONWriter extends DataWriter {
+    async process(data) {
+        this.stream.write('[\n');
+        for await (const row of data) {
+            if (row.index !== undefined && row.index > 0) {
+                this.stream.write(',\n');
+            }
+            // toJSON() returns JSON-safe values: bigints as strings, dates as ISO strings
+            const json = JSON.stringify(row.toJSON(), null, 2);
+            const jsonLines = json.split('\n');
+            for (let i = 0; i < jsonLines.length; i++) {
+                const line = jsonLines[i];
+                this.stream.write(`  ${line}`);
+                if (i < jsonLines.length - 1) {
+                    this.stream.write('\n');
+                }
+            }
+        }
+        this.stream.write('\n]\n');
+        this.stream.close();
+    }
+}
+exports.JSONWriter = JSONWriter;
+// =============================================================================
+// CSVWriter
+// =============================================================================
+/**
+ * CSV writer class that handles nested data.
+ * This writer creates CSV using a DFS traversal of the result dataset.
+ * Each trivial column value is converted to a CSV of 1x1 matrix and all the
+ * columns are merged together to create a CSV that represents 1 QueryDataRow.
+ * Since this follows DFS, each non trivial data is rendered into a NxM matrix
+ * where N is the number of rows in the nested data and M is the number of
+ * columns it has.
+ * For any row with X number of columns, we end up with X number of NxM matrices
+ * where the value of N,M pair may be different for each column.
+ * We then merge the matrices so that we end up with a larger matrix of size
+ * Max(N)xSum(M) by taking one row of csv from each matric at a time. For any
+ * matrix with N<Max(N), we add a row of empty CSV cells of size N.
+ */
+class CSVWriter extends DataWriter {
+    constructor() {
+        super(...arguments);
+        this.columnSeparator = ',';
+        this.rowSeparator = '\n';
+        this.quoteCharacter = '"';
+        this.includeHeader = true;
+        this.emptyCell = '';
+    }
+    escape(value) {
+        const hasInnerQuote = value.includes(this.quoteCharacter);
+        const hasInnerCommas = value.includes(this.columnSeparator);
+        const hasNewline = value.includes(this.rowSeparator);
+        const needsQuoting = hasInnerCommas || hasInnerQuote || hasNewline;
+        if (hasInnerQuote) {
+            value = value.replace(new RegExp(this.quoteCharacter, 'g'), this.quoteCharacter + this.quoteCharacter);
+        }
+        if (needsQuoting) {
+            value = this.quoteCharacter + value + this.quoteCharacter;
+        }
+        return value;
+    }
+    // Re-using the old stringify method for sanity.
+    stringify(value) {
+        if (value === null) {
+            return this.emptyCell;
+        }
+        else if (value instanceof Date) {
+            return value.toISOString();
+        }
+        else if (typeof value === 'boolean' || typeof value === 'number') {
+            return JSON.stringify(value);
+        }
+        else if (typeof value === 'bigint') {
+            // Bigints from toObject() - write as unquoted number string
+            return value.toString();
+        }
+        else {
+            return `${value}`;
+        }
+    }
+    // Extra weight to be added becase of nested tables inside the cells.
+    getColWeight(jsonVal) {
+        let firstVal = jsonVal;
+        if (Array.isArray(jsonVal)) {
+            firstVal = jsonVal[0];
+        }
+        let numKeys = 0;
+        for (const key in firstVal) {
+            numKeys = numKeys + 1;
+            const val = firstVal[key];
+            if (Array.isArray(val)) {
+                const weight = this.getColWeight(val) - 1;
+                numKeys = numKeys + weight;
+            }
+        }
+        return numKeys;
+    }
+    // Get header row along with extra empty spaces for nested children.
+    getHeaderRow(row) {
+        const csv = [];
+        let width = 0;
+        for (const key in row) {
+            csv.push(this.escape(key));
+            const val = row[key];
+            width++;
+            if (Array.isArray(val)) {
+                const numKeys = this.getColWeight(val) - 1;
+                width = width + numKeys;
+                for (let i = 0; i < numKeys; i++) {
+                    csv.push(this.emptyCell);
+                }
+            }
+        }
+        return { rows: [csv.join(this.columnSeparator)], length: 1, width: width };
+    }
+    // Merge the child matrices i.e. merge the columns into one bigger matrix i.e. CSV.
+    mergeMatrices(matrices) {
+        const maxLength = Math.max(...matrices.map(matrix => matrix.length));
+        const matrixWidth = matrices.reduce((sum, matrix) => sum + matrix.width, 0);
+        const csvMatrix = [];
+        for (let i = 0; i < maxLength; i++) {
+            const csvRow = [];
+            for (const matrix of matrices) {
+                if (i < matrix.length) {
+                    csvRow.push(matrix.rows[i]);
+                }
+                else {
+                    // Add empty cells.
+                    const emptyCells = Array(matrix.width).fill(this.emptyCell);
+                    csvRow.push(...emptyCells);
+                }
+            }
+            csvMatrix.push(csvRow.join(this.columnSeparator));
+        }
+        return {
+            rows: csvMatrix,
+            length: maxLength,
+            width: matrixWidth,
+        };
+    }
+    // Gets CSV for a data cell that has nested data.
+    getChildMatrix(jsonVal) {
+        // This is not expected to happen.
+        if (!Array.isArray(jsonVal)) {
+            return {
+                rows: ['Invalid data found, value is not an array'],
+                length: 1,
+                width: 1,
+            };
+        }
+        else if (jsonVal.length === 0) {
+            return {
+                rows: [''],
+                length: 1,
+                width: 1,
+            };
+        }
+        const csvMatrix = [];
+        const header = this.getHeaderRow(jsonVal[0]);
+        // Header has 1 row.
+        csvMatrix.push(...header.rows);
+        const width = header.width;
+        let rowCount = 1;
+        for (const row of jsonVal) {
+            const rowMatrix = this.getRowMatrix(row);
+            rowCount = rowCount + rowMatrix.length;
+            csvMatrix.push(...rowMatrix.rows);
+        }
+        return { rows: csvMatrix, length: rowCount, width: width };
+    }
+    // Creates CSV content for one row of data.
+    getRowMatrix(row) {
+        const matrices = [];
+        for (const key in row) {
+            const val = row[key];
+            if (!Array.isArray(val)) {
+                const cell = {
+                    rows: [this.stringify(val)],
+                    length: 1,
+                    width: 1,
+                };
+                matrices.push(cell);
+            }
+            else {
+                const cell = this.getChildMatrix(val);
+                matrices.push(cell);
+            }
+        }
+        return this.mergeMatrices(matrices);
+    }
+    async process(data) {
+        let headerDefined = false;
+        for await (const row of data) {
+            if (!headerDefined && this.includeHeader) {
+                const header = this.getHeaderRow(row.toObject());
+                this.stream.write(header.rows[0]);
+                this.stream.write(this.rowSeparator);
+                headerDefined = true;
+            }
+            const rowCsv = this.getRowMatrix(row.toObject());
+            for (const line of rowCsv.rows) {
+                this.stream.write(line);
+                this.stream.write(this.rowSeparator);
+            }
+        }
+        this.stream.close();
+    }
+}
+exports.CSVWriter = CSVWriter;
+//# sourceMappingURL=writers.js.map

package/dist/api/util.d.ts

@@ -1,5 +1,5 @@
 import type { InfoConnection as LegacyInfoConnection, Connection as LegacyConnection } from '../connection';
-import type { Result } from '../malloy';
+import type { Result } from './foundation';
 import type { Expr } from '../model';
 import { type QueryData } from '../model';
 import type { Connection, InfoConnection } from './connection';

package/dist/connection/base_connection.d.ts

@@ -16,6 +16,11 @@ export declare abstract class BaseConnection implements Connection {
     abstract runSQL(sql: string, options?: RunSQLOptions | undefined): Promise<MalloyQueryData>;
     abstract get name(): string;
     abstract get dialectName(): string;
+    /**
+     * Get a digest identifying this connection's target database.
+     * Used for cache key computation in persist manifests.
+     */
+    abstract getDigest(): string;
     abstract fetchTableSchema(tableName: string, tablePath: string): Promise<TableSourceDef | string>;
     abstract fetchSelectSchema(sqlSource: SQLSourceRequest): Promise<SQLSourceDef | string>;
     protected schemaCache: Record<string, CachedSchema<StructDef>>;

package/dist/connection/types.d.ts

@@ -42,6 +42,11 @@ export interface InfoConnection {
      */
     get name(): string;
     get dialectName(): string;
+    /**
+     * Get a digest identifying this connection's target database.
+     * Used for cache key computation in persist manifests.
+     */
+    getDigest(): string;
 }
 export type ConnectionParameterValue = string | number | boolean | Array<ConnectionParameterValue>;
 export interface ConnectionParameter {

package/dist/dialect/duckdb/duckdb.js

@@ -86,7 +86,8 @@ class DuckDBDialect extends pg_impl_1.PostgresBase {
         return `__udf${Math.floor(Math.random() * 100000)}`;
     }
     quoteTablePath(tableName) {
-        return tableName.match(/[/*:]/) ? `'${tableName}'` : tableName;
+        // Quote if contains special chars that could be SQL injection or need quoting
+        return tableName.match(/[/*:;-]/) ? `'${tableName}'` : tableName;
     }
     sqlGroupSetTable(groupSetCount) {
         return `CROSS JOIN (SELECT UNNEST(GENERATE_SERIES(0,${groupSetCount},1)) as group_set  ) as group_set`;

package/dist/dialect/snowflake/snowflake.js

@@ -103,8 +103,14 @@ class SnowflakeDialect extends dialect_1.Dialect {
             { min: dialect_1.MIN_DECIMAL38, max: dialect_1.MAX_DECIMAL38, numberType: 'bigint' },
         ];
     }
-    // don't mess with the table pathing.
     quoteTablePath(tablePath) {
+        // Quote with double quotes if contains dangerous characters
+        if (tablePath.match(/[;-]/)) {
+            return tablePath
+                .split('.')
+                .map(part => `"${part}"`)
+                .join('.');
+        }
         return tablePath;
     }
     sqlGroupSetTable(groupSetCount) {

package/dist/dialect/trino/trino.js

@@ -201,8 +201,13 @@ class TrinoDialect extends pg_impl_1.PostgresBase {
   WITHIN`.split(/\s/);
     }
     quoteTablePath(tablePath) {
-        // TODO: look into escaping.
-        //return `${tablePath.replace(/malloytest/g, 'malloy_demo.malloytest')}`;
+        // Quote with double quotes if contains dangerous characters
+        if (tablePath.match(/[;-]/)) {
+            return tablePath
+                .split('.')
+                .map(part => `"${part}"`)
+                .join('.');
+        }
         return tablePath;
     }
     sqlGroupSetTable(groupSetCount) {

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, DateLiteralNode, TimestampLiteralNode, TimestamptzLiteralNode, TimeLiteralExpr, TypecastExpr, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQueryDef, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, DateLiteralNode, TimestampLiteralNode, TimestamptzLiteralNode, TimeLiteralExpr, TypecastExpr, BuildManifest, BuildManifestEntry, } from './model';
 export { isSourceDef, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, constantExprToSQL, } from './model';
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
-export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, InMemoryModelCache, CacheManager, } from './malloy';
-export type { PreparedQuery, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, Loggable, ModelMaterializer, DocumentTablePath, DocumentSymbol, ResultJSON, PreparedResultJSON, PreparedResultMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, ModelCache, CachedModel, DateField, TimestampField, } from './malloy';
+export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, InMemoryModelCache, CacheManager, } from './api/foundation';
+export type { PreparedQuery, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, Loggable, ModelMaterializer, DocumentTablePath, DocumentSymbol, ResultJSON, PreparedResultJSON, PreparedResultMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, ModelCache, CachedModel, DateField, TimestampField, } from './api/foundation';
 export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionFactory, ConnectionParameter, ConnectionParameterValue, ConnectionConfigSchema, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';
@@ -15,3 +15,6 @@ export * as API from './api';
 export type { SQLSourceRequest } from './lang/translate-response';
 export { sqlKey } from './model/sql_block';
 export { annotationToTag, annotationToTaglines } from './annotation';
+export type { BuildGraph, BuildNode, BuildPlan } from './api/foundation';
+export { PersistSource } from './api/foundation';
+export { makeDigest } from './model';

package/dist/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
+exports.makeDigest = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -108,31 +108,31 @@ var lang_1 = require("./lang");
 Object.defineProperty(exports, "malloyToQuery", { enumerable: true, get: function () { return lang_1.malloyToQuery; } });
 // Needed for tests only
 Object.defineProperty(exports, "MalloyTranslator", { enumerable: true, get: function () { return lang_1.MalloyTranslator; } });
-var malloy_1 = require("./malloy");
-Object.defineProperty(exports, "Model", { enumerable: true, get: function () { return malloy_1.Model; } });
-Object.defineProperty(exports, "Malloy", { enumerable: true, get: function () { return malloy_1.Malloy; } });
-Object.defineProperty(exports, "Runtime", { enumerable: true, get: function () { return malloy_1.Runtime; } });
-Object.defineProperty(exports, "AtomicFieldType", { enumerable: true, get: function () { return malloy_1.AtomicFieldType; } });
-Object.defineProperty(exports, "ConnectionRuntime", { enumerable: true, get: function () { return malloy_1.ConnectionRuntime; } });
-Object.defineProperty(exports, "SingleConnectionRuntime", { enumerable: true, get: function () { return malloy_1.SingleConnectionRuntime; } });
-Object.defineProperty(exports, "EmptyURLReader", { enumerable: true, get: function () { return malloy_1.EmptyURLReader; } });
-Object.defineProperty(exports, "InMemoryURLReader", { enumerable: true, get: function () { return malloy_1.InMemoryURLReader; } });
-Object.defineProperty(exports, "FixedConnectionMap", { enumerable: true, get: function () { return malloy_1.FixedConnectionMap; } });
-Object.defineProperty(exports, "MalloyError", { enumerable: true, get: function () { return malloy_1.MalloyError; } });
-Object.defineProperty(exports, "JoinRelationship", { enumerable: true, get: function () { return malloy_1.JoinRelationship; } });
-Object.defineProperty(exports, "SourceRelationship", { enumerable: true, get: function () { return malloy_1.SourceRelationship; } });
-Object.defineProperty(exports, "DateTimeframe", { enumerable: true, get: function () { return malloy_1.DateTimeframe; } });
-Object.defineProperty(exports, "TimestampTimeframe", { enumerable: true, get: function () { return malloy_1.TimestampTimeframe; } });
-Object.defineProperty(exports, "PreparedResult", { enumerable: true, get: function () { return malloy_1.PreparedResult; } });
-Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return malloy_1.Result; } });
-Object.defineProperty(exports, "QueryMaterializer", { enumerable: true, get: function () { return malloy_1.QueryMaterializer; } });
-Object.defineProperty(exports, "CSVWriter", { enumerable: true, get: function () { return malloy_1.CSVWriter; } });
-Object.defineProperty(exports, "JSONWriter", { enumerable: true, get: function () { return malloy_1.JSONWriter; } });
-Object.defineProperty(exports, "Parse", { enumerable: true, get: function () { return malloy_1.Parse; } });
-Object.defineProperty(exports, "DataWriter", { enumerable: true, get: function () { return malloy_1.DataWriter; } });
-Object.defineProperty(exports, "Explore", { enumerable: true, get: function () { return malloy_1.Explore; } });
-Object.defineProperty(exports, "InMemoryModelCache", { enumerable: true, get: function () { return malloy_1.InMemoryModelCache; } });
-Object.defineProperty(exports, "CacheManager", { enumerable: true, get: function () { return malloy_1.CacheManager; } });
+var foundation_1 = require("./api/foundation");
+Object.defineProperty(exports, "Model", { enumerable: true, get: function () { return foundation_1.Model; } });
+Object.defineProperty(exports, "Malloy", { enumerable: true, get: function () { return foundation_1.Malloy; } });
+Object.defineProperty(exports, "Runtime", { enumerable: true, get: function () { return foundation_1.Runtime; } });
+Object.defineProperty(exports, "AtomicFieldType", { enumerable: true, get: function () { return foundation_1.AtomicFieldType; } });
+Object.defineProperty(exports, "ConnectionRuntime", { enumerable: true, get: function () { return foundation_1.ConnectionRuntime; } });
+Object.defineProperty(exports, "SingleConnectionRuntime", { enumerable: true, get: function () { return foundation_1.SingleConnectionRuntime; } });
+Object.defineProperty(exports, "EmptyURLReader", { enumerable: true, get: function () { return foundation_1.EmptyURLReader; } });
+Object.defineProperty(exports, "InMemoryURLReader", { enumerable: true, get: function () { return foundation_1.InMemoryURLReader; } });
+Object.defineProperty(exports, "FixedConnectionMap", { enumerable: true, get: function () { return foundation_1.FixedConnectionMap; } });
+Object.defineProperty(exports, "MalloyError", { enumerable: true, get: function () { return foundation_1.MalloyError; } });
+Object.defineProperty(exports, "JoinRelationship", { enumerable: true, get: function () { return foundation_1.JoinRelationship; } });
+Object.defineProperty(exports, "SourceRelationship", { enumerable: true, get: function () { return foundation_1.SourceRelationship; } });
+Object.defineProperty(exports, "DateTimeframe", { enumerable: true, get: function () { return foundation_1.DateTimeframe; } });
+Object.defineProperty(exports, "TimestampTimeframe", { enumerable: true, get: function () { return foundation_1.TimestampTimeframe; } });
+Object.defineProperty(exports, "PreparedResult", { enumerable: true, get: function () { return foundation_1.PreparedResult; } });
+Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return foundation_1.Result; } });
+Object.defineProperty(exports, "QueryMaterializer", { enumerable: true, get: function () { return foundation_1.QueryMaterializer; } });
+Object.defineProperty(exports, "CSVWriter", { enumerable: true, get: function () { return foundation_1.CSVWriter; } });
+Object.defineProperty(exports, "JSONWriter", { enumerable: true, get: function () { return foundation_1.JSONWriter; } });
+Object.defineProperty(exports, "Parse", { enumerable: true, get: function () { return foundation_1.Parse; } });
+Object.defineProperty(exports, "DataWriter", { enumerable: true, get: function () { return foundation_1.DataWriter; } });
+Object.defineProperty(exports, "Explore", { enumerable: true, get: function () { return foundation_1.Explore; } });
+Object.defineProperty(exports, "InMemoryModelCache", { enumerable: true, get: function () { return foundation_1.InMemoryModelCache; } });
+Object.defineProperty(exports, "CacheManager", { enumerable: true, get: function () { return foundation_1.CacheManager; } });
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
 var to_stable_1 = require("./to_stable");
@@ -146,4 +146,8 @@ Object.defineProperty(exports, "sqlKey", { enumerable: true, get: function () {
 var annotation_1 = require("./annotation");
 Object.defineProperty(exports, "annotationToTag", { enumerable: true, get: function () { return annotation_1.annotationToTag; } });
 Object.defineProperty(exports, "annotationToTaglines", { enumerable: true, get: function () { return annotation_1.annotationToTaglines; } });
+var foundation_2 = require("./api/foundation");
+Object.defineProperty(exports, "PersistSource", { enumerable: true, get: function () { return foundation_2.PersistSource; } });
+var model_2 = require("./model");
+Object.defineProperty(exports, "makeDigest", { enumerable: true, get: function () { return model_2.makeDigest; } });
 //# sourceMappingURL=index.js.map

package/dist/lang/ast/error-factory.js

@@ -26,7 +26,7 @@ exports.ErrorFactory = void 0;
 const ERR_NAME = '~malformed~';
 class ErrorFactory {
     static get structDef() {
-        const factoryStruct = {
+        return {
             type: 'table',
             name: ERR_NAME,
             dialect: '~malformed~',
@@ -35,10 +35,9 @@ class ErrorFactory {
             fields: [],
             errorFactory: true,
         };
-        return factoryStruct;
     }
     static get joinDef() {
-        const factoryJoin = {
+        return {
             type: 'table',
             name: ERR_NAME,
             dialect: '~malformed~',
@@ -49,10 +48,9 @@ class ErrorFactory {
             matrixOperation: 'left',
             errorFactory: true,
         };
-        return factoryJoin;
     }
     static didCreate(s) {
-        return 'errorFactory' in s;
+        return s.errorFactory === true;
     }
     static get query() {
         return {

package/dist/lang/ast/expressions/expr-count-distinct.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprCountDistinct extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('distinct', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return {

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -77,7 +77,7 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
         this.units = units;
         this.truncate = truncate;
         this.elementType = 'granularTime';
-        this.legalChildTypes = [TDU.timestampT, TDU.dateT];
+        this.legalChildTypes = [TDU.timestampT, TDU.timestamptzT, TDU.dateT];
     }
     granular() {
         return true;

package/dist/lang/ast/expressions/expr-max.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprMax extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('max', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return ev;

package/dist/lang/ast/expressions/expr-min.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprMin extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('min', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return ev;

package/dist/lang/ast/expressions/for-range.js

@@ -71,7 +71,7 @@ class ForRange extends expression_def_1.ExpressionDef {
         this.duration = duration;
         this.timeframe = timeframe;
         this.elementType = 'forRange';
-        this.legalChildTypes = [TDU.timestampT, TDU.dateT];
+        this.legalChildTypes = [TDU.timestampT, TDU.timestamptzT, TDU.dateT];
     }
     apply(fs, op, expr) {
         const startV = this.from.getExpression(fs);

package/dist/lang/ast/source-elements/query-source.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuerySource = void 0;
+const source_def_utils_1 = require("../../../model/source_def_utils");
 const source_1 = require("./source");
 const uuid_1 = require("uuid");
 class QuerySource extends source_1.Source {
@@ -37,13 +38,7 @@ class QuerySource extends source_1.Source {
     withParameters(parameterSpace, pList) {
         var _a;
         const comp = this.query.queryComp(false);
-        const queryStruct = {
-            ...comp.outputStruct,
-            name: `QuerySource-${(0, uuid_1.v4)()}`,
-            type: 'query_source',
-            query: comp.query,
-            arguments: comp.query.sourceArguments,
-        };
+        const queryStruct = (0, source_def_utils_1.mkQuerySourceDef)(comp.outputStruct, comp.query, `QuerySource-${(0, uuid_1.v4)()}`);
         (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(queryStruct);
         return {
             ...queryStruct,