@malloydata/malloy 0.0.280 → 0.0.282

package/dist/api/core.js

@@ -415,7 +415,7 @@ function newCompileQueryState(request) {
     };
 }
 function statedCompileQuery(state) {
-    var _a;
+    var _a, _b;
     const result = _statedCompileModel(state);
     // TODO this can expose the internal URL... is there a better way to handle URL-less errors from the compiler?
     const defaultURL = state.translator.sourceURL;
@@ -462,10 +462,22 @@ function statedCompileQuery(state) {
             const sourceAnnotations = (0, annotation_1.annotationToTaglines)(source.annotation).map(l => ({
                 value: l,
             }));
+            const sourceMetadataTag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
+            sourceMetadataTag.set(['source', 'name'], translatedQuery.sourceExplore);
+            const sourceArguments = (_b = translatedQuery.sourceArguments) !== null && _b !== void 0 ? _b : ((0, model_1.isSourceDef)(source) ? source.arguments : undefined);
+            if (sourceArguments) {
+                const args = Object.entries(sourceArguments);
+                for (let i = 0; i < args.length; i++) {
+                    const [name, value] = args[i];
+                    const literal = (0, util_1.nodeToLiteralValue)(value.value);
+                    if (literal !== undefined) {
+                        (0, to_stable_1.writeLiteralToTag)(sourceMetadataTag, ['source', 'parameters', i, 'value'], literal);
+                    }
+                    sourceMetadataTag.set(['source', 'parameters', i, 'name'], name);
+                }
+            }
             annotations.push({
-                value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
-                    .set(['source_name'], translatedQuery.sourceExplore)
-                    .toString(),
+                value: sourceMetadataTag.toString(),
             });
             if (translatedQuery.queryName) {
                 annotations.push({

package/dist/api/util.d.ts

@@ -1,6 +1,7 @@
 import type { InfoConnection as LegacyInfoConnection, Connection as LegacyConnection } from '../connection';
 import type { Result } from '../malloy';
-import type { QueryData } from '../model';
+import type { Expr } from '../model';
+import { type QueryData } from '../model';
 import type { Connection, InfoConnection } from './connection';
 import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { LogMessage } from '../lang';
@@ -8,5 +9,6 @@ export declare function wrapLegacyInfoConnection(connection: LegacyInfoConnectio
 export declare function wrapLegacyConnection(connection: LegacyConnection): Connection;
 export declare function mapData(data: QueryData, schema: Malloy.Schema): Malloy.Data;
 export declare function wrapResult(result: Result): Malloy.Result;
+export declare function nodeToLiteralValue(expr?: Expr | null): Malloy.LiteralValue | undefined;
 export declare const DEFAULT_LOG_RANGE: Malloy.DocumentRange;
 export declare function mapLogs(logs: LogMessage[], defaultURL: string): Malloy.LogMessage[];

package/dist/api/util.js

@@ -11,9 +11,11 @@ exports.wrapLegacyInfoConnection = wrapLegacyInfoConnection;
 exports.wrapLegacyConnection = wrapLegacyConnection;
 exports.mapData = mapData;
 exports.wrapResult = wrapResult;
+exports.nodeToLiteralValue = nodeToLiteralValue;
 exports.mapLogs = mapLogs;
 const malloy_tag_1 = require("@malloydata/malloy-tag");
 const annotation_1 = require("../annotation");
+const model_1 = require("../model");
 const to_stable_1 = require("../to_stable");
 const luxon_1 = require("luxon");
 function wrapLegacyInfoConnection(connection) {
@@ -193,13 +195,22 @@ function wrapResult(result) {
         annotations.push(metadataAnnot);
     }
     annotations.push(...(struct.resultMetadata ? [] : []));
+    const sourceMetadataTag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     if (result.sourceExplore) {
-        annotations.push({
-            value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
-                .set(['source_name'], result.sourceExplore.name)
-                .toString(),
-        });
+        sourceMetadataTag.set(['source', 'name'], result.sourceExplore.name);
+    }
+    if (result._sourceArguments) {
+        const args = Object.entries(result._sourceArguments);
+        for (let i = 0; i < args.length; i++) {
+            const [name, value] = args[i];
+            const literal = nodeToLiteralValue(value.value);
+            if (literal !== undefined) {
+                (0, to_stable_1.writeLiteralToTag)(sourceMetadataTag, ['source', 'parameters', i, 'value'], literal);
+            }
+            sourceMetadataTag.set(['source', 'parameters', i, 'name'], name);
+        }
     }
+    annotations.push({ value: sourceMetadataTag.toString() });
     annotations.push({
         value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
             .set(['query_name'], result.resultExplore.name)
@@ -214,6 +225,53 @@ function wrapResult(result) {
         sql: result.sql,
     };
 }
+function nodeToLiteralValue(expr) {
+    switch (expr === null || expr === void 0 ? void 0 : expr.node) {
+        case 'numberLiteral':
+            return {
+                kind: 'number_literal',
+                number_value: Number.parseFloat(expr.literal),
+            };
+        case 'null':
+            return { kind: 'null_literal' };
+        case 'stringLiteral':
+            return { kind: 'string_literal', string_value: expr.literal };
+        case 'filterLiteral':
+            return {
+                kind: 'filter_expression_literal',
+                filter_expression_value: expr.filterSrc,
+                // TODO type?
+            };
+        case 'true':
+            return { kind: 'boolean_literal', boolean_value: true };
+        case 'false':
+            return { kind: 'boolean_literal', boolean_value: false };
+        case 'timeLiteral': {
+            if (expr.typeDef.type === 'date') {
+                if (expr.typeDef.timeframe === undefined ||
+                    (0, model_1.isDateUnit)(expr.typeDef.timeframe)) {
+                    return {
+                        kind: 'date_literal',
+                        date_value: expr.literal,
+                        timezone: expr.timezone,
+                        granularity: expr.typeDef.timeframe,
+                    };
+                }
+                return undefined;
+            }
+            else {
+                return {
+                    kind: 'timestamp_literal',
+                    timestamp_value: expr.literal,
+                    timezone: expr.timezone,
+                    granularity: expr.typeDef.timeframe,
+                };
+            }
+        }
+        default:
+            return undefined;
+    }
+}
 exports.DEFAULT_LOG_RANGE = {
     start: {
         line: 0,

package/dist/dialect/dialect.d.ts

@@ -24,6 +24,7 @@ export declare function inDays(units: string): boolean;
 export declare function qtz(qi: QueryInfo): string | undefined;
 export type OrderByClauseType = 'output_name' | 'ordinal' | 'expression';
 export type OrderByRequest = 'query' | 'turtle' | 'analytical';
+export type BooleanTypeSupport = 'supported' | 'simulated' | 'none';
 export declare abstract class Dialect {
     abstract name: string;
     abstract defaultNumberType: string;
@@ -58,7 +59,7 @@ export declare abstract class Dialect {
     supportsFullJoin: boolean;
     nestedArrays: boolean;
     compoundObjectInSchema: boolean;
-    booleanAsNumbers: boolean;
+    booleanType: BooleanTypeSupport;
     likeEscape: boolean;
     abstract getDialectFunctionOverrides(): {
         [name: string]: DialectFunctionOverloadDef[];
@@ -143,5 +144,13 @@ export declare abstract class Dialect {
      * but some SQL dialects use an ESCAPE clause.
      */
     sqlLike(likeOp: 'LIKE' | 'NOT LIKE', left: string, likeStr: string): string;
+    /**
+     * SQL to generate to get a boolean value for a boolean expression
+     */
+    sqlBoolean(bv: boolean): string;
+    /**
+     * What a boolean value looks like in a query result
+     */
+    resultBoolean(bv: boolean): boolean | 0 | 1;
 }
 export {};

package/dist/dialect/dialect.js

@@ -85,8 +85,7 @@ class Dialect {
         this.nestedArrays = true;
         // An array or record will reveal type of contents on schema read
         this.compoundObjectInSchema = true;
-        // No true boolean type, e.g. true=1 and false=0, set this to true
-        this.booleanAsNumbers = false;
+        this.booleanType = 'supported';
         // Like characters are escaped with ESCAPE clause
         this.likeEscape = true;
     }
@@ -264,6 +263,24 @@ class Dialect {
         const compare = `${left} ${likeOp} ${this.sqlLiteralString(escaped)}`;
         return escapeClause ? `${compare} ESCAPE '^'` : compare;
     }
+    /**
+     * SQL to generate to get a boolean value for a boolean expression
+     */
+    sqlBoolean(bv) {
+        if (this.booleanType === 'none') {
+            return bv ? '(1=1)' : '(1-0)';
+        }
+        return bv ? 'true' : 'false';
+    }
+    /**
+     * What a boolean value looks like in a query result
+     */
+    resultBoolean(bv) {
+        if (this.booleanType !== 'supported') {
+            return bv ? 1 : 0;
+        }
+        return bv ? true : false;
+    }
 }
 exports.Dialect = Dialect;
 //# sourceMappingURL=dialect.js.map

package/dist/dialect/mysql/mysql.d.ts

@@ -1,5 +1,5 @@
 import type { Sampling, MeasureTimeExpr, TimeLiteralNode, RegexMatchExpr, TimeDeltaExpr, TimeTruncExpr, TimeExtractExpr, TypecastExpr, BasicAtomicTypeDef, AtomicTypeDef, ArrayLiteralNode, RecordLiteralNode } from '../../model/malloy_types';
-import type { DialectFieldList, FieldReferenceType, OrderByClauseType, QueryInfo } from '../dialect';
+import type { BooleanTypeSupport, DialectFieldList, FieldReferenceType, OrderByClauseType, QueryInfo } from '../dialect';
 import { Dialect } from '../dialect';
 import type { DialectFunctionOverloadDef } from '../functions';
 export declare class MySQLDialect extends Dialect {
@@ -29,7 +29,7 @@ export declare class MySQLDialect extends Dialect {
     supportsComplexFilteredSources: boolean;
     supportsArraysInData: boolean;
     compoundObjectInSchema: boolean;
-    booleanAsNumbers: boolean;
+    booleanType: BooleanTypeSupport;
     orderByClause: OrderByClauseType;
     malloyTypeToSQLType(malloyType: AtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): BasicAtomicTypeDef;

package/dist/dialect/mysql/mysql.js

@@ -93,7 +93,7 @@ class MySQLDialect extends dialect_1.Dialect {
         this.supportsComplexFilteredSources = false;
         this.supportsArraysInData = false;
         this.compoundObjectInSchema = false;
-        this.booleanAsNumbers = true;
+        this.booleanType = 'simulated';
         this.orderByClause = 'ordinal';
     }
     malloyTypeToSQLType(malloyType) {

package/dist/dialect/standardsql/dialect_functions.js

@@ -60,10 +60,32 @@ const string_agg_distinct = {
         },
     },
 };
+const max_by = {
+    generic: { 'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'] },
+    takes: {
+        'value': { dimension: T },
+        'order_by_val': { dimension: 'any' },
+    },
+    returns: { measure: T },
+    impl: { function: 'MAX_BY' },
+    isSymmetric: true,
+};
+const min_by = {
+    generic: { 'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'] },
+    takes: {
+        'value': { dimension: T },
+        'order_by_val': { dimension: 'any' },
+    },
+    returns: { measure: T },
+    impl: { function: 'MIN_BY' },
+    isSymmetric: true,
+};
 exports.STANDARDSQL_DIALECT_FUNCTIONS = {
     date_from_unix_date,
     string_agg,
     string_agg_distinct,
+    max_by,
+    min_by,
     hll_accumulate: {
         default: {
             takes: { 'value': { dimension: T } },

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 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, QueryRunStats, 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, } from './model';
-export { isSourceDef, Segment, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, } from './model';
+export { isSourceDef, Segment, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, } 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';

package/dist/index.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = 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.Segment = 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.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 = void 0;
+exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = 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.Segment = 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.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
  *
@@ -101,6 +101,8 @@ Object.defineProperty(exports, "expressionIsScalar", { enumerable: true, get: fu
 Object.defineProperty(exports, "expressionIsUngroupedAggregate", { enumerable: true, get: function () { return model_1.expressionIsUngroupedAggregate; } });
 Object.defineProperty(exports, "indent", { enumerable: true, get: function () { return model_1.indent; } });
 Object.defineProperty(exports, "composeSQLExpr", { enumerable: true, get: function () { return model_1.composeSQLExpr; } });
+Object.defineProperty(exports, "isTimestampUnit", { enumerable: true, get: function () { return model_1.isTimestampUnit; } });
+Object.defineProperty(exports, "isDateUnit", { enumerable: true, get: function () { return model_1.isDateUnit; } });
 var lang_1 = require("./lang");
 Object.defineProperty(exports, "malloyToQuery", { enumerable: true, get: function () { return lang_1.malloyToQuery; } });
 // Needed for tests only

package/dist/lang/ast/expressions/boolean.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 export declare class Boolean extends ExpressionDef {
@@ -5,4 +6,5 @@ export declare class Boolean extends ExpressionDef {
     elementType: string;
     constructor(value: 'true' | 'false');
     getExpression(): ExprValue;
+    getStableLiteral(): Malloy.LiteralValue;
 }

package/dist/lang/ast/expressions/boolean.js

@@ -67,6 +67,12 @@ class Boolean extends expression_def_1.ExpressionDef {
     getExpression() {
         return { ...TDU.boolT, value: { node: this.value } };
     }
+    getStableLiteral() {
+        return {
+            kind: 'boolean_literal',
+            boolean_value: this.value === 'true',
+        };
+    }
 }
 exports.Boolean = Boolean;
 //# sourceMappingURL=boolean.js.map

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

@@ -297,29 +297,18 @@ class ExprFunc extends expression_def_1.ExpressionDef {
             else {
                 const literal = str.literal;
                 const parts = parseSQLInterpolation(literal);
-                const unsupportedInterpolations = parts
-                    .filter(part => part.type === 'interpolation' && part.name.includes('.'))
-                    .map(unsupportedPart => unsupportedPart.type === 'interpolation'
-                    ? `\${${unsupportedPart.name}}`
-                    : `\${${unsupportedPart.value}}`);
-                if (unsupportedInterpolations.length > 0) {
-                    const unsupportedInterpolationMsg = unsupportedInterpolations.length === 1
-                        ? `'.' paths are not yet supported in sql interpolations, found ${unsupportedInterpolations.at(0)}`
-                        : `'.' paths are not yet supported in sql interpolations, found (${unsupportedInterpolations.join(', ')})`;
-                    return this.loggedErrorExpr('unsupported-sql-function-interpolation', unsupportedInterpolationMsg);
-                }
                 const expr = [];
                 for (const part of parts) {
                     if (part.type === 'string') {
                         expr.push(part.value);
                     }
-                    else if (part.name === 'TABLE') {
+                    else if (part.path.length === 1 && part.path[0] === 'TABLE') {
                         expr.push({ node: 'source-reference' });
                     }
                     else {
-                        const name = new field_space_1.FieldName(part.name);
-                        this.has({ name });
-                        const result = fs.lookup([name]);
+                        const names = part.path.map(p => new field_space_1.FieldName(p));
+                        this.has({ names });
+                        const result = fs.lookup(names);
                         if (result.found === undefined) {
                             return this.loggedErrorExpr('sql-function-interpolation-not-found', `Invalid interpolation: ${result.error.message}`);
                         }
@@ -327,12 +316,13 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                             return this.loggedErrorExpr('filter-expression-error', 'Filter expressions cannot be used in sql_ functions');
                         }
                         if (result.found.refType === 'parameter') {
-                            expr.push({ node: 'parameter', path: [part.name] });
+                            expr.push({ node: 'parameter', path: part.path });
                         }
                         else {
                             expr.push({
                                 node: 'field',
-                                path: [part.name],
+                                // TODO when we have namespaces, this will need to be replaced with the resolved path
+                                path: part.path,
                                 at: this.args[0].location,
                             });
                         }
@@ -483,7 +473,9 @@ function parseSQLInterpolation(template) {
             }
             parts.push({
                 type: 'interpolation',
-                name: remaining.slice(nextInterp + 2, interpEnd + nextInterp),
+                path: remaining
+                    .slice(nextInterp + 2, interpEnd + nextInterp)
+                    .split('.'),
             });
             remaining = remaining.slice(interpEnd + nextInterp + 1);
         }

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

@@ -67,7 +67,7 @@ class ExprNot extends unary_1.Unary {
     getExpression(fs) {
         var _a;
         const notThis = this.expr.getExpression(fs);
-        if ((_a = fs.dialectObj()) === null || _a === void 0 ? void 0 : _a.booleanAsNumbers) {
+        if (((_a = fs.dialectObj()) === null || _a === void 0 ? void 0 : _a.booleanType) !== 'supported') {
             if (this.legalChildTypes.find(t => t.type === 'number') === undefined) {
                 this.legalChildTypes.push(TDU.numberT);
             }

package/dist/lang/ast/expressions/expr-number.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { ExprValue } from '../types/expr-value';
 import type { FieldSpace } from '../types/field-space';
 import { ExpressionDef } from '../types/expression-def';
@@ -7,4 +8,5 @@ export declare class ExprNumber extends ExpressionDef {
     constructor(n: string);
     getExpression(_fs: FieldSpace): ExprValue;
     constantExpression(): ExprValue;
+    getStableLiteral(): Malloy.LiteralValue;
 }

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

@@ -44,6 +44,12 @@ class ExprNumber extends expression_def_1.ExpressionDef {
             value: { node: 'numberLiteral', literal: this.n },
         });
     }
+    getStableLiteral() {
+        return {
+            kind: 'number_literal',
+            number_value: Number(this.n),
+        };
+    }
 }
 exports.ExprNumber = ExprNumber;
 //# sourceMappingURL=expr-number.js.map

package/dist/lang/ast/expressions/expr-string.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import { ExpressionDef } from '../types/expression-def';
 import type { FieldSpace } from '../types/field-space';
 import type { ExprValue } from '../types/expr-value';
@@ -6,4 +7,5 @@ export declare class ExprString extends ExpressionDef {
     value: string;
     constructor(src: string);
     getExpression(_fs: FieldSpace): ExprValue;
+    getStableLiteral(): Malloy.LiteralValue;
 }

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

@@ -1,26 +1,4 @@
 "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.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprString = void 0;
 const expression_def_1 = require("../types/expression-def");
@@ -37,6 +15,12 @@ class ExprString extends expression_def_1.ExpressionDef {
             value: { node: 'stringLiteral', literal: this.value },
         });
     }
+    getStableLiteral() {
+        return {
+            kind: 'string_literal',
+            string_value: this.value,
+        };
+    }
 }
 exports.ExprString = ExprString;
 //# sourceMappingURL=expr-string.js.map

package/dist/lang/ast/expressions/time-literal.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { TemporalFieldType, TimestampUnit, TimeLiteralNode } from '../../../model/malloy_types';
 import type { ExprValue } from '../types/expr-value';
 import type { FieldSpace } from '../types/field-space';
@@ -13,15 +14,21 @@ interface TimeText {
 /**
  * Literals specified with an @ in Malloy all become one of these
  */
-declare abstract class TimeLiteral extends ExpressionDef {
+export declare abstract class TimeLiteral extends ExpressionDef {
     readonly units: TimestampUnit | undefined;
     readonly timeType: TemporalFieldType;
     literalPart: string;
     nextLit?: string;
     timeZone?: string;
     constructor(tm: TimeText, units: TimestampUnit | undefined, timeType: TemporalFieldType);
-    protected makeLiteral(val: string, typ: TemporalFieldType): TimeLiteralNode;
+    protected makeLiteral(val: string, typ: TemporalFieldType, units: TimestampUnit | undefined): TimeLiteralNode;
     protected makeValue(val: string, dataType: TemporalFieldType): TimeResult;
+    getStableLiteral(): Malloy.LiteralValue;
+    getValue(): (import("../../../model/malloy_types").DateTypeDef & import("../../../model/malloy_types").TypeInfo & import("../types/expr-result").WithValue & {
+        timeframe?: TimestampUnit;
+    }) | (import("../../../model/malloy_types").TimestampTypeDef & import("../../../model/malloy_types").TypeInfo & import("../types/expr-result").WithValue & {
+        timeframe?: TimestampUnit;
+    });
     getExpression(_fs: FieldSpace): ExprValue;
     getNext(): ExprValue | undefined;
     granular(): boolean;

package/dist/lang/ast/expressions/time-literal.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiteralYear = exports.LiteralQuarter = exports.LiteralMonth = exports.LiteralWeek = exports.LiteralDay = exports.LiteralHour = exports.LiteralTimestamp = exports.TimeFormatError = void 0;
+exports.LiteralYear = exports.LiteralQuarter = exports.LiteralMonth = exports.LiteralWeek = exports.LiteralDay = exports.LiteralHour = exports.LiteralTimestamp = exports.TimeLiteral = exports.TimeFormatError = void 0;
 const luxon_1 = require("luxon");
 const malloy_types_1 = require("../../../model/malloy_types");
 const expr_value_1 = require("../types/expr-value");
@@ -69,11 +69,16 @@ class TimeLiteral extends expression_def_1.ExpressionDef {
             this.timeZone = tm.tzSpec;
         }
     }
-    makeLiteral(val, typ) {
+    makeLiteral(val, typ, units) {
         const timeFrag = {
             node: 'timeLiteral',
             literal: val,
-            typeDef: { type: typ },
+            typeDef: typ === 'timestamp'
+                ? { type: typ, timeframe: units }
+                : {
+                    type: typ,
+                    timeframe: units !== undefined && (0, malloy_types_1.isDateUnit)(units) ? units : undefined,
+                },
         };
         if (this.timeZone) {
             timeFrag.timezone = this.timeZone;
@@ -81,13 +86,52 @@ class TimeLiteral extends expression_def_1.ExpressionDef {
         return timeFrag;
     }
     makeValue(val, dataType) {
-        const value = this.makeLiteral(val, dataType);
+        const value = this.makeLiteral(val, dataType, this.units);
         return (0, expr_value_1.literalTimeResult)({
             value,
-            dataType: { type: dataType },
+            dataType: value.typeDef,
             timeframe: this.units,
         });
     }
+    getStableLiteral() {
+        const value = this.getValue();
+        let granularity = value.timeframe;
+        if (value.value.node !== 'timeLiteral') {
+            // TODO should probably just throw...
+            return {
+                kind: 'timestamp_literal',
+                timestamp_value: '1970-01-01 00:00:00',
+                granularity,
+            };
+        }
+        const timeValue = value.value.literal;
+        const timezone = value.value.timezone;
+        if (value.type === 'timestamp') {
+            return {
+                kind: 'timestamp_literal',
+                timestamp_value: timeValue,
+                granularity,
+                timezone,
+            };
+        }
+        else {
+            if (granularity === 'hour' ||
+                granularity === 'minute' ||
+                granularity === 'second') {
+                // TODO should probably just throw...
+                granularity = 'day';
+            }
+            return {
+                kind: 'date_literal',
+                date_value: timeValue,
+                granularity,
+                timezone,
+            };
+        }
+    }
+    getValue() {
+        return this.makeValue(this.literalPart, this.timeType);
+    }
     getExpression(_fs) {
         return this.makeValue(this.literalPart, this.timeType);
     }
@@ -100,6 +144,7 @@ class TimeLiteral extends expression_def_1.ExpressionDef {
         return this.nextLit !== undefined;
     }
 }
+exports.TimeLiteral = TimeLiteral;
 class LiteralTimestamp extends TimeLiteral {
     constructor(tm, units) {
         super(tm, units, 'timestamp');
@@ -208,12 +253,12 @@ class DateBasedLiteral extends GranularLiteral {
     }
     getExpression(_fs) {
         const dateValue = this.makeValue(this.literalPart, 'date');
-        const timestamp = this.makeLiteral(`${this.literalPart} 00:00:00`, 'timestamp');
+        const timestamp = this.makeLiteral(`${this.literalPart} 00:00:00`, 'timestamp', this.units);
         return { ...dateValue, morphic: { timestamp }, evalSpace: 'literal' };
     }
     getNext() {
         const dateValue = this.makeValue(this.nextLit, 'date');
-        const timestamp = this.makeLiteral(`${this.nextLit} 00:00:00`, 'timestamp');
+        const timestamp = this.makeLiteral(`${this.nextLit} 00:00:00`, 'timestamp', this.units);
         return { ...dateValue, morphic: { timestamp } };
     }
 }

package/dist/lang/ast/field-space/def-space.d.ts

@@ -0,0 +1,16 @@
+import type { AccessModifierLabel } from '../../../model';
+import type { AtomicFieldDeclaration } from '../query-items/field-declaration';
+import type { FieldName, FieldSpace } from '../types/field-space';
+import type { LookupResult } from '../types/lookup-result';
+import { PassthroughSpace } from './passthrough-space';
+/**
+ * Used to detect references to fields in the statement which defines them
+ */
+export declare class DefSpace extends PassthroughSpace {
+    readonly realFS: FieldSpace;
+    readonly circular: AtomicFieldDeclaration;
+    foundCircle: boolean;
+    constructor(realFS: FieldSpace, circular: AtomicFieldDeclaration);
+    lookup(symbol: FieldName[]): LookupResult;
+    accessProtectionLevel(): AccessModifierLabel;
+}