@malloydata/malloy 0.0.208 → 0.0.209

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

@@ -100,31 +100,28 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         return { found: func, error: undefined };
     }
     getPropsExpression(fs, props) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const argExprsWithoutImplicit = this.args.map(arg => arg.getExpression(fs));
         if (this.isRaw) {
-            let collectType;
             const funcCall = [`${this.name}(`];
-            for (const expr of argExprsWithoutImplicit) {
-                if (collectType) {
+            argExprsWithoutImplicit.forEach((expr, i) => {
+                if (i !== 0) {
                     funcCall.push(',');
                 }
-                else {
-                    if ((0, malloy_types_1.isCastType)(expr.type)) {
-                        collectType = expr.type;
-                    }
-                }
                 funcCall.push(expr.value);
-            }
+            });
             funcCall.push(')');
-            const dataType = (_b = (_a = this.rawType) !== null && _a !== void 0 ? _a : collectType) !== null && _b !== void 0 ? _b : 'number';
+            const inferredType = (_a = argExprsWithoutImplicit[0]) !== null && _a !== void 0 ? _a : { type: 'number' };
+            const dataType = this.rawType
+                ? { type: this.rawType }
+                : inferredType;
             return (0, expr_value_1.computedExprValue)({
-                dataType: { type: dataType },
+                dataType,
                 value: (0, utils_1.composeSQLExpr)(funcCall),
                 from: argExprsWithoutImplicit,
             });
         }
-        const dialect = (_c = fs.dialectObj()) === null || _c === void 0 ? void 0 : _c.name;
+        const dialect = (_b = fs.dialectObj()) === null || _b === void 0 ? void 0 : _b.name;
         const { found: func, error } = this.findFunctionDef(dialect);
         if (func === undefined) {
             return (0, ast_utils_1.errorFor)(error);
@@ -132,7 +129,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         // Find the 'implicit argument' for aggregate functions called like `some_join.some_field.agg(...args)`
         // where the full arg list is `(some_field, ...args)`.
         let implicitExpr = undefined;
-        let structPath = (_d = this.source) === null || _d === void 0 ? void 0 : _d.path;
+        let structPath = (_c = this.source) === null || _c === void 0 ? void 0 : _c.path;
         if (this.source) {
             const lookup = this.source.getField(fs);
             const sourceFoot = lookup.found;

package/dist/lang/test/expressions.spec.js

@@ -61,6 +61,9 @@ describe('expressions', () => {
     test('function call', () => {
         expect((0, test_translator_1.expr) `concat('foo')`).toTranslate();
     });
+    test('raw function call codegen', () => {
+        expect((0, test_translator_1.expr) `special_function!(aweird, 'foo')`).compilesTo('special_function({aweird},{"foo"})');
+    });
     describe('operators', () => {
         test('addition', () => {
             expect('42 + 7').compilesTo('{42 + 7}');

package/dist/lang/test/parse-expects.js

@@ -177,6 +177,17 @@ function eToStr(e, symbols) {
                 .map(o => `${subExpr(o)}`)
                 .join(',')}}}`;
         }
+        case 'genericSQLExpr': {
+            let sql = '';
+            let i = 0;
+            for (; i < e.kids.args.length; i++) {
+                sql += `${e.src[i]}{${subExpr(e.kids.args[i])}}`;
+            }
+            if (i < e.src.length) {
+                sql += e.src[i];
+            }
+            return sql;
+        }
     }
     if ((0, model_1.exprHasKids)(e) && e.kids['left'] && e.kids['right']) {
         return `{${subExpr(e.kids['left'])} ${e.node} ${subExpr(e.kids['right'])}}`;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.208";
+export declare const MALLOY_VERSION = "0.0.209";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.208",
+  "version": "0.0.209",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",