@malloydata/malloy 0.0.301 → 0.0.303

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

@@ -111,7 +111,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         return { found: func, error: undefined };
     }
     getPropsExpression(fs, props) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const argExprsWithoutImplicit = this.args.map(arg => arg.getExpression(fs));
         if (this.isRaw) {
             const funcCall = [`${this.name}(`];
@@ -280,6 +280,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
             }
             frag.partitionBy = partitionByFields;
         }
+        const sqlFunctionFieldUsage = [];
         if ([
             'sql_number',
             'sql_string',
@@ -312,9 +313,11 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                         if (result.found === undefined) {
                             return this.loggedErrorExpr('sql-function-interpolation-not-found', `Invalid interpolation: ${result.error.message}`);
                         }
-                        if (result.found.typeDesc().type === 'filter expression') {
+                        const typeDesc = result.found.typeDesc();
+                        if (typeDesc.type === 'filter expression') {
                             return this.loggedErrorExpr('filter-expression-error', 'Filter expressions cannot be used in sql_ functions');
                         }
+                        sqlFunctionFieldUsage.push(...((_e = typeDesc.fieldUsage) !== null && _e !== void 0 ? _e : []));
                         if (result.found.refType === 'parameter') {
                             expr.push({ node: 'parameter', path: part.path });
                         }
@@ -350,7 +353,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
             expressionType,
             value: funcCall,
             evalSpace,
-            fieldUsage: (0, composite_source_utils_1.mergeFieldUsage)(...argExprs.map(e => e.fieldUsage)),
+            fieldUsage: (0, composite_source_utils_1.mergeFieldUsage)(...argExprs.map(e => e.fieldUsage), sqlFunctionFieldUsage),
         };
     }
 }

package/dist/model/composite_source_utils.js

@@ -356,7 +356,7 @@ function getPartitionCompositeDesc(annotation, structDef, logTo) {
             logTo.logError('invalid-partition-composite', `Invalid partition specification for \`${id}\`; must be a tag with property \\fields\``);
             return undefined;
         }
-        const fields = Object.keys(partitionsTag.getProperties());
+        const fields = Object.keys(partitionTag.getProperties());
         allFields.forEach(f => allFields.add(f));
         partitions.push({ id, fields });
     }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.301";
+export declare const MALLOY_VERSION = "0.0.303";

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.301';
+exports.MALLOY_VERSION = '0.0.303';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.301",
+  "version": "0.0.303",
   "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.301",
-    "@malloydata/malloy-interfaces": "0.0.301",
-    "@malloydata/malloy-tag": "0.0.301",
+    "@malloydata/malloy-filter": "0.0.303",
+    "@malloydata/malloy-interfaces": "0.0.303",
+    "@malloydata/malloy-tag": "0.0.303",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",