@malloydata/malloy 0.0.51-dev230629171920 → 0.0.51-dev230705184641

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelAnnotation = exports.ObjectAnnotation = exports.Document = exports.RunList = exports.ListOf = exports.isDocStatement = exports.ModelEntryReference = exports.Unimplemented = exports.MalloyElement = void 0;
+exports.ModelAnnotation = exports.ObjectAnnotation = exports.Document = exports.DocStatementList = exports.ListOf = exports.isDocStatementOrDocStatementList = exports.isDocStatement = exports.ModelEntryReference = exports.Unimplemented = exports.MalloyElement = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -202,16 +202,15 @@ class MalloyElement {
         }
         return asString;
     }
-    walk(callBack) {
-        callBack(this);
+    *walk() {
         for (const kidLabel of Object.keys(this.children)) {
             const kiddle = this.children[kidLabel];
             if (kiddle instanceof MalloyElement) {
-                kiddle.walk(callBack);
+                yield kiddle;
             }
             else {
                 for (const k of kiddle) {
-                    k.walk(callBack);
+                    yield k;
                 }
             }
         }
@@ -234,6 +233,13 @@ class MalloyElement {
         this.log(`INTERNAL ERROR IN TRANSLATION: ${msg}`);
         return new Error(msg);
     }
+    needs(doc) {
+        for (const child of this.walk()) {
+            const childNeeds = child.needs(doc);
+            if (childNeeds)
+                return childNeeds;
+        }
+    }
 }
 exports.MalloyElement = MalloyElement;
 class Unimplemented extends MalloyElement {
@@ -262,6 +268,10 @@ function isDocStatement(e) {
     return e.execute !== undefined;
 }
 exports.isDocStatement = isDocStatement;
+function isDocStatementOrDocStatementList(el) {
+    return el instanceof DocStatementList || isDocStatement(el);
+}
+exports.isDocStatementOrDocStatementList = isDocStatementOrDocStatementList;
 class ListOf extends MalloyElement {
     constructor(elements) {
         super();
@@ -285,9 +295,16 @@ class ListOf extends MalloyElement {
         this.newContents();
         return this.elements;
     }
+    needs(doc) {
+        for (const element of this.elements) {
+            const elementNeeds = element.needs(doc);
+            if (elementNeeds)
+                return elementNeeds;
+        }
+    }
 }
 exports.ListOf = ListOf;
-class RunList extends ListOf {
+class DocStatementList extends ListOf {
     constructor() {
         super(...arguments);
         this.elementType = 'topLevelStatements';
@@ -307,18 +324,30 @@ class RunList extends ListOf {
                 }
                 this.noteCursor += 1;
             }
-            const resp = el.execute(doc);
-            if (resp) {
-                // Statment needs information (likely SQL schema) so we return
-                // the response, and will come back here later
-                return resp;
+            // For DocStatementLists, we want to incrementally execute
+            // the list, returning needs only when individual statements
+            // report needs, not when the whole list has needs (because
+            // the needs of one statement in a list may depend on those
+            // of another statement earlier in the list). For regular
+            // DocStatements, we first check their needs and return them
+            // if there are any; otherwise we execute the statement.
+            if (el instanceof DocStatementList) {
+                const needs = el.executeList(doc);
+                if (needs)
+                    return needs;
+            }
+            else {
+                const needs = el.needs(doc);
+                if (needs)
+                    return needs;
+                el.execute(doc);
             }
             this.execCursor += 1;
         }
         return undefined;
     }
 }
-exports.RunList = RunList;
+exports.DocStatementList = DocStatementList;
 /**
  * The Document class is a little weird because we might need to bounce back
  * to the requestor, which might be on the other side of a wire, to get
@@ -342,7 +371,7 @@ class Document extends MalloyElement {
         this.sqlBlocks = [];
         this.didInitModel = false;
         this.notes = [];
-        this.statements = new RunList(statements);
+        this.statements = new DocStatementList(statements);
         this.has({ statements: statements });
     }
     initModelDef(extendingModelDef) {
@@ -435,7 +464,6 @@ class ModelAnnotation extends ObjectAnnotation {
     }
     execute(doc) {
         doc.notes = doc.notes.concat(this.notes);
-        return;
     }
 }
 exports.ModelAnnotation = ModelAnnotation;

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

@@ -31,7 +31,7 @@ export declare class MalloyLexer extends Lexer {
     static readonly SAMPLE = 26;
     static readonly SELECT = 27;
     static readonly SOURCE = 28;
-    static readonly SQL = 29;
+    static readonly SQLC = 29;
     static readonly TOP = 30;
     static readonly WHERE = 31;
     static readonly TIMEZONE = 32;
@@ -78,77 +78,78 @@ export declare class MalloyLexer extends Lexer {
     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 DOC_ANNOTATION = 91;
-    static readonly ANNOTATION = 92;
-    static readonly AMPER = 93;
-    static readonly ARROW = 94;
-    static readonly FAT_ARROW = 95;
-    static readonly OPAREN = 96;
-    static readonly CPAREN = 97;
-    static readonly OBRACK = 98;
-    static readonly CBRACK = 99;
-    static readonly OCURLY = 100;
-    static readonly CCURLY = 101;
-    static readonly DOUBLECOLON = 102;
-    static readonly TRIPLECOLON = 103;
-    static readonly EXCLAM = 104;
-    static readonly COLON = 105;
-    static readonly COMMA = 106;
-    static readonly DOT = 107;
-    static readonly LT = 108;
-    static readonly GT = 109;
-    static readonly EQ = 110;
-    static readonly NE = 111;
-    static readonly LTE = 112;
-    static readonly GTE = 113;
-    static readonly PLUS = 114;
-    static readonly MINUS = 115;
-    static readonly STAR = 116;
-    static readonly STARSTAR = 117;
-    static readonly SLASH = 118;
-    static readonly BAR = 119;
-    static readonly SEMI = 120;
-    static readonly NOT_MATCH = 121;
-    static readonly MATCH = 122;
-    static readonly PERCENT = 123;
-    static readonly DOUBLE_QMARK = 124;
-    static readonly QMARK = 125;
-    static readonly LITERAL_TIMESTAMP = 126;
-    static readonly LITERAL_HOUR = 127;
-    static readonly LITERAL_DAY = 128;
-    static readonly LITERAL_QUARTER = 129;
-    static readonly LITERAL_MONTH = 130;
-    static readonly LITERAL_WEEK = 131;
-    static readonly LITERAL_YEAR = 132;
-    static readonly IDENTIFIER = 133;
-    static readonly PERCENT_LITERAL = 134;
-    static readonly INTEGER_LITERAL = 135;
-    static readonly NUMERIC_LITERAL = 136;
-    static readonly OBJECT_NAME_LITERAL = 137;
-    static readonly BLOCK_COMMENT = 138;
-    static readonly COMMENT_TO_EOL = 139;
-    static readonly WHITE_SPACE = 140;
-    static readonly SQL_BEGIN = 141;
-    static readonly CLOSE_CODE = 142;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 143;
-    static readonly UNEXPECTED_CHAR = 144;
-    static readonly OPEN_CODE = 145;
-    static readonly SQL_END = 146;
+    static readonly SQL = 76;
+    static readonly TABLE = 77;
+    static readonly THEN = 78;
+    static readonly THIS = 79;
+    static readonly TIMESTAMP = 80;
+    static readonly TO = 81;
+    static readonly TRUE = 82;
+    static readonly TURTLE = 83;
+    static readonly WEEK = 84;
+    static readonly WHEN = 85;
+    static readonly WITH = 86;
+    static readonly YEAR = 87;
+    static readonly UNGROUPED = 88;
+    static readonly STRING_ESCAPE = 89;
+    static readonly HACKY_REGEX = 90;
+    static readonly STRING_LITERAL = 91;
+    static readonly DOC_ANNOTATION = 92;
+    static readonly ANNOTATION = 93;
+    static readonly AMPER = 94;
+    static readonly ARROW = 95;
+    static readonly FAT_ARROW = 96;
+    static readonly OPAREN = 97;
+    static readonly CPAREN = 98;
+    static readonly OBRACK = 99;
+    static readonly CBRACK = 100;
+    static readonly OCURLY = 101;
+    static readonly CCURLY = 102;
+    static readonly DOUBLECOLON = 103;
+    static readonly TRIPLECOLON = 104;
+    static readonly EXCLAM = 105;
+    static readonly COLON = 106;
+    static readonly COMMA = 107;
+    static readonly DOT = 108;
+    static readonly LT = 109;
+    static readonly GT = 110;
+    static readonly EQ = 111;
+    static readonly NE = 112;
+    static readonly LTE = 113;
+    static readonly GTE = 114;
+    static readonly PLUS = 115;
+    static readonly MINUS = 116;
+    static readonly STAR = 117;
+    static readonly STARSTAR = 118;
+    static readonly SLASH = 119;
+    static readonly BAR = 120;
+    static readonly SEMI = 121;
+    static readonly NOT_MATCH = 122;
+    static readonly MATCH = 123;
+    static readonly PERCENT = 124;
+    static readonly DOUBLE_QMARK = 125;
+    static readonly QMARK = 126;
+    static readonly LITERAL_TIMESTAMP = 127;
+    static readonly LITERAL_HOUR = 128;
+    static readonly LITERAL_DAY = 129;
+    static readonly LITERAL_QUARTER = 130;
+    static readonly LITERAL_MONTH = 131;
+    static readonly LITERAL_WEEK = 132;
+    static readonly LITERAL_YEAR = 133;
+    static readonly IDENTIFIER = 134;
+    static readonly PERCENT_LITERAL = 135;
+    static readonly INTEGER_LITERAL = 136;
+    static readonly NUMERIC_LITERAL = 137;
+    static readonly OBJECT_NAME_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 SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];