@malloydata/malloy-interfaces 0.0.263-dev250414165131 → 0.0.263-dev250414204152

package/dist/to_malloy.js

@@ -54,6 +54,8 @@ function escapeString(str) {
 function literalToFragments(literal) {
     var _a, _b;
     switch (literal.kind) {
+        case 'filter_expression_literal':
+            return [quoteFilter(literal.filter_expression_value)];
         case 'boolean_literal':
             return [literal.boolean_value.toString()];
         case 'string_literal': {

package/dist/types.d.ts

@@ -119,10 +119,12 @@ export type CompileModelResponse = {
 export type CompileQueryRequest = {
     model_url: string;
     query: Query;
+    default_row_limit?: number;
     compiler_needs?: CompilerNeeds;
 };
 export type CompileQueryResponse = {
     result?: Result;
+    default_row_limit_added?: number;
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
     translations?: Array<Translation>;
@@ -220,6 +222,10 @@ export type Filter = FilterWithFilterString;
 export type FilterWithFilterString = {
     kind: 'filter_string';
 } & FilterStringApplication;
+export type FilterExpressionLiteral = {
+    filter_expression_value: string;
+};
+export type FilterExpressionType = {};
 export type FilterOperation = {
     filter: Filter;
 };
@@ -248,8 +254,8 @@ export type JoinInfo = {
 export type Limit = {
     limit: number;
 };
-export type LiteralValueType = 'string_literal' | 'number_literal' | 'date_literal' | 'timestamp_literal' | 'boolean_literal' | 'null_literal';
-export type LiteralValue = LiteralValueWithStringLiteral | LiteralValueWithNumberLiteral | LiteralValueWithDateLiteral | LiteralValueWithTimestampLiteral | LiteralValueWithBooleanLiteral | LiteralValueWithNullLiteral;
+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 = {
     kind: 'string_literal';
 } & StringLiteral;
@@ -268,6 +274,9 @@ export type LiteralValueWithBooleanLiteral = {
 export type LiteralValueWithNullLiteral = {
     kind: 'null_literal';
 } & NullLiteral;
+export type LiteralValueWithFilterExpressionLiteral = {
+    kind: 'filter_expression_literal';
+} & FilterExpressionLiteral;
 export type Location = {
     url: string;
     range: Range;
@@ -320,9 +329,41 @@ export type OrderBy = {
 export type OrderByDirection = 'asc' | 'desc';
 export type ParameterInfo = {
     name: string;
-    type: AtomicType;
+    type: ParameterType;
     default_value?: LiteralValue;
 };
+export type ParameterTypeType = 'string_type' | 'boolean_type' | 'number_type' | 'json_type' | 'sql_native_type' | 'date_type' | 'timestamp_type' | 'array_type' | 'record_type' | 'filter_expression_type';
+export type ParameterType = ParameterTypeWithStringType | ParameterTypeWithBooleanType | ParameterTypeWithNumberType | ParameterTypeWithJSONType | ParameterTypeWithSQLNativeType | ParameterTypeWithDateType | ParameterTypeWithTimestampType | ParameterTypeWithArrayType | ParameterTypeWithRecordType | ParameterTypeWithFilterExpressionType;
+export type ParameterTypeWithStringType = {
+    kind: 'string_type';
+} & StringType;
+export type ParameterTypeWithBooleanType = {
+    kind: 'boolean_type';
+} & BooleanType;
+export type ParameterTypeWithNumberType = {
+    kind: 'number_type';
+} & NumberType;
+export type ParameterTypeWithJSONType = {
+    kind: 'json_type';
+} & JSONType;
+export type ParameterTypeWithSQLNativeType = {
+    kind: 'sql_native_type';
+} & SQLNativeType;
+export type ParameterTypeWithDateType = {
+    kind: 'date_type';
+} & DateType;
+export type ParameterTypeWithTimestampType = {
+    kind: 'timestamp_type';
+} & TimestampType;
+export type ParameterTypeWithArrayType = {
+    kind: 'array_type';
+} & ArrayType;
+export type ParameterTypeWithRecordType = {
+    kind: 'record_type';
+} & RecordType;
+export type ParameterTypeWithFilterExpressionType = {
+    kind: 'filter_expression_type';
+} & FilterExpressionType;
 export type ParameterValue = {
     name: string;
     value: LiteralValue;
@@ -407,10 +448,12 @@ export type RunIndexQueryResponse = {
 export type RunQueryRequest = {
     model_url: string;
     query: Query;
+    default_row_limit?: number;
     compiler_needs?: CompilerNeeds;
 };
 export type RunQueryResponse = {
     result?: Result;
+    default_row_limit_added?: number;
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
 };

package/dist/types.js

@@ -211,6 +211,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': false,
                 'array': false,
             },
+            'default_row_limit': {
+                'type': 'number',
+                'optional': true,
+                'array': false,
+            },
             'compiler_needs': {
                 'type': 'CompilerNeeds',
                 'optional': true,
@@ -227,6 +232,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'default_row_limit_added': {
+                'type': 'number',
+                'optional': true,
+                'array': false,
+            },
             'logs': {
                 'type': 'LogMessage',
                 'array': true,
@@ -511,6 +521,22 @@ exports.MALLOY_INTERFACE_TYPES = {
             'filter_string': 'FilterStringApplication',
         },
     },
+    'FilterExpressionLiteral': {
+        'type': 'struct',
+        'name': 'FilterExpressionLiteral',
+        'fields': {
+            'filter_expression_value': {
+                'type': 'string',
+                'optional': false,
+                'array': false,
+            },
+        },
+    },
+    'FilterExpressionType': {
+        'type': 'struct',
+        'name': 'FilterExpressionType',
+        'fields': {},
+    },
     'FilterOperation': {
         'type': 'struct',
         'name': 'FilterOperation',
@@ -633,6 +659,7 @@ exports.MALLOY_INTERFACE_TYPES = {
             'timestamp_literal': 'TimestampLiteral',
             'boolean_literal': 'BooleanLiteral',
             'null_literal': 'NullLiteral',
+            'filter_expression_literal': 'FilterExpressionLiteral',
         },
     },
     'Location': {
@@ -838,7 +865,7 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'array': false,
             },
             'type': {
-                'type': 'AtomicType',
+                'type': 'ParameterType',
                 'optional': false,
                 'array': false,
             },
@@ -849,6 +876,22 @@ exports.MALLOY_INTERFACE_TYPES = {
             },
         },
     },
+    'ParameterType': {
+        'type': 'union',
+        'name': 'ParameterType',
+        'options': {
+            'string_type': 'StringType',
+            'boolean_type': 'BooleanType',
+            'number_type': 'NumberType',
+            'json_type': 'JSONType',
+            'sql_native_type': 'SQLNativeType',
+            'date_type': 'DateType',
+            'timestamp_type': 'TimestampType',
+            'array_type': 'ArrayType',
+            'record_type': 'RecordType',
+            'filter_expression_type': 'FilterExpressionType',
+        },
+    },
     'ParameterValue': {
         'type': 'struct',
         'name': 'ParameterValue',
@@ -1142,6 +1185,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': false,
                 'array': false,
             },
+            'default_row_limit': {
+                'type': 'number',
+                'optional': true,
+                'array': false,
+            },
             'compiler_needs': {
                 'type': 'CompilerNeeds',
                 'optional': true,
@@ -1158,6 +1206,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'default_row_limit_added': {
+                'type': 'number',
+                'optional': true,
+                'array': false,
+            },
             'logs': {
                 'type': 'LogMessage',
                 'array': true,

package/package.json

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

package/thrift/malloy.thrift

@@ -25,7 +25,7 @@ struct SourceInfo {
 
 struct ParameterInfo {
   1: required string name,
-  2: required AtomicType type,
+  2: required ParameterType type,
   3: optional LiteralValue default_value,
 }
 
@@ -176,6 +176,10 @@ struct RecordType {
   1: required list<DimensionInfo> fields
 }
 
+struct FilterExpressionType {
+}
+
+
 union AtomicType {
   1: required StringType string_type,
   2: required BooleanType boolean_type,
@@ -188,6 +192,19 @@ union AtomicType {
   10: required RecordType record_type,
 }
 
+union ParameterType {
+  1: required StringType string_type,
+  2: required BooleanType boolean_type,
+  3: required NumberType number_type,
+  4: required JSONType json_type,
+  5: required SQLNativeType sql_native_type,
+  6: required DateType date_type,
+  7: required TimestampType timestamp_type,
+  9: required ArrayType array_type,
+  10: required RecordType record_type,
+  11: required FilterExpressionType filter_expression_type,
+}
+
 struct SQLNativeType {
   1: optional string sql_type,
 }
@@ -373,6 +390,7 @@ union LiteralValue {
   4: required TimestampLiteral timestamp_literal,
   5: required BooleanLiteral boolean_literal,
   6: required NullLiteral null_literal,
+  7: required FilterExpressionLiteral filter_expression_literal,
 }
 
 struct StringLiteral {
@@ -400,6 +418,10 @@ struct TimestampLiteral {
 struct NullLiteral {
 }
 
+struct FilterExpressionLiteral {
+  1: required string filter_expression_value,
+}
+
 union Expression {
   1: required Reference field_reference,
   2: required TimeTruncationFieldReference time_truncation,
@@ -626,6 +648,7 @@ struct CompileSourceResponse {
 struct RunQueryRequest {
   1: required string model_url,
   2: required Query query,
+  3: optional i32 default_row_limit,
 
   9: optional CompilerNeeds compiler_needs,
 }
@@ -633,6 +656,7 @@ struct RunQueryRequest {
 struct RunQueryResponse {
   1: optional Result result,
 
+  7: optional i32 default_row_limit_added,
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
 }
@@ -642,6 +666,7 @@ struct RunQueryResponse {
 struct CompileQueryRequest {
   1: required string model_url,
   2: required Query query,
+  3: optional i32 default_row_limit,
 
   9: optional CompilerNeeds compiler_needs,
 }
@@ -649,6 +674,7 @@ struct CompileQueryRequest {
 struct CompileQueryResponse {
   1: optional Result result,
 
+  7: optional i32 default_row_limit_added,
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
   10: optional list<Translation> translations;