@malloydata/malloy 0.0.110 → 0.0.111-dev231204165238

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

@@ -30,11 +30,13 @@ export declare class KeyJoin extends Join {
     fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
 }
 type ExpressionJoinType = 'many' | 'one' | 'cross';
+export type MatrixOperation = 'left' | 'inner' | 'right' | 'full';
 export declare class ExpressionJoin extends Join {
     readonly name: ModelEntryReference;
     readonly sourceExpr: SourceQueryNode;
     elementType: string;
     joinType: ExpressionJoinType;
+    matrixOperation: MatrixOperation;
     private expr?;
     constructor(name: ModelEntryReference, sourceExpr: SourceQueryNode);
     set joinOn(joinExpr: ExpressionDef | undefined);

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

@@ -65,6 +65,7 @@ class KeyJoin extends Join {
             ...sourceDef,
             structRelationship: {
                 type: 'one',
+                matrixOperation: 'left',
                 onExpression: ["('join fixup'='not done yet')"],
             },
             location: this.location,
@@ -90,6 +91,7 @@ class KeyJoin extends Join {
                 if (pkey.type === exprX.dataType) {
                     inStruct.structRelationship = {
                         type: 'one',
+                        matrixOperation: 'left',
                         onExpression: [
                             {
                                 type: 'field',
@@ -122,6 +124,7 @@ class ExpressionJoin extends Join {
         this.sourceExpr = sourceExpr;
         this.elementType = 'joinOnExpr';
         this.joinType = 'one';
+        this.matrixOperation = 'left';
     }
     set joinOn(joinExpr) {
         this.expr = joinExpr;
@@ -152,9 +155,17 @@ class ExpressionJoin extends Join {
             return error_factory_1.ErrorFactory.structDef;
         }
         const sourceDef = source.structDef();
+        let matrixOperation = 'left';
+        if (this.inExperiment('join_types', true)) {
+            matrixOperation = this.matrixOperation;
+        }
         const joinStruct = {
             ...sourceDef,
-            structRelationship: { type: this.joinType },
+            // MTOY: add matrix type here
+            structRelationship: {
+                type: this.joinType,
+                matrixOperation,
+            },
             location: this.location,
         };
         if (sourceDef.structSource.type === 'query') {

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

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