@malloydata/malloy 0.0.107 → 0.0.108-dev231130212526

package/dist/lang/ast/query-items/field-declaration.js

@@ -75,7 +75,11 @@ class FieldDeclaration extends malloy_element_1.MalloyElement {
             };
         }
         const compressValue = (0, utils_1.compressExpr)(exprValue.value);
-        const retType = exprValue.dataType;
+        let retType = exprValue.dataType;
+        if (retType === 'null') {
+            this.expr.log('null value defaults to type number, use "null::TYPE" to specify correct type', 'warn');
+            retType = 'number';
+        }
         if ((0, malloy_types_1.isAtomicFieldType)(retType) && retType !== 'error') {
             const template = {
                 name: exprName,

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

@@ -322,7 +322,7 @@ describe('error cascading', () => {
         source: a1 is a extend {
           join_one: b with astr
           dimension:
-            ${'err is null'}
+            ${'err is nothing'}
             ${scalars.map((d, i) => `e${i} is ${d}`).join('\n            ')}
           measure:
             measure_err is count(foo),
@@ -330,18 +330,18 @@ describe('error cascading', () => {
             .map((m, i) => `e${i + scalars.length} is ${m}`)
             .join('\n            ')}
         }
-      `).translationToFailWith("Cannot define 'err', unexpected type: null", "'foo' is not defined");
+      `).translationToFailWith("'nothing' is not defined", "'foo' is not defined");
     });
     test('error type inference is good', () => {
         for (const scalar of scalars) {
             const source = `
           source: a1 is a extend {
             dimension:
-              ${'err is null'}
+              ${'err is nothing'}
               dim is length(${scalar}, 1)
           }
         `;
-            expect(source).translationToFailWith("Cannot define 'err', unexpected type: null", `No matching overload for function length(${typedScalars[scalar]}, number)`);
+            expect(source).translationToFailWith("'nothing' is not defined", `No matching overload for function length(${typedScalars[scalar]}, number)`);
         }
     });
     test('eval space of errors is preserved', () => {
@@ -351,7 +351,7 @@ describe('error cascading', () => {
         }
         run: a1 -> {
           group_by:
-            ${'err is null'}
+            ${'err is nothing'}
           aggregate:
             measure_err is count(foo)
           calculate:
@@ -362,7 +362,7 @@ describe('error cascading', () => {
             .map((m, i) => `e${i + scalars.length} is lag(${m})`)
             .join('\n            ')}
         }
-      `).translationToFailWith("Cannot define 'err', unexpected type: null", "'foo' is not defined");
+      `).translationToFailWith("'nothing' is not defined", "'foo' is not defined");
     });
 });
 describe('pipeline comprehension', () => {

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

@@ -64,6 +64,9 @@ describe('source:', () => {
         test('single dimension', () => {
             expect('source: aa is a extend { dimension: x is 1 }').toTranslate();
         });
+        test('field def with null value', () => {
+            expect((0, test_translator_1.markSource) `source: aa is a extend { dimension: x is ${'null'} }`).toTranslateWithWarnings('null value defaults to type number, use "null::TYPE" to specify correct type');
+        });
         test('multiple dimensions', () => {
             expect(`
         source: aa is a extend {

package/package.json

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