@malloydata/malloy 0.0.2 → 0.0.3

package/dist/lang/lib/Malloy/MalloyParserVisitor.js

@@ -0,0 +1,4 @@
+"use strict";
+// Generated from MalloyParser.g4 by ANTLR 4.9.0-SNAPSHOT
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=MalloyParserVisitor.js.map

package/dist/lang/parse-to-ast.d.ts

@@ -1,17 +1,16 @@
 import { ParserRuleContext } from "antlr4ts";
 import type { ParseTree } from "antlr4ts/tree";
 import { AbstractParseTreeVisitor } from "antlr4ts/tree/AbstractParseTreeVisitor";
-import { MalloyVisitor } from "./lib/Malloy/MalloyVisitor";
+import { MalloyParserVisitor } from "./lib/Malloy/MalloyParserVisitor";
 import * as parse from "./lib/Malloy/MalloyParser";
 import * as ast from "./ast";
-import { MessageLogger } from "./parse-log";
+import { LogSeverity, MessageLogger } from "./parse-log";
 import { MalloyParseRoot } from "./parse-malloy";
-import { LogSeverity } from "./parse-log";
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
  */
-export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElement> implements MalloyVisitor<ast.MalloyElement> {
+export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElement> implements MalloyParserVisitor<ast.MalloyElement> {
     readonly parse: MalloyParseRoot;
     readonly msgLog: MessageLogger;
     constructor(parse: MalloyParseRoot, msgLog: MessageLogger);

package/dist/lang/parse-to-ast.js

@@ -917,7 +917,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.visitSQLStatementDef(pcx.sqlStatementDef());
     }
     visitSQLStatementDef(pcx) {
-        const commands = pcx.sqlBlock().text;
+        const commands = pcx.SQL_STRING().text;
         const sqlStmt = new ast.SQLStatement({
             select: commands.slice(2, commands.length - 2),
             connection: this.optionalText(pcx.connectionName()),

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

@@ -26,6 +26,7 @@ const EXPLORE_PROPERTIES = [
     "accept",
     "except",
     "query",
+    "declare",
 ];
 const QUERY_PROPERTIES = [
     "group_by",
@@ -38,6 +39,7 @@ const QUERY_PROPERTIES = [
     "where",
     "having",
     "nest",
+    "declare",
 ];
 const MODEL_PROPERTIES = ["source", "explore", "query", "sql"];
 class DocumentCompletionWalker {

package/dist/lang/parse-tree-walkers/explore-query-walker.d.ts

@@ -1,6 +1,6 @@
 import { CommonTokenStream } from "antlr4ts";
 import { ParseTree } from "antlr4ts/tree";
-import { MalloyListener } from "../lib/Malloy/MalloyListener";
+import { MalloyParserListener } from "../lib/Malloy/MalloyParserListener";
 declare type SimpleRange = [number | undefined, number | undefined];
 export interface FilterRef {
     text: string;
@@ -19,7 +19,7 @@ export interface ExploreClauseRef {
     filterLists: FilterList[];
     range: SimpleRange;
 }
-export declare class ExploreQueryWalker implements MalloyListener {
+export declare class ExploreQueryWalker implements MalloyParserListener {
     tokens: CommonTokenStream;
     exploreClauseRefs: ExploreClauseRef[];
     currentExploreClauseRef: ExploreClauseRef | undefined;

package/dist/lang/test/field-symbols.spec.js

@@ -25,7 +25,7 @@ describe("structdef comprehension", () => {
             type: "struct",
             name: "test",
             dialect: "standardsql",
-            structSource: { type: "table" },
+            structSource: { type: "table", tablePath: "test" },
             structRelationship: { type: "basetable", connectionName: "test" },
             fields: [field],
         };
@@ -122,7 +122,7 @@ describe("structdef comprehension", () => {
                     { type: "field", path: "t.a" },
                 ],
             },
-            structSource: { type: "table" },
+            structSource: { type: "table", tablePath: "t" },
             fields: [{ type: "string", name: "a" }],
         };
         const struct = mkStructDef(field);

package/dist/lang/test/parse.spec.js

@@ -1124,6 +1124,21 @@ describe("error handling", () => {
       }
     `).compileToFailWith("Output already has a field named 'astr'");
     });
+    test("rejoin a query is renamed", modelOK(`
+      source: querySrc is from(
+        table('malloytest.flights')->{
+          group_by: origin
+          nest: nested is { group_by: destination }
+        }
+      )
+
+    source: refineQuerySrc is querySrc {
+      join_one: rejoin is querySrc on 7=8
+      query: broken is {
+        group_by: rejoin.nested.destination
+      }
+    }
+    `));
 });
 function getSelectOneStruct(sqlBlock) {
     return {

package/dist/lang/test/test-translator.js

@@ -27,7 +27,7 @@ const mockSchema = {
         type: "struct",
         name: "aTable",
         dialect: "standardsql",
-        structSource: { type: "table" },
+        structSource: { type: "table", tablePath: "aTable" },
         structRelationship: { type: "basetable", connectionName: "test" },
         fields: [
             { type: "string", name: "astr" },

package/dist/malloy.d.ts

@@ -218,7 +218,7 @@ export declare class PreparedQuery {
     get preparedResult(): PreparedResult;
     get dialect(): string;
 }
-export declare function parseTableURL(tableURL: string): {
+export declare function parseTableURI(tableURI: string): {
     connectionName?: string;
     tablePath: string;
 };

package/dist/malloy.js

@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.parseTableURL = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
+exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.parseTableURI = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
 const lang_1 = require("./lang");
 const model_1 = require("./model");
 class Malloy {
@@ -99,7 +99,7 @@ class Malloy {
                     // collect tables by connection name since there may be multiple connections
                     const tablesByConnection = new Map();
                     for (const connectionTableString of result.tables) {
-                        const { connectionName } = parseTableURL(connectionTableString);
+                        const { connectionName } = parseTableURI(connectionTableString);
                         let connectionToTablesMap = tablesByConnection.get(connectionName);
                         if (!connectionToTablesMap) {
                             connectionToTablesMap = [connectionTableString];
@@ -136,6 +136,9 @@ class Malloy {
                     const sqlRefsByConnection = new Map();
                     for (const missingSQLSchemaRef of result.sqlStructs) {
                         const connectionName = missingSQLSchemaRef.connection;
+                        // if (connectionName === undefined) {
+                        //   throw new Error("Oops have not made it required here yet...");
+                        // }
                         let connectionToSQLReferencesMap = sqlRefsByConnection.get(connectionName);
                         if (!connectionToSQLReferencesMap) {
                             connectionToSQLReferencesMap = [missingSQLSchemaRef];
@@ -434,8 +437,8 @@ class PreparedQuery {
     }
 }
 exports.PreparedQuery = PreparedQuery;
-function parseTableURL(tableURL) {
-    const [firstPart, secondPart] = tableURL.split(":");
+function parseTableURI(tableURI) {
+    const [firstPart, secondPart] = tableURI.split(":");
     if (secondPart) {
         return { connectionName: firstPart, tablePath: secondPart };
     }
@@ -443,7 +446,7 @@ function parseTableURL(tableURL) {
         return { tablePath: firstPart };
     }
 }
-exports.parseTableURL = parseTableURL;
+exports.parseTableURI = parseTableURI;
 /**
  * A parsed Malloy document.
  */
@@ -2066,6 +2069,9 @@ class DataTimestamp extends ScalarData {
         if (this._value instanceof Date) {
             return this._value;
         }
+        else if (typeof this._value === "number") {
+            return new Date(super.value);
+        }
         else if (typeof this._value !== "string") {
             return new Date(this._value.value);
         }

package/dist/md5.d.ts

@@ -0,0 +1 @@
+export declare const md5: (val: string) => string;

package/dist/md5.js

@@ -0,0 +1,30 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.md5 = void 0;
+const crypto = __importStar(require("crypto"));
+const md5 = (val) => crypto.createHash("md5").update(val).digest("hex");
+exports.md5 = md5;
+//# sourceMappingURL=md5.js.map

package/dist/model/malloy_query.js

@@ -21,7 +21,6 @@ const standardsql_1 = require("../dialect/standardsql");
 const dialect_1 = require("../dialect");
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
-const malloy_1 = require("../malloy");
 const md5_1 = __importDefault(require("md5"));
 // quote a string for SQL use.  Perhaps should be in dialect.
 function generateSQLStringLiteral(sourceString) {
@@ -769,7 +768,7 @@ class FieldInstanceResult {
     addStructToJoin(qs, query, mayNeedUniqueKey, joinStack) {
         var _a;
         const name = qs.getIdentifier();
-        // we're already chasing the dependancy for this join.
+        // we're already chasing the dependency for this join.
         if (joinStack.indexOf(name) !== -1) {
             return;
         }
@@ -1576,8 +1575,7 @@ class QueryQuery extends QueryField {
                 type: "basetable",
                 connectionName: this.parent.connectionName,
             },
-            // structSource: {type: 'query', query: this.fieldDef}
-            structSource: { type: "table" },
+            structSource: { type: "query_result" },
             resultMetadata: this.getResultMetadata(this.rootResult),
             type: "struct",
         };
@@ -2359,7 +2357,7 @@ FROM ${resultStage}\n`);
                 type: "basetable",
                 connectionName: this.parent.connectionName,
             },
-            structSource: { type: "table" },
+            structSource: { type: "query_result" },
         };
     }
 }
@@ -2654,7 +2652,7 @@ class QueryStruct extends QueryNode {
     structSourceSQL(stageWriter) {
         switch (this.fieldDef.structSource.type) {
             case "table": {
-                const { tablePath } = (0, malloy_1.parseTableURL)(this.fieldDef.structSource.tablePath || this.fieldDef.name);
+                const tablePath = this.fieldDef.structSource.tablePath;
                 return this.dialect.quoteTablePath(tablePath);
             }
             case "sql":

package/dist/model/malloy_types.d.ts

@@ -389,7 +389,7 @@ interface SubquerySource {
 /** where does the struct come from? */
 export declare type StructSource = {
     type: "table";
-    tablePath?: string;
+    tablePath: string;
 } | {
     type: "nested";
 } | {
@@ -400,6 +400,8 @@ export declare type StructSource = {
 } | {
     type: "sql";
     method: "nested" | "lastStage";
+} | {
+    type: "query_result";
 } | SubquerySource;
 /** struct that is intrinsic to the table */
 export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "homepage": "https://github.com/looker-open-source/malloy#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/looker-open-source/malloy"
+  },
   "scripts": {
     "test": "jest --config=../../jest.config.js",
-    "build-parser": "cd src/lang/grammar && cross-os build-parser",
+    "build-parser": "node src/lang/grammar/build_parser.js",
     "testLang": "npm run test --testPathPattern=packages/malloy/src/lang",
     "clean": "rm -rf src/lang/lib",
     "build": "npm run build-parser && tsc --build",
@@ -15,23 +20,13 @@
   "dependencies": {
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
-    "blueimp-md5": "^2.19.0",
     "lodash": "^4.17.20",
     "luxon": "^1.26.0",
-    "md5": "^2.3.0",
-    "url": "^0.11.0"
+    "md5": "^2.3.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.165",
     "@types/luxon": "^1.26.4",
-    "antlr4ts-cli": "^0.5.0-alpha.4",
-    "path": "^0.12.7"
-  },
-  "cross-os": {
-    "build-parser": {
-      "darwin": "sh build-parser.sh",
-      "linux": "sh build-parser.sh",
-      "win32": "build-parser.cmd"
-    }
+    "antlr4ts-cli": "^0.5.0-alpha.4"
   }
 }

package/dist/dialect/dialect-map.d.ts

@@ -1,3 +0,0 @@
-import { Dialect } from "./dialect";
-export declare function getDialect(name: string): Dialect;
-export declare function registerDialect(d: Dialect): void;

package/dist/dialect/dialect-map.js

@@ -1,33 +0,0 @@
-"use strict";
-/*
- * Copyright 2021 Google LLC
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerDialect = exports.getDialect = void 0;
-const postgres_1 = require("./postgres");
-const standardsql_1 = require("./standardsql");
-const dialectMap = new Map();
-function getDialect(name) {
-    const d = dialectMap.get(name);
-    if (d === undefined) {
-        throw new Error(`Unknown Dialect ${name}`);
-    }
-    return d;
-}
-exports.getDialect = getDialect;
-function registerDialect(d) {
-    dialectMap.set(d.name, d);
-}
-exports.registerDialect = registerDialect;
-registerDialect(new postgres_1.PostgresDialect());
-registerDialect(new standardsql_1.StandardSQLDialect());
-//# sourceMappingURL=dialect-map.js.map