@malloydata/malloy-interfaces 0.0.296 → 0.0.297

package/dist/types.d.ts

@@ -115,6 +115,7 @@ export type CompileModelResponse = {
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
     translations?: Array<Translation>;
+    timing_info?: TimingInfo;
 };
 export type CompileQueryRequest = {
     model_url: string;
@@ -128,6 +129,7 @@ export type CompileQueryResponse = {
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
     translations?: Array<Translation>;
+    timing_info?: TimingInfo;
 };
 export type CompileSourceRequest = {
     model_url: string;
@@ -139,6 +141,7 @@ export type CompileSourceResponse = {
     source?: SourceInfo;
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
+    timing_info?: TimingInfo;
 };
 export type CompilerNeeds = {
     table_schemas?: Array<SQLTable>;
@@ -481,6 +484,7 @@ export type RunIndexQueryRequest = {
 export type RunIndexQueryResponse = {
     result?: Result;
     compiler_needs?: CompilerNeeds;
+    timing_info?: TimingInfo;
 };
 export type RunQueryRequest = {
     model_url: string;
@@ -493,6 +497,7 @@ export type RunQueryResponse = {
     default_row_limit_added?: number;
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
+    timing_info?: TimingInfo;
 };
 export type SQLNativeCell = {
     sql_native_value: string;
@@ -542,6 +547,11 @@ export type TimestampTimeframe = 'year' | 'quarter' | 'month' | 'week' | 'day' |
 export type TimestampType = {
     timeframe?: TimestampTimeframe;
 };
+export type TimingInfo = {
+    name: string;
+    duration_ms: number;
+    detailed_timing?: Array<TimingInfo>;
+};
 export type Translation = {
     url: string;
     compiled_model_json?: string;

package/dist/types.js

@@ -195,6 +195,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'array': true,
                 'optional': true,
             },
+            'timing_info': {
+                'type': 'TimingInfo',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'CompileQueryRequest': {
@@ -252,6 +257,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'array': true,
                 'optional': true,
             },
+            'timing_info': {
+                'type': 'TimingInfo',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'CompileSourceRequest': {
@@ -299,6 +309,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'timing_info': {
+                'type': 'TimingInfo',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'CompilerNeeds': {
@@ -1236,6 +1251,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'timing_info': {
+                'type': 'TimingInfo',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'RunQueryRequest': {
@@ -1288,6 +1308,11 @@ exports.MALLOY_INTERFACE_TYPES = {
                 'optional': true,
                 'array': false,
             },
+            'timing_info': {
+                'type': 'TimingInfo',
+                'optional': true,
+                'array': false,
+            },
         },
     },
     'SQLNativeCell': {
@@ -1491,6 +1516,27 @@ exports.MALLOY_INTERFACE_TYPES = {
             },
         },
     },
+    'TimingInfo': {
+        'type': 'struct',
+        'name': 'TimingInfo',
+        'fields': {
+            'name': {
+                'type': 'string',
+                'optional': false,
+                'array': false,
+            },
+            'duration_ms': {
+                'type': 'number',
+                'optional': false,
+                'array': false,
+            },
+            'detailed_timing': {
+                'type': 'TimingInfo',
+                'array': true,
+                'optional': true,
+            },
+        },
+    },
     'Translation': {
         'type': 'struct',
         'name': 'Translation',

package/package.json

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

package/scripts/hacky_gen_types.ts

@@ -86,7 +86,7 @@ for (const file of fs.readdirSync('./generated-types')) {
     const name = nameMatch[1];
     const fields: Record<string, MalloyInterfaceFieldType> = {};
     const fieldMatches = actualTypes.matchAll(
-      / {4}([a-z_]+)(\?)?: (?:([a-z]+)|([A-Za-z]+)\.[A-Za-z]+|(?:Array<([a-z]+)>)|(?:Array<([A-Za-z]+)\.[A-Za-z]+>));/g
+      / {4}([a-z_]+)(\?)?: (?:([a-z]+)|([A-Za-z]+)\.[A-Za-z]+|I([A-Za-z]+)|(?:Array<([a-z]+)>)|(?:Array<([A-Za-z]+)\.[A-Za-z]+>)|(?:Array<I([A-Za-z]+)>));/g
     );
     for (const fieldMatch of fieldMatches) {
       const [
@@ -94,8 +94,10 @@ for (const file of fs.readdirSync('./generated-types')) {
         optionalQ,
         basicType,
         specialType,
+        recursiveType,
         arrayBasicType,
         arraySpecialType,
+        arrayRecursiveType,
       ] = [
         fieldMatch[1],
         fieldMatch[2],
@@ -103,11 +105,14 @@ for (const file of fs.readdirSync('./generated-types')) {
         fieldMatch[4],
         fieldMatch[5],
         fieldMatch[6],
+        fieldMatch[7],
+        fieldMatch[8],
       ];
       const optional = optionalQ === '?';
       const type =
         (basicType && {type: basicType, optional, array: false}) ??
         (specialType && {type: specialType, optional, array: false}) ??
+        (recursiveType && {type: recursiveType, optional, array: false}) ??
         (arrayBasicType && {
           type: arrayBasicType,
           array: true,
@@ -117,6 +122,11 @@ for (const file of fs.readdirSync('./generated-types')) {
           type: arraySpecialType,
           array: true,
           optional,
+        }) ??
+        (arrayRecursiveType && {
+          type: arrayRecursiveType,
+          array: true,
+          optional,
         });
       if (!type) throw new Error(`Invalid type ${fieldMatch[0]}`);
       fields[name] = type;

package/thrift/malloy.thrift

@@ -636,6 +636,12 @@ struct LogMessage {
   4: required string message;
 }
 
+struct TimingInfo {
+  1: required string name;
+  3: required i32 duration_ms;
+  4: optional list<TimingInfo> detailed_timing;
+}
+
 // Given the URL to a model, return the StableModelDef for that model
 
 struct CompileModelRequest {
@@ -651,6 +657,7 @@ struct CompileModelResponse {
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
   10: optional list<Translation> translations;
+  11: optional TimingInfo timing_info;
 }
 
 // Given the URL to a model and a name of a queryable thing, get a StableSourceDef
@@ -668,6 +675,7 @@ struct CompileSourceResponse {
 
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
+  11: optional TimingInfo timing_info;
 }
 
 // Given a StableQueryDef and the URL to a model, run it and return a StableResult
@@ -686,6 +694,7 @@ struct RunQueryResponse {
   7: optional i32 default_row_limit_added,
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
+  11: optional TimingInfo timing_info;
 }
 
 // Given a StableQueryDef and the URL to a model, compile it and return a StableResultDef
@@ -705,6 +714,7 @@ struct CompileQueryResponse {
   8: optional list<LogMessage> logs,
   9: optional CompilerNeeds compiler_needs,
   10: optional list<Translation> translations;
+  11: optional TimingInfo timing_info;
 }
 
 // Given a URL to a model and the name of a source, run the indexing query
@@ -720,4 +730,5 @@ struct RunIndexQueryResponse {
   1: optional Result result,
 
   9: optional CompilerNeeds compiler_needs,
+  11: optional TimingInfo timing_info;
 }