@malloydata/malloy 0.0.279 → 0.0.281

package/dist/dialect/functions/util.js

@@ -23,16 +23,34 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.def = exports.expandOverrideMapFromBase = exports.expandBlueprintMap = exports.overload = exports.minAnalytic = exports.minAggregate = exports.minScalar = exports.maxAnalytic = exports.maxUngroupedAggregate = exports.anyExprType = exports.maxAggregate = exports.maxScalar = exports.makeParam = exports.param = exports.variadicParam = exports.literal = exports.output = exports.constant = exports.sql = exports.spread = exports.arg = void 0;
+exports.arg = arg;
+exports.spread = spread;
+exports.sql = sql;
+exports.constant = constant;
+exports.output = output;
+exports.literal = literal;
+exports.variadicParam = variadicParam;
+exports.param = param;
+exports.makeParam = makeParam;
+exports.maxScalar = maxScalar;
+exports.maxAggregate = maxAggregate;
+exports.anyExprType = anyExprType;
+exports.maxUngroupedAggregate = maxUngroupedAggregate;
+exports.maxAnalytic = maxAnalytic;
+exports.minScalar = minScalar;
+exports.minAggregate = minAggregate;
+exports.minAnalytic = minAnalytic;
+exports.overload = overload;
+exports.expandBlueprintMap = expandBlueprintMap;
+exports.expandOverrideMapFromBase = expandOverrideMapFromBase;
+exports.def = def;
 const malloy_types_1 = require("../../model/malloy_types");
 function arg(name) {
     return { node: 'function_parameter', name };
 }
-exports.arg = arg;
 function spread(e, prefix = undefined, suffix = undefined) {
     return { node: 'spread', e, prefix, suffix };
 }
