@malloydata/malloy 0.0.22-dev230207182613 → 0.0.22-dev230207183024

package/dist/lang/parse-malloy.js

@@ -87,7 +87,7 @@ class ParseStep {
                 const msg = e instanceof Error ? e.message : "";
                 that.urlIsFullPath = false;
                 that.root.logger.log({
-                    message: `Could not compute full path URL: ${msg}`,
+                    "message": `Could not compute full path URL: ${msg}`
                 });
             }
         }
@@ -105,7 +105,7 @@ class ParseStep {
                 this.response = that.fatalErrors();
                 return this.response;
             }
-            return { urls: [that.sourceURL] };
+            return { "urls": [that.sourceURL] };
         }
         const source = srcEnt.value == "" ? "\n" : srcEnt.value;
         this.sourceInfo = this.getSourceInfo(source);
@@ -115,14 +115,14 @@ class ParseStep {
         }
         catch (parseException) {
             that.root.logger.log({
-                message: `Malloy internal parser exception [${parseException.message}]`,
+                "message": `Malloy internal parser exception [${parseException.message}]`
             });
             parse = undefined;
         }
         if (that.root.logger.hasErrors()) {
             this.response = {
                 parse,
-                ...that.fatalErrors(),
+                ...that.fatalErrors()
             };
         }
         else {
@@ -137,9 +137,9 @@ class ParseStep {
     getSourceInfo(code) {
         const eolRegex = /\r?\n/;
         const info = {
-            at: [],
-            lines: [],
-            length: code.length,
+            "at": [],
+            "lines": [],
+            "length": code.length
         };
         let src = code;
         let lineStart = 0;
@@ -150,8 +150,8 @@ class ParseStep {
                 info.lines.push(src.slice(0, eol.index));
                 const lineLength = eol.index + eol[0].length;
                 info.at.push({
-                    begin: lineStart,
-                    end: lineStart + lineLength,
+                    "begin": lineStart,
+                    "end": lineStart + lineLength
                 });
                 lineStart += lineLength;
                 src = src.slice(lineLength);
@@ -159,7 +159,7 @@ class ParseStep {
             else {
                 // last line, does not have a line end
                 info.lines.push(src);
-                info.at.push({ begin: lineStart, end: lineStart + src.length });
+                info.at.push({ "begin": lineStart, "end": lineStart + src.length });
                 break;
             }
         }
@@ -180,12 +180,12 @@ class ParseStep {
             throw new Error(`No such parse rule as ${that.grammarRule}`);
         }
         return {
-            root: parseFunc.call(malloyParser),
-            tokenStream: tokenStream,
-            sourceStream: inputStream,
+            "root": parseFunc.call(malloyParser),
+            "tokenStream": tokenStream,
+            "sourceStream": inputStream,
             // TODO put the real version here
-            malloyVersion: "?.?.?-????",
-            subTranslator: that,
+            "malloyVersion": "?.?.?-????",
+            "subTranslator": that
         };
     }
 }
@@ -205,8 +205,8 @@ class ImportsAndTablesStep {
             if (parseRefs === null || parseRefs === void 0 ? void 0 : parseRefs.tables) {
                 for (const ref in parseRefs.tables) {
                     that.root.schemaZone.reference(ref, {
-                        url: that.sourceURL,
-                        range: parseRefs.tables[ref],
+                        "url": that.sourceURL,
+                        "range": parseRefs.tables[ref]
                     });
                 }
             }
@@ -217,8 +217,8 @@ class ImportsAndTablesStep {
                         const ref = decodeURI(new URL(relativeRef, that.sourceURL).toString());
                         that.addChild(ref);
                         that.root.importZone.reference(ref, {
-                            url: that.sourceURL,
-                            range: firstRef,
+                            "url": that.sourceURL,
+                            "range": firstRef
                         });
                     }
                     catch (err) {
@@ -226,8 +226,8 @@ class ImportsAndTablesStep {
                         // may be impossible, because it will append any garbage
                         // to the known good rootURL assuming it is relative
                         that.root.logger.log({
-                            message: `Malformed URL '${relativeRef}'"`,
-                            at: { url: that.sourceURL, range: firstRef },
+                            "message": `Malformed URL '${relativeRef}'"`,
+                            "at": { "url": that.sourceURL, "range": firstRef }
                         });
                     }
                 }
@@ -241,11 +241,11 @@ class ImportsAndTablesStep {
         let allMissing = {};
         const missingTables = that.root.schemaZone.getUndefined();
         if (missingTables) {
-            allMissing = { tables: missingTables };
+            allMissing = { "tables": missingTables };
         }
         const missingImports = that.root.importZone.getUndefined();
         if (missingImports) {
-            allMissing = { ...allMissing, urls: missingImports };
+            allMissing = { ...allMissing, "urls": missingImports };
         }
         if ((0, translate_response_1.isNeedResponse)(allMissing)) {
             return allMissing;
@@ -337,8 +337,8 @@ class ASTStep {
         newAst.setTranslator(that);
         this.response = {
             ...that.errors(),
-            ast: newAst,
-            final: true,
+            "ast": newAst,
+            "final": true
         };
         return this.response;
     }
@@ -374,11 +374,11 @@ class MetadataStep {
                 }
                 this.response = {
                     symbols,
-                    highlights: (0, document_highlight_walker_1.sortHighlights)([
+                    "highlights": (0, document_highlight_walker_1.sortHighlights)([
                         ...(0, document_highlight_walker_1.passForHighlights)(tryParse.parse.tokenStream),
-                        ...walkHighlights,
+                        ...walkHighlights
                     ]),
-                    final: true,
+                    "final": true
                 };
             }
         }
@@ -406,7 +406,7 @@ class CompletionsStep {
             }
             return {
                 ...tryParse,
-                completions,
+                completions
             };
         }
     }
@@ -432,7 +432,7 @@ class HelpContextStep {
             }
             return {
                 ...tryParse,
-                helpContext,
+                helpContext
             };
         }
     }
@@ -472,8 +472,8 @@ class TranslateStep {
             }
             else {
                 that.root.logger.log({
-                    message: `'${that.sourceURL}' did not parse to malloy document`,
-                    at: that.defaultLocation(),
+                    "message": `'${that.sourceURL}' did not parse to malloy document`,
+                    "at": that.defaultLocation()
                 });
             }
         }
