@malloydata/malloy 0.0.197-dev241009205116 → 0.0.197-dev241010003320

package/dist/lang/test/source.spec.js

@@ -308,5 +308,13 @@ describe('source:', () => {
       `).toTranslate();
         });
     });
+    test('dates do not become timestamps', () => {
+        const dateThing = (0, test_translator_1.model) `source: hasDate is a -> { select: ad }`;
+        expect(dateThing).toTranslate();
+        const hasDate = dateThing.translator.getSourceDef('hasDate');
+        expect(hasDate).toBeDefined();
+        const ad = (0, test_translator_1.getFieldDef)(hasDate, 'ad');
+        expect(ad).toMatchObject({ name: 'ad', type: 'date' });
+    });
 });
 //# sourceMappingURL=source.spec.js.map

package/dist/model/malloy_query.js

@@ -1925,25 +1925,17 @@ class QueryQuery extends QueryField {
                         case 'date':
                         case 'timestamp': {
                             const timeframe = fi.f.fieldDef.timeframe;
+                            const fd = { type: fi.f.fieldDef.type };
                             if (timeframe) {
-                                fields.push({
-                                    name,
-                                    type: 'timestamp',
-                                    timeframe,
-                                    resultMetadata,
-                                    location,
-                                    annotation,
-                                });
-                            }
-                            else {
-                                fields.push({
-                                    name,
-                                    type: 'timestamp',
-                                    resultMetadata,
-                                    location,
-                                    annotation,
-                                });
+                                fd.timeframe = timeframe;
                             }
+                            fields.push({
+                                name,
+                                ...fd,
+                                resultMetadata,
+                                location,
+                                annotation,
+                            });
                             break;
                         }
                         case 'number':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.197-dev241009205116",
+  "version": "0.0.197-dev241010003320",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",