-exports.spread = spread;
 function sql(strings, ...subExprs) {
     const ret = {
         node: 'genericSQLExpr',
@@ -60,28 +78,24 @@ function sql(strings, ...subExprs) {
     }
     return ret;
 }
-exports.sql = sql;
 function constant(type) {
     return {
         ...type,
         evalSpace: 'constant',
     };
 }
-exports.constant = constant;
 function output(type) {
     return {
         ...type,
         evalSpace: 'output',
     };
 }
-exports.output = output;
 function literal(type) {
     return {
         ...type,
         evalSpace: 'literal',
     };
 }
-exports.literal = literal;
 function variadicParam(name, ...allowedTypes) {
     return {
         name,
@@ -89,7 +103,6 @@ function variadicParam(name, ...allowedTypes) {
         allowedTypes,
     };
 }
-exports.variadicParam = variadicParam;
 /**
  * Prefer `makeParam` for future function definitions
  */
@@ -100,43 +113,33 @@ function param(name, ...allowedTypes) {
         allowedTypes,
     };
 }
-exports.param = param;
 function makeParam(name, ...allowedTypes) {
     return { param: param(name, ...allowedTypes), arg: arg(name) };
 }
-exports.makeParam = makeParam;
 function maxScalar(type) {
     return { ...type, expressionType: 'scalar', evalSpace: 'input' };
 }
-exports.maxScalar = maxScalar;
 function maxAggregate(type) {
     return { ...type, expressionType: 'aggregate', evalSpace: 'input' };
 }
-exports.maxAggregate = maxAggregate;
 function anyExprType(type) {
     return { ...type, expressionType: undefined, evalSpace: 'input' };
 }
-exports.anyExprType = anyExprType;
 function maxUngroupedAggregate(type) {
     return { ...type, expressionType: 'ungrouped_aggregate', evalSpace: 'input' };
 }
-exports.maxUngroupedAggregate = maxUngroupedAggregate;
 function maxAnalytic(type) {
     return { ...type, expressionType: 'aggregate_analytic', evalSpace: 'input' };
 }
-exports.maxAnalytic = maxAnalytic;
 function minScalar(type) {
     return { ...type, expressionType: 'scalar', evalSpace: 'input' };
 }
-exports.minScalar = minScalar;
 function minAggregate(type) {
     return { ...type, expressionType: 'aggregate', evalSpace: 'input' };
 }
-exports.minAggregate = minAggregate;
 function minAnalytic(type) {
     return { ...type, expressionType: 'scalar_analytic', evalSpace: 'input' };
 }
-exports.minAnalytic = minAnalytic;
 function overload(returnType, params, e, options) {
     return {
         returnType,
@@ -150,7 +153,6 @@ function overload(returnType, params, e, options) {
         supportsLimit: options === null || options === void 0 ? void 0 : options.supportsLimit,
     };
 }
-exports.overload = overload;
 function expandTypeDescElementBlueprint(blueprint, allowAny = true, allowGenerics = true) {
     if (!allowAny && blueprint === 'any') {
         throw new Error('Return type cannot include any');
@@ -436,7 +438,6 @@ function expandBlueprintMap(blueprints) {
     }
     return map;
 }
-exports.expandBlueprintMap = expandBlueprintMap;
 function expandImplementationBlueprint(base, impl) {
     return [expandBlueprint({ ...base, impl })];
 }
@@ -470,7 +471,6 @@ function expandOverrideMapFromBase(base, overrides) {
     }
     return map;
 }
-exports.expandOverrideMapFromBase = expandOverrideMapFromBase;
 /**
  * Walks a type and returns all the generic references
  * @param tdbp A type
@@ -548,5 +548,4 @@ function def(name, takes, returns, options = {}) {
     };
     return { [name]: newDef };
 }
-exports.def = def;
 //# sourceMappingURL=util.js.map

package/dist/dialect/trino/dialect_functions.js

@@ -48,6 +48,22 @@ const min_by = {
     impl: { function: 'MIN_BY' },
     isSymmetric: true,
 };
+const array_agg = {
+    takes: { x: T },
+    generic: { 'T': ['any'] },
+    returns: { measure: { array: T } },
+    supportsOrderBy: true,
+    impl: { sql: 'ARRAY_AGG(${x} ${order_by:})' },
+    isSymmetric: true,
+};
+const array_agg_distinct = {
+    takes: { x: T },
+    generic: { 'T': ['any'] },
+    returns: { measure: { array: T } },
+    supportsOrderBy: true,
+    impl: { sql: 'ARRAY_AGG(DISTINCT ${x} ${order_by:})' },
+    isSymmetric: true,
+};
 const string_agg = {
     default_separator: {
         takes: { 'value': { dimension: 'string' } },
@@ -295,6 +311,8 @@ exports.TRINO_DIALECT_FUNCTIONS = {
     // window functions
     percent_rank,
     // array function
+    array_agg,
+    array_agg_distinct,
     array_join,
     sequence,
     ...(0, util_1.def)('array_distinct', { 'x': { array: T } }, { array: T }),

package/dist/index.d.ts

@@ -10,7 +10,7 @@ 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';
 export { toAsyncGenerator } from './connection_utils';
-export { modelDefToModelInfo } from './to_stable';
+export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
 export * as API from './api';
 export type { SQLSourceRequest } from './lang/translate-response';
 export { sqlKey } from './model/sql_block';

package/dist/index.js

@@ -15,16 +15,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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.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.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;
 /*
  * Copyright 2023 Google LLC
  *
@@ -124,6 +134,7 @@ 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");
 Object.defineProperty(exports, "modelDefToModelInfo", { enumerable: true, get: function () { return to_stable_1.modelDefToModelInfo; } });
+Object.defineProperty(exports, "sourceDefToSourceInfo", { enumerable: true, get: function () { return to_stable_1.sourceDefToSourceInfo; } });
 exports.API = __importStar(require("./api"));
 var sql_block_1 = require("./model/sql_block");
 Object.defineProperty(exports, "sqlKey", { enumerable: true, get: function () { return sql_block_1.sqlKey; } });

package/dist/lang/ast/ast-utils.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errorFor = void 0;
+exports.errorFor = errorFor;
 /**
  * When a translation hits an error, log and return one of these as a value.
  * This will allow the rest of the translation walk to complete. The
@@ -40,5 +40,4 @@ function errorFor(reason) {
         fieldUsage: [],
     };
 }
-exports.errorFor = errorFor;
 //# sourceMappingURL=ast-utils.js.map

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinaryBoolean = void 0;
 const ast_utils_1 = require("../ast-utils");

package/dist/lang/ast/expressions/binary-numeric.js

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinaryNumeric = void 0;
 const TDU = __importStar(require("../typedesc-utils"));

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Boolean = void 0;
 const expression_def_1 = require("../types/expression-def");

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

@@ -21,13 +21,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CaseWhen = exports.Case = void 0;
 const expr_value_1 = require("../types/expr-value");

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprAggregateFunction = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");

package/dist/lang/ast/expressions/expr-array-literal.js

@@ -21,13 +21,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayLiteral = void 0;
 const expr_value_1 = require("../types/expr-value");

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprCoalesce = void 0;
 const model_1 = require("../../../model");

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprLegacyIn = exports.ExprEquality = exports.ExprCompare = void 0;
 const TDU = __importStar(require("../typedesc-utils"));

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprCountDistinct = void 0;
 const TDU = __importStar(require("../typedesc-utils"));

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

@@ -37,13 +37,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprFunc = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
@@ -287,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}`);
                         }
@@ -317,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,
                             });
                         }
@@ -473,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);
         }