@malloydata/malloy 0.0.220-dev241205182408 → 0.0.220-dev241206021955

package/dist/dialect/snowflake/snowflake.js

@@ -392,8 +392,7 @@ ${(0, utils_1.indent)(sql)}
                 return 'DOUBLE';
             }
         }
-        else if (malloyType.type === 'record' ||
-            (0, malloy_types_1.isRepeatedRecordType)(malloyType)) {
+        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)) {
@@ -408,7 +407,7 @@ ${(0, utils_1.indent)(sql)}
                 ? recordScehma
                 : `ARRAY(${recordScehma})`;
         }
-        else if ((0, malloy_types_1.isScalarArrayType)(malloyType)) {
+        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 { isRepeatedRecord, isSourceDef, Segment, isLeafAtomic, isJoinedField, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecordType, isScalarArrayType, isScalarArray, mkArrayDef, mkFieldDef, 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.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;
+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,18 +48,16 @@ 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, "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, "isJoinedField", { enumerable: true, get: function () { return model_1.isJoinedField; } });
+Object.defineProperty(exports, "isJoined", { enumerable: true, get: function () { return model_1.isJoined; } });
 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, "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; } });

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.isJoinedField)(field)) {
+            if ((0, malloy_types_1.isAtomic)(field) && !(0, malloy_types_1.isJoined)(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-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/static-space.js

@@ -50,10 +50,10 @@ class StaticSpace {
         }
     }
     defToSpaceField(from) {
-        if ((0, malloy_types_1.isJoinedField)(from)) {
+        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);
@@ -120,8 +120,7 @@ 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.isJoinedField)(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.

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

@@ -55,7 +55,7 @@ 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").LeafArrayTypeDef | import("../../../model/malloy_types").RepeatedRecordTypeDef;
+        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;
     } | {

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

@@ -58,7 +58,6 @@ export * from './expressions/expr-array-literal';
 export * from './expressions/expr-record-literal';
 export * from './expressions/range';
 export * from './expressions/time-frame';
-export * from './expressions/top-by';
 export * from './expressions/unary';
 export * from './statements/import-statement';
 export * from './query-properties/extend';

package/dist/lang/ast/index.js

@@ -96,7 +96,6 @@ __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);
-__exportStar(require("./expressions/top-by"), exports);
 __exportStar(require("./expressions/unary"), exports);
 __exportStar(require("./statements/import-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);

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/typedesc-utils.js

@@ -125,7 +125,7 @@ function atomicDef(td) {
     if (model_1.TD.isAtomic(td)) {
         switch (td.type) {
             case 'array': {
-                return (0, model_1.isRepeatedRecordType)(td)
+                return (0, model_1.isRepeatedRecord)(td)
                     ? {
                         type: 'array',
                         elementTypeDef: td.elementTypeDef,

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/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.isJoinedField)(f)).toBeTruthy();
-        if ((0, model_1.isJoinedField)(f)) {
+        expect((0, model_1.isJoined)(f)).toBeTruthy();
+        if ((0, model_1.isJoined)(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.isJoinedField)(q.extendSource[0])).toBeTruthy();
+                    expect((0, model_1.isJoined)(q.extendSource[0])).toBeTruthy();
                     expect(q.extendSource[0].type).toBe('table');
                 }
                 else {

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.isJoinedField)(fieldDef)) {
+                if ((0, model_1.isJoined)(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.isJoinedField)(join) || !(0, malloy_types_1.isSourceDef)(join)) {
+        if (!(0, malloy_types_1.isJoined)(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.isJoinedField)(fi.f.fieldDef) ||
+                        (0, malloy_types_1.isJoined)(fi.f.fieldDef) ||
                         (0, malloy_types_1.expressionIsAnalytic)(fi.f.fieldDef.expressionType)) {
                         continue;
                     }
@@ -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,11 +381,11 @@ export interface NativeUnsupportedTypeDef {
     rawType?: string;
 }
 export type NativeUnsupportedFieldDef = NativeUnsupportedTypeDef & AtomicFieldDef;
-export interface LeafArrayTypeDef {
+export interface ScalarArrayTypeDef {
     type: 'array';
     elementTypeDef: Exclude<AtomicTypeDef, RecordTypeDef>;
 }
-export interface LeafArrayDef extends LeafArrayTypeDef, StructDefBase, JoinBase, FieldBase {
+export interface ScalarArrayDef extends ScalarArrayTypeDef, StructDefBase, JoinBase, FieldBase {
     type: 'array';
     join: 'many';
 }
@@ -411,12 +411,10 @@ export interface RepeatedRecordDef extends RepeatedRecordTypeDef, StructDefBase,
     type: 'array';
     join: 'many';
 }
-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 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';
 }
@@ -436,8 +434,7 @@ export interface JoinBase {
 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 isJoinedField(fd: FieldDef): fd is JoinFieldDef;
-export declare function isJoined(sd: StructDef): sd is JoinFieldDef;
+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;
@@ -477,17 +474,6 @@ export interface FunctionOrderByDefaultExpression extends ExprLeaf {
     dir: 'asc' | 'desc';
 }
 export type FunctionOrderBy = FunctionOrderByExpression | FunctionOrderByDefaultExpression;
-export interface ByName {
-    by: 'name';
-    name: string;
-}
-export interface ByExpression {
-    by: 'expression';
-    e: Expr;
-}
-export type By = ByName | ByExpression;
-export declare function isByName(by: By | undefined): by is ByName;
-export declare function isByExpression(by: By | undefined): by is ByExpression;
 /** reference to a data source */
 export type StructRef = string | SourceDef;
 export declare function refIsStructDef(ref: StructRef): ref is SourceDef;
@@ -694,8 +680,8 @@ export interface ConnectionDef extends NamedObject {
 export type TemporalTypeDef = DateTypeDef | TimestampTypeDef;
 export type LeafAtomicTypeDef = StringTypeDef | TemporalTypeDef | NumberTypeDef | BooleanTypeDef | JSONTypeDef | NativeUnsupportedTypeDef | ErrorTypeDef;
 export type LeafAtomicDef = LeafAtomicTypeDef & FieldBase;
-export type AtomicTypeDef = LeafAtomicTypeDef | LeafArrayTypeDef | RecordTypeDef | RepeatedRecordTypeDef;
-export type AtomicFieldDef = LeafAtomicDef | LeafArrayDef | RecordDef | RepeatedRecordDef;
+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 = LeafAtomicDef | JoinFieldDef | TurtleDef;
 export type FieldDefType = AtomicFieldType | 'turtle' | JoinElementType;
@@ -705,6 +691,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;
@@ -782,15 +769,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.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;
+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.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 = 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',
@@ -180,10 +180,10 @@ function fieldIsIntrinsic(f) {
 }
 exports.fieldIsIntrinsic = fieldIsIntrinsic;
 function mkFieldDef(atd, name, dialect) {
-    if (isScalarArrayType(atd)) {
+    if (isScalarArray(atd)) {
         return mkArrayDef(atd.elementTypeDef, name, dialect);
     }
-    if (isRepeatedRecordType(atd)) {
+    if (isRepeatedRecord(atd)) {
         const { type, fields, elementTypeDef } = atd;
         return { type, fields, elementTypeDef, join: 'many', name, dialect };
     }
@@ -219,21 +219,13 @@ function mkArrayDef(ofType, name, dialect) {
     };
 }
 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) {
+function isScalarArray(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);
@@ -250,16 +242,12 @@ function isJoinable(sd) {
     ].includes(sd.type);
 }
 exports.isJoinable = isJoinable;
-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) && 'join' in sd;
+    return isSourceDef(sd) && isJoined(sd);
 }
 exports.isJoinedSource = isJoinedSource;
 function isDateUnit(str) {
@@ -282,20 +270,6 @@ var ValueType;
     ValueType["Number"] = "number";
     ValueType["String"] = "string";
 })(ValueType || (exports.ValueType = ValueType = {}));
-function isByName(by) {
-    if (by === undefined) {
-        return false;
-    }
-    return by.by === 'name';
-}
-exports.isByName = isByName;
-function isByExpression(by) {
-    if (by === undefined) {
-        return false;
-    }
-    return by.by === 'name';
-}
-exports.isByExpression = isByExpression;
 function refIsStructDef(ref) {
     return typeof ref !== 'string';
 }
@@ -407,7 +381,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' ||
@@ -423,18 +397,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';
 }
@@ -474,7 +444,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-dev241205182408",
+  "version": "0.0.220-dev241206021955",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",

package/dist/lang/ast/expressions/top-by.d.ts

@@ -1,10 +0,0 @@
-import { By } from '../../../model/malloy_types';
-import { ExpressionDef } from '../types/expression-def';
-import { FieldSpace } from '../types/field-space';
-import { MalloyElement } from '../types/malloy-element';
-export declare class TopBy extends MalloyElement {
-    readonly by: string | ExpressionDef;
-    elementType: string;
-    constructor(by: string | ExpressionDef);
-    getBy(fs: FieldSpace): By;
-}

package/dist/lang/ast/expressions/top-by.js

@@ -1,50 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TopBy = void 0;
-const malloy_types_1 = require("../../../model/malloy_types");
-const expression_def_1 = require("../types/expression-def");
-const malloy_element_1 = require("../types/malloy-element");
-class TopBy extends malloy_element_1.MalloyElement {
-    constructor(by) {
-        super();
-        this.by = by;
-        this.elementType = 'topBy';
-        if (by instanceof expression_def_1.ExpressionDef) {
-            this.has({ by: by });
-        }
-    }
-    getBy(fs) {
-        if (this.by instanceof expression_def_1.ExpressionDef) {
-            const byExpr = this.by.getExpression(fs);
-            if (!(0, malloy_types_1.expressionIsAggregate)(byExpr.expressionType)) {
-                this.logError('top-by-non-aggregate', 'top by expression must be an aggregate');
-            }
-            return { by: 'expression', e: byExpr.value };
-        }
-        return { by: 'name', name: this.by };
-    }
-}
-exports.TopBy = TopBy;
-//# sourceMappingURL=top-by.js.map