@malloydata/malloy 0.0.392 → 0.0.393

package/dist/lang/ast/statements/define-given.d.ts

@@ -4,9 +4,6 @@ import type { DocStatement, Document } from '../types/malloy-element';
 import { DocStatementList, MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
 import { extendNoteMethod } from '../types/noteable';
-/**
- * One named given declaration: `NAME :: TYPE [is EXPR]`.
- */
 export declare class GivenDeclaration extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
     readonly typeDef: GivenTypeDef;
@@ -19,9 +16,6 @@ export declare class GivenDeclaration extends MalloyElement implements DocStatem
     protected varInfo(): string;
     execute(doc: Document): void;
 }
-/**
- * Top-level `given:` block — a sequence of given declarations.
- */
 export declare class DefineGivens extends DocStatementList {
     elementType: string;
     readonly givens: GivenDeclaration[];

package/dist/lang/ast/statements/define-given.js

@@ -11,20 +11,15 @@ const utils_1 = require("../../../model/utils");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
-/**
- * True when exactly one of `declared` and `constVal` is filter-typed.
- * Catches `filter<T>` declared with a non-filter default (and vice versa)
- * at definition time. Inner-content validation of `filter<T>` defaults
- * (syntax + compatibility with `T`) is the filter machinery's job at the
- * use site; we don't try to do it here.
- */
+// `filter<T>` defaults can't be type-checked via TD.eq — the filter
+// expression value shape doesn't match an atomic typeDef. Catch only
+// the gross kind mismatch here; inner-content validation (filter
+// syntax + T compatibility) belongs to the filter machinery at use
+// site.
 function filterTypeMismatch(declared, constVal) {
     return ((declared.type === 'filter expression') !==
         (constVal.type === 'filter expression'));
 }
-/**
- * One named given declaration: `NAME :: TYPE [is EXPR]`.
- */
 class GivenDeclaration extends malloy_element_1.MalloyElement {
     constructor(name, typeDef, defaultExpr) {
         super();
@@ -42,7 +37,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
         return ` ${this.name} :: ${(0, utils_1.typeDefToString)(this.typeDef)}`;
     }
     execute(doc) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (this.typeDef.type === 'error')
             return;
         if (doc.modelEntry(this.name)) {
@@ -60,11 +55,19 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
         if (this.default) {
             const constVal = this.default.constantValue();
             if (constVal.type !== 'error') {
+                // `X :: timestamp is @2024-01-01` works because date literals
+                // carry a morphic.timestamp. Date/timestamp are the only
+                // MorphicType targets — other declared types fall through to
+                // the TD.eq check below.
+                const morphed = this.typeDef.type === 'date' || this.typeDef.type === 'timestamp'
+                    ? (0, expression_def_1.getMorphicValue)(constVal, this.typeDef.type)
+                    : undefined;
                 // `filter<T>` defaults are filter-expression literals — their
                 // shape doesn't match an atomic typeDef, so type-check there is
                 // owned by the filter machinery, not us. `null` is implicitly
                 // accepted for any declared type.
                 if (constVal.type !== 'null' &&
+                    morphed === undefined &&
                     (filterTypeMismatch(this.typeDef, constVal) ||
                         !malloy_types_1.TD.eq(this.typeDef, constVal))) {
                     const actual = malloy_types_1.TD.isAtomic(constVal)
@@ -79,7 +82,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
                     // again at use site. Catches bad filter syntax early.
                     (0, expression_def_1.checkFilterExpression)(this.default, this.typeDef.filterType, constVal.value);
                 }
-                defaultExpr = constVal.value;
+                defaultExpr = (_a = morphed === null || morphed === void 0 ? void 0 : morphed.value) !== null && _a !== void 0 ? _a : constVal.value;
                 // Build the transitive closure of givens reachable through this
                 // default's expression. We only include direct refs PLUS each
                 // referenced given's already-precomputed transitive (which is
@@ -100,7 +103,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
                         seen.add(g.id);
                         closure.push(g);
                         const refDecl = doc.documentGivens.get(g.id);
-                        for (const t of (_a = refDecl === null || refDecl === void 0 ? void 0 : refDecl.givenUsage) !== null && _a !== void 0 ? _a : []) {
+                        for (const t of (_b = refDecl === null || refDecl === void 0 ? void 0 : refDecl.givenUsage) !== null && _b !== void 0 ? _b : []) {
                             if (seen.has(t.id))
                                 continue;
                             seen.add(t.id);
@@ -111,8 +114,8 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
                 }
             }
         }
-        const id = (0, source_def_utils_1.mkGivenID)(this.name, (_b = this.location) === null || _b === void 0 ? void 0 : _b.url);
-        const defaultText = defaultExpr !== undefined ? (_c = this.default) === null || _c === void 0 ? void 0 : _c.code : undefined;
+        const id = (0, source_def_utils_1.mkGivenID)(this.name, (_c = this.location) === null || _c === void 0 ? void 0 : _c.url);
+        const defaultText = defaultExpr !== undefined ? (_d = this.default) === null || _d === void 0 ? void 0 : _d.code : undefined;
         const givenIR = {
             name: this.name,
             type: this.typeDef,
@@ -132,7 +135,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
         this.addReference({
             type: 'givenReference',
             text: this.name,
-            location: (_d = this.location) !== null && _d !== void 0 ? _d : {
+            location: (_e = this.location) !== null && _e !== void 0 ? _e : {
                 url: '',
                 range: {
                     start: { line: 0, character: 0 },
@@ -149,9 +152,6 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
     }
 }
 exports.GivenDeclaration = GivenDeclaration;
-/**
- * Top-level `given:` block — a sequence of given declarations.
- */
 class DefineGivens extends malloy_element_1.DocStatementList {
     constructor(givens) {
         super(givens);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.392";
+export declare const MALLOY_VERSION = "0.0.393";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.392';
+exports.MALLOY_VERSION = '0.0.393';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.392",
+  "version": "0.0.393",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.392",
-    "@malloydata/malloy-interfaces": "0.0.392",
-    "@malloydata/malloy-tag": "0.0.392",
+    "@malloydata/malloy-filter": "0.0.393",
+    "@malloydata/malloy-interfaces": "0.0.393",
+    "@malloydata/malloy-tag": "0.0.393",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",