@malloydata/malloy 0.0.195-dev241003204819 → 0.0.195-dev241007154000

package/dist/lang/ast/query-items/field-declaration.js

@@ -79,27 +79,62 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
             retType = 'number';
         }
         if ((0, malloy_types_1.isAtomicFieldType)(retType) && retType !== 'error') {
-            const template = {
-                name: exprName,
-                type: retType,
-                location: this.location,
-            };
-            template.e = exprValue.value;
+            this.typecheckExprValue(exprValue);
+            let ret;
+            switch (retType) {
+                case 'date':
+                case 'timestamp': {
+                    const timeRet = {
+                        name: exprName,
+                        type: retType,
+                        location: this.location,
+                        e: exprValue.value,
+                    };
+                    if ((0, granular_result_1.isGranularResult)(exprValue)) {
+                        timeRet.timeframe = exprValue.timeframe;
+                    }
+                    ret = timeRet;
+                    break;
+                }
+                case 'json':
+                case 'boolean':
+                case 'string':
+                case 'number':
+                case 'sql native': {
+                    ret = {
+                        type: retType,
+                        name: exprName,
+                        location: this.location,
+                        e: exprValue.value,
+                    };
+                    break;
+                }
+                case 'record': {
+                    const fields = [];
+                    ret = {
+                        type: 'record',
+                        name: exprName,
+                        location: this.location,
+                        join: 'one',
+                        fields,
+                        e: exprValue.value,
+                        dialect: exprFS.dialectName(),
+                    };
+                    break;
+                }
+                case 'array':
+                    throw this.internalError('Cannot return an array result from a query (yet)');
+            }
             if (exprValue.expressionType) {
-                template.expressionType = exprValue.expressionType;
+                ret.expressionType = exprValue.expressionType;
             }
-            this.typecheckExprValue(exprValue);
             if (this.exprSrc) {
-                template.code = this.exprSrc;
-            }
-            if ((0, granular_result_1.isGranularResult)(exprValue) &&
-                (template.type === 'timestamp' || template.type === 'date')) {
-                template.timeframe = exprValue.timeframe;
+                ret.code = this.exprSrc;
             }
             if (this.note) {
-                template.annotation = this.note;
+                ret.annotation = this.note;
             }
-            return template;
+            return ret;
         }
         const circularDef = exprFS instanceof DefSpace && exprFS.foundCircle;
         if (!circularDef) {
@@ -226,6 +261,9 @@ class DefSpace {
     entries() {
         return this.realFS.entries();
     }
+    dialectName() {
+        return this.realFS.dialectName();
+    }
     dialectObj() {
         return this.realFS.dialectObj();
     }
@@ -256,27 +294,31 @@ class FieldDefinitionValue extends space_field_1.SpaceField {
     get name() {
         return this.fieldName;
     }
-    // A source will call this when it defines the field
     fieldDef() {
-        if (!this.haveFieldDef) {
-            this.haveFieldDef = this.exprDef.fieldDef(this.space, this.name);
+        let def = this.defInSource;
+        if (def === undefined) {
+            this.defInSource = def;
+            def = this.exprDef.fieldDef(this.space, this.name);
         }
-        return this.haveFieldDef;
+        return def;
     }
     getQueryFieldDef(fs) {
-        if (!this.qfd) {
+        if (!this.defInQuery) {
             const def = this.exprDef.queryFieldDef(fs, this.name);
-            this.qfd = def;
+            this.defInQuery = def;
         }
-        return this.qfd;
+        return this.defInQuery;
     }
     // If this is called before the expression has been evaluated, we don't
     // really know what type we have. However since we have the FieldSpace,
     // we can compile the expression to find out, this might result in
     // some expressions being compiled twice.
     typeDesc() {
-        const typeFrom = this.qfd || this.fieldDef();
-        return this.fieldTypeFromFieldDef(typeFrom);
+        const typeFrom = this.defInQuery || this.fieldDef();
+        if ((0, malloy_types_1.isAtomic)(typeFrom)) {
+            return this.fieldTypeFromFieldDef(typeFrom);
+        }
+        throw new Error(`Can't get typeDesc for ${typeFrom.type}`);
     }
 }
 exports.FieldDefinitionValue = FieldDefinitionValue;

package/dist/lang/ast/query-properties/qop-desc.d.ts

@@ -1,5 +1,5 @@
 import { PipeSegment } from '../../../model/malloy_types';
-import { FieldSpace } from '../types/field-space';
+import { SourceFieldSpace } from '../types/field-space';
 import { ListOf } from '../types/malloy-element';
 import { OpDesc } from '../types/op-desc';
 import { QueryProperty } from '../types/query-property';
@@ -12,5 +12,5 @@ export declare class QOpDesc extends ListOf<QueryProperty> {
     protected computeType(): QueryClass | undefined;
     refineFrom(existing: PipeSegment): void;
     private getBuilder;
-    getOp(inputFS: FieldSpace, isNestIn: QueryOperationSpace | undefined): OpDesc;
+    getOp(inputFS: SourceFieldSpace, isNestIn: QueryOperationSpace | undefined): OpDesc;
 }

package/dist/lang/ast/query-properties/qop-desc.js

@@ -98,7 +98,7 @@ class QOpDesc extends malloy_element_1.ListOf {
             // TODO someday we'd like to get rid of the call to opOutputStruct here.
             // If the `build.resultFS` is correct, then we should be able to just use that
             // in a more direct way.
-            new static_space_1.StaticSpace((0, struct_utils_1.opOutputStruct)(this, inputFS.structDef(), segment)),
+            new static_space_1.StaticSourceSpace((0, struct_utils_1.opOutputStruct)(this, inputFS.structDef(), segment)),
         };
     }
 }

package/dist/lang/ast/source-elements/named-source.d.ts

@@ -1,4 +1,4 @@
-import { Argument, InvokedStructRef, StructDef } from '../../../model/malloy_types';
+import { Argument, InvokedStructRef, SourceDef } from '../../../model/malloy_types';
 import { Source } from './source';
 import { ModelEntryReference } from '../types/malloy-element';
 import { Argument as HasArgument } from '../parameters/argument';
@@ -14,9 +14,9 @@ export declare class NamedSource extends Source {
     get refName(): string;
     structRef(parameterSpace: ParameterSpace | undefined): InvokedStructRef;
     refLogError<T extends MessageCode>(code: T, parameters: MessageParameterType<T>, options?: Omit<LogMessageOptions, 'severity'>): void;
-    modelStruct(): StructDef | undefined;
+    modelStruct(): SourceDef | undefined;
     private evaluateArgumentsForRef;
     private evaluateArguments;
-    structDef(parameterSpace: ParameterSpace | undefined): StructDef;
-    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): StructDef;
+    getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
+    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): SourceDef;
 }

