@malloydata/malloy 0.0.222-dev241212154316 → 0.0.222-dev241212190052

package/dist/dialect/duckdb/duckdb.js

@@ -423,7 +423,7 @@ class DuckDBTypeParser extends tiny_parser_1.TinyParser {
                     fieldName.type === 'qdouble' ||
                     fieldName.type === 'id') {
                     const fieldType = this.typeDef();
-                    baseType.fields.push((0, malloy_types_1.mkFieldDef)(fieldType, this.unquoteName(fieldName), 'duckdb'));
+                    baseType.fields.push((0, malloy_types_1.mkFieldDef)(fieldType, this.unquoteName(fieldName)));
                 }
                 else {
                     if (fieldName.type !== ')') {

package/dist/dialect/functions/util.d.ts

@@ -48,7 +48,14 @@ export declare function overload(returnType: TypeDesc, params: FunctionParameter
     defaultOrderByArgIndex?: number;
     supportsOrderBy?: boolean | 'only_default';
 }): DialectFunctionOverloadDef;
-export type TypeDescBlueprint = LeafExpressionType | {
+export interface ArrayBlueprint {
+    array: TypeDescElementBlueprint;
+}
+export interface RecordBlueprint {
+    record: Record<string, TypeDescElementBlueprint>;
+}
+export type TypeDescElementBlueprint = LeafExpressionType | ArrayBlueprint | RecordBlueprint;
+export type TypeDescBlueprint = TypeDescElementBlueprint | {
     generic: string;
 } | {
     literal: LeafExpressionType | {

package/dist/dialect/functions/util.js

@@ -24,6 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandOverrideMapFromBase = exports.expandBlueprintMap = exports.overload = exports.minAnalytic = exports.minAggregate = exports.minScalar = exports.maxAnalytic = exports.maxUngroupedAggregate = exports.anyExprType = exports.maxAggregate = exports.maxScalar = exports.makeParam = exports.param = exports.variadicParam = exports.literal = exports.output = exports.constant = exports.sql = exports.spread = exports.arg = void 0;
 const composite_source_utils_1 = require("../../model/composite_source_utils");
+const malloy_types_1 = require("../../model/malloy_types");
 function arg(name) {
     return { node: 'function_parameter', name };
 }
@@ -116,6 +117,10 @@ function anyExprType(type) {
     return { type, expressionType: undefined, evalSpace: 'input' };
 }
 exports.anyExprType = anyExprType;
+function anyExprTypeBP(type, generic) {
+    const typeDesc = expandReturnTypeBlueprint(type, generic);
+    return { ...typeDesc, expressionType: undefined, evalSpace: 'input' };
+}
 function maxUngroupedAggregate(type) {
     return { type, expressionType: 'ungrouped_aggregate', evalSpace: 'input' };
 }
@@ -165,6 +170,48 @@ function expandReturnTypeBlueprint(blueprint, generic) {
     if (typeof blueprint === 'string') {
         base = minScalar(blueprint);
     }
+    else if ('array' in blueprint) {
+        const innerType = expandReturnTypeBlueprint(blueprint.array, generic);
+        const { expressionType, evalSpace } = innerType;
+        if (malloy_types_1.TD.isAtomic(innerType)) {
+            if (innerType.type !== 'record') {
+                base = {
+                    type: 'array',
+                    elementTypeDef: innerType,
+                    expressionType,
+                    evalSpace,
+                };
+            }
+            else {
+                base = {
+                    type: 'array',
+                    elementTypeDef: { type: 'record_element' },
+                    fields: innerType.fields,
+                    expressionType,
+                    evalSpace,
+                };
+            }
+        }
+        else {
+            // mtoy todo  fix by doing "exapndElementBlueprint" ...
+            throw new Error(`TypeDescElementBlueprint should never allow ${blueprint.array}`);
+        }
+    }
+    else if ('record' in blueprint) {
+        const fields = [];
+        for (const [fieldName, fieldBlueprint] of Object.entries(blueprint.record)) {
+            const fieldDesc = expandReturnTypeBlueprint(fieldBlueprint, generic);
+            if (malloy_types_1.TD.isAtomic(fieldDesc)) {
+                fields.push((0, malloy_types_1.mkFieldDef)(fieldDesc, fieldName));
+            }
+        }
+        base = {
+            type: 'record',
+            fields,
+            evalSpace: 'input',
+            expressionType: 'scalar',
+        };
+    }
     else if ('generic' in blueprint) {
         base = minScalar(removeGeneric(blueprint, generic));
     }
@@ -191,6 +238,8 @@ function expandReturnTypeBlueprint(blueprint, generic) {
 }
 function isTypeDescBlueprint(blueprint) {
     return (typeof blueprint === 'string' ||
+        'array' in blueprint ||
+        'record' in blueprint ||
         'generic' in blueprint ||
         'literal' in blueprint ||
         'constant' in blueprint ||
@@ -231,6 +280,12 @@ function expandParamTypeBlueprint(blueprint, generic) {
     else if ('measure' in blueprint) {
         return maxAggregate(removeGeneric(blueprint.measure, generic));
     }
+    else if ('array' in blueprint) {
+        return anyExprTypeBP(blueprint, generic);
+    }
+    else if ('record' in blueprint) {
+        return anyExprTypeBP(blueprint, generic);
+    }
     else {
         return maxAnalytic(removeGeneric(blueprint.calculation, generic));
     }

package/dist/dialect/trino/dialect_functions.js

@@ -239,6 +239,11 @@ const url_extract_query = {
     returns: 'string',
     impl: { function: 'URL_EXTRACT_QUERY' },
 };
+const split = {
+    takes: { 'src': 'string', 'splitChar': 'string' },
+    returns: { array: 'string' },
+    impl: { function: 'SPLIT' },
+};
 exports.TRINO_DIALECT_FUNCTIONS = {
     // aggregate functions
     approx_percentile,
@@ -274,5 +279,6 @@ exports.TRINO_DIALECT_FUNCTIONS = {
     url_extract_query,
     // window functions
     percent_rank,
+    split,
 };
 //# sourceMappingURL=dialect_functions.js.map

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

@@ -67,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((0, model_1.mkFieldDef)(TDU.atomicDef(xVal), el.key, fs.dialectName()));
+                recLit.typeDef.fields.push((0, model_1.mkFieldDef)(TDU.atomicDef(xVal), el.key));
             }
             else {
                 this.logError('illegal-record-property-type', `Record property '${el.key} is type '${xVal.type}', which is not a legal property value type`);

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

@@ -58,7 +58,7 @@ const struct_space_field_base_1 = require("./struct-space-field-base");
 const parameter_space_1 = require("./parameter-space");
 class DynamicSpace extends static_space_1.StaticSpace {
     constructor(extending) {
-        super(structuredClone(extending));
+        super(structuredClone(extending), extending.dialect);
         this.complete = false;
         this.parameters = [];
         this.fromSource = extending;

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

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

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

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

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

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

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

@@ -6,11 +6,11 @@ import { FieldName, FieldSpace, QueryFieldSpace, SourceFieldSpace } from '../typ
 import { SpaceField } from '../types/space-field';
 import { StructSpaceFieldBase } from './struct-space-field-base';
 export declare class StaticSpace implements FieldSpace {
-    protected fromStruct: StructDef;
     readonly type = "fieldSpace";
     private memoMap?;
-    get dialect(): string;
-    constructor(fromStruct: StructDef);
+    protected fromStruct: StructDef;
+    protected structDialect: string;
+    constructor(struct: StructDef, dialect_name: string);
     dialectName(): string;
     dialectObj(): Dialect | undefined;
     defToSpaceField(from: FieldDef): SpaceField;
@@ -26,7 +26,8 @@ export declare class StaticSpace implements FieldSpace {
     isQueryFieldSpace(): this is QueryFieldSpace;
 }
 export declare class StructSpaceField extends StructSpaceFieldBase {
-    constructor(def: JoinFieldDef);
+    private forDialect;
+    constructor(def: JoinFieldDef, forDialect: string);
     get fieldSpace(): FieldSpace;
 }
 export declare class StaticSourceSpace extends StaticSpace implements SourceFieldSpace {

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

@@ -31,19 +31,17 @@ const struct_space_field_base_1 = require("./struct-space-field-base");
 const column_space_field_1 = require("./column-space-field");
 const ir_view_field_1 = require("./ir-view-field");
 class StaticSpace {
-    get dialect() {
-        return this.fromStruct.dialect;
-    }
-    constructor(fromStruct) {
-        this.fromStruct = fromStruct;
+    constructor(struct, dialect_name) {
         this.type = 'fieldSpace';
+        this.fromStruct = struct;
+        this.structDialect = dialect_name;
     }
     dialectName() {
-        return this.fromStruct.dialect;
+        return this.structDialect;
     }
     dialectObj() {
         try {
-            return (0, dialect_map_1.getDialect)(this.fromStruct.dialect);
+            return (0, dialect_map_1.getDialect)(this.structDialect);
         }
         catch {
             return undefined;
@@ -51,7 +49,7 @@ class StaticSpace {
     }
     defToSpaceField(from) {
         if ((0, malloy_types_1.isJoined)(from)) {
-            return new StructSpaceField(from);
+            return new StructSpaceField(from, this.structDialect);
         }
         else if ((0, malloy_types_1.isTurtle)(from)) {
             return new ir_view_field_1.IRViewField(this, from);
@@ -125,7 +123,7 @@ class StaticSpace {
                     // because it is someting like "dimension: joinedArray is arrayComputation"
                     // which wasn't known to be a join when the fieldspace was constructed.
                     // TODO don't make one of these every time you do a lookup
-                    found = new StructSpaceField(definition);
+                    found = new StructSpaceField(definition, this.structDialect);
                 }
                 // cswenson review todo I don't know how to count the reference properly now
                 // i tried only writing it as a join reference if there was more in the path
@@ -173,17 +171,23 @@ class StaticSpace {
 }
 exports.StaticSpace = StaticSpace;
 class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
-    constructor(def) {
+    constructor(def, forDialect) {
         super(def);
+        this.forDialect = forDialect;
     }
     get fieldSpace() {
-        return new StaticSpace(this.structDef);
+        if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
+            return new StaticSourceSpace(this.structDef);
+        }
+        else {
+            return new StaticSpace(this.structDef, this.forDialect);
+        }
     }
 }
 exports.StructSpaceField = StructSpaceField;
 class StaticSourceSpace extends StaticSpace {
     constructor(source) {
-        super(source);
+        super(source, source.dialect);
         this.source = source;
     }
     structDef() {

package/dist/lang/ast/query-elements/query-arrow.js

@@ -58,14 +58,14 @@ class QueryArrow extends query_base_1.QueryBase {
             inputStruct = (0, malloy_types_1.refIsStructDef)(invoked.structRef)
                 ? invoked.structRef
                 : this.source.getSourceDef(undefined);
-            fieldSpace = new static_space_1.StaticSpace(inputStruct);
+            fieldSpace = new static_space_1.StaticSourceSpace(inputStruct);
         }
         else {
             // We are adding a second stage to the given "source" query; we get the query and add a segment
             const lhsQuery = this.source.queryComp(isRefOk);
             queryBase = lhsQuery.query;
             inputStruct = lhsQuery.outputStruct;
-            fieldSpace = new static_space_1.StaticSpace(lhsQuery.outputStruct);
+            fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct);
         }
         const { pipeline, annotation, outputStruct, name } = this.view.pipelineComp(fieldSpace);
         return {

package/dist/lang/ast/query-elements/query-refine.js

@@ -40,7 +40,7 @@ class QueryRefine extends query_base_1.QueryBase {
     }
     queryComp(isRefOk) {
         const q = this.base.queryComp(isRefOk);
-        const inputFS = new static_space_1.StaticSpace(q.inputStruct);
+        const inputFS = new static_space_1.StaticSourceSpace(q.inputStruct);
         const resultPipe = this.refinement.refine(inputFS, q.query.pipeline, undefined);
         return {
             query: {

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

@@ -109,7 +109,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         }
         if ((0, malloy_types_1.isAtomicFieldType)(exprValue.type) && exprValue.type !== 'error') {
             this.typecheckExprValue(exprValue);
-            const ret = (0, malloy_types_1.mkFieldDef)(TDU.atomicDef(exprValue), exprName, exprFS.dialectName());
+            const ret = (0, malloy_types_1.mkFieldDef)(TDU.atomicDef(exprValue), exprName);
             if ((ret.type === 'date' || ret.type === 'timestamp') &&
                 (0, granular_result_1.isGranularResult)(exprValue)) {
                 ret.timeframe = exprValue.timeframe;

package/dist/lang/ast/source-elements/named-source.js

@@ -104,7 +104,8 @@ class NamedSource extends source_1.Source {
                 return { ...entry };
             }
         }
-        this.logError('invalid-source-source', `Cannot construct a source from a ${entry.type}`);
+        // I think this is now a never
+        this.logError('invalid-source-source', 'Cannot construct a source from a never type');
     }
     evaluateArgumentsForRef(parameterSpace) {
         const base = this.modelStruct();

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

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

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

@@ -40,7 +40,7 @@ class ViewArrow extends view_1.View {
     }
     pipelineComp(fs) {
         const baseComp = this.base.pipelineComp(fs);
-        const nextFS = new static_space_1.StaticSpace(baseComp.outputStruct);
+        const nextFS = new static_space_1.StaticSourceSpace(baseComp.outputStruct);
         const finalComp = this.operation.pipelineComp(nextFS);
         return {
             pipeline: [...baseComp.pipeline, ...finalComp.pipeline],

package/dist/lang/test/field-symbols.spec.js

@@ -51,7 +51,7 @@ describe('structdef comprehension', () => {
             type: 'string',
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -63,7 +63,7 @@ describe('structdef comprehension', () => {
             numberType: 'float',
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -75,7 +75,7 @@ describe('structdef comprehension', () => {
             numberType: 'integer',
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -86,7 +86,7 @@ describe('structdef comprehension', () => {
             type: 'boolean',
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -97,7 +97,7 @@ describe('structdef comprehension', () => {
             type: 'sql native',
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -106,14 +106,13 @@ describe('structdef comprehension', () => {
         const field = {
             name: 't',
             type: 'array',
-            dialect: 'standardsql',
             elementTypeDef: { type: 'string' },
             join: 'many',
             matrixOperation: 'left',
             fields: [{ type: 'string', name: 'b' }],
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t.b')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -122,13 +121,12 @@ describe('structdef comprehension', () => {
         const field = {
             name: 't',
             type: 'record',
-            dialect: 'standardsql',
             join: 'one',
             matrixOperation: 'left',
             fields: [{ type: 'string', name: 'a' }],
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t.a')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -152,7 +150,7 @@ describe('structdef comprehension', () => {
             fields: [{ type: 'string', name: 'a' }],
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t.a')).found).toBeInstanceOf(column_space_field_1.ColumnSpaceField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -169,7 +167,7 @@ describe('structdef comprehension', () => {
             ],
         };
         const struct = mkStructDef(field);
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('t')).found).toBeInstanceOf(ir_view_field_1.IRViewField);
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
@@ -188,7 +186,7 @@ describe('structdef comprehension', () => {
                 value: { node: 'stringLiteral', literal: 'value' },
             },
         };
-        const space = new static_space_1.StaticSpace(struct);
+        const space = new static_space_1.StaticSourceSpace(struct);
         expect(space.lookup(fieldRef('cReqStr')).found).toBeInstanceOf(space_param_1.DefinedParameter);
         expect(space.lookup(fieldRef('cOptStr')).found).toBeInstanceOf(space_param_1.DefinedParameter);
     });

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

@@ -64,7 +64,6 @@ const mockSchema = {
                         numberType: 'integer',
                     },
                 ],
-                dialect: 'standardsql',
             },
             {
                 type: 'record',
@@ -72,9 +71,8 @@ const mockSchema = {
                 fields: [{ ...intType, name: 'column' }],
                 join: 'one',
                 matrixOperation: 'left',
-                dialect: 'standardsql',
             },
-            (0, malloy_types_1.mkArrayDef)(intType, 'ais', 'standardsql'),
+            (0, malloy_types_1.mkArrayDef)(intType, 'ais'),
         ],
     },
     'malloytest.carriers': {

package/dist/malloy.js

@@ -1025,6 +1025,9 @@ class Explore extends Entity {
         return new PreparedQuery(internalQuery, this.modelDef, [], name);
     }
     get modelDef() {
+        if (!(0, model_1.isSourceDef)(this.structDef)) {
+            throw new Error(`Cannot create pseudo model for struct type ${this.structDef.type}`);
+        }
         return {
             name: 'generated_model',
             exports: [],

package/dist/model/malloy_query.d.ts

@@ -307,6 +307,7 @@ declare class QueryStruct {
     connectionName: string;
     recordAlias?: string;
     constructor(structDef: StructDef, sourceArguments: Record<string, Argument> | undefined, parent: ParentQueryStruct | ParentQueryModel, prepareResultOptions: PrepareResultOptions);
+    protected findFirstDialect(): string;
     informOfAliasValue(av: string): void;
     maybeEmitParameterizedSourceUsage(): void;
     private resolveParentParameterReferences;

package/dist/model/malloy_query.js

@@ -2020,7 +2020,7 @@ class QueryQuery extends QueryField {
             type: 'query_result',
             name: this.resultStage || 'result',
             fields,
-            dialect: this.parent.structDef.dialect,
+            dialect: this.parent.dialect.name,
             primaryKey,
             connection: this.parent.connectionName,
             resultMetadata: this.getResultMetadata(this.rootResult),
@@ -3008,7 +3008,7 @@ class QueryQueryIndex extends QueryQuery {
         const ret = {
             type: 'query_result',
             name: this.resultStage || 'result',
-            dialect: this.parent.structDef.dialect,
+            dialect: this.parent.dialect.name,
             fields: [
                 { type: 'string', name: 'fieldName' },
                 { type: 'string', name: 'fieldPath' },
@@ -3078,9 +3078,18 @@ class QueryStruct {
             this.pathAliasMap = this.root().pathAliasMap;
             this.connectionName = this.root().connectionName;
         }
-        this.dialect = (0, dialect_1.getDialect)(structDef.dialect);
+        this.dialect = (0, dialect_1.getDialect)(this.findFirstDialect());
         this.addFieldsFromFieldList(structDef.fields);
     }
+    findFirstDialect() {
+        if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
+            return this.structDef.dialect;
+        }
+        if (this.parent) {
+            return this.parent.findFirstDialect();
+        }
+        throw new Error('Cannot create QueryStruct from record with model parent');
+    }
     informOfAliasValue(av) {
         this.recordAlias = av;
     }

package/dist/model/malloy_types.d.ts

@@ -389,8 +389,8 @@ export interface ScalarArrayDef extends ScalarArrayTypeDef, StructDefBase, JoinB
     type: 'array';
     join: 'many';
 }
-export declare function mkFieldDef(atd: AtomicTypeDef, name: string, dialect: string): AtomicFieldDef;
-export declare function mkArrayDef(ofType: AtomicTypeDef, name: string, dialect: string): ArrayDef;
+export declare function mkFieldDef(atd: AtomicTypeDef, name: string): AtomicFieldDef;
+export declare function mkArrayDef(ofType: AtomicTypeDef, name: string): ArrayDef;
 export interface RecordTypeDef {
     type: 'record';
     fields: FieldDef[];
@@ -572,7 +572,6 @@ interface StructDefBase extends HasLocation, NamedObject {
     annotation?: Annotation;
     modelAnnotation?: ModelAnnotation;
     fields: FieldDef[];
-    dialect: string;
 }
 interface SourceDefBase extends StructDefBase, Filtered, ResultStructMetadata {
     arguments?: Record<string, Argument>;
@@ -580,6 +579,7 @@ interface SourceDefBase extends StructDefBase, Filtered, ResultStructMetadata {
     queryTimezone?: string;
     connection: string;
     primaryKey?: PrimaryKeyRef;
+    dialect: string;
 }
 /** which field is the primary key in this struct */
 export type PrimaryKeyRef = string;
@@ -695,7 +695,7 @@ 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;
+export type NamedModelObject = SourceDef | NamedQuery | FunctionDef | ConnectionDef;
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;

package/dist/model/malloy_types.js

@@ -179,38 +179,36 @@ function fieldIsIntrinsic(f) {
     return isAtomicFieldType(f.type) && !hasExpression(f);
 }
 exports.fieldIsIntrinsic = fieldIsIntrinsic;
-function mkFieldDef(atd, name, dialect) {
+function mkFieldDef(atd, name) {
     if (isScalarArray(atd)) {
-        return mkArrayDef(atd.elementTypeDef, name, dialect);
+        return mkArrayDef(atd.elementTypeDef, name);
     }
     if (isRepeatedRecord(atd)) {
         const { type, fields, elementTypeDef } = atd;
-        return { type, fields, elementTypeDef, join: 'many', name, dialect };
+        return { type, fields, elementTypeDef, join: 'many', name };
     }
     if (atd.type === 'record') {
         const { type, fields } = atd;
-        return { type, fields, join: 'one', dialect, name };
+        return { type, fields, join: 'one', name };
     }
     return { ...atd, name };
 }
 exports.mkFieldDef = mkFieldDef;
-function mkArrayDef(ofType, name, dialect) {
+function mkArrayDef(ofType, name) {
     if (ofType.type === 'record') {
         return {
             type: 'array',
             join: 'many',
             name,
-            dialect,
             elementTypeDef: { type: 'record_element' },
             fields: ofType.fields,
         };
     }
-    const valueEnt = mkFieldDef(ofType, 'value', dialect);
+    const valueEnt = mkFieldDef(ofType, 'value');
     return {
         type: 'array',
         join: 'many',
         name,
-        dialect,
         elementTypeDef: ofType,
         fields: [
             valueEnt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.222-dev241212154316",
+  "version": "0.0.222-dev241212190052",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",