@malloydata/malloy 0.0.215 → 0.0.216-dev241118202522

package/dist/lang/ast/types/space-param.js

@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefinedParameter = exports.AbstractParameter = exports.SpaceParam = void 0;
 const space_entry_1 = require("./space-entry");
 const TDU = __importStar(require("../typedesc-utils"));
+const composite_source_utils_1 = require("../../../model/composite_source_utils");
 class SpaceParam extends space_entry_1.SpaceEntry {
     constructor() {
         super(...arguments);
@@ -72,6 +73,7 @@ class AbstractParameter extends SpaceParam {
             ...TDU.atomicDef(this.parameter()),
             expressionType: 'scalar',
             evalSpace: 'constant',
+            compositeFieldUsage: (0, composite_source_utils_1.emptyCompositeFieldUsage)(),
         };
     }
     entryType() {
@@ -94,6 +96,7 @@ class DefinedParameter extends SpaceParam {
             // TODO Not sure whether params are considered "input space". It seems like they
             // could be input or constant, depending on usage (same as above).
             evalSpace: 'input',
+            compositeFieldUsage: (0, composite_source_utils_1.emptyCompositeFieldUsage)(),
         };
     }
     entryType() {

package/dist/lang/ast/view-elements/reference-view.js

@@ -74,6 +74,7 @@ class ReferenceView extends view_1.View {
             const newSegment = {
                 type: 'reduce',
                 queryFields: [this.reference.refToField],
+                compositeFieldUsage: fieldDef.compositeFieldUsage,
             };
             const name = this.reference.nameString;
             const outputStruct = {

package/dist/lang/ast/view-elements/refine-utils.js

@@ -24,6 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refine = void 0;
 const model_1 = require("../../../model");
+const composite_source_utils_1 = require("../../../model/composite_source_utils");
 const field_utils_1 = require("../../field-utils");
 function refine(logTo, refineTo, refineFrom) {
     var _a, _b;
@@ -92,6 +93,7 @@ function refine(logTo, refineTo, refineFrom) {
             if (overlappingFields.length > 0) {
                 logTo.logError('name-conflict-in-refinement', `overlapping fields in refinement: ${overlappingFields.map(field_utils_1.nameFromDef)}`);
             }
+            to.compositeFieldUsage = (0, composite_source_utils_1.mergeCompositeFieldUsage)(to.compositeFieldUsage, from.compositeFieldUsage);
         }
         else if (from.type === 'index' && to.type === 'index') {
             to.indexFields = [...from.indexFields, ...to.indexFields];

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

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