@malloydata/malloy-interfaces 0.0.281 → 0.0.283

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import type * as Malloy from './types';
 export * from './types';
-export { queryToMalloy } from './to_malloy';
+export { queryToMalloy, filterToMalloy } from './to_malloy';
 export { nestUnions, unnestUnions, convertFromThrift, convertToThrift, } from './nest_unions';
 export declare const test: Malloy.ModelInfo;
 export declare const res: Malloy.Result;

package/dist/index.js

@@ -20,10 +20,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.thingy4sddfdfsd = exports.thingy4sdfsd = exports.thingy4dfdsfs = exports.thingy4asdfas = exports.thingy4asdfasdf = exports.thingy3dfdf = exports.thingy3 = exports.thingy2asdf = exports.thingyssdfg = exports.thingy123r = exports.thingy1 = exports.res = exports.test = exports.convertToThrift = exports.convertFromThrift = exports.unnestUnions = exports.nestUnions = exports.queryToMalloy = void 0;
+exports.thingy4sddfdfsd = exports.thingy4sdfsd = exports.thingy4dfdsfs = exports.thingy4asdfas = exports.thingy4asdfasdf = exports.thingy3dfdf = exports.thingy3 = exports.thingy2asdf = exports.thingyssdfg = exports.thingy123r = exports.thingy1 = exports.res = exports.test = exports.convertToThrift = exports.convertFromThrift = exports.unnestUnions = exports.nestUnions = exports.filterToMalloy = exports.queryToMalloy = void 0;
 __exportStar(require("./types"), exports);
 var to_malloy_1 = require("./to_malloy");
 Object.defineProperty(exports, "queryToMalloy", { enumerable: true, get: function () { return to_malloy_1.queryToMalloy; } });
+Object.defineProperty(exports, "filterToMalloy", { enumerable: true, get: function () { return to_malloy_1.filterToMalloy; } });
 var nest_unions_1 = require("./nest_unions");
 Object.defineProperty(exports, "nestUnions", { enumerable: true, get: function () { return nest_unions_1.nestUnions; } });
 Object.defineProperty(exports, "unnestUnions", { enumerable: true, get: function () { return nest_unions_1.unnestUnions; } });

package/dist/to_malloy.d.ts

@@ -2,3 +2,6 @@ import type * as Malloy from './types';
 export declare function queryToMalloy(query: Malloy.Query, { tabWidth }?: {
     tabWidth: number;
 }): string;
+export declare function filterToMalloy(filter: Malloy.Filter, { tabWidth }?: {
+    tabWidth: number;
+}): string;

package/dist/to_malloy.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryToMalloy = queryToMalloy;
+exports.filterToMalloy = filterToMalloy;
 const util_1 = require("./util");
 function queryToMalloy(query, { tabWidth } = { tabWidth: 2 }) {
     const fragments = queryToFragments(query);
     return codeFromFragments(fragments, { tabWidth });
 }
+function filterToMalloy(filter, { tabWidth } = { tabWidth: 2 }) {
+    const fragments = filterToFragments(filter);
+    return codeFromFragments(fragments, { tabWidth });
+}
 const INDENT = Symbol('indent');
 const NEWLINE = Symbol('newline');
 const OUTDENT = Symbol('outdent');
@@ -68,11 +73,11 @@ function literalToFragments(literal) {
             return ['null'];
         case 'date_literal':
             return [
-                serializeDateAsLiteral(parseDate(literal.date_value), (_a = literal.granularity) !== null && _a !== void 0 ? _a : 'day'),
+                serializeDateAsLiteral(parseDate(literal.date_value), (_a = literal.granularity) !== null && _a !== void 0 ? _a : 'day', literal.timezone),
             ];
         case 'timestamp_literal':
             return [
-                serializeDateAsLiteral(parseDate(literal.timestamp_value), (_b = literal.granularity) !== null && _b !== void 0 ? _b : 'second'),
+                serializeDateAsLiteral(parseDate(literal.timestamp_value), (_b = literal.granularity) !== null && _b !== void 0 ? _b : 'second', literal.timezone),
             ];
     }
 }
