@malloydata/malloy-interfaces 0.0.294 → 0.0.296

package/dist/index.js

@@ -257,7 +257,7 @@ exports.thingy2asdf = {
                         kind: 'where',
                         filter: {
                             kind: 'filter_string',
-                            field_reference: { name: 'carrier' },
+                            expression: { kind: 'field_reference', name: 'carrier' },
                             filter: 'WN',
                         },
                     },

package/dist/to_malloy.js

@@ -122,7 +122,7 @@ function serializeDateAsLiteral([year, month, day, hour, minute, second], granul
             return `@${year}-${month}`;
         }
         case 'week': {
-            return `@WK${year}-${month}-${day}`;
+            return `@${year}-${month}-${day}-WK`;
         }
         case 'day': {
             return `@${year}-${month}-${day}`;
@@ -463,13 +463,13 @@ function filterToFragments(filter) {
     switch (filter.kind) {
         case 'filter_string':
             return [
-                ...referenceToFragments(filter.field_reference),
+                ...expressionToFragments(filter.expression),
                 ' ~ ',
                 quoteFilter(filter.filter),
             ];
         case 'literal_equality':
             return [
-                ...referenceToFragments(filter.field_reference),
+                ...expressionToFragments(filter.expression),
                 ' = ',
                 ...literalToFragments(filter.value),
             ];

package/dist/types.d.ts

@@ -242,7 +242,7 @@ export type FilterOperation = {
     filter: Filter;
 };
 export type FilterStringApplication = {
-    field_reference: Reference;
+    expression: Expression;
     filter: string;
 };
 export type FilterableTypeType = 'string_type' | 'boolean_type' | 'number_type' | 'date_type' | 'timestamp_type';
@@ -284,7 +284,7 @@ export type Limit = {
     limit: number;
 };
 export type LiteralEqualityComparison = {
-    field_reference: Reference;
+    expression: Expression;
     value: LiteralValue;
 };
 export type LiteralValueType = 'string_literal' | 'number_literal' | 'date_literal' | 'timestamp_literal' | 'boolean_literal' | 'null_literal' | 'filter_expression_literal';

package/dist/types.js

@@ -576,8 +576,8 @@ exports.MALLOY_INTERFACE_TYPES = {
         'type': 'struct',
         'name': 'FilterStringApplication',
         'fields': {
-            'field_reference': {
-                'type': 'Reference',
+            'expression': {
+                'type': 'Expression',
                 'optional': false,
                 'array': false,
             },
@@ -688,8 +688,8 @@ exports.MALLOY_INTERFACE_TYPES = {
         'type': 'struct',
         'name': 'LiteralEqualityComparison',
         'fields': {
-            'field_reference': {
-                'type': 'Reference',
+            'expression': {
+                'type': 'Expression',
                 'optional': false,
                 'array': false,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-interfaces",
-  "version": "0.0.294",
+  "version": "0.0.296",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/thrift/malloy.thrift

@@ -316,12 +316,12 @@ union Filter {
 }
 
 struct FilterStringApplication {
-  1: required Reference field_reference,
+  1: required Expression expression,
   2: required string filter,
 }
 
 struct LiteralEqualityComparison {
-  1: required Reference field_reference,
+  1: required Expression expression,
   2: required LiteralValue value,
 }