@malloydata/malloy 0.0.6 → 0.0.7-221110172722

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type { QueryDataRow, ModelDef, Fragment, Query, 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, } 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, } from "./model";
 export { Segment, isFilteredAliasedName, } from "./model";
 export { HighlightType, MalloyTranslator, } from "./lang";
 export type { LogMessage, TranslateResponse } from "./lang";

package/dist/malloy.d.ts

@@ -2,7 +2,7 @@
 import { InfoConnection } from ".";
 import { DocumentHighlight as DocumentHighlightDefinition, DocumentSymbol as DocumentSymbolDefinition, DocumentCompletion as DocumentCompletionDefinition, LogMessage, MalloyTranslator } from "./lang";
 import { DocumentHelpContext } from "./lang/parse-tree-walkers/document-help-context-walker";
-import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult } from "./model";
+import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult, NamedQuery } from "./model";
 import { LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader, Connection } from "./runtime_types";
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
@@ -206,9 +206,9 @@ export declare class Model {
  * A prepared query which has all the necessary information to produce its SQL.
  */
 export declare class PreparedQuery {
-    private _modelDef;
-    private _query;
-    private name?;
+    _modelDef: ModelDef;
+    _query: InternalQuery | NamedQuery;
+    name?: string;
     constructor(query: InternalQuery, model: ModelDef, name?: string);
     /**
      * Generate the SQL for this query.
@@ -217,6 +217,10 @@ export declare class PreparedQuery {
      */
     get preparedResult(): PreparedResult;
     get dialect(): string;
+    /**
+     * Get the flattened version of a query -- one that does not have a `pipeHead`.
+     */
+    getFlattenedQuery(defaultName: string): PreparedQuery;
 }
 export declare function parseTableURI(tableURI: string): {
     connectionName?: string;

package/dist/malloy.js

@@ -435,6 +435,23 @@ class PreparedQuery {
         }
         return source.dialect;
     }
+    /**
+     * Get the flattened version of a query -- one that does not have a `pipeHead`.
+     */
+    getFlattenedQuery(defaultName) {
+        let structRef = this._query.structRef;
+        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,
+            ...this._query,
+            type: "turtle",
+        });
+        return new PreparedQuery({ ...turtleDef, structRef, type: "query" }, this._modelDef, this.name || turtleDef.as || turtleDef.name);
+    }
 }
 exports.PreparedQuery = PreparedQuery;
 function parseTableURI(tableURI) {

package/package.json

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