@malloydata/malloy 0.0.219 → 0.0.220-dev241204170603

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isLeafAtomic = exports.Segment = exports.isSourceDef = exports.isRepeatedRecord = exports.arrayEachFields = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.Tag = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = void 0;
+exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isLeafAtomic = exports.Segment = exports.isSourceDef = exports.isRepeatedRecord = exports.arrayEachFields = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
+exports.Tag = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -46,6 +46,7 @@ Object.defineProperty(exports, "variadicParam", { enumerable: true, get: functio
 Object.defineProperty(exports, "literal", { enumerable: true, get: function () { return dialect_1.literal; } });
 Object.defineProperty(exports, "spread", { enumerable: true, get: function () { return dialect_1.spread; } });
 Object.defineProperty(exports, "Dialect", { enumerable: true, get: function () { return dialect_1.Dialect; } });
+Object.defineProperty(exports, "TinyParser", { enumerable: true, get: function () { return dialect_1.TinyParser; } });
 var model_1 = require("./model");
 Object.defineProperty(exports, "arrayEachFields", { enumerable: true, get: function () { return model_1.arrayEachFields; } });
 Object.defineProperty(exports, "isRepeatedRecord", { enumerable: true, get: function () { return model_1.isRepeatedRecord; } });

package/dist/lang/ast/expressions/case.js

@@ -3,7 +3,7 @@
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/lang/ast/expressions/expr-array-literal.d.ts

@@ -0,0 +1,9 @@
+import { ExprValue } from '../types/expr-value';
+import { ExpressionDef } from '../types/expression-def';
+import { FieldSpace } from '../types/field-space';
+export declare class ArrayLiteral extends ExpressionDef {
+    readonly elements: ExpressionDef[];
+    elementType: string;
+    constructor(elements: ExpressionDef[]);
+    getExpression(fs: FieldSpace): ExprValue;
+}

package/dist/lang/ast/expressions/expr-array-literal.js

@@ -0,0 +1,93 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayLiteral = void 0;
+const model_1 = require("../../../model");
+const expr_value_1 = require("../types/expr-value");
+const expression_def_1 = require("../types/expression-def");
+const TDU = __importStar(require("../typedesc-utils"));
+class ArrayLiteral extends expression_def_1.ExpressionDef {
+    constructor(elements) {
+        super();
+        this.elements = elements;
+        this.elementType = 'array literal';
+        this.has({ elements });
+    }
+    getExpression(fs) {
+        const values = [];
+        const fromValues = [];
+        let firstValue = undefined;
+        if (this.elements.length > 0) {
+            for (const nextElement of this.elements) {
+                const v = nextElement.getExpression(fs);
+                fromValues.push(v);
+                if (v.type === 'error') {
+                    continue;
+                }
+                if (firstValue) {
+                    if (!TDU.typeEq(firstValue, v)) {
+                        nextElement.logError('array-values-incompatible', 'All array elements must be same type');
+                        continue;
+                    }
+                }
+                else {
+                    firstValue = v;
+                }
+                values.push(v.value);
+            }
+        }
+        const elementTypeDef = TDU.atomicDef(firstValue || { type: 'number' });
+        const typeDef = {
+            type: 'array',
+            join: 'many',
+            name: '',
+            dialect: fs.dialectName(),
+            elementTypeDef: elementTypeDef.type !== 'record'
+                ? elementTypeDef
+                : { type: 'record_element' },
+            fields: elementTypeDef.type === 'record'
+                ? elementTypeDef.fields
+                : (0, model_1.arrayEachFields)(elementTypeDef),
+        };
+        const aLit = {
+            node: 'arrayLiteral',
+            kids: { values },
+            typeDef,
+        };
+        return (0, expr_value_1.computedExprValue)({
+            dataType: typeDef,
+            value: aLit,
+            from: fromValues,
+        });
+    }
+}
+exports.ArrayLiteral = ArrayLiteral;
+//# sourceMappingURL=expr-array-literal.js.map

package/dist/lang/ast/expressions/expr-record-literal.d.ts

@@ -12,5 +12,5 @@ export declare class RecordLiteral extends ExpressionDef {
     readonly pairs: RecordElement[];
     elementType: string;
     constructor(pairs: RecordElement[]);
-    getExpression(_fs: FieldSpace): ExprValue;
+    getExpression(fs: FieldSpace): ExprValue;
 }

package/dist/lang/ast/expressions/expr-record-literal.js

@@ -3,12 +3,38 @@
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecordLiteral = exports.RecordElement = void 0;
+const model_1 = require("../../../model");
+const expr_value_1 = require("../types/expr-value");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");
+const TDU = __importStar(require("../typedesc-utils"));
 class RecordElement extends malloy_element_1.MalloyElement {
     constructor(key, value) {
         super();
@@ -26,33 +52,35 @@ class RecordLiteral extends expression_def_1.ExpressionDef {
         this.elementType = 'record literal';
         this.has({ pairs });
     }
-    getExpression(_fs) {
-        throw new Error('get expression on record todo');
-        // const recLit: RecordLiteralNode = {
-        //   node: 'recordLiteral',
-        //   kids: {},
-        // };
-        // const dependents: ExprValue[] = [];
-        // for (const el of this.pairs) {
-        //   const xVal = el.value.getExpression(fs);
-        //   const expr: TypedExpr = {typeDef: {type: 'error'}, ...xVal.value};
-        //   if (TD.isError(expr.typeDef) && isAtomicFieldType(xVal.dataType)) {
-        //     expr.typeDef = xVal.dataType;
-        //   }
-        //   if (TD.isError(expr.typeDef) && xVal.dataType !== 'error') {
-        //     this.logError(
-        //       'illegal-record-property-type',
-        //       `Type '${xVal.dataType}' not a legal record value`
-        //     );
-        //   }
-        //   recLit.kids[el.key] = expr;
-        //   dependents.push(xVal);
-        // }
-        // return computedExprValue({
-        //   dataType: 'record',
-        //   value: recLit,
-        //   from: dependents,
-        // });
+    getExpression(fs) {
+        const recLit = {
+            node: 'recordLiteral',
+            kids: {},
+            typeDef: {
+                name: '',
+                type: 'record',
+                join: 'one',
+                dialect: fs.dialectName(),
+                fields: [],
+            },
+        };
+        const dependents = [];
+        for (const el of this.pairs) {
+            const xVal = el.value.getExpression(fs);
+            if (model_1.TD.isAtomic(xVal)) {
+                dependents.push(xVal);
+                recLit.kids[el.key] = xVal.value;
+                recLit.typeDef.fields.push({ ...TDU.atomicDef(xVal), name: el.key });
+            }
+            else {
+                this.logError('illegal-record-property-type', `Record property '${el.key} is type '${xVal.type}', which is not a legal property value type`);
+            }
+        }
+        return (0, expr_value_1.computedExprValue)({
+            value: recLit,
+            dataType: recLit.typeDef,
+            from: dependents,
+        });
     }
 }
 exports.RecordLiteral = RecordLiteral;

package/dist/lang/ast/field-space/join-space-field.d.ts

@@ -4,5 +4,5 @@ import { StructSpaceField } from './static-space';
 export declare class JoinSpaceField extends StructSpaceField {
     readonly parameterSpace: ParameterSpace;
     readonly join: Join;
-    constructor(parameterSpace: ParameterSpace, join: Join, parentDialect: string);
+    constructor(parameterSpace: ParameterSpace, join: Join);
 }

package/dist/lang/ast/field-space/join-space-field.js

@@ -25,8 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinSpaceField = void 0;
 const static_space_1 = require("./static-space");
 class JoinSpaceField extends static_space_1.StructSpaceField {
-    constructor(parameterSpace, join, parentDialect) {
-        super(join.structDef(parameterSpace), parentDialect);
+    constructor(parameterSpace, join) {
+        super(join.structDef(parameterSpace));
         this.parameterSpace = parameterSpace;
         this.join = join;
     }

package/dist/lang/ast/field-space/project-field-space.js

@@ -32,7 +32,7 @@ class ProjectFieldSpace extends query_spaces_1.QuerySpace {
     }
     canContain(typeDesc) {
         if (typeDesc === undefined ||
-            !malloy_types_1.TD.isLeafAtomic(typeDesc) ||
+            !malloy_types_1.TD.isAtomic(typeDesc) ||
             (0, malloy_types_1.expressionIsAggregate)(typeDesc.expressionType)) {
             // We don't need to log here, because an error should have already been logged.
             return false;

package/dist/lang/ast/field-space/reference-field.js

@@ -84,7 +84,7 @@ class ReferenceField extends space_field_1.SpaceField {
                     };
                 }
                 else {
-                    // mtoy todo
+                    // not sure what to do here, if we get here
                     throw new Error('impossible turtle/join parameter');
                 }
             }

package/dist/lang/ast/field-space/static-space.d.ts

@@ -26,8 +26,7 @@ export declare class StaticSpace implements FieldSpace {
     isQueryFieldSpace(): this is QueryFieldSpace;
 }
 export declare class StructSpaceField extends StructSpaceFieldBase {
-    private parentDialect;
-    constructor(def: JoinFieldDef, dialect: string);
+    constructor(def: JoinFieldDef);
     get fieldSpace(): FieldSpace;
 }
 export declare class StaticSourceSpace extends StaticSpace implements SourceFieldSpace {

package/dist/lang/ast/field-space/static-space.js

@@ -51,7 +51,7 @@ class StaticSpace {
     }
     defToSpaceField(from) {
         if ((0, malloy_types_1.isJoined)(from)) {
-            return new StructSpaceField(from, this.fromStruct.dialect);
+            return new StructSpaceField(from);
         }
         else if ((0, malloy_types_1.isTurtleDef)(from)) {
             return new ir_view_field_1.IRViewField(this, from);
@@ -107,7 +107,7 @@ class StaticSpace {
     lookup(path) {
         const head = path[0];
         const rest = path.slice(1);
-        const found = this.entry(head.refString);
+        let found = this.entry(head.refString);
         if (!found) {
             return {
                 error: {
@@ -120,6 +120,17 @@ class StaticSpace {
         if (found instanceof space_field_1.SpaceField) {
             const definition = found.fieldDef();
             if (definition) {
+                if (!(found instanceof struct_space_field_base_1.StructSpaceFieldBase) && (0, malloy_types_1.isJoined)(definition)) {
+                    // We have looked up a field which is a join, but not a StructSpaceField
+                    // because it is someting like "dimension: joinedArray is arrayComputation"
+                    // which wasn't known to be a join when the fieldspace was constructed.
+                    // TODO don't make one of these every time you do a lookup
+                    found = new StructSpaceField(definition);
+                }
+                // cswenson review todo I don't know how to count the reference properly now
+                // i tried only writing it as a join reference if there was more in the path
+                // but that failed because lookup([JOINNAME]) is called when translating JOINNAME.AGGREGATE(...)
+                // with a 1-length-path but that IS a join reference and there is a test
                 head.addReference({
                     type: found instanceof struct_space_field_base_1.StructSpaceFieldBase
                         ? 'joinReference'
@@ -129,7 +140,7 @@ class StaticSpace {
                     text: head.refString,
                 });
             }
-        }
+        } // cswenson review todo { else this is SpaceEntry not a field which can only be a param and what is going on? }
         const joinPath = found instanceof struct_space_field_base_1.StructSpaceFieldBase
             ? [{ ...found.joinPathElement, name: head.refString }]
             : [];
@@ -162,9 +173,8 @@ class StaticSpace {
 }
 exports.StaticSpace = StaticSpace;
 class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
-    constructor(def, dialect) {
+    constructor(def) {
         super(def);
-        this.parentDialect = dialect;
     }
     get fieldSpace() {
         return new StaticSpace(this.structDef);

package/dist/lang/ast/field-space/view-field.d.ts

@@ -62,7 +62,7 @@ export declare abstract class ViewField extends SpaceField {
         onCompositeFieldUsage?: import("../../../model/malloy_types").CompositeFieldUsage | undefined;
         annotation?: import("../../../model/malloy_types").Annotation | undefined;
         modelAnnotation?: import("../../../model/malloy_types").ModelAnnotation | undefined;
-        fields: ((import("../../../model/malloy_types").StringTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").DateTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").TimestampTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NumberTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").BooleanTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JSONTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NativeUnsupportedTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ErrorTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").TableSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").SQLSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").QuerySourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | TurtleDef)[];
+        fields: ((import("../../../model/malloy_types").StringTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").DateTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").TimestampTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NumberTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").BooleanTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JSONTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NativeUnsupportedTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ErrorTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").TableSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").SQLSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").QuerySourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").CompositeSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | TurtleDef)[];
         dialect: string;
         location?: import("../../../model/malloy_types").DocumentLocation | undefined;
         name: string;
@@ -75,7 +75,7 @@ export declare abstract class ViewField extends SpaceField {
         join: "one";
         annotation?: import("../../../model/malloy_types").Annotation | undefined;
         modelAnnotation?: import("../../../model/malloy_types").ModelAnnotation | undefined;
-        fields: ((import("../../../model/malloy_types").StringTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").DateTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").TimestampTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NumberTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").BooleanTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JSONTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NativeUnsupportedTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ErrorTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").TableSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").SQLSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").QuerySourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | TurtleDef)[];
+        fields: ((import("../../../model/malloy_types").StringTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").DateTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").TimestampTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NumberTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").BooleanTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JSONTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").NativeUnsupportedTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ErrorTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").TableSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").SQLSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").QuerySourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").CompositeSourceDef) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").ArrayTypeDef & import("../../../model/malloy_types").FieldBase) | (import("../../../model/malloy_types").JoinBase & import("../../../model/malloy_types").RecordTypeDef & import("../../../model/malloy_types").FieldBase) | TurtleDef)[];
         dialect: string;
         location?: import("../../../model/malloy_types").DocumentLocation | undefined;
         name: string;

package/dist/lang/ast/index.d.ts

@@ -54,6 +54,7 @@ export * from './expressions/partial-compare';
 export * from './expressions/partition_by';
 export * from './expressions/pick-when';
 export * from './expressions/case';
+export * from './expressions/expr-array-literal';
 export * from './expressions/expr-record-literal';
 export * from './expressions/range';
 export * from './expressions/time-frame';

package/dist/lang/ast/index.js

@@ -92,6 +92,7 @@ __exportStar(require("./expressions/partial-compare"), exports);
 __exportStar(require("./expressions/partition_by"), exports);
 __exportStar(require("./expressions/pick-when"), exports);
 __exportStar(require("./expressions/case"), exports);
+__exportStar(require("./expressions/expr-array-literal"), exports);
 __exportStar(require("./expressions/expr-record-literal"), exports);
 __exportStar(require("./expressions/range"), exports);
 __exportStar(require("./expressions/time-frame"), exports);

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

@@ -96,20 +96,26 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 type: 'error',
             };
         }
-        let retType = exprValue.type;
-        if (retType === 'null') {
+        if (exprValue.type === 'null') {
             this.expr.logWarning('null-typed-field-definition', 'null value defaults to type number, use "null::TYPE" to specify correct type');
-            retType = 'number';
+            const nullAsNumber = {
+                type: 'number',
+                value: exprValue.value,
+                expressionType: exprValue.expressionType,
+                evalSpace: exprValue.evalSpace,
+                compositeFieldUsage: exprValue.compositeFieldUsage,
+            };
+            exprValue = nullAsNumber;
         }
-        if ((0, malloy_types_1.isAtomicFieldType)(retType) && retType !== 'error') {
+        if ((0, malloy_types_1.isAtomicFieldType)(exprValue.type) && exprValue.type !== 'error') {
             this.typecheckExprValue(exprValue);
             let ret;
-            switch (retType) {
+            switch (exprValue.type) {
                 case 'date':
                 case 'timestamp': {
                     const timeRet = {
                         name: exprName,
-                        type: retType,
+                        type: exprValue.type,
                         location: this.location,
                         e: exprValue.value,
                         compositeFieldUsage: exprValue.compositeFieldUsage,
@@ -126,7 +132,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 case 'number':
                 case 'sql native': {
                     ret = {
-                        type: retType,
+                        type: exprValue.type,
                         name: exprName,
                         location: this.location,
                         e: exprValue.value,
@@ -135,21 +141,29 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                     break;
                 }
                 case 'record': {
-                    const fields = [];
                     ret = {
                         type: 'record',
                         name: exprName,
                         location: this.location,
                         join: 'one',
-                        fields,
+                        fields: exprValue.fields,
                         e: exprValue.value,
                         compositeFieldUsage: exprValue.compositeFieldUsage,
                         dialect: exprFS.dialectName(),
                     };
                     break;
                 }
-                case 'array':
-                    throw this.internalError('Cannot return an array result from a query (yet)');
+                case 'array': {
+                    ret = {
+                        type: 'array',
+                        elementTypeDef: exprValue.elementTypeDef,
+                        name: exprName,
+                        join: 'many',
+                        fields: exprValue.fields,
+                        e: exprValue.value,
+                        dialect: exprValue.dialect,
+                    };
+                }
             }
             if (exprValue.expressionType) {
                 ret.expressionType = exprValue.expressionType;

package/dist/lang/ast/query-properties/filters.js

@@ -73,8 +73,6 @@ class Filter extends malloy_element_1.ListOf {
     }
     checkedFilterCondition(fs, filter) {
         const fExpr = filter.filterCondition(fs);
-        // mtoy todo is having we never set then queryRefinementStage might be wrong
-        // ... calculations and aggregations must go last
         // Aggregates are ALSO checked at SQL generation time, but checking
         // here allows better reflection of errors back to user.
         if (this.havingClause !== undefined) {

package/dist/lang/ast/source-properties/join.js

@@ -37,7 +37,7 @@ class Join extends malloy_element_1.MalloyElement {
         this.extendNote = noteable_1.extendNoteMethod;
     }
     makeEntry(fs) {
-        fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(fs.parameterSpace(), this, fs.dialect));
+        fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(fs.parameterSpace(), this));
     }
     getStructDefFromExpr(parameterSpace) {
         const source = this.sourceExpr.getSource();

package/dist/lang/ast/types/binary_operators.js

@@ -3,7 +3,7 @@
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isComparison = exports.isEquality = exports.getExprNode = void 0;

package/dist/lang/ast/types/dialect-name-space.js

@@ -3,7 +3,7 @@
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DialectNameSpace = void 0;

package/dist/lang/lib/Malloy/MalloyParser.d.ts

@@ -2055,7 +2055,7 @@ export declare class ExprLiteralRecordContext extends FieldExprContext {
     OCURLY(): TerminalNode;
     recordElement(): RecordElementContext[];
     recordElement(i: number): RecordElementContext;
-    closeCurly(): CloseCurlyContext;
+    CCURLY(): TerminalNode;
     COMMA(): TerminalNode[];
     COMMA(i: number): TerminalNode;
     constructor(ctx: FieldExprContext);

package/dist/lang/lib/Malloy/MalloyParser.js

@@ -5817,24 +5817,22 @@ class MalloyParser extends Parser_1.Parser {
                             this.recordElement();
                             this.state = 1094;
                             this._errHandler.sync(this);
-                            _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
-                            while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
-                                if (_alt === 1) {
+                            _la = this._input.LA(1);
+                            while (_la === MalloyParser.COMMA) {
+                                {
                                     {
-                                        {
-                                            this.state = 1090;
-                                            this.match(MalloyParser.COMMA);
-                                            this.state = 1091;
-                                            this.recordElement();
-                                        }
+                                        this.state = 1090;
+                                        this.match(MalloyParser.COMMA);
+                                        this.state = 1091;
+                                        this.recordElement();
                                     }
                                 }
                                 this.state = 1096;
                                 this._errHandler.sync(this);
-                                _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
+                                _la = this._input.LA(1);
                             }
                             this.state = 1097;
-                            this.closeCurly();
+                            this.match(MalloyParser.CCURLY);
                         }
                         break;
                     case 5:
@@ -8569,8 +8567,8 @@ MalloyParser._serializedATNSegment2 = "\u0430\xE7\x03\x02\x02\x02\u0431\u0432\bu
     "\u0448\x05\xF8}\x02\u0444\u0445\x07w\x02\x02\u0445\u0447\x05\xF8}\x02" +
     "\u0446\u0444\x03\x02\x02\x02\u0447\u044A\x03\x02\x02\x02\u0448\u0446\x03" +
     "\x02\x02\x02\u0448\u0449\x03\x02\x02\x02\u0449\u044B\x03\x02\x02\x02\u044A" +
-    "\u0448\x03\x02\x02\x02\u044B\u044C\x05\x04\x03\x02\u044C\u0499\x03\x02" +
-    "\x02\x02\u044D\u044E\x07\x80\x02\x02\u044E\u0499\x05\xE8u\x1B\u044F\u0450" +
+    "\u0448\x03\x02\x02\x02\u044B\u044C\x07r\x02\x02\u044C\u0499\x03\x02\x02" +
+    "\x02\u044D\u044E\x07\x80\x02\x02\u044E\u0499\x05\xE8u\x1B\u044F\u0450" +
     "\x07I\x02\x02\u0450\u0499\x05\xE8u\x0F\u0451\u0452\x07+\x02\x02\u0452" +
     "\u0453\x07m\x02\x02\u0453\u0454\x05\xE8u\x02\u0454\u0455\x07%\x02\x02" +
     "\u0455\u0456\x05\xE6t\x02\u0456\u0457\x07n\x02\x02\u0457\u0499\x03\x02" +
@@ -14590,9 +14588,7 @@ class ExprLiteralRecordContext extends FieldExprContext {
             return this.getRuleContext(i, RecordElementContext);
         }
     }
-    closeCurly() {
-        return this.getRuleContext(0, CloseCurlyContext);
-    }
+    CCURLY() { return this.getToken(MalloyParser.CCURLY, 0); }
     COMMA(i) {
         if (i === undefined) {
             return this.getTokens(MalloyParser.COMMA);

package/dist/lang/malloy-to-ast.d.ts

@@ -228,7 +228,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitRecordRef(pcx: parse.RecordRefContext): ast.RecordElement;
     visitRecordExpr(pcx: parse.RecordExprContext): ast.RecordElement;
     visitExprLiteralRecord(pcx: parse.ExprLiteralRecordContext): ast.RecordLiteral;
-    visitExprArrayLiteral(pcx: parse.ExprArrayLiteralContext): ast.Unimplemented;
+    visitExprArrayLiteral(pcx: parse.ExprArrayLiteralContext): ast.ArrayLiteral;
     visitExprWarnLike(pcx: parse.ExprWarnLikeContext): ast.ExprCompare;
     visitExprWarnNullCmp(pcx: parse.ExprWarnNullCmpContext): ast.ExprCompare;
     visitExprWarnIn(pcx: parse.ExprWarnInContext): ast.ExprLegacyIn;

package/dist/lang/malloy-to-ast.js

@@ -1338,13 +1338,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.RecordElement(elementKey, elementVal);
     }
     visitExprLiteralRecord(pcx) {
-        this.contextError(pcx, 'not-yet-implemented', 'Record data is not yet implemented');
         const els = this.only(pcx.recordElement().map(elCx => this.astAt(this.visit(elCx), elCx)), visited => visited instanceof ast.RecordElement && visited, 'a key value pair');
         return new ast.RecordLiteral(els);
     }
     visitExprArrayLiteral(pcx) {
-        this.contextError(pcx, 'not-yet-implemented', 'Array data is not yet implemented');
-        return new ast.Unimplemented();
+        const contents = pcx.fieldExpr().map(fcx => this.getFieldExpr(fcx));
+        const literal = new ast.ArrayLiteral(contents);
+        return this.astAt(literal, pcx);
     }
     visitExprWarnLike(pcx) {
         let op = '~';