@@ -104,7 +109,7 @@ function parseDate(date) {
     }
     return ['1970', '01', '01', '00', '00', '00'];
 }
-function serializeDateAsLiteral([year, month, day, hour, minute, second], granularity) {
+function serializeDateAsLiteral([year, month, day, hour, minute, second], granularity, timezone) {
     switch (granularity) {
         case 'year': {
             return `@${year}`;
@@ -129,6 +134,9 @@ function serializeDateAsLiteral([year, month, day, hour, minute, second], granul
             return `@${year}-${month}-${day} ${hour}:${minute}`;
         }
         case 'second': {
+            if (timezone !== undefined) {
+                return `@${year}-${month}-${day} ${hour}:${minute}:${second}[${timezone}]`;
+            }
             return `@${year}-${month}-${day} ${hour}:${minute}:${second}`;
         }
         default:
@@ -273,6 +281,8 @@ function groupedOperationsToFragments(operations) {
             return whereToFragments(operations);
         case 'having':
             return havingToFragments(operations);
+        case 'drill':
+            return drillToFragments(operations);
     }
 }
 function formatBlock(label, items, separator = '') {
@@ -324,6 +334,8 @@ function expressionToFragments(expression) {
                 ...referenceToFragments(expression.field_reference),
                 ...wrap(' {', whereToFragments(expression.where), '}'),
             ];
+        case 'literal_value':
+            return literalToFragments(expression.literal_value);
     }
 }
 function groupByOrAggregateItemToFragments(item, hideAnnotations = false) {
@@ -409,6 +421,9 @@ function limitToFragments(limits) {
 function whereToFragments(where) {
     return formatBlock('where', where.map(filterOperationItemToFragments), ',');
 }
+function drillToFragments(drill) {
+    return formatBlock('drill', drill.map(filterOperationItemToFragments), ',');
+}
 function havingToFragments(having) {
     return formatBlock('having', having.map(filterOperationItemToFragments), ',');
 }
@@ -444,16 +459,25 @@ function escapeFilter(filter, quote) {
     }
     return result;
 }
-function filterOperationItemToFragments(whereItem) {
-    switch (whereItem.filter.kind) {
+function filterToFragments(filter) {
+    switch (filter.kind) {
         case 'filter_string':
             return [
-                ...referenceToFragments(whereItem.filter.field_reference),
+                ...referenceToFragments(filter.field_reference),
                 ' ~ ',
-                quoteFilter(whereItem.filter.filter),
+                quoteFilter(filter.filter),
+            ];
+        case 'literal_equality':
+            return [
+                ...referenceToFragments(filter.field_reference),
+                ' = ',
+                ...literalToFragments(filter.value),
             ];
     }
 }
+function filterOperationItemToFragments(whereItem) {
+    return filterToFragments(whereItem.filter);
+}
 function annotationsToFragments(annotations) {
     return annotations ? annotations.flatMap(annotationToFragments) : [];
 }

package/dist/types.d.ts

@@ -165,6 +165,7 @@ export type DateCell = {
 export type DateLiteral = {
     date_value: string;
     granularity?: DateTimeframe;
+    timezone?: string;
 };
 export type DateTimeframe = 'year' | 'quarter' | 'month' | 'week' | 'day';
 export type DateType = {
@@ -183,8 +184,11 @@ export type DocumentRange = {
     start: DocumentPosition;
     end: DocumentPosition;
 };
-export type ExpressionType = 'field_reference' | 'time_truncation' | 'filtered_field';
-export type Expression = ExpressionWithFieldReference | ExpressionWithTimeTruncation | ExpressionWithFilteredField;
+export type DrillOperation = {
+    filter: Filter;
+};
+export type ExpressionType = 'field_reference' | 'time_truncation' | 'filtered_field' | 'literal_value';
+export type Expression = ExpressionWithFieldReference | ExpressionWithTimeTruncation | ExpressionWithFilteredField | ExpressionWithLiteralValue;
 export type ExpressionWithFieldReference = {
     kind: 'field_reference';
 } & Reference;
@@ -194,6 +198,9 @@ export type ExpressionWithTimeTruncation = {
 export type ExpressionWithFilteredField = {
     kind: 'filtered_field';
 } & FilteredField;
+export type ExpressionWithLiteralValue = {
+    kind: 'literal_value';
+} & LiteralValueExpression;
 export type Field = {
     expression: Expression;
     annotations?: Array<Annotation>;
@@ -217,11 +224,14 @@ export type File = {
     contents?: string;
     invalidation_key?: string;
 };
-export type FilterType = 'filter_string';
-export type Filter = FilterWithFilterString;
+export type FilterType = 'filter_string' | 'literal_equality';
+export type Filter = FilterWithFilterString | FilterWithLiteralEquality;
 export type FilterWithFilterString = {
     kind: 'filter_string';
 } & FilterStringApplication;
+export type FilterWithLiteralEquality = {
+    kind: 'literal_equality';
+} & LiteralEqualityComparison;
 export type FilterExpressionLiteral = {
     filter_expression_value: string;
 };
@@ -273,6 +283,10 @@ export type JoinInfo = {
 export type Limit = {
     limit: number;
 };
+export type LiteralEqualityComparison = {
+    field_reference: Reference;
+    value: LiteralValue;
+};
 export type LiteralValueType = 'string_literal' | 'number_literal' | 'date_literal' | 'timestamp_literal' | 'boolean_literal' | 'null_literal' | 'filter_expression_literal';
 export type LiteralValue = LiteralValueWithStringLiteral | LiteralValueWithNumberLiteral | LiteralValueWithDateLiteral | LiteralValueWithTimestampLiteral | LiteralValueWithBooleanLiteral | LiteralValueWithNullLiteral | LiteralValueWithFilterExpressionLiteral;
 export type LiteralValueWithStringLiteral = {
@@ -296,6 +310,9 @@ export type LiteralValueWithNullLiteral = {
 export type LiteralValueWithFilterExpressionLiteral = {
     kind: 'filter_expression_literal';
 } & FilterExpressionLiteral;
+export type LiteralValueExpression = {
+    literal_value: LiteralValue;
+};
 export type Location = {
     url: string;
     range: Range;
@@ -519,6 +536,7 @@ export type TimestampCell = {
 export type TimestampLiteral = {
     timestamp_value: string;
     granularity?: TimestampTimeframe;
+    timezone?: string;
 };
 export type TimestampTimeframe = 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
 export type TimestampType = {
@@ -556,8 +574,8 @@ export type ViewInfo = {
     annotations?: Array<Annotation>;
     definition?: View;
 };
-export type ViewOperationType = 'group_by' | 'aggregate' | 'order_by' | 'limit' | 'where' | 'nest' | 'having';
-export type ViewOperation = ViewOperationWithGroupBy | ViewOperationWithAggregate | ViewOperationWithOrderBy | ViewOperationWithLimit | ViewOperationWithWhere | ViewOperationWithNest | ViewOperationWithHaving;
+export type ViewOperationType = 'group_by' | 'aggregate' | 'order_by' | 'limit' | 'where' | 'nest' | 'having' | 'drill';
+export type ViewOperation = ViewOperationWithGroupBy | ViewOperationWithAggregate | ViewOperationWithOrderBy | ViewOperationWithLimit | ViewOperationWithWhere | ViewOperationWithNest | ViewOperationWithHaving | ViewOperationWithDrill;
 export type ViewOperationWithGroupBy = {
     kind: 'group_by';
 } & GroupBy;
@@ -579,6 +597,9 @@ export type ViewOperationWithNest = {
 export type ViewOperationWithHaving = {
     kind: 'having';
 } & FilterOperation;
+export type ViewOperationWithDrill = {
+    kind: 'drill';
+} & DrillOperation;
 export type ViewRefinement = {
     base: ViewDefinition;
     refinement: ViewDefinition;

package/dist/types.js

@@ -381,6 +381,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'timezone': {
+                'type': 'string',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'DateTimeframe': {
@@ -458,6 +463,17 @@ exports.MALLOY_INTERFACE_TYPES = {
             },
         },
     },
+    'DrillOperation': {
+        'type': 'struct',
+        'name': 'DrillOperation',
+        'fields': {
+            'filter': {
+                'type': 'Filter',
+                'optional': false,
+                'array': false,
+            },
+        },
+    },
     'Expression': {
         'type': 'union',
         'name': 'Expression',
@@ -465,6 +481,7 @@ exports.MALLOY_INTERFACE_TYPES = {
             'field_reference': 'Reference',
             'time_truncation': 'TimeTruncationFieldReference',
             'filtered_field': 'FilteredField',
+            'literal_value': 'LiteralValueExpression',
         },
     },
     'Field': {
@@ -519,6 +536,7 @@ exports.MALLOY_INTERFACE_TYPES = {
         'name': 'Filter',
         'options': {
             'filter_string': 'FilterStringApplication',
+            'literal_equality': 'LiteralEqualityComparison',
         },
     },
     'FilterExpressionLiteral': {
@@ -666,6 +684,22 @@ exports.MALLOY_INTERFACE_TYPES = {
             },
         },
     },
+    'LiteralEqualityComparison': {
+        'type': 'struct',
+        'name': 'LiteralEqualityComparison',
+        'fields': {
+            'field_reference': {
+                'type': 'Reference',
+                'optional': false,
+                'array': false,
+            },
+            'value': {
+                'type': 'LiteralValue',
+                'optional': false,
+                'array': false,
+            },
+        },
+    },
     'LiteralValue': {
         'type': 'union',
         'name': 'LiteralValue',
@@ -679,6 +713,17 @@ exports.MALLOY_INTERFACE_TYPES = {
             'filter_expression_literal': 'FilterExpressionLiteral',
         },
     },
+    'LiteralValueExpression': {
+        'type': 'struct',
+        'name': 'LiteralValueExpression',
+        'fields': {
+            'literal_value': {
+                'type': 'LiteralValue',
+                'optional': false,
+                'array': false,
+            },
+        },
+    },
     'Location': {
         'type': 'struct',
         'name': 'Location',
@@ -1414,6 +1459,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'timezone': {
+                'type': 'string',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'TimestampTimeframe': {
@@ -1536,6 +1586,7 @@ exports.MALLOY_INTERFACE_TYPES = {
             'where': 'FilterOperation',
             'nest': 'Nest',
             'having': 'FilterOperation',
+            'drill': 'DrillOperation',
         },
     },
     'ViewRefinement': {

package/package.json

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

package/thrift/malloy.thrift

@@ -264,6 +264,7 @@ union ViewOperation {
   5: required FilterOperation where,
   6: required Nest nest,
   7: required FilterOperation having,
+  8: required DrillOperation drill,
 }
 
 struct GroupBy {
@@ -305,8 +306,13 @@ struct FilterOperation {
   1: required Filter filter,
 }
 
+struct DrillOperation {
+  1: required Filter filter,
+}
+
 union Filter {
   1: required FilterStringApplication filter_string,
+  2: required LiteralEqualityComparison literal_equality,
 }
 
 struct FilterStringApplication {
@@ -314,6 +320,11 @@ struct FilterStringApplication {
   2: required string filter,
 }
 
+struct LiteralEqualityComparison {
+  1: required Reference field_reference,
+  2: required LiteralValue value,
+}
+
 /**
 
 stages: [
@@ -416,11 +427,13 @@ struct BooleanLiteral {
 struct DateLiteral {
   1: required string date_value,
   2: optional DateTimeframe granularity,
+  3: optional string timezone,
 }
 
 struct TimestampLiteral {
   1: required string timestamp_value,
   2: optional TimestampTimeframe granularity,
+  3: optional string timezone,
 }
 
 struct NullLiteral {
@@ -430,10 +443,15 @@ struct FilterExpressionLiteral {
   1: required string filter_expression_value,
 }
 
+struct LiteralValueExpression {
+  1: required LiteralValue literal_value,
+}
+
 union Expression {
   1: required Reference field_reference,
   2: required TimeTruncationFieldReference time_truncation,
   3: required FilteredField filtered_field,
+  4: required LiteralValueExpression literal_value,
 }
 
 struct TimeTruncationFieldReference {