@malloydata/malloy 0.0.123-dev240205203120 → 0.0.123-dev240207164302

package/dist/dialect/duckdb/duckdb.js

@@ -76,7 +76,7 @@ class DuckDBDialect extends dialect_1.Dialect {
         return `__udf${Math.floor(Math.random() * 100000)}`;
     }
     quoteTablePath(tableName) {
-        return tableName.match(/\//) ? `'${tableName}'` : tableName;
+        return tableName.match(/[/*:]/) ? `'${tableName}'` : tableName;
     }
     sqlGroupSetTable(groupSetCount) {
         return `CROSS JOIN (SELECT UNNEST(GENERATE_SERIES(0,${groupSetCount},1)) as group_set  ) as group_set`;

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

@@ -87,7 +87,8 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                     // locality to be that join path
                     const joinUsage = this.getJoinUsage(inputFS);
                     const allUsagesSame = joinUsage.length === 1 ||
-                        joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0]));
+                        (joinUsage.length > 1 &&
+                            joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0])));
                     if (allUsagesSame) {
                         structPath = joinUsage[0].map(p => p.name);
                         sourceRelationship = joinUsage[0];
@@ -227,7 +228,6 @@ function getJoinUsage(fs, expr) {
     };
     (0, utils_1.exprWalk)(expr, frag => {
         if (typeof frag !== 'string') {
-            // TODO make this work for field references inside sql_* functions
             if (frag.type === 'field') {
                 const def = lookup(fs, frag.path);
                 if (def.def.type !== 'struct' && def.def.type !== 'turtle') {
@@ -240,6 +240,15 @@ function getJoinUsage(fs, expr) {
                     }
                 }
             }
+            else if (frag.type === 'source-reference') {
+                if (frag.path) {
+                    const def = lookup(fs, frag.path);
+                    result.push(def.relationship);
+                }
+                else {
+                    result.push([]);
+                }
+            }
         }
     });
     return result;

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

@@ -35,7 +35,7 @@ class ExprMinus extends expression_def_1.ExpressionDef {
     }
     getExpression(fs) {
         const expr = this.expr.getExpression(fs);
-        if (this.typeCheck(this.expr, expr)) {
+        if (fragtype_utils_1.FT.typeIn(expr, this.legalChildTypes)) {
             if (expr.value.length > 1) {
                 return { ...expr, dataType: 'number', value: ['-(', ...expr.value, ')'] };
             }

package/dist/lang/ast/fragtype-utils.d.ts

@@ -15,6 +15,12 @@ export declare class FT {
      * @param checkThis The possibly undefined candidate
      */
     static eq(good: TypeDesc, checkThis: TypeDesc | undefined): boolean;
+    /**
+     * Checks if a given type is in a list, ignoring aggregate
+     * @param check The type to check (can be undefined)
+     * @param from List of types which are OK
+     */
+    static typeIn(check: TypeDesc | undefined, from: TypeDesc[]): boolean;
     /**
      * Checks if the base types, ignoring aggregate, are equal
      * @param left Left type

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

@@ -53,6 +53,18 @@ class FT {
             good.dataType === checkThis.dataType &&
             good.expressionType === checkThis.expressionType);
     }
+    /**
+     * Checks if a given type is in a list, ignoring aggregate
+     * @param check The type to check (can be undefined)
+     * @param from List of types which are OK
+     */
+    static typeIn(check, from) {
+        if (check) {
+            const found = from.find(okType => FT.typeEq(okType, check));
+            return found !== undefined;
+        }
+        return false;
+    }
     /**
      * Checks if the base types, ignoring aggregate, are equal
      * @param left Left type

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

@@ -475,6 +475,18 @@ describe('expressions', () => {
         test('source.sum(nested.column)', () => {
             expect(modelX `source.sum(nested.column)`).translationToFailWith('Cannot compute `sum` across repeated relationship `nested`; use `nested.column.sum()`');
         });
+        test('can aggregate field defined with no join usage', () => {
+            expect((0, test_translator_1.markSource) `
+        ##! experimental { sql_functions }
+        source: s is a extend {
+          measure: c is count()
+          dimension: f is 1
+        }
+        run: s -> {
+          aggregate: v is f.sum()
+        }
+      `).toTranslate();
+        });
         test('sum(inline.column)', () => {
             expect(modelX `sum(inline.column)`).toTranslateWithWarnings('Join path is required for this calculation; use `inline.column.sum()` or `source.sum(inline.column)` to get a result weighted with respect to `source`');
         });
@@ -799,6 +811,11 @@ describe('unspported fields in schema', () => {
     test('negative numbers are not tokens', () => {
         expect((0, test_translator_1.expr) `ai-1`).toTranslate();
     });
+    describe('sql functions', () => {
+        test('can aggregate a sql_ function', () => {
+            expect((0, test_translator_1.expr) `sum(sql_number("\${a} * 2"))`).toTranslate();
+        });
+    });
     describe('cast', () => {
         // The "+ 1"s are there to make sure the result is of type 'number'
         test('sql cast', () => {

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

@@ -875,5 +875,19 @@ describe('m3/m4 source query sentences', () => {
     `).toTranslate();
     });
 });
+describe('sql_functions', () => {
+    test('can aggregate sql function', () => {
+        expect((0, test_translator_1.markSource) `
+      ##! experimental { sql_functions }
+      source: s is a extend {
+        measure: c is count()
+        dimension: sql_expr is sql_number("LENGTH(\${TABLE}.astr)")
+      }
+      run: s -> {
+        aggregate: v is sql_expr.sum()
+      }
+    `).toTranslate();
+    });
+});
 test('non breaking space in source', () => expect('source:\u00a0z\u00a0is\u00a0a').toParse());
 //# sourceMappingURL=parse.spec.js.map

package/dist/model/utils.js

@@ -125,6 +125,9 @@ function exprMap(expr, func) {
                 case 'function_parameter':
                 case 'parameter':
                 case 'outputField':
+                case 'source-reference':
+                case 'aggregate_limit':
+                case 'aggregate_order_by':
                     return fragment;
                 case 'sql-string':
                     return {
@@ -231,6 +234,9 @@ function exprWalk(expr, func) {
             case 'function_parameter':
             case 'parameter':
             case 'outputField':
+            case 'source-reference':
+            case 'aggregate_limit':
+            case 'aggregate_order_by':
                 return fragment;
             case 'function_call':
                 return {
@@ -304,7 +310,7 @@ function exprWalk(expr, func) {
                 }
             }
             default:
-                throw new Error('unexpected');
+                throw new Error(`unexpected fragment type ${fragment.type}`);
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.123-dev240205203120",
+  "version": "0.0.123-dev240207164302",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",