@malloydata/malloy 0.0.220-dev241205013400 → 0.0.220-dev241205182408

package/dist/dialect/snowflake/snowflake.js

@@ -393,8 +393,7 @@ ${(0, utils_1.indent)(sql)}
             }
         }
         else if (malloyType.type === 'record' ||
-            (malloyType.type === 'array' &&
-                malloyType.elementTypeDef.type === 'record_element')) {
+            (0, malloy_types_1.isRepeatedRecordType)(malloyType)) {
             const sqlFields = malloyType.fields.reduce((ret, f) => {
                 var _a;
                 if ((0, malloy_types_1.isAtomic)(f)) {
@@ -409,8 +408,7 @@ ${(0, utils_1.indent)(sql)}
                 ? recordScehma
                 : `ARRAY(${recordScehma})`;
         }
-        else if (malloyType.type === 'array' &&
-            malloyType.elementTypeDef.type !== 'record_element') {
+        else if ((0, malloy_types_1.isScalarArrayType)(malloyType)) {
             return `ARRAY(${this.malloyTypeToSQLType(malloyType.elementTypeDef)})`;
         }
         return malloyType.type;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
 export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, SQLSentence, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, LeafAtomicTypeDef, LeafAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, ArrayLiteralNode, } from './model';
-export { arrayEachFields, isRepeatedRecord, isSourceDef, Segment, isLeafAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, } from './model';
+export { isRepeatedRecord, isSourceDef, Segment, isLeafAtomic, isJoinedField, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecordType, isScalarArrayType, isScalarArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, } from './model';
 export { MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.mkFieldDef = exports.mkArrayDef = exports.isScalarArray = exports.isScalarArrayType = exports.isRepeatedRecordType = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoinedField = exports.isLeafAtomic = exports.Segment = exports.isSourceDef = exports.isRepeatedRecord = 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 = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -48,17 +48,21 @@ Object.defineProperty(exports, "spread", { enumerable: true, get: function () {
 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; } });
 Object.defineProperty(exports, "isSourceDef", { enumerable: true, get: function () { return model_1.isSourceDef; } });
 // Used in Composer Demo
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return model_1.Segment; } });
 Object.defineProperty(exports, "isLeafAtomic", { enumerable: true, get: function () { return model_1.isLeafAtomic; } });
-Object.defineProperty(exports, "isJoined", { enumerable: true, get: function () { return model_1.isJoined; } });
+Object.defineProperty(exports, "isJoinedField", { enumerable: true, get: function () { return model_1.isJoinedField; } });
 Object.defineProperty(exports, "isJoinedSource", { enumerable: true, get: function () { return model_1.isJoinedSource; } });
 Object.defineProperty(exports, "isSamplingEnable", { enumerable: true, get: function () { return model_1.isSamplingEnable; } });
 Object.defineProperty(exports, "isSamplingPercent", { enumerable: true, get: function () { return model_1.isSamplingPercent; } });
 Object.defineProperty(exports, "isSamplingRows", { enumerable: true, get: function () { return model_1.isSamplingRows; } });
+Object.defineProperty(exports, "isRepeatedRecordType", { enumerable: true, get: function () { return model_1.isRepeatedRecordType; } });
+Object.defineProperty(exports, "isScalarArrayType", { enumerable: true, get: function () { return model_1.isScalarArrayType; } });
+Object.defineProperty(exports, "isScalarArray", { enumerable: true, get: function () { return model_1.isScalarArray; } });
+Object.defineProperty(exports, "mkArrayDef", { enumerable: true, get: function () { return model_1.mkArrayDef; } });
+Object.defineProperty(exports, "mkFieldDef", { enumerable: true, get: function () { return model_1.mkFieldDef; } });
 Object.defineProperty(exports, "expressionIsAggregate", { enumerable: true, get: function () { return model_1.expressionIsAggregate; } });
 Object.defineProperty(exports, "expressionIsAnalytic", { enumerable: true, get: function () { return model_1.expressionIsAnalytic; } });
 Object.defineProperty(exports, "expressionIsCalculation", { enumerable: true, get: function () { return model_1.expressionIsCalculation; } });

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

@@ -241,7 +241,7 @@ function getJoinUsage(fs, expr) {
         if (frag.node === 'field') {
             const def = lookupWithPath(fs, frag.path);
             const field = def.def;
-            if ((0, malloy_types_1.isAtomic)(field) && !(0, malloy_types_1.isJoined)(field)) {
+            if ((0, malloy_types_1.isAtomic)(field) && !(0, malloy_types_1.isJoinedField)(field)) {
                 if ((0, malloy_types_1.hasExpression)(field)) {
                     const defUsage = getJoinUsage(def.fs, field.e);
                     result.push(...defUsage.map(r => [...def.joinPath, ...r]));

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

@@ -30,7 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 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"));
@@ -65,18 +64,16 @@ class ArrayLiteral extends expression_def_1.ExpressionDef {
             }
         }
         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 typeDef = elementTypeDef.type === 'record'
+            ? {
+                type: 'array',
+                elementTypeDef: { type: 'record_element' },
+                fields: elementTypeDef.fields,
+            }
+            : {
+                type: 'array',
+                elementTypeDef,
+            };
         const aLit = {
             node: 'arrayLiteral',
             kids: { values },

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

@@ -57,10 +57,7 @@ class RecordLiteral extends expression_def_1.ExpressionDef {
             node: 'recordLiteral',
             kids: {},
             typeDef: {
-                name: '',
                 type: 'record',
-                join: 'one',
-                dialect: fs.dialectName(),
                 fields: [],
             },
         };
@@ -70,7 +67,7 @@ class RecordLiteral extends expression_def_1.ExpressionDef {
             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 });
+                recLit.typeDef.fields.push((0, model_1.mkFieldDef)(TDU.atomicDef(xVal), el.key, fs.dialectName()));
             }
             else {
                 this.logError('illegal-record-property-type', `Record property '${el.key} is type '${xVal.type}', which is not a legal property value type`);

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

@@ -78,8 +78,7 @@ class ReferenceField extends space_field_1.SpaceField {
                 const foundType = check.found.typeDesc();
                 if (malloy_types_1.TD.isAtomic(foundType)) {
                     this.queryFieldDef = {
-                        ...TDU.atomicDef(foundType),
-                        name: path[0],
+                        ...(0, malloy_types_1.mkFieldDef)(TDU.atomicDef(foundType), path[0], fs.dialectName()),
                         e: { node: 'parameter', path },
                     };
                 }

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

@@ -50,7 +50,7 @@ class StaticSpace {
         }
     }
     defToSpaceField(from) {
-        if ((0, malloy_types_1.isJoined)(from)) {
+        if ((0, malloy_types_1.isJoinedField)(from)) {
             return new StructSpaceField(from);
         }
         else if ((0, malloy_types_1.isTurtleDef)(from)) {
@@ -120,7 +120,8 @@ 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)) {
+                if (!(found instanceof struct_space_field_base_1.StructSpaceFieldBase) &&
+                    (0, malloy_types_1.isJoinedField)(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.

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

@@ -55,34 +55,20 @@ export declare abstract class ViewField extends SpaceField {
     } | {
         compositeFieldUsage: import("../../../model/malloy_types").CompositeFieldUsage;
         type: "array";
-        elementTypeDef: import("../../../model/malloy_types").LeafAtomicTypeDef | import("../../../model/malloy_types").ArrayTypeDef | import("../../../model/malloy_types").RecordElementTypeDef;
-        join: "many";
-        matrixOperation?: import("../../../model/malloy_types").MatrixOperation | undefined;
-        onExpression?: import("../../../model/malloy_types").Expr | undefined;
-        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").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;
-        as?: string | undefined;
+        elementTypeDef: import("../../../model/malloy_types").LeafAtomicTypeDef | import("../../../model/malloy_types").LeafArrayTypeDef | import("../../../model/malloy_types").RepeatedRecordTypeDef;
         expressionType: import("../../../model/malloy_types").ExpressionType;
         evalSpace: import("../../../model/malloy_types").EvalSpace;
     } | {
         compositeFieldUsage: import("../../../model/malloy_types").CompositeFieldUsage;
         type: "record";
-        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").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;
-        as?: string | undefined;
-        matrixOperation?: import("../../../model/malloy_types").MatrixOperation | undefined;
-        onExpression?: import("../../../model/malloy_types").Expr | undefined;
-        onCompositeFieldUsage?: import("../../../model/malloy_types").CompositeFieldUsage | undefined;
+        fields: import("../../../model/malloy_types").FieldDef[];
+        expressionType: import("../../../model/malloy_types").ExpressionType;
+        evalSpace: import("../../../model/malloy_types").EvalSpace;
+    } | {
+        compositeFieldUsage: import("../../../model/malloy_types").CompositeFieldUsage;
+        type: "array";
+        elementTypeDef: import("../../../model/malloy_types").RecordElementTypeDef;
+        fields: import("../../../model/malloy_types").FieldDef[];
         expressionType: import("../../../model/malloy_types").ExpressionType;
         evalSpace: import("../../../model/malloy_types").EvalSpace;
     } | {

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

@@ -109,62 +109,14 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         }
         if ((0, malloy_types_1.isAtomicFieldType)(exprValue.type) && exprValue.type !== 'error') {
             this.typecheckExprValue(exprValue);
-            let ret;
-            switch (exprValue.type) {
-                case 'date':
-                case 'timestamp': {
-                    const timeRet = {
-                        name: exprName,
-                        type: exprValue.type,
-                        location: this.location,
-                        e: exprValue.value,
-                        compositeFieldUsage: exprValue.compositeFieldUsage,
-                    };
-                    if ((0, granular_result_1.isGranularResult)(exprValue)) {
-                        timeRet.timeframe = exprValue.timeframe;
-                    }
-                    ret = timeRet;
-                    break;
-                }
-                case 'json':
-                case 'boolean':
-                case 'string':
-                case 'number':
-                case 'sql native': {
-                    ret = {
-                        type: exprValue.type,
-                        name: exprName,
-                        location: this.location,
-                        e: exprValue.value,
-                        compositeFieldUsage: exprValue.compositeFieldUsage,
-                    };
-                    break;
-                }
-                case 'record': {
-                    ret = {
-                        type: 'record',
-                        name: exprName,
-                        location: this.location,
-                        join: 'one',
-                        fields: exprValue.fields,
-                        e: exprValue.value,
-                        compositeFieldUsage: exprValue.compositeFieldUsage,
-                        dialect: exprFS.dialectName(),
-                    };
-                    break;
-                }
-                case 'array': {
-                    ret = {
-                        type: 'array',
-                        elementTypeDef: exprValue.elementTypeDef,
-                        name: exprName,
-                        join: 'many',
-                        fields: exprValue.fields,
-                        e: exprValue.value,
-                        dialect: exprValue.dialect,
-                    };
-                }
+            const ret = (0, malloy_types_1.mkFieldDef)(TDU.atomicDef(exprValue), exprName, exprFS.dialectName());
+            if ((ret.type === 'date' || ret.type === 'timestamp') &&
+                (0, granular_result_1.isGranularResult)(exprValue)) {
+                ret.timeframe = exprValue.timeframe;
             }
+            ret.location = this.location;
+            ret.e = exprValue.value;
+            ret.compositeFieldUsage = exprValue.compositeFieldUsage;
             if (exprValue.expressionType) {
                 ret.expressionType = exprValue.expressionType;
             }

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

@@ -125,23 +125,19 @@ function atomicDef(td) {
     if (model_1.TD.isAtomic(td)) {
         switch (td.type) {
             case 'array': {
-                return {
-                    name: '',
-                    type: 'array',
-                    join: 'many',
-                    elementTypeDef: td.elementTypeDef,
-                    dialect: td.dialect,
-                    fields: td.fields,
-                };
+                return (0, model_1.isRepeatedRecordType)(td)
+                    ? {
+                        type: 'array',
+                        elementTypeDef: td.elementTypeDef,
+                        fields: td.fields,
+                    }
+                    : {
+                        type: 'array',
+                        elementTypeDef: td.elementTypeDef,
+                    };
             }
             case 'record': {
-                return {
-                    name: '',
-                    type: 'record',
-                    join: 'one',
-                    dialect: td.dialect,
-                    fields: td.fields,
-                };
+                return { type: 'record', fields: td.fields };
             }
             case 'number': {
                 return td.numberType

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

@@ -92,8 +92,8 @@ source: botProjQSrc is botProjQ
         const maybeField = newSrc === null || newSrc === void 0 ? void 0 : newSrc.fields.find(f => f.name === 'b');
         expect(maybeField).toBeDefined();
         const f = maybeField;
-        expect((0, model_1.isJoined)(f)).toBeTruthy();
-        if ((0, model_1.isJoined)(f)) {
+        expect((0, model_1.isJoinedField)(f)).toBeTruthy();
+        if ((0, model_1.isJoinedField)(f)) {
             expect(f.type).toBe('query_source');
             if (f.type === 'query_source') {
                 expect(typeof f.query.structRef).not.toBe('string');

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

@@ -1038,7 +1038,7 @@ describe('query:', () => {
                 const q = t.translated.queryList[0].pipeline[0];
                 if (q.type === 'reduce' && q.extendSource) {
                     expect(q.extendSource.length).toBe(1);
-                    expect((0, model_1.isJoined)(q.extendSource[0])).toBeTruthy();
+                    expect((0, model_1.isJoinedField)(q.extendSource[0])).toBeTruthy();
                     expect(q.extendSource[0].type).toBe('table');
                 }
                 else {

package/dist/lang/test/test-translator.js

@@ -74,14 +74,7 @@ const mockSchema = {
                 matrixOperation: 'left',
                 dialect: 'standardsql',
             },
-            {
-                type: 'array',
-                name: 'ais',
-                elementTypeDef: intType,
-                join: 'many',
-                fields: (0, malloy_types_1.arrayEachFields)(intType),
-                dialect: 'standardsql',
-            },
+            (0, malloy_types_1.mkArrayDef)(intType, 'ais', 'standardsql'),
         ],
     },
     'malloytest.carriers': {

package/dist/malloy.js

@@ -1041,7 +1041,7 @@ class Explore extends Entity {
             this._fieldMap = new Map(this.structDef.fields.map(fieldDef => {
                 const name = fieldDef.as || fieldDef.name;
                 const sourceField = sourceFields.get(fieldDef.name);
-                if ((0, model_1.isJoined)(fieldDef)) {
+                if ((0, model_1.isJoinedField)(fieldDef)) {
                     return [name, new ExploreField(fieldDef, this, sourceField)];
                 }
                 else if (fieldDef.type === 'turtle') {

package/dist/model/composite_source_utils.js

@@ -107,7 +107,7 @@ function _resolveCompositeSources(path, source, compositeFieldUsage, narrowedCom
                 error: { code: 'composite_source_not_defined', data: { path: newPath } },
             };
         }
-        if (!(0, malloy_types_1.isJoined)(join) || !(0, malloy_types_1.isSourceDef)(join)) {
+        if (!(0, malloy_types_1.isJoinedField)(join) || !(0, malloy_types_1.isSourceDef)(join)) {
             return {
                 error: { code: 'composite_source_not_a_join', data: { path: newPath } },
             };

package/dist/model/malloy_query.js

@@ -1269,7 +1269,7 @@ class FieldInstanceResult {
             if (fi instanceof FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
                     if (fi.f.fieldDef.type === 'turtle' ||
-                        (0, malloy_types_1.isJoined)(fi.f.fieldDef) ||
+                        (0, malloy_types_1.isJoinedField)(fi.f.fieldDef) ||
                         (0, malloy_types_1.expressionIsAnalytic)(fi.f.fieldDef.expressionType)) {
                         continue;
                     }

package/dist/model/malloy_types.d.ts

@@ -381,28 +381,42 @@ export interface NativeUnsupportedTypeDef {
     rawType?: string;
 }
 export type NativeUnsupportedFieldDef = NativeUnsupportedTypeDef & AtomicFieldDef;
-export interface ArrayTypeDef extends JoinBase, StructDefBase {
+export interface LeafArrayTypeDef {
+    type: 'array';
+    elementTypeDef: Exclude<AtomicTypeDef, RecordTypeDef>;
+}
+export interface LeafArrayDef extends LeafArrayTypeDef, StructDefBase, JoinBase, FieldBase {
     type: 'array';
-    elementTypeDef: Exclude<AtomicTypeDef, RecordTypeDef> | RecordElementTypeDef;
     join: 'many';
 }
-export type ArrayDef = ArrayTypeDef & AtomicFieldDef;
-export declare function arrayEachFields(arrayOf: AtomicTypeDef): AtomicFieldDef[];
-export interface RecordTypeDef extends StructDefBase, JoinBase {
+export declare function mkFieldDef(atd: AtomicTypeDef, name: string, dialect: string): AtomicFieldDef;
+export declare function mkArrayDef(ofType: AtomicTypeDef, name: string, dialect: string): ArrayDef;
+export interface RecordTypeDef {
+    type: 'record';
+    fields: FieldDef[];
+}
+export interface RecordDef extends RecordTypeDef, StructDefBase, JoinBase, FieldBase {
     type: 'record';
     join: 'one';
 }
 export interface RecordElementTypeDef {
     type: 'record_element';
 }
-export interface RepeatedRecordTypeDef extends ArrayDef {
+export interface RepeatedRecordTypeDef {
     type: 'array';
     elementTypeDef: RecordElementTypeDef;
+    fields: FieldDef[];
+}
+export interface RepeatedRecordDef extends RepeatedRecordTypeDef, StructDefBase, JoinBase, FieldBase {
+    type: 'array';
     join: 'many';
 }
-export type RecordDef = RecordTypeDef & AtomicFieldDef;
-export type RepeatedRecordDef = RepeatedRecordTypeDef & AtomicFieldDef;
-export declare function isRepeatedRecord(fd: FieldDef): fd is RepeatedRecordDef;
+export type ArrayTypeDef = LeafArrayTypeDef | RepeatedRecordTypeDef;
+export type ArrayDef = LeafArrayDef | RepeatedRecordDef;
+export declare function isRepeatedRecordType(td: AtomicTypeDef): td is RepeatedRecordTypeDef;
+export declare function isRepeatedRecord(fd: FieldDef | QueryFieldDef | StructDef): fd is RepeatedRecordDef;
+export declare function isScalarArrayType(td: AtomicTypeDef): td is LeafArrayTypeDef;
+export declare function isScalarArray(fd: FieldDef | QueryFieldDef | StructDef): fd is LeafArrayDef;
 export interface ErrorTypeDef {
     type: 'error';
 }
@@ -419,10 +433,11 @@ export interface JoinBase {
     onExpression?: Expr;
     onCompositeFieldUsage?: CompositeFieldUsage;
 }
-export type Joinable = CompositeSourceDef | TableSourceDef | SQLSourceDef | QuerySourceDef | RecordDef | ArrayDef;
-export type JoinFieldDef = JoinBase & Joinable;
+export type Joinable = CompositeSourceDef | TableSourceDef | SQLSourceDef | QuerySourceDef | RepeatedRecordDef | RecordDef | ArrayDef;
+export type JoinFieldDef = Joinable & JoinBase;
 export declare function isJoinable(sd: StructDef): sd is Joinable;
-export declare function isJoined<T extends FieldDef | StructDef>(fd: T): fd is T & Joinable & JoinBase;
+export declare function isJoinedField(fd: FieldDef): fd is JoinFieldDef;
+export declare function isJoined(sd: StructDef): sd is JoinFieldDef;
 export declare function isJoinedSource(sd: StructDef): sd is SourceDef & JoinBase;
 export type DateUnit = 'day' | 'week' | 'month' | 'quarter' | 'year';
 export declare function isDateUnit(str: string): str is DateUnit;
@@ -622,7 +637,6 @@ export declare function isSourceDef(sd: NamedModelObject | FieldDef): sd is Sour
 export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryResultDef | FinalizeSourceDef | NestSourceDef | CompositeSourceDef;
 /** Is this the "FROM" table of a query tree */
 export declare function isBaseTable(def: StructDef): def is SourceDef;
-export declare function isScalarArray(def: FieldDef | StructDef): boolean;
 export type StructDef = SourceDef | RecordDef | ArrayDef;
 export type NonAtomicType = Exclude<JoinElementType, 'array' | 'record'> | 'turtle' | 'null' | 'duration' | 'any' | 'regular expression';
 export interface NonAtomicTypeDef {
@@ -679,11 +693,11 @@ export interface ConnectionDef extends NamedObject {
 }
 export type TemporalTypeDef = DateTypeDef | TimestampTypeDef;
 export type LeafAtomicTypeDef = StringTypeDef | TemporalTypeDef | NumberTypeDef | BooleanTypeDef | JSONTypeDef | NativeUnsupportedTypeDef | ErrorTypeDef;
-export type AtomicTypeDef = LeafAtomicTypeDef | ArrayTypeDef | RecordTypeDef;
 export type LeafAtomicDef = LeafAtomicTypeDef & FieldBase;
-export type AtomicFieldDef = AtomicTypeDef & FieldBase;
+export type AtomicTypeDef = LeafAtomicTypeDef | LeafArrayTypeDef | RecordTypeDef | RepeatedRecordTypeDef;
+export type AtomicFieldDef = LeafAtomicDef | LeafArrayDef | RecordDef | RepeatedRecordDef;
 export declare function isLeafAtomic(fd: FieldDef | QueryFieldDef | AtomicTypeDef): fd is LeafAtomicDef;
-export type FieldDef = AtomicFieldDef | JoinFieldDef | TurtleDef;
+export type FieldDef = LeafAtomicDef | JoinFieldDef | TurtleDef;
 export type FieldDefType = AtomicFieldType | 'turtle' | JoinElementType;
 export interface RefToField {
     type: 'fieldref';

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBaseTable = exports.isSourceDef = exports.sourceBase = exports.isSegmentSQL = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.isJoinedSource = exports.isJoined = exports.isJoinable = exports.isMatrixOperation = exports.isRepeatedRecord = exports.arrayEachFields = exports.fieldIsIntrinsic = exports.isCastType = exports.canOrderBy = exports.isAtomicFieldType = exports.isTemporalField = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.paramHasValue = exports.isRawCast = exports.mkTemporal = exports.isAsymmetricExpr = exports.exprIsLeaf = exports.exprHasE = exports.exprHasKids = void 0;
-exports.TD = exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.getAtomicFields = exports.isAtomic = exports.isTurtleDef = exports.getIdentifier = exports.isLeafAtomic = exports.mergeEvalSpaces = exports.isLiteral = exports.isScalarArray = void 0;
+exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.isJoinedSource = exports.isJoined = exports.isJoinedField = exports.isJoinable = exports.isMatrixOperation = exports.isScalarArray = exports.isScalarArrayType = exports.isRepeatedRecord = exports.isRepeatedRecordType = exports.mkArrayDef = exports.mkFieldDef = exports.fieldIsIntrinsic = exports.isCastType = exports.canOrderBy = exports.isAtomicFieldType = exports.isTemporalField = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.paramHasValue = exports.isRawCast = exports.mkTemporal = exports.isAsymmetricExpr = exports.exprIsLeaf = exports.exprHasE = exports.exprHasKids = void 0;
+exports.TD = exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.getAtomicFields = exports.isAtomic = exports.isTurtleDef = exports.getIdentifier = exports.isLeafAtomic = exports.mergeEvalSpaces = exports.isLiteral = exports.isBaseTable = exports.isSourceDef = exports.sourceBase = exports.isSegmentSQL = exports.isIndexSegment = void 0;
 function exprHasKids(e) {
     return 'kids' in e;
 }
@@ -179,38 +179,87 @@ function fieldIsIntrinsic(f) {
     return isAtomicFieldType(f.type) && !hasExpression(f);
 }
 exports.fieldIsIntrinsic = fieldIsIntrinsic;
-function arrayEachFields(arrayOf) {
-    return [
-        { ...arrayOf, e: { node: 'field', path: ['value'] }, name: 'each' },
-        { ...arrayOf, name: 'value' },
-    ];
-}
-exports.arrayEachFields = arrayEachFields;
+function mkFieldDef(atd, name, dialect) {
+    if (isScalarArrayType(atd)) {
+        return mkArrayDef(atd.elementTypeDef, name, dialect);
+    }
+    if (isRepeatedRecordType(atd)) {
+        const { type, fields, elementTypeDef } = atd;
+        return { type, fields, elementTypeDef, join: 'many', name, dialect };
+    }
+    if (atd.type === 'record') {
+        const { type, fields } = atd;
+        return { type, fields, join: 'one', dialect, name };
+    }
+    return { ...atd, name };
+}
+exports.mkFieldDef = mkFieldDef;
+function mkArrayDef(ofType, name, dialect) {
+    if (ofType.type === 'record') {
+        return {
+            type: 'array',
+            join: 'many',
+            name,
+            dialect,
+            elementTypeDef: { type: 'record_element' },
+            fields: ofType.fields,
+        };
+    }
+    const valueEnt = mkFieldDef(ofType, 'value', dialect);
+    return {
+        type: 'array',
+        join: 'many',
+        name,
+        dialect,
+        elementTypeDef: ofType,
+        fields: [
+            valueEnt,
+            { ...valueEnt, name: 'each', e: { node: 'field', path: ['value'] } },
+        ],
+    };
+}
+exports.mkArrayDef = mkArrayDef;
+function isRepeatedRecordType(td) {
+    return td.type === 'array' && td.elementTypeDef.type === 'record_element';
+}
+exports.isRepeatedRecordType = isRepeatedRecordType;
 function isRepeatedRecord(fd) {
     return fd.type === 'array' && fd.elementTypeDef.type === 'record_element';
 }
 exports.isRepeatedRecord = isRepeatedRecord;
+function isScalarArrayType(td) {
+    return td.type === 'array' && td.elementTypeDef.type !== 'record_element';
+}
+exports.isScalarArrayType = isScalarArrayType;
+function isScalarArray(fd) {
+    return fd.type === 'array' && fd.elementTypeDef.type !== 'record_element';
+}
+exports.isScalarArray = isScalarArray;
 function isMatrixOperation(x) {
     return ['left', 'right', 'full', 'inner'].includes(x);
 }
 exports.isMatrixOperation = isMatrixOperation;
 function isJoinable(sd) {
     return [
+        'composite',
         'table',
         'sql_select',
         'query_source',
         'array',
         'record',
-        'composite',
     ].includes(sd.type);
 }
 exports.isJoinable = isJoinable;
-function isJoined(fd) {
+function isJoinedField(fd) {
     return 'join' in fd;
 }
+exports.isJoinedField = isJoinedField;
+function isJoined(sd) {
+    return 'join' in sd;
+}
 exports.isJoined = isJoined;
 function isJoinedSource(sd) {
-    return isSourceDef(sd) && isJoined(sd);
+    return isSourceDef(sd) && 'join' in sd;
 }
 exports.isJoinedSource = isJoinedSource;
 function isDateUnit(str) {
@@ -330,7 +379,7 @@ function isSourceDef(sd) {
 exports.isSourceDef = isSourceDef;
 /** Is this the "FROM" table of a query tree */
 function isBaseTable(def) {
-    if (isJoined(def)) {
+    if (isJoinedSource(def)) {
         return false;
     }
     if (isSourceDef(def)) {
@@ -339,10 +388,6 @@ function isBaseTable(def) {
     return false;
 }
 exports.isBaseTable = isBaseTable;
-function isScalarArray(def) {
-    return def.type === 'array' && def.elementTypeDef.type !== 'record_element';
-}
-exports.isScalarArray = isScalarArray;
 function isLiteral(evalSpace) {
     return evalSpace === 'literal';
 }

package/package.json

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