@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

package/dist/lang/ast/index.js

@@ -41,6 +41,8 @@ __exportStar(require("./elements/define-source"), exports);
 __exportStar(require("./elements/define-query"), exports);
 __exportStar(require("./elements/source"), exports);
 __exportStar(require("./elements/refined-source"), exports);
+__exportStar(require("./elements/source-query"), exports);
+__exportStar(require("./elements/source-query-nodes"), exports);
 __exportStar(require("./source-properties/field-list-edit"), exports);
 __exportStar(require("./source-properties/primary-key"), exports);
 __exportStar(require("./source-properties/renames"), exports);
@@ -91,7 +93,6 @@ __exportStar(require("./elements/import-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./parameters/has-parameter"), exports);
 __exportStar(require("./query-elements/anonymous-query"), exports);
-__exportStar(require("./query-elements/run-query"), exports);
 __exportStar(require("./query-elements/existing-query"), exports);
 __exportStar(require("./query-elements/full-query"), exports);
 __exportStar(require("./query-items/field-declaration"), exports);
@@ -115,7 +116,6 @@ __exportStar(require("./query-properties/qop-desc"), exports);
 __exportStar(require("./query-properties/sampling"), exports);
 __exportStar(require("./query-properties/top"), exports);
 __exportStar(require("./sources/named-source"), exports);
-__exportStar(require("./sources/named-source-or-query"), exports);
 __exportStar(require("./sources/query-source"), exports);
 __exportStar(require("./sources/from-sql-source"), exports);
 __exportStar(require("./sources/sql-source"), exports);

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

@@ -1,11 +1,11 @@
 import { Annotation } from '../../../model';
 import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
