@malloydata/malloy 0.0.81 → 0.0.82-dev230912221500

package/dist/malloy.d.ts

@@ -148,9 +148,9 @@ export declare class Model implements Taggable {
     private modelDef;
     private queryList;
     private sqlBlocks;
+    readonly problems: LogMessage[];
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
     _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
-    readonly problems: LogMessage[];
     constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
@@ -224,10 +224,10 @@ export declare class Model implements Taggable {
  * A prepared query which has all the necessary information to produce its SQL.
  */
 export declare class PreparedQuery implements Taggable {
+    name?: string | undefined;
     _modelDef: ModelDef;
     _query: InternalQuery | NamedQuery;
-    name?: string;
-    constructor(query: InternalQuery, model: ModelDef, name?: string);
+    constructor(query: InternalQuery, model: ModelDef, name?: string | undefined);
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
@@ -409,8 +409,8 @@ export declare class DocumentCompletion {
  * A fully-prepared query containing SQL and metadata required to run the query.
  */
 export declare class PreparedResult implements Taggable {
-    protected inner: CompiledQuery;
     protected modelDef: ModelDef;
+    protected inner: CompiledQuery;
     constructor(query: CompiledQuery, modelDef: ModelDef);
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
@@ -455,7 +455,7 @@ export declare class InMemoryURLReader implements URLReader {
 export declare class FixedConnectionMap implements LookupConnection<Connection> {
     private connections;
     private defaultConnectionName?;
-    constructor(connections: Map<string, Connection>, defaultConnectionName?: string);
+    constructor(connections: Map<string, Connection>, defaultConnectionName?: string | undefined);
     /**
      * Get a connection by name.
      *

package/dist/malloy.js

@@ -322,9 +322,9 @@ class Model {
         this.modelDef = modelDef;
         this.queryList = queryList;
         this.sqlBlocks = sqlBlocks;
+        this.problems = problems;
         this._referenceAt = referenceAt;
         this._importAt = importAt;
-        this.problems = problems;
     }
     tagParse(spec) {
         return tags_1.Tag.annotationToTag(this.modelDef.annotation, spec);
@@ -458,9 +458,9 @@ exports.Model = Model;
  */
 class PreparedQuery {
     constructor(query, model, name) {
+        this.name = name;
         this._query = query;
         this._modelDef = model;
-        this.name = name;
     }
     tagParse(spec) {
         const modelScope = tags_1.Tag.annotationToTag(this._modelDef.annotation).tag;
@@ -707,8 +707,8 @@ exports.DocumentCompletion = DocumentCompletion;
  */
 class PreparedResult {
     constructor(query, modelDef) {
-        this.inner = query;
         this.modelDef = modelDef;
+        this.inner = query;
     }
     tagParse(spec) {
         const modelScope = tags_1.Tag.annotationToTag(this.modelDef.annotation).tag;

package/dist/model/malloy_query.d.ts

@@ -18,11 +18,11 @@ interface OutputPipelinedSQL {
     pipelineSQL: string;
 }
 declare class StageWriter {
+    parent: StageWriter | undefined;
     withs: string[];
     udfs: string[];
     pdts: string[];
     stagePrefix: string;
-    parent: StageWriter | undefined;
     useCTE: boolean;
     constructor(useCTE: boolean | undefined, parent: StageWriter | undefined);
     getName(id: number): string;
@@ -113,11 +113,11 @@ interface FieldInstance {
     root(): FieldInstanceResultRoot;
 }
 declare class FieldInstanceField implements FieldInstance {
-    type: FieldInstanceType;
     f: QueryField;
     fieldUsage: FieldUsage;
-    additionalGroupSets: number[];
     parent: FieldInstanceResult;
+    type: FieldInstanceType;
+    additionalGroupSets: number[];
     analyticalSQL: string | undefined;
     partitionSQL: string | undefined;
     constructor(f: QueryField, fieldUsage: FieldUsage, parent: FieldInstanceResult);
@@ -132,13 +132,13 @@ type UngroupSet = {
     groupSet: number;
 };
 declare class FieldInstanceResult implements FieldInstance {
+    turtleDef: TurtleDef;
+    parent: FieldInstanceResult | undefined;
     type: FieldInstanceType;
     allFields: Map<string, FieldInstance>;
     groupSet: number;
     depth: number;
-    parent: FieldInstanceResult | undefined;
     childGroups: number[];
-    turtleDef: TurtleDef;
     firstSegment: PipeSegment;
     hasHaving: boolean;
     ungroupedSets: Map<string, UngroupSet>;
@@ -185,13 +185,13 @@ declare class FieldInstanceResultRoot extends FieldInstanceResult {
     calculateSymmetricAggregates(): void;
 }
 declare class JoinInstance {
+    queryStruct: QueryStruct;
+    alias: string;
+    parent: JoinInstance | undefined;
     mayNeedUniqueKey: boolean;
     makeUniqueKey: boolean;
     leafiest: boolean;
-    parent: JoinInstance | undefined;
-    queryStruct: QueryStruct;
     joinFilterConditions?: QueryFieldBoolean[];
-    alias: string;
     children: JoinInstance[];
     constructor(queryStruct: QueryStruct, alias: string, parent: JoinInstance | undefined);
     parentRelationship(): 'root' | JoinRelationship;

package/dist/model/malloy_query.js

@@ -40,11 +40,11 @@ function identifierNormalize(s) {
 }
 class StageWriter {
     constructor(useCTE = true, parent) {
+        this.parent = parent;
         this.withs = [];
         this.udfs = [];
         this.pdts = [];
         this.stagePrefix = '__stage';
-        this.parent = parent;
         this.useCTE = useCTE;
     }
     getName(id) {
@@ -777,11 +777,11 @@ function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
 }
 class FieldInstanceField {
     constructor(f, fieldUsage, parent) {
-        this.type = 'field';
-        this.additionalGroupSets = [];
         this.f = f;
         this.fieldUsage = fieldUsage;
         this.parent = parent;
+        this.type = 'field';
+        this.additionalGroupSets = [];
     }
     root() {
         return this.parent.root();
@@ -809,6 +809,8 @@ class FieldInstanceField {
 }
 class FieldInstanceResult {
     constructor(turtleDef, parent) {
+        this.turtleDef = turtleDef;
+        this.parent = parent;
         this.type = 'query';
         this.allFields = new Map();
         this.groupSet = 0;
@@ -818,8 +820,6 @@ class FieldInstanceResult {
         this.ungroupedSets = new Map();
         // query: QueryQuery;
         this.resultUsesUngrouped = false;
-        this.parent = parent;
-        this.turtleDef = turtleDef;
         this.firstSegment = turtleDef.pipeline[0];
     }
     getQueryInfo() {
@@ -1185,13 +1185,13 @@ class FieldInstanceResultRoot extends FieldInstanceResult {
 }
 class JoinInstance {
     constructor(queryStruct, alias, parent) {
+        this.queryStruct = queryStruct;
+        this.alias = alias;
+        this.parent = parent;
         this.mayNeedUniqueKey = false;
         this.makeUniqueKey = false;
         this.leafiest = false;
         this.children = [];
-        this.queryStruct = queryStruct;
-        this.parent = parent;
-        this.alias = alias;
         if (parent) {
             parent.children.push(this);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.81",
+  "version": "0.0.82-dev230912221500",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",