more code review changes

malloydata · Oct 2, 2024 · 75609e3 · 75609e3
1 parent 2fabfb2
commit 75609e3
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/packages/malloy/src/lang/ast/query-elements/query-arrow.ts b/packages/malloy/src/lang/ast/query-elements/query-arrow.ts
@@ -54,7 +54,7 @@ export class QueryArrow extends QueryBase implements QueryElement {
       // the view as the head, or the scalar as the head (if scalar lenses is enabled)
       const invoked = isRefOk
         ? this.source.structRef(undefined)
-        : {structRef: this.source.getStructDef(undefined)};
+        : {structRef: this.source.getSourceDef(undefined)};
       queryBase = {
         type: 'query',
         ...invoked,
@@ -63,7 +63,7 @@ export class QueryArrow extends QueryBase implements QueryElement {
       };
       inputStruct = refIsStructDef(invoked.structRef)
         ? invoked.structRef
-        : this.source.getStructDef(undefined);
+        : this.source.getSourceDef(undefined);
       fieldSpace = new StaticSpace(inputStruct);
     } else {
       // We are adding a second stage to the given "source" query; we get the query and add a segment

diff --git a/packages/malloy/src/lang/ast/query-elements/query-head-struct.ts b/packages/malloy/src/lang/ast/query-elements/query-head-struct.ts
@@ -46,12 +46,12 @@ export class QueryHeadStruct extends Source {
     return {structRef: this.fromRef};
   }
 
-  getStructDef(parameterSpace: ParameterSpace | undefined): SourceDef {
+  getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef {
     if (refIsStructDef(this.fromRef)) {
       return this.fromRef;
     }
     const ns = new NamedSource(this.fromRef, this.sourceArguments, undefined);
     this.has({exploreReference: ns});
-    return ns.getStructDef(parameterSpace);
+    return ns.getSourceDef(parameterSpace);
   }
 }
diff --git a/packages/malloy/src/lang/ast/query-elements/query-raw.ts b/packages/malloy/src/lang/ast/query-elements/query-raw.ts
@@ -45,10 +45,10 @@ export class QueryRaw extends MalloyElement implements QueryElement {
   queryComp(isRefOk: boolean): QueryComp {
     const invoked = isRefOk
       ? this.source.structRef(undefined)
-      : {structRef: this.source.getStructDef(undefined)};
+      : {structRef: this.source.getSourceDef(undefined)};
     const structDef = refIsStructDef(invoked.structRef)
       ? invoked.structRef
-      : this.source.getStructDef(undefined);
+      : this.source.getSourceDef(undefined);
     return {
       query: {
         type: 'query',

diff --git a/packages/malloy/src/lang/ast/query-elements/query-reference.ts b/packages/malloy/src/lang/ast/query-elements/query-reference.ts
@@ -64,7 +64,7 @@ export class QueryReference extends MalloyElement implements QueryElement {
         query.sourceArguments
       );
       this.has({queryHead: queryHead});
-      const inputStruct = queryHead.getStructDef(undefined);
+      const inputStruct = queryHead.getSourceDef(undefined);
       const outputStruct = getFinalStruct(this, inputStruct, query.pipeline);
       const unRefedQuery = isRefOk
         ? query

diff --git a/packages/malloy/src/lang/ast/source-elements/named-source.ts b/packages/malloy/src/lang/ast/source-elements/named-source.ts
@@ -72,7 +72,7 @@ export class NamedSource extends Source {
     // If we are not exporting the referenced structdef, don't use the reference
     if (modelEnt && !modelEnt.exported) {
       return {
-        structRef: this.getStructDef(parameterSpace),
+        structRef: this.getSourceDef(parameterSpace),
       };
     }
     return {
@@ -219,7 +219,7 @@ export class NamedSource extends Source {
     return outArguments;
   }
 
-  getStructDef(parameterSpace: ParameterSpace | undefined): SourceDef {
+  getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef {
     return this.withParameters(parameterSpace, []);
   }
 

diff --git a/packages/malloy/src/lang/ast/source-elements/query-source.ts b/packages/malloy/src/lang/ast/source-elements/query-source.ts
@@ -34,7 +34,7 @@ export class QuerySource extends Source {
     super({query});
   }
 
-  getStructDef(parameterSpace: ParameterSpace | undefined): SourceDef {
+  getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef {
     return this.withParameters(parameterSpace, undefined);
   }
 

diff --git a/packages/malloy/src/lang/ast/source-elements/refined-source.ts b/packages/malloy/src/lang/ast/source-elements/refined-source.ts
@@ -57,7 +57,7 @@ export class RefinedSource extends Source {
     super({source, refinement});
   }
 
-  getStructDef(parameterSpace: ParameterSpace | undefined): SourceDef {
+  getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef {
     return this.withParameters(parameterSpace, []);
   }
 
@@ -111,7 +111,7 @@ export class RefinedSource extends Source {
     }
 
     const paramSpace = pList ? new ParameterSpace(pList) : undefined;
-    const from = structuredClone(this.source.getStructDef(paramSpace));
+    const from = structuredClone(this.source.getSourceDef(paramSpace));
     // Note that this is explicitly not:
     // const from = structuredClone(this.source.withParameters(parameterSpace, pList));
     // Because the parameters are added to the resulting struct, not the base struct

diff --git a/packages/malloy/src/lang/ast/source-elements/source.ts b/packages/malloy/src/lang/ast/source-elements/source.ts
@@ -36,11 +36,11 @@ import {ParameterSpace} from '../field-space/parameter-space';
  * function of a source is to represent an eventual StructDef
  */
 export abstract class Source extends MalloyElement {
-  abstract getStructDef(parameterSpace: ParameterSpace | undefined): SourceDef;
+  abstract getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
 
   structRef(parameterSpace: ParameterSpace | undefined): InvokedStructRef {
     return {
-      structRef: this.getStructDef(parameterSpace),
+      structRef: this.getSourceDef(parameterSpace),
     };
   }
 
@@ -60,7 +60,7 @@ export abstract class Source extends MalloyElement {
     parameterSpace: ParameterSpace | undefined,
     pList: HasParameter[] | undefined
   ): StructDef {
-    const before = this.getStructDef(parameterSpace);
+    const before = this.getSourceDef(parameterSpace);
     return {
       ...before,
       parameters: this.packParameters(pList),

diff --git a/packages/malloy/src/lang/ast/source-elements/sql-source.ts b/packages/malloy/src/lang/ast/source-elements/sql-source.ts
@@ -57,7 +57,7 @@ export class SQLSource extends Source {
 
   structRef(): InvokedStructRef {
     return {
-      structRef: this.getStructDef(),
+      structRef: this.getSourceDef(),
     };
   }
 
@@ -109,7 +109,7 @@ export class SQLSource extends Source {
     }
   }
 
-  getStructDef(): SourceDef {
+  getSourceDef(): SourceDef {
     if (!this.validateConnectionName()) {
       return ErrorFactory.structDef;
     }

diff --git a/packages/malloy/src/lang/ast/source-elements/table-source.ts b/packages/malloy/src/lang/ast/source-elements/table-source.ts
@@ -34,7 +34,7 @@ type TableInfo = {tablePath: string; connectionName?: string | undefined};
 export abstract class TableSource extends Source {
   abstract getTableInfo(): TableInfo | undefined;
 
-  getStructDef(): SourceDef {
+  getSourceDef(): SourceDef {
     const info = this.getTableInfo();
     if (info === undefined) {
       return ErrorFactory.structDef;

diff --git a/packages/malloy/src/lang/ast/source-properties/join.ts b/packages/malloy/src/lang/ast/source-properties/join.ts
@@ -76,7 +76,7 @@ export abstract class Join
       );
       return ErrorFactory.structDef;
     }
-    return source.getStructDef(parameterSpace);
+    return source.getSourceDef(parameterSpace);
   }
 }
 
@@ -198,7 +198,7 @@ export class ExpressionJoin extends Join {
       );
       return ErrorFactory.joinDef;
     }
-    const sourceDef = source.getStructDef(parameterSpace);
+    const sourceDef = source.getSourceDef(parameterSpace);
     let matrixOperation: MatrixOperation = 'left';
     if (this.inExperiment('join_types', true)) {
       matrixOperation = this.matrixOperation;