@malloydata/malloy 0.0.22-dev230207182613 → 0.0.22-dev230207183024

package/dist/malloy.js

@@ -41,11 +41,11 @@ class Malloy {
             url = new URL("internal://internal.malloy");
         }
         const translator = new lang_1.MalloyTranslator(url.toString(), {
-            urls: { [url.toString()]: source },
+            "urls": { [url.toString()]: source }
         });
         return new Parse(translator);
     }
-    static parse({ url, urlReader, source, }) {
+    static parse({ url, urlReader, source }) {
         if (source !== undefined) {
             return Malloy._parse(source, url);
         }
@@ -70,7 +70,7 @@ class Malloy {
      * @param model A compiled model to build upon (optional).
      * @returns A (promise of a) compiled `Model`.
      */
-    static async compile({ urlReader, connections, parse, model, }) {
+    static async compile({ urlReader, connections, parse, model }) {
         const translator = parse._translator;
         // eslint-disable-next-line no-constant-condition
         while (true) {
@@ -100,7 +100,7 @@ class Malloy {
                         }
                         catch (error) {
                             translator.update({
-                                errors: { urls: { [neededUrl]: error.message } },
+                                "errors": { "urls": { [neededUrl]: error.message } }
                             });
                         }
                     }
@@ -120,14 +120,14 @@ class Malloy {
                         tablesByConnection.set(connectionName, connectionToTablesMap);
                     }
                     // iterate over connections, fetching schema for all missing tables
-                    for (const [connectionName, connectionTableString,] of tablesByConnection) {
+                    for (const [connectionName, connectionTableString] of tablesByConnection) {
                         try {
                             const connection = await connections.lookupConnection(connectionName);
                             // TODO detect if the union of `Object.keys(tables)` and `Object.keys(errors)` is not the same
                             //      as `Object.keys(connectionTableString)`, i.e. that all tables are accounted for. Otherwise
                             //      the translator runs into an infinite loop fetching tables.
-                            const { schemas: tables, errors } = await connection.fetchSchemaForTables(connectionTableString);
-                            translator.update({ tables, errors: { tables: errors } });
+                            const { "schemas": tables, errors } = await connection.fetchSchemaForTables(connectionTableString);
+                            translator.update({ tables, "errors": { "tables": errors } });
                         }
                         catch (error) {
                             // There was an exception getting the connection, associate that error
@@ -137,7 +137,7 @@ class Malloy {
                             for (const table of connectionTableString) {
                                 errors[table] = error.toString();
                             }
-                            translator.update({ tables, errors: { tables: errors } });
+                            translator.update({ tables, "errors": { "tables": errors } });
                         }
                     }
                 }
@@ -151,13 +151,13 @@ class Malloy {
                         const resolved = await conn.fetchSchemaForSQLBlock(expanded);
                         if (resolved.error) {
                             translator.update({
-                                errors: { compileSQL: { [expanded.name]: resolved.error } },
+                                "errors": { "compileSQL": { [expanded.name]: resolved.error } }
                             });
                         }
                         if (resolved.structDef) {
                             if ((0, model_1.isSQLBlock)(resolved.structDef)) {
                                 translator.update({
-                                    compileSQL: { [expanded.name]: resolved.structDef },
+                                    "compileSQL": { [expanded.name]: resolved.structDef }
                                 });
                             }
                         }
@@ -165,7 +165,7 @@ class Malloy {
                     catch (error) {
                         const errors = {};
                         errors[toCompile.name] = error.toString();
-                        translator.update({ errors: { compileSQL: errors } });
+                        translator.update({ "errors": { "compileSQL": errors } });
                     }
                 }
             }
@@ -190,13 +190,13 @@ class Malloy {
         });
         const { name, connection } = toCompile;
         return {
-            type: "sqlBlock",
+            "type": "sqlBlock",
             name,
             connection,
-            selectStr: sqlStrings.join(""),
+            "selectStr": sqlStrings.join("")
         };
     }
-    static async run({ connections, preparedResult, sqlStruct, connection, options, }) {
+    static async run({ connections, preparedResult, sqlStruct, connection, options }) {
         const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
         if (!connection) {
             if (!connections) {
@@ -211,36 +211,36 @@ class Malloy {
             }
             const data = await connection.runSQL(sqlBlock.selectStr);
             return new Result({
-                structs: [sqlStruct],
-                sql: sqlBlock.selectStr,
-                result: data.rows,
-                totalRows: data.totalRows,
-                lastStageName: sqlBlock.name,
+                "structs": [sqlStruct],
+                "sql": sqlBlock.selectStr,
+                "result": data.rows,
+                "totalRows": data.totalRows,
+                "lastStageName": sqlBlock.name,
                 // TODO feature-sql-block There is no malloy code...
-                malloy: "",
-                connectionName: sqlStruct.structRelationship.connectionName,
+                "malloy": "",
+                "connectionName": sqlStruct.structRelationship.connectionName,
                 // TODO feature-sql-block There is no source explore...
-                sourceExplore: "",
-                sourceFilters: [],
+                "sourceExplore": "",
+                "sourceFilters": []
             }, {
-                name: "empty_model",
-                exports: [],
-                contents: {},
+                "name": "empty_model",
+                "exports": [],
+                "contents": {}
             });
         }
         else if (preparedResult) {
             const result = await connection.runSQL(preparedResult.sql, options);
             return new Result({
                 ...preparedResult._rawQuery,
-                result: result.rows,
-                totalRows: result.totalRows,
+                "result": result.rows,
+                "totalRows": result.totalRows
             }, preparedResult._modelDef);
         }
         else {
             throw new Error("Internal error: sqlStruct or preparedResult must be provided.");
         }
     }
-    static async *runStream({ connections, preparedResult, sqlStruct, connection, options, }) {
+    static async *runStream({ connections, preparedResult, sqlStruct, connection, options }) {
         const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
         if (sqlBlock === undefined && preparedResult === undefined) {
             throw new Error("Internal error: sqlBlock or preparedResult must be provided.");
@@ -430,7 +430,7 @@ class PreparedQuery {
         const translatedQuery = queryModel.compileQuery(this._query);
         return new PreparedResult({
             ...translatedQuery,
-            queryName: this.name || translatedQuery.queryName,
+            "queryName": this.name || translatedQuery.queryName
         }, this._modelDef);
     }
     get dialect() {
@@ -453,10 +453,10 @@ class PreparedQuery {
         }
         const turtleDef = (0, model_1.flattenQuery)(this._modelDef, {
             ...this._query,
-            type: "query",
-            name: "as" in this._query ? this._query.as || this._query.name : defaultName,
+            "type": "query",
+            "name": "as" in this._query ? this._query.as || this._query.name : defaultName
         });
-        return new PreparedQuery({ ...turtleDef, structRef, type: "query" }, this._modelDef, this.name || turtleDef.as || turtleDef.name);
+        return new PreparedQuery({ ...turtleDef, structRef, "type": "query" }, this._modelDef, this.name || turtleDef.as || turtleDef.name);
     }
 }
 exports.PreparedQuery = PreparedQuery;
@@ -464,10 +464,10 @@ function parseTableURI(tableURI) {
     const parts = tableURI.match(/^([^:]*):(.*)$/);
     if (parts) {
         const [, firstPart, secondPart] = parts;
-        return { connectionName: firstPart, tablePath: secondPart };
+        return { "connectionName": firstPart, "tablePath": secondPart };
     }
     else {
-        return { tablePath: tableURI };
+        return { "tablePath": tableURI };
     }
 }
 exports.parseTableURI = parseTableURI;
@@ -561,8 +561,8 @@ class DocumentRange {
      */
     toJSON() {
         return {
-            start: this.start.toJSON(),
-            end: this.end.toJSON(),
+            "start": this.start.toJSON(),
+            "end": this.end.toJSON()
         };
     }
 }
@@ -591,7 +591,7 @@ class DocumentPosition {
      * @returns This position in JSON format.
      */
     toJSON() {
-        return { line: this.line, character: this.character };
+        return { "line": this.line, "character": this.character };
     }
 }
 exports.DocumentPosition = DocumentPosition;
@@ -682,7 +682,7 @@ class PreparedResult {
         const explore = this.inner.structs[this.inner.structs.length - 1];
         const namedExplore = {
             ...explore,
-            name: this.inner.queryName || explore.name,
+            "name": this.inner.queryName || explore.name
         };
         // TODO `sourceExplore` is not fully-implemented yet -- it cannot
         //      handle cases where the source of the query is something other than
@@ -855,22 +855,22 @@ class Explore extends Entity {
     }
     getQueryByName(name) {
         const internalQuery = {
-            type: "query",
-            structRef: this.structDef,
-            pipeline: [
+            "type": "query",
+            "structRef": this.structDef,
+            "pipeline": [
                 {
-                    type: "reduce",
-                    fields: [name],
-                },
-            ],
+                    "type": "reduce",
+                    "fields": [name]
+                }
+            ]
         };
         return new PreparedQuery(internalQuery, this.modelDef, name);
     }
     get modelDef() {
         return {
-            name: "generated_model",
-            exports: [],
-            contents: { [this.structDef.name]: this.structDef },
+            "name": "generated_model",
+            "exports": [],
+            "contents": { [this.structDef.name]: this.structDef }
         };
     }
     getSingleExploreModel() {
@@ -904,7 +904,7 @@ class Explore extends Entity {
                             ["day_of_month", "day_of_week", "day_of_year"].includes(fieldDef.timeframe)) {
                             return [
                                 name,
-                                new NumberField({ ...fieldDef, type: "number" }, this, sourceField),
+                                new NumberField({ ...fieldDef, "type": "number" }, this, sourceField)
                             ];
                         }
                         return [name, new DateField(fieldDef, this, sourceField)];
@@ -1282,7 +1282,7 @@ class Runtime {
             }
             else {
                 connections = {
-                    lookupConnection: () => Promise.resolve(arg),
+                    "lookupConnection": () => Promise.resolve(arg)
                 };
             }
         }
@@ -1318,16 +1318,16 @@ class Runtime {
         return new ModelMaterializer(this, async () => {
             const parse = source instanceof URL
                 ? await Malloy.parse({
-                    url: source,
-                    urlReader: this.urlReader,
+                    "url": source,
+                    "urlReader": this.urlReader
                 })
                 : Malloy.parse({
-                    source,
+                    source
                 });
             return Malloy.compile({
-                urlReader: this.urlReader,
-                connections: this.connections,
-                parse,
+                "urlReader": this.urlReader,
+                "connections": this.connections,
+                parse
             });
         });
     }
@@ -1575,18 +1575,18 @@ class ModelMaterializer extends FluentState {
             const connections = this.runtime.connections;
             const parse = query instanceof URL
                 ? await Malloy.parse({
-                    url: query,
-                    urlReader,
+                    "url": query,
+                    urlReader
                 })
                 : Malloy.parse({
-                    source: query,
+                    "source": query
                 });
             const model = await this.getModel();
             const queryModel = await Malloy.compile({
                 urlReader,
                 connections,
                 parse,
-                model,
+                model
             });
             return queryModel.preparedQuery;
         });
@@ -1628,7 +1628,7 @@ class ModelMaterializer extends FluentState {
         }
     `;
         const result = await this.loadQuery(searchMapMalloy).run({
-            rowLimit: 1000,
+            "rowLimit": 1000
         });
         return result._queryResult.result;
     }
@@ -1873,8 +1873,8 @@ class SQLBlockMaterializer extends FluentState {
         const connections = this.runtime.connections;
         return Malloy.run({
             connections,
-            sqlStruct: sqlBlock,
-            options,
+            "sqlStruct": sqlBlock,
+            options
         });
     }
     async *runStream(options) {
@@ -1964,7 +1964,7 @@ class Result extends PreparedResult {
         return this.inner.totalRows;
     }
     toJSON() {
-        return { queryResult: this.inner, modelDef: this._modelDef };
+        return { "queryResult": this.inner, "modelDef": this._modelDef };
     }
     static fromJSON({ queryResult, modelDef }) {
         return new Result(queryResult, modelDef);
@@ -2199,12 +2199,12 @@ class DataArray extends Data {
         return {
             next() {
                 if (currentIndex < queryData.length) {
-                    return { value: getRow(currentIndex++), done: false };
+                    return { "value": getRow(currentIndex++), "done": false };
                 }
                 else {
-                    return { value: undefined, done: true };
+                    return { "value": undefined, "done": true };
                 }
-            },
+            }
         };
     }
     async *inMemoryStream() {
@@ -2294,14 +2294,14 @@ class DataRecord extends Data {
                 if (!returned) {
                     returned = true;
                     return {
-                        value: getSelf(),
-                        done: false,
+                        "value": getSelf(),
+                        "done": false
                     };
                 }
                 else {
-                    return { value: undefined, done: true };
+                    return { "value": undefined, "done": true };
                 }
-            },
+            }
         };
     }
 }

package/dist/model/malloy_query.d.ts

@@ -1,7 +1,7 @@
 import { Dialect, DialectFieldList } from "../dialect";
-import { FieldDef, FieldRef, FilterExpression, ModelDef, Query, QueryFieldDef, StructDef, StructRef, OrderBy, ResultMetadataDef, Expr, FieldFragment, AggregateFragment, CompiledQuery, FilterFragment, PipeSegment, TurtleDef, QuerySegment, Filtered, ParameterFragment, Parameter, JoinRelationship, DialectFragment, UngroupFragment, NamedQuery, AnalyticFragment, ResultStructMetadataDef, SearchIndexResult } from "./malloy_types";
-import { AndChain } from "./utils";
+import { AggregateFragment, AnalyticFragment, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, Filtered, FilterExpression, FilterFragment, JoinRelationship, ModelDef, NamedQuery, OrderBy, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, StructDef, StructRef, TurtleDef, UngroupFragment } from "./malloy_types";
 import { Connection } from "../runtime_types";
+import { AndChain } from "./utils";
 interface TurtleDefPlus extends TurtleDef, Filtered {
 }
 interface OutputPipelinedSQL {