@malloydata/malloy 0.0.280 → 0.0.281

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/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.280";
+export declare const MALLOY_VERSION = "0.0.281";

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.280",
+  "version": "0.0.281",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.280",
-    "@malloydata/malloy-interfaces": "0.0.280",
-    "@malloydata/malloy-tag": "0.0.280",
+    "@malloydata/malloy-filter": "0.0.281",
+    "@malloydata/malloy-interfaces": "0.0.281",
+    "@malloydata/malloy-tag": "0.0.281",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",