package/dist/lang/ast/source-elements/named-source.js

@@ -53,7 +53,7 @@ class NamedSource extends source_1.Source {
         // If we are not exporting the referenced structdef, don't use the reference
         if (modelEnt && !modelEnt.exported) {
             return {
-                structRef: this.structDef(parameterSpace),
+                structRef: this.getSourceDef(parameterSpace),
             };
         }
         return {
@@ -78,7 +78,16 @@ class NamedSource extends source_1.Source {
             return;
         }
         if (entry.type === 'query') {
-            this.logError('invalid-source-from-query', `Cannot construct a source from a query '${this.refName}'`);
+            // I don't understand under what circumstance this code would be
+            // executed, what Malloy you would write to generate this error,
+            // but the error exists so I am leaving it for now.
+            //
+            // Someone with time and courage should either remove this error
+            // because it isn't possible, or go ahead and make a source out
+            // of a query, which is a thing you can do, although when you
+            // do that it currently doesn't go through this path, so I don't
+            // know how you would test that change.
+            this.logError('invalid-source-from-query', `Cannot construct a source from query '${this.refName}'`);
             return;
         }
         else if (entry.type === 'function') {
@@ -89,14 +98,13 @@ class NamedSource extends source_1.Source {
             this.logError('invalid-source-from-connection', `Cannot construct a source from a connection '${this.refName}'`);
             return;
         }
-        else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
-            this.logError('invalid-source-from-sql-block', `Must use 'from_sql()' for sql source '${this.refName}'`);
-            return;
-        }
         else {
             (_a = this.document()) === null || _a === void 0 ? void 0 : _a.checkExperimentalDialect(this, entry.dialect);
+            if ((0, malloy_types_1.isSourceDef)(entry)) {
+                return { ...entry };
+            }
         }
-        return { ...entry };
+        this.logError('invalid-source-source', `Cannot construct a source from a ${entry.type}`);
     }
     evaluateArgumentsForRef(parameterSpace) {
         const base = this.modelStruct();
@@ -152,7 +160,7 @@ class NamedSource extends source_1.Source {
         }
         return outArguments;
     }
-    structDef(parameterSpace) {
+    getSourceDef(parameterSpace) {
         return this.withParameters(parameterSpace, []);
     }
     withParameters(parameterSpace, pList) {

package/dist/lang/ast/source-elements/query-source.d.ts

@@ -1,4 +1,4 @@
-import { StructDef } from '../../../model/malloy_types';
+import { SourceDef } from '../../../model/malloy_types';
 import { Source } from './source';
 import { QueryElement } from '../types/query-element';
 import { ParameterSpace } from '../field-space/parameter-space';
@@ -7,6 +7,6 @@ export declare class QuerySource extends Source {
     readonly query: QueryElement;
     elementType: string;
     constructor(query: QueryElement);
-    structDef(parameterSpace: ParameterSpace | undefined): StructDef;
-    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): StructDef;
+    getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
+    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): SourceDef;
 }

package/dist/lang/ast/source-elements/query-source.js

@@ -24,13 +24,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuerySource = void 0;
 const source_1 = require("./source");
+const uuid_1 = require("uuid");
 class QuerySource extends source_1.Source {
     constructor(query) {
         super({ query });
         this.query = query;
         this.elementType = 'querySource';
     }
-    structDef(parameterSpace) {
+    getSourceDef(parameterSpace) {
         return this.withParameters(parameterSpace, undefined);
     }
     withParameters(parameterSpace, pList) {
@@ -38,7 +39,9 @@ class QuerySource extends source_1.Source {
         const comp = this.query.queryComp(false);
         const queryStruct = {
             ...comp.outputStruct,
-            structSource: { type: 'query', query: comp.query },
+            name: `QuerySource-${(0, uuid_1.v4)()}`,
+            type: 'query_source',
+            query: comp.query,
         };
         (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(queryStruct);
         return {

package/dist/lang/ast/source-elements/refined-source.d.ts

@@ -1,4 +1,4 @@
-import { Annotation, StructDef } from '../../../model/malloy_types';
+import { Annotation, SourceDef } from '../../../model/malloy_types';
 import { HasParameter } from '../parameters/has-parameter';
 import { SourceDesc } from '../types/source-desc';
 import { Source } from './source';
@@ -12,6 +12,6 @@ export declare class RefinedSource extends Source {
     elementType: string;
     currentAnnotation?: Annotation;
     constructor(source: Source, refinement: SourceDesc);
-    structDef(parameterSpace: ParameterSpace | undefined): StructDef;
-    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): StructDef;
+    getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
+    withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): SourceDef;
 }

package/dist/lang/ast/source-elements/refined-source.js

@@ -27,7 +27,6 @@ const malloy_types_1 = require("../../../model/malloy_types");
 const refined_space_1 = require("../field-space/refined-space");
 const declare_fields_1 = require("../query-properties/declare-fields");
 const filters_1 = require("../query-properties/filters");
-const joins_1 = require("../source-properties/joins");
 const field_list_edit_1 = require("../source-properties/field-list-edit");
 const primary_key_1 = require("../source-properties/primary-key");
 const views_1 = require("../source-properties/views");
@@ -36,6 +35,7 @@ const timezone_statement_1 = require("../source-properties/timezone-statement");
 const annotation_elements_1 = require("../types/annotation-elements");
 const renames_1 = require("../source-properties/renames");
 const parameter_space_1 = require("../field-space/parameter-space");
+const join_1 = require("../source-properties/join");
 /**
  * A Source made from a source reference and a set of refinements
  */
@@ -46,7 +46,7 @@ class RefinedSource extends source_1.Source {
         this.refinement = refinement;
         this.elementType = 'refinedSource';
     }
-    structDef(parameterSpace) {
+    getSourceDef(parameterSpace) {
         return this.withParameters(parameterSpace, []);
     }
     withParameters(parameterSpace, pList) {
@@ -79,7 +79,7 @@ class RefinedSource extends source_1.Source {
                 fieldListEdit = el;
             }
             else if (el instanceof declare_fields_1.DeclareFields ||
-                el instanceof joins_1.Joins ||
+                el instanceof join_1.JoinStatement ||
                 el instanceof views_1.Views ||
                 el instanceof renames_1.Renames) {
                 fields.push(...el.list);
@@ -95,7 +95,7 @@ class RefinedSource extends source_1.Source {
             }
         }
         const paramSpace = pList ? new parameter_space_1.ParameterSpace(pList) : undefined;
-        const from = structuredClone(this.source.structDef(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

package/dist/lang/ast/source-elements/source.d.ts

@@ -1,4 +1,4 @@
-import { InvokedStructRef, Parameter, StructDef } from '../../../model/malloy_types';
+import { InvokedStructRef, Parameter, SourceDef, StructDef } from '../../../model/malloy_types';
 import { MalloyElement } from '../types/malloy-element';
 import { HasParameter } from '../parameters/has-parameter';
 import { ParameterSpace } from '../field-space/parameter-space';
@@ -7,7 +7,7 @@ import { ParameterSpace } from '../field-space/parameter-space';
  * function of a source is to represent an eventual StructDef
  */
 export declare abstract class Source extends MalloyElement {
-    abstract structDef(parameterSpace: ParameterSpace | undefined): StructDef;
+    abstract getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
     structRef(parameterSpace: ParameterSpace | undefined): InvokedStructRef;
     protected packParameters(pList: HasParameter[] | undefined): Record<string, Parameter> | undefined;
     withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): StructDef;

package/dist/lang/ast/source-elements/source.js

@@ -31,7 +31,7 @@ const malloy_element_1 = require("../types/malloy-element");
 class Source extends malloy_element_1.MalloyElement {
     structRef(parameterSpace) {
         return {
-            structRef: this.structDef(parameterSpace),
+            structRef: this.getSourceDef(parameterSpace),
         };
     }
     packParameters(pList) {
@@ -45,7 +45,7 @@ class Source extends malloy_element_1.MalloyElement {
         return parameters;
     }
     withParameters(parameterSpace, pList) {
-        const before = this.structDef(parameterSpace);
+        const before = this.getSourceDef(parameterSpace);
         return {
             ...before,
             parameters: this.packParameters(pList),

package/dist/lang/ast/source-elements/sql-source.d.ts

@@ -1,4 +1,4 @@
-import { StructDef, SQLBlockSource, InvokedStructRef } from '../../../model/malloy_types';
+import { SQLSentence, InvokedStructRef, SourceDef } from '../../../model/malloy_types';
 import { NeedCompileSQL } from '../../translate-response';
 import { Source } from './source';
 import { SQLString } from '../sql-elements/sql-string';
@@ -7,12 +7,12 @@ export declare class SQLSource extends Source {
     readonly connectionName: ModelEntryReference;
     readonly select: SQLString;
     elementType: string;
-    requestBlock?: SQLBlockSource;
+    requestBlock?: SQLSentence;
     private connectionNameInvalid;
     constructor(connectionName: ModelEntryReference, select: SQLString);
-    sqlBlock(): SQLBlockSource;
+    sqlSentence(): SQLSentence;
     structRef(): InvokedStructRef;
     validateConnectionName(): boolean;
     needs(doc: Document): NeedCompileSQL | undefined;
-    structDef(): StructDef;
+    getSourceDef(): SourceDef;
 }

package/dist/lang/ast/source-elements/sql-source.js

@@ -34,15 +34,15 @@ class SQLSource extends source_1.Source {
         this.elementType = 'sqlSource';
         this.connectionNameInvalid = false;
     }
-    sqlBlock() {
+    sqlSentence() {
         if (!this.requestBlock) {
-            this.requestBlock = (0, sql_block_1.makeSQLBlock)(this.select.sqlPhrases(), this.connectionName.refString);
+            this.requestBlock = (0, sql_block_1.makeSQLSentence)(this.select.sqlPhrases(), this.connectionName.refString);
         }
         return this.requestBlock;
     }
     structRef() {
         return {
-            structRef: this.structDef(),
+            structRef: this.getSourceDef(),
         };
     }
     validateConnectionName() {
@@ -69,7 +69,7 @@ class SQLSource extends source_1.Source {
         const childNeeds = super.needs(doc);
         if (childNeeds)
             return childNeeds;
-        const sql = this.sqlBlock();
+        const sql = this.sqlSentence();
         const sqlDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.sqlQueryZone;
         if (!sqlDefEntry) {
             this.logError('failed-to-fetch-sql-source-schema', "Cant't look up schema for sql block");
@@ -87,7 +87,7 @@ class SQLSource extends source_1.Source {
             doc.checkExperimentalDialect(this, lookup.value.dialect);
         }
     }
-    structDef() {
+    getSourceDef() {
         var _a;
         if (!this.validateConnectionName()) {
             return error_factory_1.ErrorFactory.structDef;
@@ -97,7 +97,7 @@ class SQLSource extends source_1.Source {
             this.logError('failed-to-fetch-sql-source-schema', "Cant't look up schema for sql block");
             return error_factory_1.ErrorFactory.structDef;
         }
-        const sql = this.sqlBlock();
+        const sql = this.sqlSentence();
         sqlDefEntry.reference(sql.name, this.location);
         const lookup = sqlDefEntry.getEntry(sql.name);
         if (lookup.status === 'error') {

package/dist/lang/ast/source-elements/table-source.d.ts

@@ -1,4 +1,4 @@
-import { StructDef } from '../../../model/malloy_types';
+import { SourceDef } from '../../../model/malloy_types';
 import { Source } from './source';
 import { ModelEntryReference } from '../types/malloy-element';
 type TableInfo = {
@@ -7,7 +7,7 @@ type TableInfo = {
 };
 export declare abstract class TableSource extends Source {
     abstract getTableInfo(): TableInfo | undefined;
-    structDef(): StructDef;
+    getSourceDef(): SourceDef;
 }
 export declare class TableMethodSource extends TableSource {
     readonly connectionName: ModelEntryReference;

package/dist/lang/ast/source-elements/table-source.js

@@ -27,7 +27,7 @@ const find_external_references_1 = require("../../parse-tree-walkers/find-extern
 const source_1 = require("./source");
 const error_factory_1 = require("../error-factory");
 class TableSource extends source_1.Source {
-    structDef() {
+    getSourceDef() {
         var _a, _b, _c;
         const info = this.getTableInfo();
         if (info === undefined) {

package/dist/lang/ast/source-properties/{joins.d.ts → join.d.ts}

@@ -1,4 +1,4 @@
-import { Annotation, Expr, StructDef } from '../../../model/malloy_types';
+import { Annotation, JoinFieldDef, JoinType, MatrixOperation, SourceDef } from '../../../model/malloy_types';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import { QueryBuilder } from '../types/query-builder';
@@ -6,20 +6,20 @@ import { ExpressionDef } from '../types/expression-def';
 import { FieldSpace } from '../types/field-space';
 import { MalloyElement, ModelEntryReference } from '../types/malloy-element';
 import { extendNoteMethod, Noteable } from '../types/noteable';
-import { LegalRefinementStage, QueryPropertyInterface } from '../types/query-property-interface';
 import { MakeEntry } from '../types/space-entry';
 import { SourceQueryElement } from '../source-query-elements/source-query-element';
 import { ParameterSpace } from '../field-space/parameter-space';
+import { LegalRefinementStage, QueryPropertyInterface } from '../types/query-property-interface';
 export declare abstract class Join extends MalloyElement implements Noteable, MakeEntry {
     abstract name: ModelEntryReference;
-    abstract structDef(parameterSpace: ParameterSpace): StructDef;
-    abstract fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
+    abstract structDef(parameterSpace: ParameterSpace): JoinFieldDef;
+    abstract fixupJoinOn(outer: FieldSpace, inStruct: JoinFieldDef): void;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     abstract sourceExpr: SourceQueryElement;
     note?: Annotation;
     makeEntry(fs: DynamicSpace): void;
-    protected getStructDefFromExpr(parameterSpace: ParameterSpace): StructDef;
+    protected getStructDefFromExpr(parameterSpace: ParameterSpace): SourceDef;
 }
 export declare class KeyJoin extends Join {
     readonly name: ModelEntryReference;
@@ -27,29 +27,26 @@ export declare class KeyJoin extends Join {
     readonly keyExpr: ExpressionDef;
     elementType: string;
     constructor(name: ModelEntryReference, sourceExpr: SourceQueryElement, keyExpr: ExpressionDef);
-    structDef(parameterSpace: ParameterSpace): StructDef;
-    fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
+    structDef(parameterSpace: ParameterSpace): JoinFieldDef;
+    fixupJoinOn(outer: FieldSpace, inStruct: JoinFieldDef): void;
 }
-type ExpressionJoinType = 'many' | 'one' | 'cross';
-export type MatrixOperation = 'left' | 'inner' | 'right' | 'full';
 export declare class ExpressionJoin extends Join {
     readonly name: ModelEntryReference;
     readonly sourceExpr: SourceQueryElement;
     elementType: string;
-    joinType: ExpressionJoinType;
+    joinType: JoinType;
     matrixOperation: MatrixOperation;
     private expr?;
     constructor(name: ModelEntryReference, sourceExpr: SourceQueryElement);
     set joinOn(joinExpr: ExpressionDef | undefined);
     get joinOn(): ExpressionDef | undefined;
-    fixupJoinOn(outer: FieldSpace, inStruct: StructDef): Expr | undefined;
-    structDef(parameterSpace: ParameterSpace): StructDef;
+    fixupJoinOn(outer: FieldSpace, inStruct: JoinFieldDef): void;
+    structDef(parameterSpace: ParameterSpace): JoinFieldDef;
 }
-export declare class Joins extends DefinitionList<Join> implements QueryPropertyInterface {
+export declare class JoinStatement extends DefinitionList<Join> implements QueryPropertyInterface {
     elementType: string;
     forceQueryClass: undefined;
     queryRefinementStage: LegalRefinementStage;
     constructor(joins: Join[]);
     queryExecute(executeFor: QueryBuilder): void;
 }
-export {};