@@ -482,13 +482,13 @@ class TranslateStep {
         }
         else {
             this.response = {
-                translated: {
-                    modelDef: that.modelDef,
-                    queryList: that.queryList,
-                    sqlBlocks: that.sqlBlocks,
+                "translated": {
+                    "modelDef": that.modelDef,
+                    "queryList": that.queryList,
+                    "sqlBlocks": that.sqlBlocks
                 },
                 ...that.errors(),
-                final: true,
+                "final": true
             };
         }
         return this.response;
@@ -502,9 +502,9 @@ class MalloyTranslation {
         this.sqlBlocks = [];
         this.childTranslators = new Map();
         this.modelDef = {
-            name: sourceURL,
-            exports: [],
-            contents: {},
+            "name": sourceURL,
+            "exports": [],
+            "contents": {}
         };
         /**
          * This is sort of the makefile for the translation, all the steps
@@ -535,8 +535,8 @@ class MalloyTranslation {
     }
     fatalErrors() {
         return {
-            final: true,
-            errors: [...this.root.logger.getLog()],
+            "final": true,
+            "errors": [...this.root.logger.getLog()]
         };
     }
     /**
@@ -545,7 +545,7 @@ class MalloyTranslation {
      */
     errors() {
         const errors = this.root.logger.getLog();
-        return { errors: [...errors] };
+        return { "errors": [...errors] };
     }
     getLineMap(url) {
         var _a, _b;
@@ -598,8 +598,8 @@ class MalloyTranslation {
         const ret = (_a = this.childTranslators.get(childURL)) === null || _a === void 0 ? void 0 : _a.translate();
         if (ret === null || ret === void 0 ? void 0 : ret.compileSQL) {
             return {
-                compileSQL: ret.compileSQL,
-                partialModel: ret.partialModel,
+                "compileSQL": ret.compileSQL,
+                "partialModel": ret.partialModel
             };
         }
     }
@@ -642,11 +642,11 @@ class MalloyTranslation {
     }
     defaultLocation() {
         return {
-            url: this.sourceURL,
-            range: {
-                start: { line: 0, character: 0 },
-                end: { line: 0, character: 0 },
-            },
+            "url": this.sourceURL,
+            "range": {
+                "start": { "line": 0, "character": 0 },
+                "end": { "line": 0, "character": 0 }
+            }
         };
     }
     rangeFromContext(pcx) {
@@ -654,8 +654,8 @@ class MalloyTranslation {
     }
     rangeFromTokens(startToken, stopToken) {
         const start = {
-            line: startToken.line - 1,
-            character: startToken.charPositionInLine,
+            "line": startToken.line - 1,
+            "character": startToken.charPositionInLine
         };
         if (this.parseStep.sourceInfo && stopToken.stopIndex != -1) {
             // Find the line which contains the stopIndex
@@ -665,10 +665,10 @@ class MalloyTranslation {
                 if (stopToken.stopIndex >= at.begin && stopToken.stopIndex <= at.end) {
                     return {
                         start,
-                        end: {
-                            line: lineNo,
-                            character: stopToken.stopIndex - at.begin + 1,
-                        },
+                        "end": {
+                            "line": lineNo,
+                            "character": stopToken.stopIndex - at.begin + 1
+                        }
                     };
                 }
             }
@@ -676,13 +676,13 @@ class MalloyTranslation {
             // character of the last line of the file
             return {
                 start,
-                end: {
-                    line: lastLine,
-                    character: this.parseStep.sourceInfo.lines[lastLine].length,
-                },
+                "end": {
+                    "line": lastLine,
+                    "character": this.parseStep.sourceInfo.lines[lastLine].length
+                }
             };
         }
-        return { start, end: start };
+        return { start, "end": start };
     }
     rangeFromToken(token) {
         return this.rangeFromTokens(token, token);

package/dist/lang/parse-tree-walkers/document-completion-walker.js

@@ -36,7 +36,7 @@ const EXPLORE_PROPERTIES = [
     "accept",
     "except",
     "query",
-    "declare",
+    "declare"
 ];
 const QUERY_PROPERTIES = [
     "group_by",
@@ -49,7 +49,7 @@ const QUERY_PROPERTIES = [
     "where",
     "having",
     "nest",
-    "declare",
+    "declare"
 ];
 const MODEL_PROPERTIES = ["source", "explore", "query", "sql"];
 class DocumentCompletionWalker {
@@ -61,16 +61,16 @@ class DocumentCompletionWalker {
     rangeOf(pcx) {
         const stopToken = pcx.stop || pcx.start;
         return {
-            start: {
-                line: pcx.start.line - 1,
-                character: pcx.start.charPositionInLine,
+            "start": {
+                "line": pcx.start.line - 1,
+                "character": pcx.start.charPositionInLine
             },
-            end: {
-                line: stopToken.line - 1,
-                character: stopToken.stopIndex -
+            "end": {
+                "line": stopToken.line - 1,
+                "character": stopToken.stopIndex -
                     (stopToken.startIndex - stopToken.charPositionInLine) +
-                    1,
-            },
+                    1
+            }
         };
     }
     inRange(range) {
@@ -94,8 +94,8 @@ class DocumentCompletionWalker {
             if (!insideStatement) {
                 for (const property of EXPLORE_PROPERTIES) {
                     this.completions.push({
-                        type: "explore_property",
-                        text: `${property}: `,
+                        "type": "explore_property",
+                        "text": `${property}: `
                     });
                 }
             }
@@ -112,8 +112,8 @@ class DocumentCompletionWalker {
             if (!insideStatement) {
                 for (const property of QUERY_PROPERTIES) {
                     this.completions.push({
-                        type: "query_property",
-                        text: `${property}: `,
+                        "type": "query_property",
+                        "text": `${property}: `
                     });
                 }
             }
@@ -130,8 +130,8 @@ class DocumentCompletionWalker {
             if (!insideStatement) {
                 for (const property of MODEL_PROPERTIES) {
                     this.completions.push({
-                        type: "model_property",
-                        text: `${property}: `,
+                        "type": "model_property",
+                        "text": `${property}: `
                     });
                 }
             }

package/dist/lang/parse-tree-walkers/document-help-context-walker.js

@@ -33,16 +33,16 @@ class HelpContextVisitor extends tree_1.AbstractParseTreeVisitor {
     rangeOf(ctx) {
         const stopToken = ctx.stop || ctx.start;
         return {
-            start: {
-                line: ctx.start.line - 1,
-                character: ctx.start.charPositionInLine,
+            "start": {
+                "line": ctx.start.line - 1,
+                "character": ctx.start.charPositionInLine
             },
-            end: {
-                line: stopToken.line - 1,
-                character: stopToken.stopIndex -
+            "end": {
+                "line": stopToken.line - 1,
+                "character": stopToken.stopIndex -
                     (stopToken.startIndex - stopToken.charPositionInLine) +
-                    1,
-            },
+                    1
+            }
         };
     }
     inRange(range) {
@@ -60,8 +60,8 @@ class HelpContextVisitor extends tree_1.AbstractParseTreeVisitor {
         let result = this.defaultResult();
         if (this.inRange(this.rangeOf(ctx))) {
             result = {
-                type: this.type,
-                token: ctx.start.text,
+                "type": this.type,
+                "token": ctx.start.text
             };
             const n = ctx.childCount;
             for (let i = 0; i < n; i++) {

package/dist/lang/parse-tree-walkers/document-highlight-walker.js

@@ -27,80 +27,80 @@ const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
 const MalloyParser_1 = require("../lib/Malloy/MalloyParser");
 // TODO maybe this could be an enum like Definition__Field, etc.
 exports.HighlightType = {
-    Identifier: "identifier",
-    Type: "type",
-    Literal: {
-        Date: "literal.date",
-        Number: "literal.number",
-        String: "literal.string",
-        RegularExpression: "literal.regular_expression",
-        Boolean: "literal.boolean",
-        Null: "literal.null",
+    "Identifier": "identifier",
+    "Type": "type",
+    "Literal": {
+        "Date": "literal.date",
+        "Number": "literal.number",
+        "String": "literal.string",
+        "RegularExpression": "literal.regular_expression",
+        "Boolean": "literal.boolean",
+        "Null": "literal.null"
     },
-    Call: {
-        Aggregate: "call.aggregate",
-        TimeFrame: "call.time_frame",
-        Cast: "call.cast",
-        Table: "call.table",
-        From: "call.from",
-        Function: "call.function",
-        FromSQL: "call.from_sql",
+    "Call": {
+        "Aggregate": "call.aggregate",
+        "TimeFrame": "call.time_frame",
+        "Cast": "call.cast",
+        "Table": "call.table",
+        "From": "call.from",
+        "Function": "call.function",
+        "FromSQL": "call.from_sql"
     },
     // TODO many of these should probably be categorized further
-    Keyword: {
-        AggregateModifier: {
-            Distinct: "keyword.aggregate_modifier.distinct",
+    "Keyword": {
+        "AggregateModifier": {
+            "Distinct": "keyword.aggregate_modifier.distinct"
         },
-        CastModifier: {
-            As: "keyword.cast_modifier.as",
+        "CastModifier": {
+            "As": "keyword.cast_modifier.as"
         },
-        Is: "keyword.is",
-        On: "keyword.on",
-        Desc: "keyword.desc",
-        Asc: "keyword.asc",
-        Pick: "keyword.pick",
-        When: "keyword.when",
-        Else: "keyword.else",
-        With: "keyword.with",
+        "Is": "keyword.is",
+        "On": "keyword.on",
+        "Desc": "keyword.desc",
+        "Asc": "keyword.asc",
+        "Pick": "keyword.pick",
+        "When": "keyword.when",
+        "Else": "keyword.else",
+        "With": "keyword.with",
         // TODO or is this a meta type?
-        JSON: "keyword.json",
+        "JSON": "keyword.json",
         // TODO or is this a meta type?
-        Turtle: "keyword.turtle",
-        Import: "keyword.import",
+        "Turtle": "keyword.turtle",
+        "Import": "keyword.import"
     },
-    Operator: {
-        Comparison: "operator.comparison",
-        Boolean: "operator.boolean",
-        Date: "operator.date",
+    "Operator": {
+        "Comparison": "operator.comparison",
+        "Boolean": "operator.boolean",
+        "Date": "operator.date"
     },
-    Comment: {
-        Line: "comment.line",
-        Block: "comment.block",
-    },
-    Property: {
-        Accept: "property.accept",
-        Aggregate: "property.aggregate",
-        Dimension: "property.dimension",
-        Except: "property.except",
-        Source: "property.source",
-        GroupBy: "property.group_by",
-        Having: "property.having",
-        Index: "property.index",
-        JoinOne: "keyword.join_one",
-        JoinMany: "keyword.join_many",
-        JoinCross: "keyword.join_cross",
-        Limit: "property.limit",
-        Measure: "property.measure",
-        Nest: "property.nest",
-        OrderBy: "property.order_by",
-        PrimaryKey: "property.primary_key",
-        Project: "property.project",
-        Query: "property.query",
-        Rename: "property.rename",
-        Top: "property.top",
-        Where: "property.where",
-        SQL: "property.sql",
+    "Comment": {
+        "Line": "comment.line",
+        "Block": "comment.block"
     },
+    "Property": {
+        "Accept": "property.accept",
+        "Aggregate": "property.aggregate",
+        "Dimension": "property.dimension",
+        "Except": "property.except",
+        "Source": "property.source",
+        "GroupBy": "property.group_by",
+        "Having": "property.having",
+        "Index": "property.index",
+        "JoinOne": "keyword.join_one",
+        "JoinMany": "keyword.join_many",
+        "JoinCross": "keyword.join_cross",
+        "Limit": "property.limit",
+        "Measure": "property.measure",
+        "Nest": "property.nest",
+        "OrderBy": "property.order_by",
+        "PrimaryKey": "property.primary_key",
+        "Project": "property.project",
+        "Query": "property.query",
+        "Rename": "property.rename",
+        "Top": "property.top",
+        "Where": "property.where",
+        "SQL": "property.sql"
+    }
 };
 function passForHighlights(tokens) {
     const highlights = [];
@@ -115,18 +115,21 @@ function passForHighlights(tokens) {
         const colonAdjustment = removeColon ? 1 : 0;
         highlights.push({
             type,
-            range: {
-                start: { line: token.line - 1, character: token.startIndex - offset },
-                end: {
-                    line: token.line - 1 + numberOfLines - 1,
-                    character: token.stopIndex +
+            "range": {
+                "start": {
+                    "line": token.line - 1,
+                    "character": token.startIndex - offset
+                },
+                "end": {
+                    "line": token.line - 1 + numberOfLines - 1,
+                    "character": token.stopIndex +
                         2 -
                         (numberOfLines > 1 ? token.startIndex : offset) -
                         lengthOfAllButLastLine -
                         numberOfLines -
-                        colonAdjustment,
-                },
-            },
+                        colonAdjustment
+                }
+            }
         });
     };
     for (let i = 0; i < tokens.size; i++) {
@@ -333,24 +336,24 @@ class DocumentHighlightWalker {
     rangeOf(pcx) {
         const stopToken = pcx.stop || pcx.start;
         return {
-            start: {
-                line: pcx.start.line - 1,
-                character: pcx.start.charPositionInLine,
+            "start": {
+                "line": pcx.start.line - 1,
+                "character": pcx.start.charPositionInLine
             },
-            end: {
-                line: stopToken.line - 1,
-                character: stopToken.stopIndex -
+            "end": {
+                "line": stopToken.line - 1,
+                "character": stopToken.stopIndex -
                     (stopToken.startIndex - stopToken.charPositionInLine) +
-                    1,
-            },
+                    1
+            }
         };
     }
     enterExprFunc(pcx) {
         const id = pcx.id() || pcx.timeframe();
         if (id) {
             this.highlights.push({
-                range: this.rangeOf(id),
-                type: exports.HighlightType.Call.Function,
+                "range": this.rangeOf(id),
+                "type": exports.HighlightType.Call.Function
             });
         }
     }