@malloydata/malloy 0.0.163-dev240807165545 → 0.0.163-dev240808155642

package/dist/lang/ast/types/expression-def.js

@@ -321,14 +321,6 @@ function compare(fs, left, op, right) {
 function oneOf(op, ...operators) {
     return operators.includes(op);
 }
-function allAre(oneType, ...values) {
-    for (const v of values) {
-        if (v.dataType !== oneType) {
-            return false;
-        }
-    }
-    return true;
-}
 function numeric(fs, left, op, right) {
     const lhs = left.getExpression(fs);
     const rhs = right.getExpression(fs);
@@ -340,7 +332,13 @@ function numeric(fs, left, op, right) {
         return noGo;
     }
     const expressionType = (0, malloy_types_1.maxExpressionType)(lhs.expressionType, rhs.expressionType);
-    if (allAre('number', lhs, rhs)) {
+    if (lhs.dataType !== 'number') {
+        left.log(`The '${op}' operator requires a number, not a '${lhs.dataType}'`);
+    }
+    else if (rhs.dataType !== 'number') {
+        right.log(`The '${op}' operator requires a number, not a '${rhs.dataType}'`);
+    }
+    else {
         return {
             dataType: 'number',
             expressionType,
@@ -348,9 +346,6 @@ function numeric(fs, left, op, right) {
             evalSpace: (0, malloy_types_1.mergeEvalSpaces)(lhs.evalSpace, rhs.evalSpace),
         };
     }
-    // TODO make the error location be the operand that is not a number, rather than
-    // always the first operand
-    left.log(`Non numeric('${lhs.dataType},${rhs.dataType}') value with '${op}'`);
     return (0, ast_utils_1.errorFor)('numbers required');
 }
 function delta(fs, left, op, right) {

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

@@ -82,6 +82,14 @@ describe('expressions', () => {
         test('addition', () => {
             expect((0, test_translator_1.expr) `42 + 7`).toTranslate();
         });
+        test('typecheck addition lhs', () => {
+            const wrong = (0, test_translator_1.expr) `${'"string"'} + 1`;
+            expect(wrong).translationToFailWith("The '+' operator requires a number, not a 'string'");
+        });
+        test('typecheck addition rhs', () => {
+            const wrong = (0, test_translator_1.expr) `1 + ${'"string"'}`;
+            expect(wrong).translationToFailWith("The '+' operator requires a number, not a 'string'");
+        });
         test('subtraction', () => {
             expect((0, test_translator_1.expr) `42 - 7`).toTranslate();
         });

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

@@ -75,8 +75,8 @@ describe('parameters', () => {
     test('no additional error if default value type is error', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
-      source: ab_new(param::number is 1 + "foo") is ab
-    `).translationToFailWith("Non numeric('number,string') value with '+'");
+      source: ab_new(param::number is 1 + ${'"foo"'}) is ab
+    `).translationToFailWith("The '+' operator requires a number, not a 'string'");
     });
     test('can declare parameter with inferred type', () => {
         expect(`

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

@@ -417,7 +417,7 @@ describe('query:', () => {
         test('function return type incorrect', () => {
             expect(`run: a -> {
           group_by: s is floor(1.2) + 'a'
-      }`).translationToFailWith("Non numeric('number,string') value with '+'");
+      }`).translationToFailWith("The '+' operator requires a number, not a 'string'");
         });
         test('can use output value in calculate', () => {
             expect(`run: a -> {

package/package.json

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