-import { QueryElement } from '../types/query-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
+import { SourceQueryNode } from '../elements/source-query';
 export declare class AnonymousQuery extends MalloyElement implements DocStatement, Noteable {
-    readonly theQuery: QueryElement;
+    readonly queryExpr: SourceQueryNode;
     elementType: string;
-    constructor(theQuery: QueryElement);
+    constructor(queryExpr: SourceQueryNode);
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     note?: Annotation;

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

@@ -26,20 +26,27 @@ exports.AnonymousQuery = void 0;
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
 class AnonymousQuery extends malloy_element_1.MalloyElement {
-    constructor(theQuery) {
+    constructor(queryExpr) {
         super();
-        this.theQuery = theQuery;
+        this.queryExpr = queryExpr;
         this.elementType = 'anonymousQuery';
         this.isNoteableObj = true;
         this.extendNote = noteable_1.extendNoteMethod;
-        this.has({ query: theQuery });
+        this.has({ queryExpr });
     }
     execute(doc) {
-        const modelQuery = this.theQuery.query();
-        if (this.note) {
-            modelQuery.annotation = modelQuery.annotation
-                ? { ...this.note, inherits: modelQuery.annotation }
-                : this.note;
+        const queryObj = this.queryExpr.getQuery();
+        if (!queryObj) {
+            this.queryExpr.sqLog('Cannot run this object as a query');
+            return;
+        }
+        const modelQuery = { ...queryObj.query() };
+        const annotation = this.note || {};
+        if (modelQuery.annotation) {
+            annotation.inherits = modelQuery.annotation;
+        }
+        if (annotation.notes || annotation.blockNotes || annotation.inherits) {
+            modelQuery.annotation = annotation;
         }
         doc.queryList.push(modelQuery);
     }

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

@@ -30,7 +30,7 @@ const query_head_struct_1 = require("./query-head-struct");
 class ExistingQuery extends pipeline_desc_1.PipelineDesc {
     constructor() {
         super(...arguments);
-        this.elementType = 'exisitingQUery';
+        this.elementType = 'exisitingQuery';
     }
     set head(head) {
         this._head = head;

package/dist/lang/ast/query-items/field-references.d.ts

@@ -60,6 +60,10 @@ export declare class DimensionFieldReference extends FieldReference {
     elementType: string;
     typecheck(type: TypeDesc): void;
 }
+export declare class ViewFieldReference extends FieldReference {
+    elementType: string;
+    typecheck(_type: TypeDesc): void;
+}
 export declare class WildcardFieldReference extends MalloyElement implements Noteable {
     readonly joinPath: FieldReference | undefined;
     elementType: string;

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

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FieldReferences = exports.WildcardFieldReference = exports.DimensionFieldReference = exports.MeasureFieldReference = exports.DeclareFieldReference = exports.ProjectFieldReference = exports.GroupByFieldReference = exports.AggregateFieldReference = exports.IndexFieldReference = exports.CalculateFieldReference = exports.ExpressionFieldReference = exports.AcceptExceptFieldReference = exports.FieldReference = void 0;
+exports.FieldReferences = exports.WildcardFieldReference = exports.ViewFieldReference = exports.DimensionFieldReference = exports.MeasureFieldReference = exports.DeclareFieldReference = exports.ProjectFieldReference = exports.GroupByFieldReference = exports.AggregateFieldReference = exports.IndexFieldReference = exports.CalculateFieldReference = exports.ExpressionFieldReference = exports.AcceptExceptFieldReference = exports.FieldReference = void 0;
 const reference_field_1 = require("../field-space/reference-field");
 const definition_list_1 = require("../types/definition-list");
 const malloy_element_1 = require("../types/malloy-element");
@@ -176,6 +176,16 @@ class DimensionFieldReference extends FieldReference {
     }
 }
 exports.DimensionFieldReference = DimensionFieldReference;
+class ViewFieldReference extends FieldReference {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'viewFieldRefernce';
+    }
+    typecheck(_type) {
+        this.log('Cannot use a view field in an expression');
+    }
+}
+exports.ViewFieldReference = ViewFieldReference;
 class WildcardFieldReference extends malloy_element_1.MalloyElement {
     constructor(joinPath) {
         super();

package/dist/lang/ast/query-items/typecheck_utils.js

@@ -30,7 +30,7 @@ function typecheckProject(type, logTo) {
         let kind;
         if (type.dataType === 'turtle') {
             useInstead = 'a nest';
-            kind = 'a query';
+            kind = 'a view';
         }
         else if ((0, model_1.expressionIsAnalytic)(type.expressionType)) {
             useInstead = 'a calculate';
@@ -51,7 +51,7 @@ function typecheckIndex(type, logTo) {
     if (type.dataType === 'turtle' || !(0, model_1.expressionIsScalar)(type.expressionType)) {
         let kind;
         if (type.dataType === 'turtle') {
-            kind = 'a query';
+            kind = 'a view';
         }
         else if ((0, model_1.expressionIsAnalytic)(type.expressionType)) {
             kind = 'an analytic';
@@ -110,7 +110,7 @@ function typecheckCalculate(type, logTo) {
         let kind;
         if (type.dataType === 'turtle') {
             useInstead = 'a nest';
-            kind = 'a query';
+            kind = 'a view';
         }
         else if ((0, model_1.expressionIsAggregate)(type.expressionType)) {
             useInstead = 'an aggregate';
@@ -134,7 +134,7 @@ function typecheckAggregate(type, logTo) {
         let kind;
         if (type.dataType === 'turtle') {
             useInstead = 'a nest';
-            kind = 'a query';
+            kind = 'a view';
         }
         else if ((0, model_1.expressionIsAnalytic)(type.expressionType)) {
             useInstead = 'a calculate';
@@ -157,7 +157,7 @@ function typecheckGroupBy(type, logTo) {
         let kind;
         if (type.dataType === 'turtle') {
             useInstead = 'a nest';
-            kind = 'a query';
+            kind = 'a view';
         }
         else if ((0, model_1.expressionIsAnalytic)(type.expressionType)) {
             useInstead = 'a calculate';

package/dist/lang/ast/query-properties/joins.d.ts

@@ -1,5 +1,4 @@
 import { Annotation, Expr, StructDef } from '../../../model/malloy_types';
-import { Source } from '../elements/source';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import { QueryBuilder } from '../types/query-builder';
@@ -9,32 +8,35 @@ 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 { SourceQueryNode } from '../elements/source-query';
 export declare abstract class Join extends MalloyElement implements Noteable, MakeEntry {
     abstract name: ModelEntryReference;
     abstract structDef(): StructDef;
     abstract fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
+    abstract sourceExpr: SourceQueryNode;
     note?: Annotation;
     makeEntry(fs: DynamicSpace): void;
+    protected getStructDefFromExpr(): StructDef;
 }
 export declare class KeyJoin extends Join {
     readonly name: ModelEntryReference;
-    readonly source: Source;
+    readonly sourceExpr: SourceQueryNode;
     readonly keyExpr: ExpressionDef;
     elementType: string;
-    constructor(name: ModelEntryReference, source: Source, keyExpr: ExpressionDef);
+    constructor(name: ModelEntryReference, sourceExpr: SourceQueryNode, keyExpr: ExpressionDef);
     structDef(): StructDef;
     fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
 }
 type ExpressionJoinType = 'many' | 'one' | 'cross';
 export declare class ExpressionJoin extends Join {
     readonly name: ModelEntryReference;
-    readonly source: Source;
+    readonly sourceExpr: SourceQueryNode;
     elementType: string;
     joinType: ExpressionJoinType;
     private expr?;
-    constructor(name: ModelEntryReference, source: Source);
+    constructor(name: ModelEntryReference, sourceExpr: SourceQueryNode);
     set joinOn(joinExpr: ExpressionDef | undefined);
     get joinOn(): ExpressionDef | undefined;
     fixupJoinOn(outer: FieldSpace, inStruct: StructDef): Expr | undefined;

package/dist/lang/ast/query-properties/joins.js

@@ -30,6 +30,7 @@ const definition_list_1 = require("../types/definition-list");
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
 const query_property_interface_1 = require("../types/query-property-interface");
+const error_factory_1 = require("../error-factory");
 class Join extends malloy_element_1.MalloyElement {
     constructor() {
         super(...arguments);
@@ -39,19 +40,27 @@ class Join extends malloy_element_1.MalloyElement {
     makeEntry(fs) {
         fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(fs, this));
     }
+    getStructDefFromExpr() {
+        const source = this.sourceExpr.getSource();
+        if (!source) {
+            this.sourceExpr.sqLog('Cannot great a source to join from');
+            return error_factory_1.ErrorFactory.structDef;
+        }
+        return source.structDef();
+    }
 }
 exports.Join = Join;
 class KeyJoin extends Join {
-    constructor(name, source, keyExpr) {
-        super({ name: name, source: source, keyExpr: keyExpr });
+    constructor(name, sourceExpr, keyExpr) {
+        super({ name, sourceExpr, keyExpr });
         this.name = name;
-        this.source = source;
+        this.sourceExpr = sourceExpr;
         this.keyExpr = keyExpr;
         this.elementType = 'joinOnKey';
     }
     structDef() {
         var _a;
-        const sourceDef = this.source.structDef();
+        const sourceDef = this.getStructDefFromExpr();
         const joinStruct = {
             ...sourceDef,
             structRelationship: {
@@ -107,10 +116,10 @@ class KeyJoin extends Join {
 }
 exports.KeyJoin = KeyJoin;
 class ExpressionJoin extends Join {
-    constructor(name, source) {
-        super({ name: name, source: source });
+    constructor(name, sourceExpr) {
+        super({ name, sourceExpr });
         this.name = name;
-        this.source = source;
+        this.sourceExpr = sourceExpr;
         this.elementType = 'joinOnExpr';
         this.joinType = 'one';
     }
@@ -137,7 +146,12 @@ class ExpressionJoin extends Join {
     }
     structDef() {
         var _a;
-        const sourceDef = this.source.structDef();
+        const source = this.sourceExpr.getSource();
+        if (!source) {
+            this.sourceExpr.sqLog('Cannot create a source to join from');
+            return error_factory_1.ErrorFactory.structDef;
+        }
+        const sourceDef = source.structDef();
         const joinStruct = {
             ...sourceDef,
             structRelationship: { type: this.joinType },

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

@@ -108,6 +108,11 @@ class SQLSource extends source_1.Source {
                 fields: lookup.value.fields.map(f => ({ ...f, location })),
                 location: this.location,
             };
+            const fromDoc = this.document();
+            const modelAnnotation = fromDoc === null || fromDoc === void 0 ? void 0 : fromDoc.currentModelAnnotation();
+            if (modelAnnotation) {
+                locStruct.modelAnnotation = modelAnnotation;
+            }
             return locStruct;
         }
         else {

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

@@ -1,7 +1,7 @@
 import { SQLPhrase } from '../../../model/malloy_types';
-import { QueryElement } from '../types/query-element';
 import { MalloyElement } from '../types/malloy-element';
-type SQLStringSegment = string | QueryElement;
+import { SourceQueryNode } from '../elements/source-query';
+type SQLStringSegment = string | SourceQueryNode;
 export declare class SQLString extends MalloyElement {
     elementType: string;
     elements: SQLStringSegment[];

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

@@ -23,8 +23,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLString = void 0;
-const query_element_1 = require("../types/query-element");
 const malloy_element_1 = require("../types/malloy-element");
+const source_query_1 = require("../elements/source-query");
 class SQLString extends malloy_element_1.MalloyElement {
     constructor() {
         super(...arguments);
@@ -34,7 +34,7 @@ class SQLString extends malloy_element_1.MalloyElement {
     }
     complete() {
         this.has({
-            queries: this.elements.filter(isMalloyElement),
+            queries: this.elements.filter(isQuery),
         });
     }
     push(el) {
@@ -43,7 +43,7 @@ class SQLString extends malloy_element_1.MalloyElement {
                 this.elements.push(el);
             }
         }
-        else if ((0, query_element_1.isQueryElement)(el)) {
+        else if (el instanceof source_query_1.SourceQueryNode) {
             this.elements.push(el);
             this.containsQueries = true;
             el.parent = this;
@@ -53,16 +53,26 @@ class SQLString extends malloy_element_1.MalloyElement {
         }
     }
     sqlPhrases() {
-        return this.elements.map(el => {
+        const ret = [];
+        for (const el of this.elements) {
             if (typeof el === 'string') {
-                return { sql: el };
+                ret.push({ sql: el });
             }
-            return el.query();
-        });
+            else {
+                const queryObject = el.getQuery();
+                if (queryObject) {
+                    ret.push(queryObject.query());
+                }
+                else {
+                    el.sqLog('Cannot expand into a query');
+                }
+            }
+        }
+        return ret;
     }
 }
 exports.SQLString = SQLString;
-function isMalloyElement(x) {
-    return typeof x !== 'string' && (0, query_element_1.isQueryElement)(x);
+function isQuery(x) {
+    return x instanceof source_query_1.SourceQueryNode;
 }
 //# sourceMappingURL=sql-string.js.map

package/dist/lang/ast/types/malloy-element.d.ts

@@ -1,4 +1,4 @@
-import { Annotation, DocumentLocation, DocumentReference, ModelDef, Note, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
+import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Note, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
 import { LogSeverity, MessageLogger } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
 import { ModelDataRequest } from '../../translate-response';
@@ -61,6 +61,7 @@ export declare class ModelEntryReference extends MalloyElement {
     constructor(name: string);
     get refString(): string;
     toString(): string;
+    getNamed(): NamedModelObject | undefined;
 }
 export interface DocStatement extends MalloyElement {
     execute(doc: Document): void;
@@ -113,6 +114,7 @@ export declare class Document extends MalloyElement implements NameSpace {
     compile(): DocumentCompileResult;
     private modelAnnotationTodoList;
     rememberToAddModelAnnotations(sd: StructDef): void;
+    currentModelAnnotation(): ModelAnnotation | undefined;
     modelDef(): ModelDef;
     defineSQL(sql: SQLBlockStructDef, name?: string): boolean;
     getEntry(str: string): ModelEntry;

package/dist/lang/ast/types/malloy-element.js

@@ -276,6 +276,10 @@ class ModelEntryReference extends MalloyElement {
     toString() {
         return this.refString;
     }
+    getNamed() {
+        var _a;
+        return (_a = this.modelEntry(this)) === null || _a === void 0 ? void 0 : _a.entry;
+    }
 }
 exports.ModelEntryReference = ModelEntryReference;
 function isDocStatement(e) {
@@ -455,11 +459,17 @@ class Document extends MalloyElement {
     rememberToAddModelAnnotations(sd) {
         this.modelAnnotationTodoList.push(sd);
     }
+    currentModelAnnotation() {
+        if (this.notes.length > 0) {
+            const ret = { id: '', notes: this.notes };
+            ret.id = annotationID(ret);
+            return ret;
+        }
+    }
     modelDef() {
         const def = { name: '', exports: [], contents: {} };
         if (this.notes.length > 0) {
-            def.annotation = { id: '', notes: this.notes };
-            def.annotation.id = annotationID(def.annotation);
+            def.annotation = this.currentModelAnnotation();
         }
         for (const entry in this.documentModel) {
             const entryDef = this.documentModel[entry].entry;
@@ -467,10 +477,11 @@ class Document extends MalloyElement {
                 if (this.documentModel[entry].exported) {
                     def.exports.push(entry);
                 }
-                def.contents[entry] = (0, cloneDeep_1.default)(entryDef);
-                if (entryDef.modelAnnotation === undefined && def.annotation) {
-                    entryDef.modelAnnotation = def.annotation;
+                const newEntry = (0, cloneDeep_1.default)(entryDef);
+                if (newEntry.modelAnnotation === undefined && def.annotation) {
+                    newEntry.modelAnnotation = def.annotation;
                 }
+                def.contents[entry] = newEntry;
             }
         }
         return def;