@malloydata/malloy-interfaces 0.0.239-dev250226010331 → 0.0.239-dev250227145856

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as Malloy from './types';
 export * from './types';
 export { queryToMalloy } from './to_malloy';
+export { nestUnions } from './nest_unions';
 export declare const test: Malloy.ModelInfo;
 export declare const res: Malloy.Result;
 export declare const thingy1: Malloy.Query;

package/dist/index.js

@@ -20,10 +20,12 @@ 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.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.nestUnions = 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; } });
+var nest_unions_1 = require("./nest_unions");
+Object.defineProperty(exports, "nestUnions", { enumerable: true, get: function () { return nest_unions_1.nestUnions; } });
 exports.test = {
     entries: [
         {
@@ -146,6 +148,7 @@ exports.test = {
     anonymous_queries: [],
 };
 exports.res = {
+    connection_name: 'foo',
     data: {
         kind: 'table',
         rows: [

package/dist/nest_unions.d.ts

@@ -0,0 +1 @@
+export declare function nestUnions(obj: unknown): unknown;

package/dist/nest_unions.js

@@ -0,0 +1,40 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nestUnions = void 0;
+function nestUnions(obj) {
+    if (obj === null) {
+        return obj;
+    }
+    else if (typeof obj === 'string' || typeof obj === 'number') {
+        return obj;
+    }
+    else if (Array.isArray(obj)) {
+        return obj.map(nestUnions);
+    }
+    else {
+        const result = {};
+        let kind = undefined;
+        for (const key in obj) {
+            if (key === 'kind') {
+                kind = obj[key];
+            }
+            else {
+                result[key] = nestUnions(obj[key]);
+            }
+        }
+        if (kind === undefined) {
+            return result;
+        }
+        else {
+            return { [kind]: result };
+        }
+    }
+}
+exports.nestUnions = nestUnions;
+//# sourceMappingURL=nest_unions.js.map

package/dist/nest_unions.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/nest_unions.spec.js

@@ -0,0 +1,67 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const nest_unions_1 = require("./nest_unions");
+describe('unnest unions', () => {
+    test('works', () => {
+        const query = {
+            definition: {
+                kind: 'arrow',
+                source_reference: {
+                    name: 'flights',
+                },
+                view: {
+                    kind: 'segment',
+                    operations: [
+                        {
+                            kind: 'group_by',
+                            field: {
+                                expression: {
+                                    kind: 'field_reference',
+                                    name: 'carrier',
+                                },
+                            },
+                        },
+                        {
+                            kind: 'limit',
+                            limit: 10,
+                        },
+                    ],
+                },
+            },
+        };
+        expect((0, nest_unions_1.nestUnions)(query)).toMatchObject({
+            definition: {
+                arrow: {
+                    source_reference: {
+                        name: 'flights',
+                    },
+                    view: {
+                        segment: {
+                            operations: [
+                                {
+                                    group_by: {
+                                        field: {
+                                            expression: {
+                                                field_reference: { name: 'carrier' },
+                                            },
+                                        },
+                                    },
+                                },
+                                {
+                                    limit: { limit: 10 },
+                                },
+                            ],
+                        },
+                    },
+                },
+            },
+        });
+    });
+});
+//# sourceMappingURL=nest_unions.spec.js.map

package/dist/types.d.ts

@@ -83,6 +83,48 @@ export type CellWithArrayCell = {
 export type CellWithTableCell = {
     kind: 'table_cell';
 } & TableCell;
+export type CompileModelRequest = {
+    model_url: string;
+    extend_model_url?: string;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompileModelResponse = {
+    model?: ModelInfo;
+    logs?: Array<LogMessage>;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompileQueryRequest = {
+    model_url: string;
+    query: Query;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompileQueryResponse = {
+    result?: Result;
+    logs?: Array<LogMessage>;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompileSourceRequest = {
+    model_url: string;
+    name: string;
+    extend_model_url?: string;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompileSourceResponse = {
+    source?: SourceInfo;
+    logs?: Array<LogMessage>;
+    compiler_needs?: CompilerNeeds;
+};
+export type CompilerNeeds = {
+    table_schemas?: Array<SQLTable>;
+    sql_schemas?: Array<SQLQuery>;
+    files?: Array<File>;
+    connections?: Array<Connection>;
+    translations?: Array<Translation>;
+};
+export type Connection = {
+    name: string;
+    dialect?: string;
+};
 export type DataType = 'record' | 'table';
 export type Data = DataWithRecord | DataWithTable;
 export type DataWithRecord = {
@@ -107,6 +149,14 @@ export type DimensionInfo = {
     type: AtomicType;
     annotations?: Array<Annotation>;
 };
+export type DocumentPosition = {
+    line: number;
+    character: number;
+};
+export type DocumentRange = {
+    start: DocumentPosition;
+    end: DocumentPosition;
+};
 export type ExpressionType = 'field_reference' | 'time_truncation' | 'filtered_field';
 export type Expression = ExpressionWithFieldReference | ExpressionWithTimeTruncation | ExpressionWithFilteredField;
 export type ExpressionWithFieldReference = {
@@ -136,6 +186,11 @@ export type FieldInfoWithJoin = {
 export type FieldInfoWithView = {
     kind: 'view';
 } & ViewInfo;
+export type File = {
+    url: string;
+    contents?: string;
+    invalidation_key?: string;
+};
 export type FilterType = 'filter_string';
 export type Filter = FilterWithFilterString;
 export type FilterWithFilterString = {
@@ -190,6 +245,13 @@ export type Location = {
     url: string;
     range: Range;
 };
+export type LogMessage = {
+    url: string;
+    range: DocumentRange;
+    severity: LogSeverity;
+    message: string;
+};
+export type LogSeverity = 'debug' | 'info' | 'warn' | 'error';
 export type MeasureInfo = {
     name: string;
     type: AtomicType;
@@ -206,7 +268,7 @@ export type ModelEntryValueWithQuery = {
 export type ModelInfo = {
     entries: Array<ModelEntryValue>;
     annotations?: Array<Annotation>;
-    anonymous_queries: Array<QueryInfo>;
+    anonymous_queries: Array<AnonymousQueryInfo>;
 };
 export type Nest = {
     name?: string;
@@ -292,13 +354,43 @@ export type Result = {
     data?: Data;
     schema: Schema;
     sql?: string;
+    connection_name: string;
 };
 export type Row = {
     cells: Array<Cell>;
 };
+export type RunIndexQueryRequest = {
+    model_url: string;
+    source_name: string;
+    compiler_needs?: CompilerNeeds;
+};
+export type RunIndexQueryResponse = {
+    result?: Result;
+    compiler_needs?: CompilerNeeds;
+};
+export type RunQueryRequest = {
+    model_url: string;
+    query: Query;
+    compiler_needs?: CompilerNeeds;
+};
+export type RunQueryResponse = {
+    result?: Result;
+    logs?: Array<LogMessage>;
+    compiler_needs?: CompilerNeeds;
+};
 export type SQLNativeType = {
     sql_type?: string;
 };
+export type SQLQuery = {
+    sql: string;
+    schema?: Schema;
+    connection_name: string;
+};
+export type SQLTable = {
+    name: string;
+    schema?: Schema;
+    connection_name: string;
+};
 export type Schema = {
     fields: Array<FieldInfo>;
 };
@@ -336,6 +428,10 @@ export type TimestampTimeframe = 'year' | 'quarter' | 'month' | 'week' | 'day' |
 export type TimestampType = {
     timeframe?: TimestampTimeframe;
 };
+export type Translation = {
+    url: string;
+    compiled_model_json?: string;
+};
 export type View = {
     definition: ViewDefinition;
     annotations?: Array<Annotation>;

package/package.json

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

package/thrift/malloy.thrift

@@ -8,7 +8,7 @@
 struct ModelInfo {
   1: required list<ModelEntryValue> entries,
   2: optional list<Annotation> annotations,
-  3: required list<QueryInfo> anonymous_queries,
+  3: required list<AnonymousQueryInfo> anonymous_queries,
 }
 
 union ModelEntryValue {
@@ -479,6 +479,7 @@ struct Result {
   1: optional Data data,
   2: required Schema schema,
   3: optional string sql,
+  4: required string connection_name,
 }
 
 /*
@@ -523,3 +524,143 @@ TODO
 
 // concern: shape of FieldInfo and GroupBy (no object for "Field") are funadmentally pretty different,
 // but it might be nice for them to be more similar.
+
+struct SQLTable {
+  1: required string name,
+  2: optional Schema schema,
+  3: required string connection_name,
+}
+
+struct SQLQuery {
+  1: required string sql,
+  2: optional Schema schema,
+  3: required string connection_name,
+}
+
+struct File {
+  1: required string url,
+  2: optional string contents,
+  3: optional string invalidation_key,
+}
+
+struct Connection {
+  1: required string name,
+  2: optional string dialect,
+}
+
+struct Translation {
+  1: required string url,
+  2: optional string compiled_model_json,
+}
+
+struct CompilerNeeds {
+  1: optional list<SQLTable> table_schemas,
+  2: optional list<SQLQuery> sql_schemas,
+  3: optional list<File> files,
+  4: optional list<Connection> connections,
+  5: optional list<Translation> translations,
+}
+
+struct DocumentPosition {
+  1: required i32 line;
+  2: required i32 character;
+}
+
+struct DocumentRange {
+  1: required DocumentPosition start;
+  2: required DocumentPosition end;
+}
+
+enum LogSeverity {
+  DEBUG = 1,
+  INFO = 2,
+  WARN = 3,
+  ERROR = 4
+}
+
+struct LogMessage {
+  1: required string url;
+  2: required DocumentRange range;
+  3: required LogSeverity severity;
+  4: required string message;
+}
+
+// Given the URL to a model, return the StableModelDef for that model
+
+struct CompileModelRequest {
+  1: required string model_url,
+  2: optional string extend_model_url,
+
+  9: optional CompilerNeeds compiler_needs,
+}
+
+struct CompileModelResponse {
+  1: optional ModelInfo model,
+
+  8: optional list<LogMessage> logs,
+  9: optional CompilerNeeds compiler_needs,
+}
+
+// Given the URL to a model and a name of a queryable thing, get a StableSourceDef
+
+struct CompileSourceRequest {
+  1: required string model_url,
+  2: required string name,
+  3: optional string extend_model_url,
+
+  9: optional CompilerNeeds compiler_needs,
+}
+
+struct CompileSourceResponse {
+  1: optional SourceInfo source,
+
+  8: optional list<LogMessage> logs,
+  9: optional CompilerNeeds compiler_needs,
+}
+
+// Given a StableQueryDef and the URL to a model, run it and return a StableResult
+
+struct RunQueryRequest {
+  1: required string model_url,
+  2: required Query query,
+
+  9: optional CompilerNeeds compiler_needs,
+}
+
+struct RunQueryResponse {
+  1: optional Result result,
+
+  8: optional list<LogMessage> logs,
+  9: optional CompilerNeeds compiler_needs,
+}
+
+// Given a StableQueryDef and the URL to a model, compile it and return a StableResultDef
+
+struct CompileQueryRequest {
+  1: required string model_url,
+  2: required Query query,
+
+  9: optional CompilerNeeds compiler_needs,
+}
+
+struct CompileQueryResponse {
+  1: optional Result result,
+
+  8: optional list<LogMessage> logs,
+  9: optional CompilerNeeds compiler_needs,
+}
+
+// Given a URL to a model and the name of a source, run the indexing query
+
+struct RunIndexQueryRequest {
+  1: required string model_url,
+  2: required string source_name,
+
+  9: optional CompilerNeeds compiler_needs,
+}
+
+struct RunIndexQueryResponse {
+  1: optional Result result,
+
+  9: optional CompilerNeeds compiler_needs,
+}