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

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',
@@ -208,7 +210,10 @@ exports.thingy1 = {
 exports.thingy123r = {
     definition: {
         kind: 'arrow',
-        source_reference: { name: 'flights' },
+        source: {
+            kind: 'source_reference',
+            name: 'flights',
+        },
         view: {
             kind: 'view_reference',
             name: 'by_carrier',
@@ -218,7 +223,10 @@ exports.thingy123r = {
 exports.thingyssdfg = {
     definition: {
         kind: 'refinement',
-        query_reference: { name: 'flights' },
+        base: {
+            kind: 'query_reference',
+            name: 'flights',
+        },
         refinement: {
             kind: 'view_reference',
             name: 'by_carrier',
@@ -228,7 +236,10 @@ exports.thingyssdfg = {
 exports.thingy2asdf = {
     definition: {
         kind: 'arrow',
-        source_reference: { name: 'flights' },
+        source: {
+            kind: 'source_reference',
+            name: 'flights',
+        },
         view: {
             kind: 'refinement',
             base: {
@@ -254,7 +265,8 @@ exports.thingy2asdf = {
 exports.thingy3 = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -292,7 +304,8 @@ exports.thingy3 = {
 exports.thingy3dfdf = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -311,7 +324,8 @@ exports.thingy3dfdf = {
 exports.thingy4asdfasdf = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -343,7 +357,8 @@ exports.thingy4asdfasdf = {
 exports.thingy4asdfas = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -356,7 +371,8 @@ exports.thingy4asdfas = {
 exports.thingy4dfdsfs = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -381,7 +397,8 @@ exports.thingy4dfdsfs = {
 exports.thingy4sdfsd = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -408,7 +425,8 @@ exports.thingy4sdfsd = {
 exports.thingy4sddfdfsd = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {

package/dist/nest_unions.spec.js

@@ -12,7 +12,8 @@ describe('unnest unions', () => {
         const query = {
             definition: {
                 kind: 'arrow',
-                source_reference: {
+                source: {
+                    kind: 'source_reference',
                     name: 'flights',
                 },
                 view: {
@@ -38,8 +39,10 @@ describe('unnest unions', () => {
         expect((0, nest_unions_1.nestUnions)(query)).toMatchObject({
             definition: {
                 arrow: {
-                    source_reference: {
-                        name: 'flights',
+                    source: {
+                        source_reference: {
+                            name: 'flights',
+                        },
                     },
                     view: {
                         segment: {

package/dist/to_malloy.js

@@ -39,11 +39,14 @@ function codeFromFragments(fragments, { tabWidth } = { tabWidth: 2 }) {
     }
     return code;
 }
-function wrap(open, block, close) {
+function wrap(open, block, close, options) {
+    var _a;
     if (block.includes(NEWLINE)) {
         return [open, NEWLINE, INDENT, ...block, NEWLINE, OUTDENT, close];
     }
-    return [open, ' ', ...block, ' ', close];
+    const spaces = (_a = options === null || options === void 0 ? void 0 : options.spaces) !== null && _a !== void 0 ? _a : true;
+    const maybeSpace = spaces ? ' ' : '';
+    return [open, maybeSpace, ...block, maybeSpace, close];
 }
 function escapeString(str) {
     return { contents: str, quoteCharacter: '"' }; // TODO
@@ -153,7 +156,7 @@ function referenceToFragments(reference) {
                 parameterFragments.push(',', NEWLINE);
             }
         }
-        fragments.push(...wrap('(', parameterFragments, ')'));
+        fragments.push(...wrap('(', parameterFragments, ')', { spaces: false }));
     }
     return fragments;
 }
@@ -164,11 +167,24 @@ function queryToFragments(query) {
     fragments.push(...queryDefinitionToFragments(query.definition));
     return fragments;
 }
+function queryArrowSourceToFragments(query) {
+    const fragments = [];
+    switch (query.kind) {
+        case 'source_reference': {
+            fragments.push(...referenceToFragments(query));
+            break;
+        }
+        case 'refinement':
+            fragments.push(...queryDefinitionToFragments(query));
+            break;
+    }
+    return fragments;
+}
 function queryDefinitionToFragments(query) {
     const fragments = [];
     switch (query.kind) {
         case 'arrow': {
-            fragments.push(...referenceToFragments(query.source_reference));
+            fragments.push(...queryArrowSourceToFragments(query.source));
             fragments.push(' -> ');
             fragments.push(...viewDefinitionToFragments(query.view));
             break;
@@ -178,7 +194,13 @@ function queryDefinitionToFragments(query) {
             break;
         }
         case 'refinement': {
-            fragments.push(...referenceToFragments(query.query_reference));
+            const baseFragments = queryDefinitionToFragments(query.base);
+            if (query.base.kind === 'arrow') {
+                fragments.push(...wrap('(', baseFragments, ')', { spaces: false }));
+            }
+            else {
+                fragments.push(...baseFragments);
+            }
             fragments.push(' + ');
             fragments.push(...viewDefinitionToFragments(query.refinement));
             break;

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;
@@ -308,9 +312,17 @@ export type Query = {
     annotations?: Array<Annotation>;
 };
 export type QueryArrow = {
-    source_reference: Reference;
+    source: QueryArrowSource;
     view: ViewDefinition;
 };
+export type QueryArrowSourceType = 'refinement' | 'source_reference';
+export type QueryArrowSource = QueryArrowSourceWithRefinement | QueryArrowSourceWithSourceReference;
+export type QueryArrowSourceWithRefinement = {
+    kind: 'refinement';
+} & QueryRefinement;
+export type QueryArrowSourceWithSourceReference = {
+    kind: 'source_reference';
+} & Reference;
 export type QueryDefinitionType = 'arrow' | 'query_reference' | 'refinement';
 export type QueryDefinition = QueryDefinitionWithArrow | QueryDefinitionWithQueryReference | QueryDefinitionWithRefinement;
 export type QueryDefinitionWithArrow = {
@@ -331,7 +343,7 @@ export type QueryInfo = {
     location?: Location;
 };
 export type QueryRefinement = {
-    query_reference: Reference;
+    base: QueryDefinition;
     refinement: ViewDefinition;
 };
 export type Range = {
@@ -355,9 +367,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 +390,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 +422,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-dev250311213218",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/thrift/malloy.thrift

@@ -305,7 +305,6 @@ stages: [
     ]
   }
 ]
-
 */
 
 struct Query {
@@ -319,13 +318,18 @@ union QueryDefinition {
   3: QueryRefinement refinement,
 }
 
+union QueryArrowSource {
+  3: QueryRefinement refinement,
+  2: Reference source_reference,
+}
+
 struct QueryArrow {
-  1: required Reference source_reference,
+  1: required QueryArrowSource source,
   2: required ViewDefinition view,
 }
 
 struct QueryRefinement {
-  1: required Reference query_reference,
+  1: required QueryDefinition base,
   2: required ViewDefinition refinement,
 }
 
@@ -423,6 +427,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 +441,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 +454,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 +463,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 +478,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,
 }
 
 /*