@malloydata/malloy 0.0.220-dev241205013400 → 0.0.220-dev241205235613

package/dist/dialect/snowflake/snowflake.js

@@ -392,9 +392,7 @@ ${(0, utils_1.indent)(sql)}
                 return 'DOUBLE';
             }
         }
-        else if (malloyType.type === 'record' ||
-            (malloyType.type === 'array' &&
-                malloyType.elementTypeDef.type === 'record_element')) {
+        else if (malloyType.type === 'record' || (0, malloy_types_1.isRepeatedRecord)(malloyType)) {
             const sqlFields = malloyType.fields.reduce((ret, f) => {
                 var _a;
                 if ((0, malloy_types_1.isAtomic)(f)) {
@@ -409,8 +407,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.isScalarArray)(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 { isSourceDef, Segment, isLeafAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, 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.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.mkFieldDef = exports.mkArrayDef = exports.isScalarArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isLeafAtomic = exports.Segment = exports.isSourceDef = 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 = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -48,8 +48,6 @@ 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; } });
@@ -59,6 +57,10 @@ Object.defineProperty(exports, "isJoinedSource", { enumerable: true, get: functi
 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, "isRepeatedRecord", { enumerable: true, get: function () { return model_1.isRepeatedRecord; } });
+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-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/expressions/expr-time-extract.js

@@ -60,10 +60,10 @@ class ExprTimeExtract extends expression_def_1.ExpressionDef {
                         from: [first, last],
                     });
                 }
-                if (!(0, malloy_types_1.isTemporalField)(first.type)) {
+                if (!(0, malloy_types_1.isTemporalType)(first.type)) {
                     return from.first.loggedErrorExpr('invalid-type-for-time-extraction', `Can't extract ${extractTo} from '${first.type}'`);
                 }
-                if (!(0, malloy_types_1.isTemporalField)(last.type)) {
+                if (!(0, malloy_types_1.isTemporalType)(last.type)) {
                     return from.last.loggedErrorExpr('invalid-type-for-time-extraction', `Cannot extract ${extractTo} from '${last.type}'`);
                 }
                 let valueType = first.type;
@@ -109,7 +109,7 @@ class ExprTimeExtract extends expression_def_1.ExpressionDef {
             }
             else {
                 const argV = from.getExpression(fs);
-                if ((0, malloy_types_1.isTemporalField)(argV.type)) {
+                if ((0, malloy_types_1.isTemporalType)(argV.type)) {
                     return (0, expr_value_1.computedExprValue)({
                         dataType: { type: 'number', numberType: 'integer' },
                         value: {

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

@@ -49,7 +49,7 @@ class ExprTime extends expression_def_1.ExpressionDef {
                 dstType: { type: timeType },
                 e: expr.value,
             };
-            if ((0, malloy_types_1.isTemporalField)(expr.type)) {
+            if ((0, malloy_types_1.isTemporalType)(expr.type)) {
                 toTs.srcType = { type: expr.type };
             }
             value = toTs;

package/dist/lang/ast/expressions/time-literal.js

@@ -166,7 +166,7 @@ class GranularLiteral extends TimeLiteral {
                 }
             }
             // Compiler is unsure about rangeEnd = newEnd for some reason
-            if (rangeEnd && (0, malloy_types_1.isTemporalField)(testValue.type)) {
+            if (rangeEnd && (0, malloy_types_1.isTemporalType)(testValue.type)) {
                 const rangeType = testValue.type;
                 const range = new range_1.Range(new expr_time_1.ExprTime(rangeType, rangeStart.value), new expr_time_1.ExprTime(rangeType, rangeEnd.value));
                 return range.apply(fs, op, left);

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

@@ -53,7 +53,7 @@ class StaticSpace {
         if ((0, malloy_types_1.isJoined)(from)) {
             return new StructSpaceField(from);
         }
-        else if ((0, malloy_types_1.isTurtleDef)(from)) {
+        else if ((0, malloy_types_1.isTurtle)(from)) {
             return new ir_view_field_1.IRViewField(this, from);
         }
         return new column_space_field_1.ColumnSpaceField(from);

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").ScalarArrayTypeDef | 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-builders/reduce-builder.js

@@ -161,7 +161,7 @@ class ReduceBuilder extends QuerySegmentBuilder {
                     fieldAnalytic =
                         (0, malloy_types_1.hasExpression)(field) && (0, malloy_types_1.expressionIsAnalytic)(field.expressionType);
                 }
-                if ((0, malloy_types_1.isTemporalField)(fieldType) || fieldAggregate) {
+                if ((0, malloy_types_1.isTemporalType)(fieldType) || fieldAggregate) {
                     reduceSegment.defaultOrderBy = true;
                     reduceSegment.orderBy = [{ field: fieldName, dir: 'desc' }];
                     usableDefaultOrderField = undefined;

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.isRepeatedRecord)(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/ast/types/expression-def.js

@@ -154,7 +154,7 @@ class ExprDuration extends ExpressionDef {
     apply(fs, op, left) {
         const lhs = left.getExpression(fs);
         this.typeCheck(this, lhs);
-        if ((0, malloy_types_1.isTemporalField)(lhs.type) && (op === '+' || op === '-')) {
+        if ((0, malloy_types_1.isTemporalType)(lhs.type) && (op === '+' || op === '-')) {
             const num = this.n.getExpression(fs);
             if (!TDU.typeEq(num, TDU.numberT)) {
                 this.logError('invalid-duration-quantity', `Duration quantity needs number not '${num.type}`);
@@ -209,8 +209,8 @@ function getMorphicValue(mv, mt) {
 }
 exports.getMorphicValue = getMorphicValue;
 function timeCompare(left, lhs, op, rhs) {
-    const leftIsTime = (0, malloy_types_1.isTemporalField)(lhs.type);
-    const rightIsTime = (0, malloy_types_1.isTemporalField)(rhs.type);
+    const leftIsTime = (0, malloy_types_1.isTemporalType)(lhs.type);
+    const rightIsTime = (0, malloy_types_1.isTemporalType)(rhs.type);
     const node = (0, binary_operators_1.getExprNode)(op);
     if (leftIsTime && rightIsTime) {
         if (lhs.type !== rhs.type) {
@@ -371,7 +371,7 @@ function delta(fs, left, op, right) {
     if (noGo) {
         return noGo;
     }
-    const timeLHS = (0, malloy_types_1.isTemporalField)(lhs.type);
+    const timeLHS = (0, malloy_types_1.isTemporalType)(lhs.type);
     const err = errorCascade(timeLHS ? 'error' : 'number', lhs, rhs);
     if (err)
         return err;

package/dist/lang/ast/view-elements/reference-view.js

@@ -89,7 +89,7 @@ class ReferenceView extends view_1.View {
                 outputStruct,
             };
         }
-        else if ((0, malloy_types_1.isTurtleDef)(fieldDef)) {
+        else if ((0, malloy_types_1.isTurtle)(fieldDef)) {
             if (this.reference.list.length > 1) {
                 if (forRefinement) {
                     this.logError('refinement-with-joined-view', 'Cannot use view from join as refinement');

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/model/malloy_query.js

@@ -3597,7 +3597,16 @@ class QueryModel {
             // for (const f of ret.outputStruct.fields) {
             //   fieldNames.push(getIdentifier(f));
             // }
-            const fieldNames = (0, malloy_types_1.getAtomicFields)(ret.outputStruct).map(fieldDef => q.parent.dialect.sqlMaybeQuoteIdentifier(fieldDef.name));
+            const fieldNames = [];
+            for (const f of ret.outputStruct.fields) {
+                if ((0, malloy_types_1.isAtomic)(f)) {
+                    const quoted = q.parent.dialect.sqlMaybeQuoteIdentifier(f.name);
+                    fieldNames.push(quoted);
+                }
+            }
+            // const fieldNames = getAtomicFields(ret.outputStruct).map(fieldDef =>
+            //   q.parent.dialect.sqlMaybeQuoteIdentifier(fieldDef.name)
+            // );
             ret.lastStageName = stageWriter.addStage(q.parent.dialect.sqlFinalStage(ret.lastStageName, fieldNames));
         }
         return {

package/dist/model/malloy_types.d.ts

@@ -342,7 +342,7 @@ export interface HasExpression {
 }
 export declare function hasExpression<T extends FieldDef>(f: T): f is T & Expression & HasExpression;
 export type TemporalFieldType = 'date' | 'timestamp';
-export declare function isTemporalField(s: string): s is TemporalFieldType;
+export declare function isTemporalType(s: string): s is TemporalFieldType;
 export type CastType = 'string' | 'number' | TemporalFieldType | 'boolean' | 'json';
 export type AtomicFieldType = CastType | 'sql native' | 'record' | 'array' | 'error';
 export declare function isAtomicFieldType(s: string): s is AtomicFieldType;
@@ -381,28 +381,40 @@ export interface NativeUnsupportedTypeDef {
     rawType?: string;
 }
 export type NativeUnsupportedFieldDef = NativeUnsupportedTypeDef & AtomicFieldDef;
-export interface ArrayTypeDef extends JoinBase, StructDefBase {
+export interface ScalarArrayTypeDef {
+    type: 'array';
+    elementTypeDef: Exclude<AtomicTypeDef, RecordTypeDef>;
+}
+export interface ScalarArrayDef extends ScalarArrayTypeDef, 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 = ScalarArrayTypeDef | RepeatedRecordTypeDef;
+export type ArrayDef = ScalarArrayDef | RepeatedRecordDef;
+export declare function isRepeatedRecord(fd: FieldDef | QueryFieldDef | StructDef | AtomicTypeDef): fd is RepeatedRecordTypeDef;
+export declare function isScalarArray(td: AtomicTypeDef | FieldDef | QueryFieldDef | StructDef): td is ScalarArrayTypeDef;
 export interface ErrorTypeDef {
     type: 'error';
 }
@@ -419,10 +431,10 @@ 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 isJoined(sd: TypedDef): 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 +634,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 +690,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 | ScalarArrayTypeDef | RecordTypeDef | RepeatedRecordTypeDef;
+export type AtomicFieldDef = LeafAtomicDef | ScalarArrayDef | 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';
@@ -691,6 +702,7 @@ export interface RefToField {
     annotation?: Annotation;
 }
 export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
+export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;
 /** Get the output name for a NamedObject */
 export declare function getIdentifier(n: AliasedName): string;
 export type NamedModelObject = StructDef | NamedQuery | FunctionDef | ConnectionDef;
@@ -768,15 +780,14 @@ export interface QueryResult extends CompiledQuery {
     runStats?: QueryRunStats;
     profilingUrl?: string;
 }
-export declare function isTurtleDef(def: FieldDef): def is TurtleDef;
-export declare function isAtomic(def: FieldDef | StructDef): def is AtomicFieldDef;
+export declare function isTurtle(def: TypedDef): def is TurtleDef;
+export declare function isAtomic(def: TypedDef): def is AtomicTypeDef;
 export interface SearchResultRow {
     field_name: string;
     field_value: string;
     weight: number;
 }
 export type SearchResult = SearchResultRow[];
-export declare function getAtomicFields(structDef: StructDef): AtomicFieldDef[];
 export declare function isValueString(value: QueryValue, field: FieldDef): value is string | null;
 export declare function isValueNumber(value: QueryValue, field: FieldDef): value is number | null;
 export declare function isValueBoolean(value: QueryValue, field: FieldDef): value is boolean | null;

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.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.isScalarArray = exports.isRepeatedRecord = exports.mkArrayDef = exports.mkFieldDef = exports.fieldIsIntrinsic = exports.isCastType = exports.canOrderBy = exports.isAtomicFieldType = exports.isTemporalType = 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.isAtomic = exports.isTurtle = exports.getIdentifier = exports.isLeafAtomic = exports.mergeEvalSpaces = exports.isLiteral = exports.isBaseTable = exports.isSourceDef = void 0;
 function exprHasKids(e) {
     return 'kids' in e;
 }
@@ -147,10 +147,10 @@ function hasExpression(f) {
     return 'e' in f;
 }
 exports.hasExpression = hasExpression;
-function isTemporalField(s) {
+function isTemporalType(s) {
     return s === 'date' || s === 'timestamp';
 }
-exports.isTemporalField = isTemporalField;
+exports.isTemporalType = isTemporalType;
 function isAtomicFieldType(s) {
     return [
         'string',
@@ -179,34 +179,71 @@ 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 (isScalarArray(atd)) {
+        return mkArrayDef(atd.elementTypeDef, name, dialect);
+    }
+    if (isRepeatedRecord(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 isRepeatedRecord(fd) {
     return fd.type === 'array' && fd.elementTypeDef.type === 'record_element';
 }
 exports.isRepeatedRecord = isRepeatedRecord;
+function isScalarArray(td) {
+    return td.type === 'array' && td.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) {
-    return 'join' in fd;
+function isJoined(sd) {
+    return 'join' in sd;
 }
 exports.isJoined = isJoined;
 function isJoinedSource(sd) {
@@ -330,7 +367,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 +376,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';
 }
@@ -362,7 +395,7 @@ function mergeEvalSpaces(...evalSpaces) {
 exports.mergeEvalSpaces = mergeEvalSpaces;
 function isLeafAtomic(fd) {
     return (fd.type === 'string' ||
-        isTemporalField(fd.type) ||
+        isTemporalType(fd.type) ||
         fd.type === 'number' ||
         fd.type === 'boolean' ||
         fd.type === 'json' ||
@@ -378,18 +411,14 @@ function getIdentifier(n) {
     return n.name;
 }
 exports.getIdentifier = getIdentifier;
-function isTurtleDef(def) {
+function isTurtle(def) {
     return def.type === 'turtle';
 }
-exports.isTurtleDef = isTurtleDef;
+exports.isTurtle = isTurtle;
 function isAtomic(def) {
     return isAtomicFieldType(def.type);
 }
 exports.isAtomic = isAtomic;
-function getAtomicFields(structDef) {
-    return structDef.fields.filter(isAtomic);
-}
-exports.getAtomicFields = getAtomicFields;
 function isValueString(value, field) {
     return field.type === 'string';
 }
@@ -429,7 +458,9 @@ exports.TD = {
     isDate: (td) => (td === null || td === void 0 ? void 0 : td.type) === 'date',
     isTimestamp: (td) => (td === null || td === void 0 ? void 0 : td.type) === 'timestamp',
     isTemporal(td) {
-        return (td === null || td === void 0 ? void 0 : td.type) === 'timestamp' || (td === null || td === void 0 ? void 0 : td.type) === 'date';
+        var _a;
+        const typ = (_a = td === null || td === void 0 ? void 0 : td.type) !== null && _a !== void 0 ? _a : '';
+        return isTemporalType(typ);
     },
     isError: (td) => (td === null || td === void 0 ? void 0 : td.type) === 'error',
     eq(x, y) {

package/package.json

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