@malloydata/malloy 0.0.43-dev230622180905 → 0.0.43-dev230622192152

package/dist/lang/ast/executors/reduce-executor.js

@@ -38,6 +38,7 @@ const nest_1 = require("../query-properties/nest");
 const query_spaces_1 = require("../field-space/query-spaces");
 const calculate_1 = require("../query-properties/calculate");
 const timezone_statement_1 = require("../source-properties/timezone-statement");
+const extend_1 = require("../query-properties/extend");
 class ReduceExecutor {
     constructor(baseFS, refineThis) {
         this.filters = [];
@@ -99,6 +100,13 @@ class ReduceExecutor {
                 this.inputFS.extendSource(qel);
             }
         }
+        else if (qp instanceof extend_1.ExtendBlock) {
+            for (const block of qp.list) {
+                for (const qel of block.list) {
+                    this.inputFS.extendSource(qel);
+                }
+            }
+        }
         else if (qp instanceof timezone_statement_1.TimezoneStatement) {
             this.resultFS.setTimezone(qp.tz);
         }

package/dist/lang/ast/expressions/expr-func.js

@@ -79,6 +79,12 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         if (func.name !== this.name) {
             this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
         }
+        if (func.name !== this.name) {
+            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
+        }
+        if (func.name !== this.name) {
+            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
+        }
         // Find the 'implicit argument' for aggregate functions called like `some_join.some_field.agg(...args)`
         // where the full arg list is `(some_field, ...args)`.
         let implicitExpr = undefined;

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

@@ -51,8 +51,10 @@ export * from './expressions/unary';
 export * from './expressions/utils';
 export * from './elements/import-statement';
 export * from './query-properties/nest-reference';
+export * from './query-properties/extend';
 export * from './parameters/has-parameter';
 export * from './query-elements/anonymous-query';
+export * from './query-elements/run-query';
 export * from './query-elements/existing-query';
 export * from './query-elements/full-query';
 export * from './query-items/field-declaration';
@@ -91,3 +93,4 @@ export * from './types/query-element';
 export * from './types/query-item';
 export * from './types/query-property';
 export * from './types/turtle-headed-pipe';
+export * from './types/query-extend-property';

package/dist/lang/ast/index.js

@@ -89,8 +89,10 @@ __exportStar(require("./expressions/unary"), exports);
 __exportStar(require("./expressions/utils"), exports);
 __exportStar(require("./elements/import-statement"), exports);
 __exportStar(require("./query-properties/nest-reference"), 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);
@@ -129,4 +131,5 @@ __exportStar(require("./types/query-element"), exports);
 __exportStar(require("./types/query-item"), exports);
 __exportStar(require("./types/query-property"), exports);
 __exportStar(require("./types/turtle-headed-pipe"), exports);
+__exportStar(require("./types/query-extend-property"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -0,0 +1,18 @@
+import { ModelDataRequest } from '../../translate-response';
+import { DocStatement, Document, MalloyElement, ModelEntryReference } from '../types/malloy-element';
+import { QueryElement } from '../types/query-element';
+declare abstract class RunQuery extends MalloyElement implements DocStatement {
+    elementType: string;
+    abstract execute(doc: Document): ModelDataRequest;
+}
+export declare class RunQueryDef extends RunQuery {
+    readonly theQuery: QueryElement;
+    constructor(theQuery: QueryElement);
+    execute(doc: Document): ModelDataRequest;
+}
+export declare class RunQueryRef extends RunQuery {
+    readonly queryName: ModelEntryReference;
+    constructor(queryName: ModelEntryReference);
+    execute(doc: Document): ModelDataRequest;
+}
+export {};

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

@@ -0,0 +1,67 @@
+"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.RunQueryRef = exports.RunQueryDef = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class RunQuery extends malloy_element_1.MalloyElement {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'runQuery';
+    }
+}
+class RunQueryDef extends RunQuery {
+    constructor(theQuery) {
+        super();
+        this.theQuery = theQuery;
+        this.has({ query: theQuery });
+    }
+    execute(doc) {
+        const modelQuery = this.theQuery.query();
+        doc.queryList.push(modelQuery);
+        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;
+//# sourceMappingURL=run-query.js.map

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

@@ -0,0 +1,5 @@
+import { ListOf } from '../types/malloy-element';
+import { QueryExtendProperty } from '../types/query-extend-property';
+export declare class ExtendBlock extends ListOf<QueryExtendProperty> {
+    constructor(properties: QueryExtendProperty[]);
+}

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

@@ -0,0 +1,33 @@
+"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.ExtendBlock = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class ExtendBlock extends malloy_element_1.ListOf {
+    constructor(properties) {
+        super('extend property', properties);
+    }
+}
+exports.ExtendBlock = ExtendBlock;
+//# sourceMappingURL=extend.js.map

package/dist/lang/ast/types/query-extend-property.d.ts

@@ -0,0 +1,6 @@
+import { Dimensions } from '../query-properties/dimmensions';
+import { Joins } from '../query-properties/joins';
+import { Measures } from '../query-properties/measures';
+import { MalloyElement } from './malloy-element';
+export declare type QueryExtendProperty = Dimensions | Measures | Joins;
+export declare function isQueryExtendProperty(q: MalloyElement): q is QueryExtendProperty;

package/dist/lang/ast/types/query-extend-property.js

@@ -0,0 +1,33 @@
+"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.isQueryExtendProperty = void 0;
+const dimmensions_1 = require("../query-properties/dimmensions");
+const joins_1 = require("../query-properties/joins");
+const measures_1 = require("../query-properties/measures");
+function isQueryExtendProperty(q) {
+    return q instanceof dimmensions_1.Dimensions || q instanceof measures_1.Measures || q instanceof joins_1.Joins;
+}
+exports.isQueryExtendProperty = isQueryExtendProperty;
+//# sourceMappingURL=query-extend-property.js.map

package/dist/lang/ast/types/query-property.d.ts

@@ -13,5 +13,6 @@ import { Ordering } from '../query-properties/ordering';
 import { ProjectStatement } from '../query-properties/project-statement';
 import { SampleProperty } from '../query-properties/sampling';
 import { Top } from '../query-properties/top';
-export declare type QueryProperty = Ordering | Top | Limit | Filter | Index | SampleProperty | Joins | DeclareFields | ProjectStatement | NestReference | NestDefinition | NestReference | Nests | Aggregate | GroupBy;
+import { ExtendBlock } from '../query-properties/extend';
+export declare type QueryProperty = Ordering | Top | Limit | Filter | Index | SampleProperty | Joins | DeclareFields | ProjectStatement | NestReference | NestDefinition | NestReference | Nests | Aggregate | GroupBy | ExtendBlock;
 export declare function isQueryProperty(q: MalloyElement): q is QueryProperty;

package/dist/lang/ast/types/query-property.js

@@ -38,6 +38,7 @@ const sampling_1 = require("../query-properties/sampling");
 const top_1 = require("../query-properties/top");
 const timezone_statement_1 = require("../source-properties/timezone-statement");
 const calculate_1 = require("../query-properties/calculate");
+const extend_1 = require("../query-properties/extend");
 function isQueryProperty(q) {
     return (q instanceof ordering_1.Ordering ||
         q instanceof top_1.Top ||
@@ -51,6 +52,7 @@ function isQueryProperty(q) {
         q instanceof aggregate_1.Aggregate ||
         q instanceof calculate_1.Calculate ||
         q instanceof nests_1.Nests ||
+        q instanceof extend_1.ExtendBlock ||
         (0, nest_1.isNestedQuery)(q) ||
         q instanceof group_by_1.GroupBy ||
         q instanceof timezone_statement_1.TimezoneStatement);

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

@@ -12,138 +12,140 @@ export declare class MalloyLexer extends Lexer {
     static readonly DECLARE = 7;
     static readonly DIMENSION = 8;
     static readonly EXCEPT = 9;
-    static readonly GROUP_BY = 10;
-    static readonly HAVING = 11;
-    static readonly INDEX = 12;
-    static readonly JOIN_CROSS = 13;
-    static readonly JOIN_ONE = 14;
-    static readonly JOIN_MANY = 15;
-    static readonly LIMIT = 16;
-    static readonly MEASURE = 17;
-    static readonly NEST = 18;
-    static readonly ORDER_BY = 19;
-    static readonly PRIMARY_KEY = 20;
-    static readonly PROJECT = 21;
-    static readonly QUERY = 22;
-    static readonly RENAME = 23;
-    static readonly SAMPLE = 24;
-    static readonly SELECT = 25;
-    static readonly SOURCE = 26;
-    static readonly SQL = 27;
-    static readonly TOP = 28;
-    static readonly WHERE = 29;
-    static readonly TIMEZONE = 30;
-    static readonly ALL = 31;
-    static readonly AND = 32;
-    static readonly AS = 33;
-    static readonly ASC = 34;
-    static readonly AVG = 35;
-    static readonly BOOLEAN = 36;
-    static readonly BY = 37;
-    static readonly CASE = 38;
-    static readonly CAST = 39;
-    static readonly CONDITION = 40;
-    static readonly COUNT = 41;
-    static readonly DATE = 42;
-    static readonly DAY = 43;
-    static readonly DESC = 44;
-    static readonly DISTINCT = 45;
-    static readonly ELSE = 46;
-    static readonly END = 47;
-    static readonly EXCLUDE = 48;
-    static readonly FALSE = 49;
-    static readonly FOR = 50;
-    static readonly FROM = 51;
-    static readonly FROM_SQL = 52;
-    static readonly HAS = 53;
-    static readonly HOUR = 54;
-    static readonly IMPORT = 55;
-    static readonly IS = 56;
-    static readonly JSON = 57;
-    static readonly LAST = 58;
-    static readonly MAX = 59;
-    static readonly MIN = 60;
-    static readonly MINUTE = 61;
-    static readonly MONTH = 62;
-    static readonly NOT = 63;
-    static readonly NOW = 64;
-    static readonly NULL = 65;
-    static readonly NUMBER = 66;
-    static readonly ON = 67;
-    static readonly OR = 68;
-    static readonly PICK = 69;
-    static readonly QUARTER = 70;
-    static readonly SECOND = 71;
-    static readonly STRING = 72;
-    static readonly SUM = 73;
-    static readonly TABLE = 74;
-    static readonly THEN = 75;
-    static readonly THIS = 76;
-    static readonly TIMESTAMP = 77;
-    static readonly TO = 78;
-    static readonly TRUE = 79;
-    static readonly TURTLE = 80;
-    static readonly WEEK = 81;
-    static readonly WHEN = 82;
-    static readonly WITH = 83;
-    static readonly YEAR = 84;
-    static readonly UNGROUPED = 85;
-    static readonly STRING_ESCAPE = 86;
-    static readonly HACKY_REGEX = 87;
-    static readonly STRING_LITERAL = 88;
-    static readonly AMPER = 89;
-    static readonly ARROW = 90;
-    static readonly FAT_ARROW = 91;
-    static readonly OPAREN = 92;
-    static readonly CPAREN = 93;
-    static readonly OBRACK = 94;
-    static readonly CBRACK = 95;
-    static readonly OCURLY = 96;
-    static readonly CCURLY = 97;
-    static readonly DOUBLECOLON = 98;
-    static readonly EXCLAM = 99;
-    static readonly COLON = 100;
-    static readonly COMMA = 101;
-    static readonly DOT = 102;
-    static readonly LT = 103;
-    static readonly GT = 104;
-    static readonly EQ = 105;
-    static readonly NE = 106;
-    static readonly LTE = 107;
-    static readonly GTE = 108;
-    static readonly PLUS = 109;
-    static readonly MINUS = 110;
-    static readonly STAR = 111;
-    static readonly STARSTAR = 112;
-    static readonly SLASH = 113;
-    static readonly BAR = 114;
-    static readonly SEMI = 115;
-    static readonly NOT_MATCH = 116;
-    static readonly MATCH = 117;
-    static readonly PERCENT = 118;
-    static readonly DOUBLE_QMARK = 119;
-    static readonly QMARK = 120;
-    static readonly LITERAL_TIMESTAMP = 121;
-    static readonly LITERAL_HOUR = 122;
-    static readonly LITERAL_DAY = 123;
-    static readonly LITERAL_QUARTER = 124;
-    static readonly LITERAL_MONTH = 125;
-    static readonly LITERAL_WEEK = 126;
-    static readonly LITERAL_YEAR = 127;
-    static readonly IDENTIFIER = 128;
-    static readonly PERCENT_LITERAL = 129;
-    static readonly INTEGER_LITERAL = 130;
-    static readonly NUMERIC_LITERAL = 131;
-    static readonly OBJECT_NAME_LITERAL = 132;
-    static readonly BLOCK_COMMENT = 133;
-    static readonly COMMENT_TO_EOL = 134;
-    static readonly WHITE_SPACE = 135;
-    static readonly SQL_BEGIN = 136;
-    static readonly CLOSE_CODE = 137;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 138;
-    static readonly UNEXPECTED_CHAR = 139;
-    static readonly OPEN_CODE = 140;
-    static readonly SQL_END = 141;
+    static readonly EXTENDQ = 10;
+    static readonly GROUP_BY = 11;
+    static readonly HAVING = 12;
+    static readonly INDEX = 13;
+    static readonly JOIN_CROSS = 14;
+    static readonly JOIN_ONE = 15;
+    static readonly JOIN_MANY = 16;
+    static readonly LIMIT = 17;
+    static readonly MEASURE = 18;
+    static readonly NEST = 19;
+    static readonly ORDER_BY = 20;
+    static readonly PRIMARY_KEY = 21;
+    static readonly PROJECT = 22;
+    static readonly QUERY = 23;
+    static readonly RENAME = 24;
+    static readonly RUN = 25;
+    static readonly SAMPLE = 26;
+    static readonly SELECT = 27;
+    static readonly SOURCE = 28;
+    static readonly SQL = 29;
+    static readonly TOP = 30;
+    static readonly WHERE = 31;
+    static readonly TIMEZONE = 32;
+    static readonly ALL = 33;
+    static readonly AND = 34;
+    static readonly AS = 35;
+    static readonly ASC = 36;
+    static readonly AVG = 37;
+    static readonly BOOLEAN = 38;
+    static readonly BY = 39;
+    static readonly CASE = 40;
+    static readonly CAST = 41;
+    static readonly CONDITION = 42;
+    static readonly COUNT = 43;
+    static readonly DATE = 44;
+    static readonly DAY = 45;
+    static readonly DESC = 46;
+    static readonly DISTINCT = 47;
+    static readonly ELSE = 48;
+    static readonly END = 49;
+    static readonly EXCLUDE = 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 SECOND = 73;
+    static readonly STRING = 74;
+    static readonly SUM = 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 STRING_LITERAL = 90;
+    static readonly AMPER = 91;
+    static readonly ARROW = 92;
+    static readonly FAT_ARROW = 93;
+    static readonly OPAREN = 94;
+    static readonly CPAREN = 95;
+    static readonly OBRACK = 96;
+    static readonly CBRACK = 97;
+    static readonly OCURLY = 98;
+    static readonly CCURLY = 99;
+    static readonly DOUBLECOLON = 100;
+    static readonly EXCLAM = 101;
+    static readonly COLON = 102;
+    static readonly COMMA = 103;
+    static readonly DOT = 104;
+    static readonly LT = 105;
+    static readonly GT = 106;
+    static readonly EQ = 107;
+    static readonly NE = 108;
+    static readonly LTE = 109;
+    static readonly GTE = 110;
+    static readonly PLUS = 111;
+    static readonly MINUS = 112;
+    static readonly STAR = 113;
+    static readonly STARSTAR = 114;
+    static readonly SLASH = 115;
+    static readonly BAR = 116;
+    static readonly SEMI = 117;
+    static readonly NOT_MATCH = 118;
+    static readonly MATCH = 119;
+    static readonly PERCENT = 120;
+    static readonly DOUBLE_QMARK = 121;
+    static readonly QMARK = 122;
+    static readonly LITERAL_TIMESTAMP = 123;
+    static readonly LITERAL_HOUR = 124;
+    static readonly LITERAL_DAY = 125;
+    static readonly LITERAL_QUARTER = 126;
+    static readonly LITERAL_MONTH = 127;
+    static readonly LITERAL_WEEK = 128;
+    static readonly LITERAL_YEAR = 129;
+    static readonly IDENTIFIER = 130;
+    static readonly PERCENT_LITERAL = 131;
+    static readonly INTEGER_LITERAL = 132;
+    static readonly NUMERIC_LITERAL = 133;
+    static readonly OBJECT_NAME_LITERAL = 134;
+    static readonly BLOCK_COMMENT = 135;
+    static readonly COMMENT_TO_EOL = 136;
+    static readonly WHITE_SPACE = 137;
+    static readonly SQL_BEGIN = 138;
+    static readonly CLOSE_CODE = 139;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 140;
+    static readonly UNEXPECTED_CHAR = 141;
+    static readonly OPEN_CODE = 142;
+    static readonly SQL_END = 143;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];