@malloydata/malloy 0.0.205-dev241028163321 → 0.0.205-dev241028192658

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

@@ -120,10 +120,8 @@ class IndexFieldSpace extends query_spaces_1.QueryOperationSpace {
             }
             else {
                 const eTypeDesc = entry.typeDesc();
-                const eType = eTypeDesc.dataType;
                 // Don't index arrays and records
-                const canIndex = (0, malloy_types_1.isAtomicFieldType)(eType) && eType !== 'record' && eType !== 'array';
-                if (canIndex &&
+                if (malloy_types_1.TD.isLeafAtomic(eTypeDesc) &&
                     (0, malloy_types_1.expressionIsScalar)(eTypeDesc.expressionType) &&
                     (dialect === undefined || !dialect.ignoreInProject(name))) {
                     expandEntries.push({ name: indexName, entry });

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

@@ -2,5 +2,5 @@ import { TypeDesc } from '../../../model/malloy_types';
 import { QuerySpace } from './query-spaces';
 export declare class ProjectFieldSpace extends QuerySpace {
     readonly segmentType = "project";
-    canContain(typeDesc: TypeDesc): boolean;
+    canContain(typeDesc: TypeDesc | undefined): boolean;
 }

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

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

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -29,7 +29,7 @@ export declare abstract class QueryOperationSpace extends RefinedSpace implement
 export declare abstract class QuerySpace extends QueryOperationSpace {
     addRefineFromFields(refineThis: model.PipeSegment): void;
     pushFields(...defs: MalloyElement[]): void;
-    canContain(_typeDesc: model.TypeDesc): boolean;
+    canContain(_typeDescResult: model.TypeDesc | undefined): boolean;
     protected queryFieldDefs(): model.QueryFieldDef[];
     getQuerySegment(rf: model.QuerySegment | undefined): model.QuerySegment;
     getPipeSegment(refineFrom: model.QuerySegment | undefined): model.PipeSegment;

package/dist/lang/ast/field-space/query-spaces.js

@@ -124,7 +124,7 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
             }
             else {
                 const eType = entry.typeDesc();
-                if (model.isAtomicFieldType(eType.dataType) &&
+                if (model.TD.isAtomic(eType) &&
                     model.expressionIsScalar(eType.expressionType) &&
                     (dialect === undefined || !dialect.ignoreInProject(name))) {
                     expandEntries.push({ name, entry });
@@ -171,7 +171,7 @@ class QuerySpace extends QueryOperationSpace {
             }
         }
     }
-    canContain(_typeDesc) {
+    canContain(_typeDescResult) {
         return true;
     }
     queryFieldDefs() {
@@ -190,7 +190,8 @@ class QuerySpace extends QueryOperationSpace {
                     // isn't sent to the compiler, where it will wig out.
                     // TODO Figure out how to make errors generated by `canContain` go in the right place,
                     // maybe by adding a logable element to SpaceFields.
-                    if (typeDesc.dataType !== 'error' &&
+                    if (typeDesc &&
+                        typeDesc.type !== 'error' &&
                         this.canContain(typeDesc) &&
                         !isEmptyNest(fieldQueryDef)) {
                         fields.push(fieldQueryDef);

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

@@ -21,8 +21,33 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceField = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const TDU = __importStar(require("../typedesc-utils"));
 const space_field_1 = require("../types/space-field");
 class ReferenceField extends space_field_1.SpaceField {
     constructor(fieldRef, inFS) {
@@ -39,7 +64,6 @@ class ReferenceField extends space_field_1.SpaceField {
         return this.memoReference;
     }
     getQueryFieldDef(fs) {
-        var _a;
         if (!this.queryFieldDef) {
             const check = this.fieldRef.getField(fs);
             if (check.error) {
@@ -48,15 +72,24 @@ class ReferenceField extends space_field_1.SpaceField {
             // TODO investigate removing 'fieldref' as a type, as it obscures the
             //      actual type of the field and is redundant with the slightly
             //      more verbose `{ e: [{ type: 'field', path }] }`
-            const path = this.fieldRef.list.map(f => f.name);
-            const queryFieldDef = ((_a = check.found) === null || _a === void 0 ? void 0 : _a.refType) === 'parameter'
-                ? {
-                    type: check.found.typeDesc().dataType,
-                    name: path[0],
-                    e: { node: 'parameter', path },
+            const path = this.fieldRef.path;
+            if (check.found && check.found.refType === 'parameter') {
+                const foundType = check.found.typeDesc();
+                if (malloy_types_1.TD.isAtomic(foundType)) {
+                    this.queryFieldDef = {
+                        ...TDU.atomicDef(foundType),
+                        name: path[0],
+                        e: { node: 'parameter', path },
+                    };
+                }
+                else {
+                    // mtoy todo
+                    throw new Error('impossible turtle/join parameter');
                 }
-                : { type: 'fieldref', path };
-            this.queryFieldDef = queryFieldDef;
+            }
+            else {
+                this.queryFieldDef = { type: 'fieldref', path };
+            }
             const refTo = this.referenceTo;
             if (refTo instanceof space_field_1.SpaceField) {
                 const origFd = refTo.constructorFieldDef();
@@ -82,7 +115,7 @@ class ReferenceField extends space_field_1.SpaceField {
             this.memoTypeDesc = refTo.typeDesc();
             return this.memoTypeDesc;
         }
-        return { dataType: 'error', expressionType: 'scalar', evalSpace: 'input' };
+        return TDU.errorT;
     }
 }
 exports.ReferenceField = ReferenceField;

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

@@ -1,4 +1,4 @@
-import { DocumentLocation, FieldDef, TypeDesc } from '../../../model/malloy_types';
+import { DocumentLocation, FieldDef } from '../../../model/malloy_types';
 import { SpaceField } from '../types/space-field';
 export declare class RenameSpaceField extends SpaceField {
     private readonly otherField;
@@ -6,5 +6,5 @@ export declare class RenameSpaceField extends SpaceField {
     private readonly location;
     constructor(otherField: SpaceField, newName: string, location: DocumentLocation);
     fieldDef(): FieldDef | undefined;
-    typeDesc(): TypeDesc;
+    typeDesc(): import("../../../model/malloy_types").TypeDesc;
 }

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

@@ -167,7 +167,7 @@ class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
         this.parentDialect = dialect;
     }
     get fieldSpace() {
-        return new StaticSpace(this.sourceDef);
+        return new StaticSpace(this.structDef);
     }
 }
 exports.StructSpaceField = StructSpaceField;

package/dist/lang/ast/field-space/struct-space-field-base.d.ts

@@ -3,8 +3,8 @@ import { FieldSpace } from '../types/field-space';
 import { JoinPathElement } from '../types/lookup-result';
 import { SpaceField } from '../types/space-field';
 export declare abstract class StructSpaceFieldBase extends SpaceField {
-    protected sourceDef: JoinFieldDef;
-    constructor(sourceDef: JoinFieldDef);
+    protected structDef: JoinFieldDef;
+    constructor(structDef: JoinFieldDef);
     abstract get fieldSpace(): FieldSpace;
     fieldDef(): JoinFieldDef;
     get joinPathElement(): JoinPathElement;

package/dist/lang/ast/field-space/struct-space-field-base.js

@@ -21,29 +21,61 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructSpaceFieldBase = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const TDU = __importStar(require("../typedesc-utils"));
 const space_field_1 = require("../types/space-field");
 class StructSpaceFieldBase extends space_field_1.SpaceField {
-    constructor(sourceDef) {
+    constructor(structDef) {
         super();
-        this.sourceDef = sourceDef;
+        this.structDef = structDef;
     }
     fieldDef() {
-        return this.sourceDef;
+        return this.structDef;
     }
     get joinPathElement() {
         return {
-            name: this.sourceDef.as || this.sourceDef.name,
-            joinType: this.sourceDef.join,
-            joinElementType: this.sourceDef.type,
+            name: this.structDef.as || this.structDef.name,
+            joinType: this.structDef.join,
+            joinElementType: this.structDef.type,
         };
     }
     typeDesc() {
+        if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
+            return {
+                type: this.structDef.type,
+                evalSpace: 'input',
+                expressionType: 'scalar',
+            };
+        }
         return {
-            dataType: this.sourceDef.type,
-            expressionType: 'scalar',
+            ...TDU.atomicDef(this.structDef),
             evalSpace: 'input',
+            expressionType: 'scalar',
         };
     }
 }

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

@@ -1,4 +1,4 @@
-import { FieldDef, QueryFieldDef, TypeDesc } from '../../../model/malloy_types';
+import { FieldDef, QueryFieldDef } from '../../../model/malloy_types';
 import { FieldSpace } from '../types/field-space';
 import { SpaceField } from '../types/space-field';
 export declare abstract class ViewField extends SpaceField {
@@ -6,5 +6,5 @@ export declare abstract class ViewField extends SpaceField {
     constructor(inSpace: FieldSpace);
     abstract getQueryFieldDef(fs: FieldSpace): QueryFieldDef | undefined;
     abstract fieldDef(): FieldDef;
-    typeDesc(): TypeDesc;
+    typeDesc(): import("../../../model/malloy_types").TypeDesc;
 }

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

@@ -21,8 +21,32 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewField = void 0;
+const TDU = __importStar(require("../typedesc-utils"));
 const space_field_1 = require("../types/space-field");
 class ViewField extends space_field_1.SpaceField {
     constructor(inSpace) {
@@ -30,7 +54,7 @@ class ViewField extends space_field_1.SpaceField {
         this.inSpace = inSpace;
     }
     typeDesc() {
-        return { dataType: 'turtle', expressionType: 'scalar', evalSpace: 'input' };
+        return TDU.viewT;
     }
 }
 exports.ViewField = ViewField;

package/dist/lang/ast/parameters/has-parameter.d.ts

@@ -3,7 +3,7 @@ import { ConstantExpression } from '../expressions/constant-expression';
 import { MalloyElement } from '../types/malloy-element';
 interface HasInit {
     name: string;
-    type?: string;
+    type?: CastType;
     default?: ConstantExpression;
 }
 export declare class HasParameter extends MalloyElement {

package/dist/lang/ast/parameters/has-parameter.js

@@ -43,17 +43,17 @@ class HasParameter extends malloy_element_1.MalloyElement {
         if (this.default !== undefined) {
             const constant = this.default.constantValue();
             if (this.type &&
-                this.type !== constant.dataType &&
-                constant.dataType !== 'null' &&
-                constant.dataType !== 'error') {
+                this.type !== constant.type &&
+                constant.type !== 'null' &&
+                constant.type !== 'error') {
                 this.default.logError('parameter-default-does-not-match-declared-type', `Default value for parameter does not match declared type \`${this.type}\``);
             }
-            if (constant.dataType === 'null') {
+            if (constant.type === 'null') {
                 if (this.type) {
                     return {
+                        type: this.type,
                         value: constant.value,
                         name: this.name,
-                        type: this.type,
                     };
                 }
                 else {
@@ -65,8 +65,8 @@ class HasParameter extends malloy_element_1.MalloyElement {
                     };
                 }
             }
-            if (!(0, malloy_types_1.isCastType)(constant.dataType) && constant.dataType !== 'error') {
-                this.default.logError('parameter-illegal-default-type', `Default value cannot have type \`${constant.dataType}\``);
+            if (!(0, malloy_types_1.isCastType)(constant.type) && constant.type !== 'error') {
+                this.default.logError('parameter-illegal-default-type', `Default value cannot have type \`${constant.type}\``);
                 return {
                     value: constant.value,
                     name: this.name,
@@ -76,7 +76,7 @@ class HasParameter extends malloy_element_1.MalloyElement {
             return {
                 value: constant.value,
                 name: this.name,
-                type: constant.dataType,
+                type: constant.type,
             };
         }
         if (this.type === undefined) {

package/dist/lang/ast/query-items/field-declaration.d.ts

@@ -1,5 +1,5 @@
 import { Dialect } from '../../../dialect/dialect';
-import { Annotation, StructDef, TypeDesc, FieldDef, AtomicFieldDef } from '../../../model/malloy_types';
+import { Annotation, StructDef, TypeDesc, FieldDef, AtomicFieldDef, FieldDefType } from '../../../model/malloy_types';
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';
@@ -84,4 +84,5 @@ export declare class FieldDefinitionValue extends SpaceField {
     private defInQuery?;
     getQueryFieldDef(fs: FieldSpace): AtomicFieldDef;
     typeDesc(): TypeDesc;
+    entryType(): FieldDefType;
 }

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

@@ -21,10 +21,33 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldDefinitionValue = exports.DefSpace = exports.DimensionFieldDeclaration = exports.MeasureFieldDeclaration = exports.DeclareFieldDeclaration = exports.ProjectFieldDeclaration = exports.GroupByFieldDeclaration = exports.AggregateFieldDeclaration = exports.CalculateFieldDeclaration = exports.AtomicFieldDeclaration = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
-const fragtype_utils_1 = require("../fragtype-utils");
+const TDU = __importStar(require("../typedesc-utils"));
 const granular_result_1 = require("../types/granular-result");
 const malloy_element_1 = require("../types/malloy-element");
 const typecheck_utils_1 = require("./typecheck_utils");
@@ -73,7 +96,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 type: 'error',
             };
         }
-        let retType = exprValue.dataType;
+        let retType = exprValue.type;
         if (retType === 'null') {
             this.expr.logWarning('null-typed-field-definition', 'null value defaults to type number, use "null::TYPE" to specify correct type');
             retType = 'number';
@@ -138,8 +161,8 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         }
         const circularDef = exprFS instanceof DefSpace && exprFS.foundCircle;
         if (!circularDef) {
-            if (exprValue.dataType !== 'error') {
-                const badType = fragtype_utils_1.FT.inspect(exprValue);
+            if (exprValue.type !== 'error') {
+                const badType = TDU.inspect(exprValue);
                 this.logError('invalid-type-for-field-definition', `Cannot define '${exprName}', unexpected type: ${badType}`);
             }
         }
@@ -295,11 +318,9 @@ class FieldDefinitionValue extends space_field_1.SpaceField {
         return this.fieldName;
     }
     fieldDef() {
-        let def = this.defInSource;
-        if (def === undefined) {
-            this.defInSource = def;
-            def = this.exprDef.fieldDef(this.space, this.name);
-        }
+        var _a;
+        const def = (_a = this.defInSource) !== null && _a !== void 0 ? _a : this.exprDef.fieldDef(this.space, this.name);
+        this.defInSource = def;
         return def;
     }
     getQueryFieldDef(fs) {
@@ -320,6 +341,10 @@ class FieldDefinitionValue extends space_field_1.SpaceField {
         }
         throw new Error(`Can't get typeDesc for ${typeFrom.type}`);
     }
+    entryType() {
+        const typeFrom = this.defInQuery || this.fieldDef();
+        return typeFrom.type;
+    }
 }
 exports.FieldDefinitionValue = FieldDefinitionValue;
 //# sourceMappingURL=field-declaration.js.map

package/dist/lang/ast/query-items/typecheck_utils.js

@@ -25,11 +25,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.typecheckGroupBy = exports.typecheckAggregate = exports.typecheckCalculate = exports.typecheckDeclare = exports.typecheckMeasure = exports.typecheckDimension = exports.typecheckIndex = exports.typecheckProject = void 0;
 const model_1 = require("../../../model");
 function typecheckProject(type, logTo) {
-    if (type.dataType === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
+    if (type.type === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
         let useInstead;
         let kind;
         let code;
-        if (type.dataType === 'turtle') {
+        if (type.type === 'turtle') {
             useInstead = 'a nest';
             kind = 'a view';
             code = 'select-of-view';
@@ -52,10 +52,10 @@ function typecheckProject(type, logTo) {
 }
 exports.typecheckProject = typecheckProject;
 function typecheckIndex(type, logTo) {
-    if (type.dataType === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
+    if (type.type === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
         let kind;
         let code;
-        if (type.dataType === 'turtle') {
+        if (type.type === 'turtle') {
             kind = 'a view';
             code = 'index-of-view';
         }
@@ -103,7 +103,7 @@ function typecheckMeasure(type, logTo) {
 }
 exports.typecheckMeasure = typecheckMeasure;
 function typecheckDeclare(type, logTo) {
-    if (type.dataType === 'turtle') {
+    if (type.type === 'turtle') {
         logTo.logError('view-in-declare', 'Views cannot be used in a declare block');
     }
     else if ((0, model_1.expressionIsAnalytic)(type.expressionType)) {
@@ -112,12 +112,11 @@ function typecheckDeclare(type, logTo) {
 }
 exports.typecheckDeclare = typecheckDeclare;
 function typecheckCalculate(type, logTo) {
-    if (type.dataType === 'turtle' ||
-        !(0, model_1.expressionIsAnalytic)(type.expressionType)) {
+    if (type.type === 'turtle' || !(0, model_1.expressionIsAnalytic)(type.expressionType)) {
         let useInstead;
         let kind;
         let code;
-        if (type.dataType === 'turtle') {
+        if (type.type === 'turtle') {
             useInstead = 'a nest';
             kind = 'a view';
             code = 'calculate-of-view';
@@ -140,12 +139,11 @@ function typecheckCalculate(type, logTo) {
 }
 exports.typecheckCalculate = typecheckCalculate;
 function typecheckAggregate(type, logTo) {
-    if (type.dataType === 'turtle' ||
-        !(0, model_1.expressionIsAggregate)(type.expressionType)) {
+    if (type.type === 'turtle' || !(0, model_1.expressionIsAggregate)(type.expressionType)) {
         let useInstead;
         let kind;
         let code;
-        if (type.dataType === 'turtle') {
+        if (type.type === 'turtle') {
             useInstead = 'a nest';
             kind = 'a view';
             code = 'aggregate-of-view';
@@ -168,11 +166,11 @@ function typecheckAggregate(type, logTo) {
 }
 exports.typecheckAggregate = typecheckAggregate;
 function typecheckGroupBy(type, logTo) {
-    if (type.dataType === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
+    if (type.type === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
         let useInstead;
         let kind;
         let code;
-        if (type.dataType === 'turtle') {
+        if (type.type === 'turtle') {
             useInstead = 'a nest';
             kind = 'a view';
             code = 'group-by-view';

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

@@ -35,7 +35,7 @@ class FilterElement extends malloy_element_1.MalloyElement {
     }
     filterCondition(fs) {
         const exprVal = this.expr.getExpression(fs);
-        if (exprVal.dataType !== 'boolean') {
+        if (exprVal.type !== 'boolean') {
             this.expr.logError('non-boolean-filter', 'Filter expression must have boolean value');
             return {
                 node: 'filterCondition',

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

@@ -139,8 +139,8 @@ class NamedSource extends source_1.Source {
                 const paramSpace = parameterSpace !== null && parameterSpace !== void 0 ? parameterSpace : new parameter_space_1.ParameterSpace(parametersOut !== null && parametersOut !== void 0 ? parametersOut : []);
                 const pVal = argument.value.getExpression(paramSpace);
                 let value = pVal.value;
-                if (pVal.dataType !== parameter.type && (0, malloy_types_1.isCastType)(parameter.type)) {
-                    value = (0, time_utils_1.castTo)(parameter.type, pVal.value, pVal.dataType, true);
+                if (pVal.type !== parameter.type && (0, malloy_types_1.isCastType)(parameter.type)) {
+                    value = (0, time_utils_1.castTo)(parameter.type, pVal.value, pVal.type, true);
                 }
                 outArguments[name] = {
                     ...parameter,

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

@@ -83,7 +83,7 @@ class KeyJoin extends Join {
         if ((0, malloy_types_1.isSourceDef)(inStruct) && inStruct.primaryKey) {
             const pkey = inStruct.fields.find(f => (f.as || f.name) === inStruct.primaryKey);
             if (pkey) {
-                if (pkey.type === exprX.dataType) {
+                if (pkey.type === exprX.type) {
                     inStruct.join = 'one';
                     inStruct.onExpression = {
                         node: '=',
@@ -98,7 +98,7 @@ class KeyJoin extends Join {
                     return;
                 }
                 else {
-                    this.logError('join-on-primary-key-type-mismatch', `join_one: with type mismatch with primary key: ${exprX.dataType}/${pkey.type}`);
+                    this.logError('join-on-primary-key-type-mismatch', `join_one: with type mismatch with primary key: ${exprX.type}/${pkey.type}`);
                 }
             }
             else {
@@ -132,7 +132,7 @@ class ExpressionJoin extends Join {
             return;
         }
         const exprX = this.expr.getExpression(outer);
-        if (exprX.dataType !== 'boolean') {
+        if (exprX.type !== 'boolean') {
             this.logError('non-boolean-join-on', 'join conditions must be boolean expressions');
             return;
         }

package/dist/lang/ast/time-utils.d.ts

@@ -1,8 +1,8 @@
-import { Expr, TemporalFieldType, TimestampUnit, FieldValueType, CastType, TypecastExpr, TimeDeltaExpr } from '../../model/malloy_types';
+import { Expr, TemporalFieldType, TimestampUnit, CastType, TypecastExpr, TimeDeltaExpr, ExpressionValueType } from '../../model/malloy_types';
 import { TimeResult } from './types/time-result';
 export declare function timeOffset(timeType: TemporalFieldType, from: Expr, op: '+' | '-', n: Expr, timeframe: TimestampUnit): TimeDeltaExpr;
 export declare function castTo(castType: CastType | {
     raw: string;
-}, from: Expr, fromType: FieldValueType, safe?: boolean): TypecastExpr;
+}, from: Expr, fromType: ExpressionValueType, safe?: boolean): TypecastExpr;
 export declare function resolution(timeframe: string): TemporalFieldType;
 export declare function mkTimeResult(t: TimeResult, tt: TimestampUnit | undefined): TimeResult;

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

@@ -75,7 +75,12 @@ function resolution(timeframe) {
 exports.resolution = resolution;
 function mkTimeResult(t, tt) {
     if (tt) {
-        return { ...t, timeframe: tt };
+        if (t.type === 'timestamp') {
+            return { ...t, timeframe: tt };
+        }
+        if ((0, malloy_types_1.isDateUnit)(tt)) {
+            return { ...t, timeframe: tt };
+        }
     }
     return t;
 }