@malloydata/malloy-interfaces 0.0.240-dev250311155207 → 0.0.240-dev250311202829

package/dist/index.js

@@ -150,10 +150,11 @@ exports.test = {
 exports.res = {
     connection_name: 'foo',
     data: {
-        kind: 'table',
-        rows: [
+        kind: 'array_cell',
+        array_value: [
             {
-                cells: [
+                kind: 'record_cell',
+                record_value: [
                     {
                         kind: 'string_cell',
                         string_value: 'UA',
@@ -165,7 +166,8 @@ exports.res = {
                 ],
             },
             {
-                cells: [
+                kind: 'record_cell',
+                record_value: [
                     {
                         kind: 'string_cell',
                         string_value: 'AA',

package/dist/types.d.ts

@@ -54,8 +54,8 @@ export type BooleanLiteral = {
     boolean_value: boolean;
 };
 export type BooleanType = {};
-export type CellType = 'string_cell' | 'boolean_cell' | 'date_cell' | 'timestamp_cell' | 'number_cell' | 'json_cell' | 'record_cell' | 'array_cell' | 'table_cell';
-export type Cell = CellWithStringCell | CellWithBooleanCell | CellWithDateCell | CellWithTimestampCell | CellWithNumberCell | CellWithJSONCell | CellWithRecordCell | CellWithArrayCell | CellWithTableCell;
+export type CellType = 'string_cell' | 'boolean_cell' | 'date_cell' | 'timestamp_cell' | 'number_cell' | 'json_cell' | 'record_cell' | 'array_cell' | 'null_cell' | 'sql_native_cell';
+export type Cell = CellWithStringCell | CellWithBooleanCell | CellWithDateCell | CellWithTimestampCell | CellWithNumberCell | CellWithJSONCell | CellWithRecordCell | CellWithArrayCell | CellWithNullCell | CellWithSQLNativeCell;
 export type CellWithStringCell = {
     kind: 'string_cell';
 } & StringCell;
@@ -80,9 +80,12 @@ export type CellWithRecordCell = {
 export type CellWithArrayCell = {
     kind: 'array_cell';
 } & ArrayCell;
-export type CellWithTableCell = {
-    kind: 'table_cell';
-} & TableCell;
+export type CellWithNullCell = {
+    kind: 'null_cell';
+} & NullCell;
+export type CellWithSQLNativeCell = {
+    kind: 'sql_native_cell';
+} & SQLNativeCell;
 export type CompileModelRequest = {
     model_url: string;
     extend_model_url?: string;
@@ -125,14 +128,14 @@ export type Connection = {
     name: string;
     dialect?: string;
 };
-export type DataType = 'record' | 'table';
-export type Data = DataWithRecord | DataWithTable;
-export type DataWithRecord = {
-    kind: 'record';
+export type DataType = 'record_cell' | 'array_cell';
+export type Data = DataWithRecordCell | DataWithArrayCell;
+export type DataWithRecordCell = {
+    kind: 'record_cell';
 } & RecordCell;
-export type DataWithTable = {
-    kind: 'table';
-} & Table;
+export type DataWithArrayCell = {
+    kind: 'array_cell';
+} & ArrayCell;
 export type DateCell = {
     date_value: string;
 };
@@ -274,6 +277,7 @@ export type Nest = {
     name?: string;
     view: View;
 };
+export type NullCell = {};
 export type NullLiteral = {};
 export type NumberCell = {
     number_value: number;
@@ -355,9 +359,9 @@ export type Result = {
     schema: Schema;
     sql?: string;
     connection_name: string;
-};
-export type Row = {
-    cells: Array<Cell>;
+    annotations?: Array<Annotation>;
+    model_annotations?: Array<Annotation>;
+    query_timezone?: string;
 };
 export type RunIndexQueryRequest = {
     model_url: string;
@@ -378,6 +382,9 @@ export type RunQueryResponse = {
     logs?: Array<LogMessage>;
     compiler_needs?: CompilerNeeds;
 };
+export type SQLNativeCell = {
+    sql_native_value: string;
+};
 export type SQLNativeType = {
     sql_type?: string;
 };
@@ -407,12 +414,6 @@ export type StringLiteral = {
     string_value: string;
 };
 export type StringType = {};
-export type Table = {
-    rows: Array<Row>;
-};
-export type TableCell = {
-    table_value: Table;
-};
 export type TimeTruncationFieldReference = {
     field_reference: Reference;
     truncation: TimestampTimeframe;

package/package.json

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

package/thrift/malloy.thrift

@@ -423,6 +423,8 @@ struct NumberCell {
   1: required double number_value,
 }
 
+struct NullCell {}
+
 struct TimestampCell {
   1: required string timestamp_value, // TODO another way to represent dates?
 }
@@ -435,6 +437,10 @@ struct JSONCell {
   1: required string json_value,
 }
 
+struct SQLNativeCell {
+  1: required string sql_native_value,
+}
+
 struct ArrayCell {
   1: required list<Cell> array_value,
 }
@@ -444,10 +450,6 @@ struct RecordCell {
   1: required list<Cell> record_value,
 }
 
-struct TableCell {
-  1: required Table table_value,
-}
-
 union Cell {
   1: required StringCell string_cell,
   2: required BooleanCell boolean_cell,
@@ -457,21 +459,13 @@ union Cell {
   6: required JSONCell json_cell, // TODO does this need to be here?
   7: required RecordCell record_cell,
   8: required ArrayCell array_cell,
-  9: required TableCell table_cell, // TODO does this need to be different from an array of records
-  // TODO sql_native???
-}
-
-struct Row {
-  1: required list<Cell> cells,
-}
-
-struct Table {
-  1: required list<Row> rows,
+  9: required NullCell null_cell,
+  10: required SQLNativeCell sql_native_cell,
 }
 
 union Data {
-  1: required RecordCell record,
-  2: required Table table,
+  1: required RecordCell record_cell,
+  2: required ArrayCell array_cell,
 }
 
 // should this be one type "Result" with optional data/sql, or three different types?
@@ -480,6 +474,9 @@ struct Result {
   2: required Schema schema,
   3: optional string sql,
   4: required string connection_name,
+  5: optional list<Annotation> annotations,
+  6: optional list<Annotation> model_annotations,
+  7: optional string query_timezone,
 }
 
 /*