@malloydata/malloy 0.0.8-dev221110195142 → 0.0.8-dev221118175803

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, NamedQuery, } from "./model";
-export { Segment, isFilteredAliasedName, } from "./model";
+export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, NamedQuery, NamedModelObject, } from "./model";
+export { Segment, isFilteredAliasedName, flattenQuery, } from "./model";
 export { HighlightType, MalloyTranslator, } from "./lang";
 export type { LogMessage, TranslateResponse } from "./lang";
 export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, parseTableURI, QueryMaterializer, CSVWriter, JSONWriter, DataWriter, } from "./malloy";

package/dist/index.js

@@ -12,11 +12,12 @@
  * GNU General Public License for more details.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAsyncGenerator = exports.DataWriter = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.parseTableURI = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.isFilteredAliasedName = exports.Segment = void 0;
+exports.toAsyncGenerator = exports.DataWriter = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.parseTableURI = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
 var model_1 = require("./model");
 // Used in Composer Demo
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return model_1.Segment; } });
 Object.defineProperty(exports, "isFilteredAliasedName", { enumerable: true, get: function () { return model_1.isFilteredAliasedName; } });
+Object.defineProperty(exports, "flattenQuery", { enumerable: true, get: function () { return model_1.flattenQuery; } });
 var lang_1 = require("./lang");
 // Neede for VSCode extension
 Object.defineProperty(exports, "HighlightType", { enumerable: true, get: function () { return lang_1.HighlightType; } });

package/dist/malloy.js

@@ -443,12 +443,10 @@ class PreparedQuery {
         if (typeof structRef !== "string") {
             structRef = structRef.as || structRef.name;
         }
-        const queryModel = new model_1.QueryModel(this._modelDef);
-        const queryStruct = queryModel.getStructByName(structRef);
-        const turtleDef = queryStruct.flattenTurtleDef({
-            name: defaultName,
+        const turtleDef = (0, model_1.flattenQuery)(this._modelDef, {
             ...this._query,
-            type: "turtle",
+            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);
     }

package/dist/model/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./malloy_types";
-export { Segment, QueryModel } from "./malloy_query";
+export { Segment, QueryModel, flattenQuery } from "./malloy_query";

package/dist/model/index.js

@@ -26,9 +26,10 @@ 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.QueryModel = exports.Segment = void 0;
+exports.flattenQuery = exports.QueryModel = exports.Segment = void 0;
 __exportStar(require("./malloy_types"), exports);
 var malloy_query_1 = require("./malloy_query");
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return malloy_query_1.Segment; } });
 Object.defineProperty(exports, "QueryModel", { enumerable: true, get: function () { return malloy_query_1.QueryModel; } });
+Object.defineProperty(exports, "flattenQuery", { enumerable: true, get: function () { return malloy_query_1.flattenQuery; } });
 //# sourceMappingURL=index.js.map

package/dist/model/malloy_query.d.ts

@@ -1,5 +1,5 @@
 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 } from "./malloy_types";
+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 } from "./malloy_types";
 import { AndChain } from "./utils";
 import { ResultStructMetadataDef, SearchIndexResult } from ".";
 import { Connection } from "..";
@@ -350,4 +350,5 @@ export declare class QueryModel {
     exploreSearchSQLMap: Map<any, any>;
     searchIndex(connection: Connection, explore: string, searchValue: string, limit?: number, searchField?: string | undefined): Promise<SearchIndexResult[] | undefined>;
 }
+export declare function flattenQuery(model: ModelDef, query: NamedQuery): TurtleDef;
 export {};

package/dist/model/malloy_query.js

@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryModel = exports.Segment = void 0;
+exports.flattenQuery = exports.QueryModel = exports.Segment = void 0;
 const lodash_1 = require("lodash");
 const standardsql_1 = require("../dialect/standardsql");
 const dialect_1 = require("../dialect");
@@ -2991,4 +2991,18 @@ class QueryModel {
     }
 }
 exports.QueryModel = QueryModel;
+function flattenQuery(model, query) {
+    let structRef = query.structRef;
+    if (typeof structRef !== "string") {
+        structRef = structRef.as || structRef.name;
+    }
+    const queryModel = new QueryModel(model);
+    const queryStruct = queryModel.getStructByName(structRef);
+    const turtleDef = queryStruct.flattenTurtleDef({
+        ...query,
+        type: "turtle",
+    });
+    return turtleDef;
+}
+exports.flattenQuery = flattenQuery;
 //# sourceMappingURL=malloy_query.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.8-dev221110195142",
+  "version": "0.0.8-dev221118175803",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",