@malloydata/malloy 0.0.56-dev230710162623 → 0.0.56-dev230710183220

package/dist/lang/ast/index.d.ts

@@ -76,6 +76,7 @@ export * from './query-properties/qop-desc';
 export * from './query-properties/sampling';
 export * from './query-properties/top';
 export * from './sources/named-source';
+export * from './sources/named-source-or-query';
 export * from './sources/query-source';
 export * from './sources/from-sql-source';
 export * from './sources/sql-source';

package/dist/lang/ast/index.js

@@ -114,6 +114,7 @@ __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/existing-query.d.ts

@@ -3,9 +3,9 @@ import { PipelineDesc } from '../elements/pipeline-desc';
 import { ModelEntryReference } from '../types/malloy-element';
 import { QueryComp } from '../types/query-comp';
 export declare class ExistingQuery extends PipelineDesc {
-    _head?: ModelEntryReference;
-    set head(head: ModelEntryReference | undefined);
-    get head(): ModelEntryReference | undefined;
+    _head?: ModelEntryReference | string;
+    set head(head: ModelEntryReference | string | undefined);
+    get head(): ModelEntryReference | string | undefined;
     queryComp(isRefOk: boolean): QueryComp;
     query(): Query;
 }

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

@@ -30,7 +30,9 @@ const query_head_struct_1 = require("./query-head-struct");
 class ExistingQuery extends pipeline_desc_1.PipelineDesc {
     set head(head) {
         this._head = head;
-        this.has({ head: head });
+        if (head && typeof head !== 'string') {
+            this.has({ head: head });
+        }
     }
     get head() {
         return this._head;
@@ -39,40 +41,40 @@ class ExistingQuery extends pipeline_desc_1.PipelineDesc {
         if (!this.head) {
             throw this.internalError("can't make query from nameless query");
         }
-        const queryEntry = this.modelEntry(this.head);
-        const seedQuery = queryEntry === null || queryEntry === void 0 ? void 0 : queryEntry.entry;
+        const headEntry = this.modelEntry(this.head);
+        const head = headEntry === null || headEntry === void 0 ? void 0 : headEntry.entry;
         const oops = function () {
             return {
                 outputStruct: error_factory_1.ErrorFactory.structDef,
                 query: error_factory_1.ErrorFactory.query,
             };
         };
-        if (!seedQuery) {
+        if (!head) {
             this.log(`Reference to undefined query '${this.head}'`);
             return oops();
         }
-        if (seedQuery.type !== 'query') {
-            this.log(`Illegal reference to '${this.head}', query expected`);
-            return oops();
-        }
-        const queryHead = new query_head_struct_1.QueryHeadStruct(seedQuery.structRef);
-        this.has({ queryHead: queryHead });
-        const exploreStruct = queryHead.structDef();
-        const exploreFS = new static_space_1.StaticSpace(exploreStruct);
-        const sourcePipe = this.refinePipeline(exploreFS, seedQuery);
-        const walkStruct = this.getOutputStruct(exploreStruct, sourcePipe.pipeline);
-        const appended = this.appendOps(sourcePipe.pipeline, new static_space_1.StaticSpace(walkStruct));
-        const destPipe = { ...sourcePipe, pipeline: appended.opList };
-        const query = {
-            type: 'query',
-            ...destPipe,
-            structRef: isRefOk ? queryHead.structRef() : queryHead.structDef(),
-            location: this.location,
-        };
-        if (seedQuery.annotation) {
-            query.annotation = seedQuery.annotation;
+        if (head.type === 'query') {
+            const queryHead = new query_head_struct_1.QueryHeadStruct(head.structRef);
+            this.has({ queryHead: queryHead });
+            const exploreStruct = queryHead.structDef();
+            const exploreFS = new static_space_1.StaticSpace(exploreStruct);
+            const sourcePipe = this.refinePipeline(exploreFS, head);
+            const walkStruct = this.getOutputStruct(exploreStruct, sourcePipe.pipeline);
+            const appended = this.appendOps(sourcePipe.pipeline, new static_space_1.StaticSpace(walkStruct));
+            const destPipe = { ...sourcePipe, pipeline: appended.opList };
+            const query = {
+                type: 'query',
+                ...destPipe,
+                structRef: isRefOk ? queryHead.structRef() : queryHead.structDef(),
+                location: this.location,
+            };
+            if (head.annotation) {
+                query.annotation = head.annotation;
+            }
+            return { outputStruct: appended.structDef, query };
         }
-        return { outputStruct: appended.structDef, query };
+        this.log(`Illegal reference to '${this.head}', query expected`);
+        return oops();
     }
     query() {
         return this.queryComp(true).query;

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

@@ -46,6 +46,18 @@ class FullQuery extends turtle_headed_pipe_1.TurtleHeadedPipe {
             ? structRef
             : this.explore.structDef();
         let pipeFs = new static_space_1.StaticSpace(structDef);
+        // TODO update the compiler to allow for a SQL-headed query with 0 stages,
+        // which just runs the SQL. This would also allow us in ExistingQuery
+        // to error on `my_sql_query refine { ... }` by checking if it is a 0
+        // stage query.
+        if (structDef.structSource.type === 'sql' &&
+            this.qops.length === 0 &&
+            !this.turtleName) {
+            destQuery.pipeline.push({
+                type: 'project',
+                fields: ['*'],
+            });
+        }
         if (error_factory_1.ErrorFactory.isErrorStructDef(structDef)) {
             return {
                 outputStruct: structDef,

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

@@ -1,22 +1,13 @@
 import { Annotation } from '../../../model';
-import { DocStatement, Document, MalloyElement, ModelEntryReference } from '../types/malloy-element';
+import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
 import { QueryElement } from '../types/query-element';
-declare abstract class RunQuery extends MalloyElement implements DocStatement {
-    elementType: string;
-    abstract execute(doc: Document): void;
-}
-export declare class RunQueryDef extends RunQuery implements Noteable {
+export declare class RunQuery extends MalloyElement implements DocStatement, Noteable {
     readonly theQuery: QueryElement;
+    elementType: string;
     note?: Annotation;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     constructor(theQuery: QueryElement);
     execute(doc: Document): void;
 }
-export declare class RunQueryRef extends RunQuery {
-    readonly queryName: ModelEntryReference;
-    constructor(queryName: ModelEntryReference);
-    execute(doc: Document): void;
-}
-export {};

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

@@ -22,19 +22,14 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunQueryRef = exports.RunQueryDef = void 0;
+exports.RunQuery = void 0;
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
 class RunQuery extends malloy_element_1.MalloyElement {
-    constructor() {
-        super(...arguments);
-        this.elementType = 'runQuery';
-    }
-}
-class RunQueryDef extends RunQuery {
     constructor(theQuery) {
         super();
         this.theQuery = theQuery;
+        this.elementType = 'runQuery';
         this.isNoteableObj = true;
         this.extendNote = noteable_1.extendNoteMethod;
         this.has({ query: theQuery });
@@ -52,26 +47,5 @@ class RunQueryDef extends RunQuery {
         return undefined;
     }
 }
-exports.RunQueryDef = RunQueryDef;
-class RunQueryRef extends RunQuery {
-    constructor(queryName) {
-        super();
-        this.queryName = queryName;
-        this.has({ queryName });
-    }
-    execute(doc) {
-        const found = doc.getEntry(this.queryName.refString);
-        if (found === undefined) {
-            this.queryName.log(`${this.queryName} is not defined`);
-        }
-        if (found.entry.type === 'query') {
-            doc.queryList.push(found.entry);
-            return undefined;
-        }
-        else {
-            this.queryName.log(`${this.queryName} is not a query`);
-        }
-    }
-}
-exports.RunQueryRef = RunQueryRef;
+exports.RunQuery = RunQuery;
 //# sourceMappingURL=run-query.js.map

package/dist/lang/ast/sources/named-source-or-query.d.ts

@@ -0,0 +1,10 @@
+import { StructDef } from '../../../model';
+import { Source } from '../elements/source';
+import { ModelEntryReference } from '../types/malloy-element';
+export declare class NamedSourceOrQuery extends Source {
+    readonly ref: ModelEntryReference;
+    elementType: string;
+    constructor(ref: ModelEntryReference);
+    private getSource;
+    structDef(): StructDef;
+}

package/dist/lang/ast/sources/named-source-or-query.js

@@ -0,0 +1,68 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NamedSourceOrQuery = void 0;
+const source_1 = require("../elements/source");
+const error_factory_1 = require("../error-factory");
+const existing_query_1 = require("../query-elements/existing-query");
+const named_source_1 = require("./named-source");
+const query_source_1 = require("./query-source");
+class NamedSourceOrQuery extends source_1.Source {
+    constructor(ref) {
+        super();
+        this.ref = ref;
+        this.elementType = 'namedSourceOrQuery';
+        this.has({ ref: ref });
+    }
+    getSource() {
+        const modelEnt = this.modelEntry(this.ref);
+        const entry = modelEnt === null || modelEnt === void 0 ? void 0 : modelEnt.entry;
+        if (!entry) {
+            const undefMsg = `Undefined query or source '${this.ref.refString}'`;
+            this.ref.log(undefMsg);
+            return;
+        }
+        if (entry.type === 'query') {
+            const existingQuery = new existing_query_1.ExistingQuery();
+            existingQuery.head = this.ref;
+            return new query_source_1.QuerySource(existingQuery);
+        }
+        else if (entry.type === 'struct') {
+            return new named_source_1.NamedSource(this.ref);
+        }
+        else {
+            this.log(`'${this.ref.refString}' is a ${entry.type}, not a query or source`);
+        }
+    }
+    structDef() {
+        const source = this.getSource();
+        this.has({ source });
+        if (source === undefined) {
+            return error_factory_1.ErrorFactory.structDef;
+        }
+        return source.structDef();
+    }
+}
+exports.NamedSourceOrQuery = NamedSourceOrQuery;
+//# sourceMappingURL=named-source-or-query.js.map

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

@@ -74,19 +74,19 @@ class NamedSource extends source_1.Source {
             return;
         }
         if (entry.type === 'query') {
-            this.log(`Must use 'from()' for query source '${this.refName}`);
+            this.log(`Cannot construct a source from a query '${this.refName}'`);
             return;
         }
         else if (entry.type === 'function') {
-            this.log(`Cannot construct a source from a function '${this.refName}`);
+            this.log(`Cannot construct a source from a function '${this.refName}'`);
             return;
         }
         else if (entry.type === 'connection') {
-            this.log(`Cannot construct a source from a connection '${this.refName}`);
+            this.log(`Cannot construct a source from a connection '${this.refName}'`);
             return;
         }
         else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
-            this.log(`Must use 'from_sql()' for sql source '${this.refName}`);
+            this.log(`Must use 'from_sql()' for sql source '${this.refName}'`);
             return;
         }
         return { ...entry };

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

@@ -1,4 +1,5 @@
 import { Annotation, DocumentLocation, DocumentReference, ModelDef, Query, SQLBlockStructDef } from '../../../model/malloy_types';
+import { MalloyTagProperties } from '../../../tags';
 import { LogSeverity } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
 import { ModelDataRequest } from '../../translate-response';
@@ -121,6 +122,7 @@ export declare class ObjectAnnotation extends MalloyElement {
 }
 export declare class ModelAnnotation extends ObjectAnnotation implements DocStatement {
     elementType: string;
+    getCompilerFlags(existing: MalloyTagProperties): MalloyTagProperties;
     execute(doc: Document): void;
 }
 export {};

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

@@ -28,6 +28,7 @@ exports.ModelAnnotation = exports.ObjectAnnotation = exports.Document = exports.
  */
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const malloy_types_1 = require("../../../model/malloy_types");
+const tags_1 = require("../../../tags");
 const global_name_space_1 = require("./global-name-space");
 const noteable_1 = require("./noteable");
 class MalloyElement {
@@ -462,6 +463,18 @@ class ModelAnnotation extends ObjectAnnotation {
         super(...arguments);
         this.elementType = 'modelAnnotation';
     }
+    getCompilerFlags(existing) {
+        let flags = { ...existing };
+        for (const note of this.notes) {
+            if (note.startsWith('##! ')) {
+                const parsed = (0, tags_1.parseTagProperties)(note.slice(4), flags);
+                if (parsed) {
+                    flags = parsed;
+                }
+            }
+        }
+        return flags;
+    }
     execute(doc) {
         doc.notes = doc.notes.concat(this.notes);
     }

package/dist/lang/lib/Malloy/MalloyLexer.d.ts

@@ -52,104 +52,106 @@ export declare class MalloyLexer extends Lexer {
     static readonly ELSE = 47;
     static readonly END = 48;
     static readonly EXCLUDE = 49;
-    static readonly FALSE = 50;
-    static readonly FOR = 51;
-    static readonly FROM = 52;
-    static readonly FROM_SQL = 53;
-    static readonly HAS = 54;
-    static readonly HOUR = 55;
-    static readonly IMPORT = 56;
-    static readonly IS = 57;
-    static readonly JSON = 58;
-    static readonly LAST = 59;
-    static readonly MAX = 60;
-    static readonly MIN = 61;
-    static readonly MINUTE = 62;
-    static readonly MONTH = 63;
-    static readonly NOT = 64;
-    static readonly NOW = 65;
-    static readonly NULL = 66;
-    static readonly NUMBER = 67;
-    static readonly ON = 68;
-    static readonly OR = 69;
-    static readonly PICK = 70;
-    static readonly QUARTER = 71;
-    static readonly SECOND = 72;
-    static readonly STRING = 73;
-    static readonly SUM = 74;
-    static readonly SQL = 75;
-    static readonly TABLE = 76;
-    static readonly THEN = 77;
-    static readonly THIS = 78;
-    static readonly TIMESTAMP = 79;
-    static readonly TO = 80;
-    static readonly TRUE = 81;
-    static readonly TURTLE = 82;
-    static readonly WEEK = 83;
-    static readonly WHEN = 84;
-    static readonly WITH = 85;
-    static readonly YEAR = 86;
-    static readonly UNGROUPED = 87;
-    static readonly STRING_ESCAPE = 88;
-    static readonly HACKY_REGEX = 89;
-    static readonly SQ_STRING = 90;
-    static readonly DQ_STRING = 91;
-    static readonly BQ_STRING = 92;
-    static readonly DOC_ANNOTATION = 93;
-    static readonly ANNOTATION = 94;
-    static readonly AMPER = 95;
-    static readonly ARROW = 96;
-    static readonly FAT_ARROW = 97;
-    static readonly OPAREN = 98;
-    static readonly CPAREN = 99;
-    static readonly OBRACK = 100;
-    static readonly CBRACK = 101;
-    static readonly OCURLY = 102;
-    static readonly CCURLY = 103;
-    static readonly DOUBLECOLON = 104;
-    static readonly TRIPLECOLON = 105;
-    static readonly EXCLAM = 106;
-    static readonly COLON = 107;
-    static readonly COMMA = 108;
-    static readonly DOT = 109;
-    static readonly LT = 110;
-    static readonly GT = 111;
-    static readonly EQ = 112;
-    static readonly NE = 113;
-    static readonly LTE = 114;
-    static readonly GTE = 115;
-    static readonly PLUS = 116;
-    static readonly MINUS = 117;
-    static readonly STAR = 118;
-    static readonly STARSTAR = 119;
-    static readonly SLASH = 120;
-    static readonly BAR = 121;
-    static readonly SEMI = 122;
-    static readonly NOT_MATCH = 123;
-    static readonly MATCH = 124;
-    static readonly PERCENT = 125;
-    static readonly DOUBLE_QMARK = 126;
-    static readonly QMARK = 127;
-    static readonly LITERAL_TIMESTAMP = 128;
-    static readonly LITERAL_HOUR = 129;
-    static readonly LITERAL_DAY = 130;
-    static readonly LITERAL_QUARTER = 131;
-    static readonly LITERAL_MONTH = 132;
-    static readonly LITERAL_WEEK = 133;
-    static readonly LITERAL_YEAR = 134;
-    static readonly IDENTIFIER = 135;
-    static readonly PERCENT_LITERAL = 136;
-    static readonly INTEGER_LITERAL = 137;
-    static readonly NUMERIC_LITERAL = 138;
-    static readonly BLOCK_COMMENT = 139;
-    static readonly COMMENT_TO_EOL = 140;
-    static readonly WHITE_SPACE = 141;
-    static readonly SQL_BEGIN = 142;
-    static readonly CLOSE_CODE = 143;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 144;
-    static readonly UNEXPECTED_CHAR = 145;
-    static readonly OPEN_CODE = 146;
-    static readonly SQL_END = 147;
+    static readonly EXTEND = 50;
+    static readonly FALSE = 51;
+    static readonly FOR = 52;
+    static readonly FROM = 53;
+    static readonly FROM_SQL = 54;
+    static readonly HAS = 55;
+    static readonly HOUR = 56;
+    static readonly IMPORT = 57;
+    static readonly IS = 58;
+    static readonly JSON = 59;
+    static readonly LAST = 60;
+    static readonly MAX = 61;
+    static readonly MIN = 62;
+    static readonly MINUTE = 63;
+    static readonly MONTH = 64;
+    static readonly NOT = 65;
+    static readonly NOW = 66;
+    static readonly NULL = 67;
+    static readonly NUMBER = 68;
+    static readonly ON = 69;
+    static readonly OR = 70;
+    static readonly PICK = 71;
+    static readonly QUARTER = 72;
+    static readonly REFINE = 73;
+    static readonly SECOND = 74;
+    static readonly STRING = 75;
+    static readonly SUM = 76;
+    static readonly SQL = 77;
+    static readonly TABLE = 78;
+    static readonly THEN = 79;
+    static readonly THIS = 80;
+    static readonly TIMESTAMP = 81;
+    static readonly TO = 82;
+    static readonly TRUE = 83;
+    static readonly TURTLE = 84;
+    static readonly WEEK = 85;
+    static readonly WHEN = 86;
+    static readonly WITH = 87;
+    static readonly YEAR = 88;
+    static readonly UNGROUPED = 89;
+    static readonly STRING_ESCAPE = 90;
+    static readonly HACKY_REGEX = 91;
+    static readonly SQ_STRING = 92;
+    static readonly DQ_STRING = 93;
+    static readonly BQ_STRING = 94;
+    static readonly DOC_ANNOTATION = 95;
+    static readonly ANNOTATION = 96;
+    static readonly AMPER = 97;
+    static readonly ARROW = 98;
+    static readonly FAT_ARROW = 99;
+    static readonly OPAREN = 100;
+    static readonly CPAREN = 101;
+    static readonly OBRACK = 102;
+    static readonly CBRACK = 103;
+    static readonly OCURLY = 104;
+    static readonly CCURLY = 105;
+    static readonly DOUBLECOLON = 106;
+    static readonly TRIPLECOLON = 107;
+    static readonly EXCLAM = 108;
+    static readonly COLON = 109;
+    static readonly COMMA = 110;
+    static readonly DOT = 111;
+    static readonly LT = 112;
+    static readonly GT = 113;
+    static readonly EQ = 114;
+    static readonly NE = 115;
+    static readonly LTE = 116;
+    static readonly GTE = 117;
+    static readonly PLUS = 118;
+    static readonly MINUS = 119;
+    static readonly STAR = 120;
+    static readonly STARSTAR = 121;
+    static readonly SLASH = 122;
+    static readonly BAR = 123;
+    static readonly SEMI = 124;
+    static readonly NOT_MATCH = 125;
+    static readonly MATCH = 126;
+    static readonly PERCENT = 127;
+    static readonly DOUBLE_QMARK = 128;
+    static readonly QMARK = 129;
+    static readonly LITERAL_TIMESTAMP = 130;
+    static readonly LITERAL_HOUR = 131;
+    static readonly LITERAL_DAY = 132;
+    static readonly LITERAL_QUARTER = 133;
+    static readonly LITERAL_MONTH = 134;
+    static readonly LITERAL_WEEK = 135;
+    static readonly LITERAL_YEAR = 136;
+    static readonly IDENTIFIER = 137;
+    static readonly PERCENT_LITERAL = 138;
+    static readonly INTEGER_LITERAL = 139;
+    static readonly NUMERIC_LITERAL = 140;
+    static readonly BLOCK_COMMENT = 141;
+    static readonly COMMENT_TO_EOL = 142;
+    static readonly WHITE_SPACE = 143;
+    static readonly SQL_BEGIN = 144;
+    static readonly CLOSE_CODE = 145;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 146;
+    static readonly UNEXPECTED_CHAR = 147;
+    static readonly OPEN_CODE = 148;
+    static readonly SQL_END = 149;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];