@malloydata/malloy 0.0.48 → 0.0.49-dev230626192330

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStruct
 export { Segment, isFilteredAliasedName, flattenQuery, expressionIsCalculation, } from './model';
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
-export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, parseTableURI, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';
+export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';
 export type { Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, } from './malloy';
 export type { RunSQLOptions } from './run_sql_options';
 export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';

package/dist/index.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tags = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.parseTableURI = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
+exports.Tags = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
 var model_1 = require("./model");
 // Used in Composer Demo
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return model_1.Segment; } });
@@ -49,7 +49,6 @@ Object.defineProperty(exports, "SourceRelationship", { enumerable: true, get: fu
 Object.defineProperty(exports, "DateTimeframe", { enumerable: true, get: function () { return malloy_1.DateTimeframe; } });
 Object.defineProperty(exports, "TimestampTimeframe", { enumerable: true, get: function () { return malloy_1.TimestampTimeframe; } });
 Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return malloy_1.Result; } });
-Object.defineProperty(exports, "parseTableURI", { enumerable: true, get: function () { return malloy_1.parseTableURI; } });
 Object.defineProperty(exports, "QueryMaterializer", { enumerable: true, get: function () { return malloy_1.QueryMaterializer; } });
 Object.defineProperty(exports, "CSVWriter", { enumerable: true, get: function () { return malloy_1.CSVWriter; } });
 Object.defineProperty(exports, "JSONWriter", { enumerable: true, get: function () { return malloy_1.JSONWriter; } });

package/dist/lang/ast/expressions/expr-func.js

@@ -79,12 +79,6 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         if (func.name !== this.name) {
             this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
         }
-        if (func.name !== this.name) {
-            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
-        }
-        if (func.name !== this.name) {
-            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
-        }
         // Find the 'implicit argument' for aggregate functions called like `some_join.some_field.agg(...args)`
         // where the full arg list is `(some_field, ...args)`.
         let implicitExpr = undefined;

package/dist/lang/ast/sources/named-source.js

@@ -81,6 +81,10 @@ class NamedSource extends source_1.Source {
             this.log(`Cannot construct a source from a function '${this.refName}`);
             return;
         }
+        else if (entry.type === 'connection') {
+            this.log(`Cannot construct a source from a connection '${this.refName}`);
+            return;
+        }
         else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
             this.log(`Must use 'from_sql()' for sql source '${this.refName}`);
             return;

package/dist/lang/ast/sources/sql-source.js

@@ -48,6 +48,10 @@ class SQLSource extends named_source_1.NamedSource {
             this.log(`Cannot use 'from_sql()' with a query '${this.refName}'`);
             return;
         }
+        else if (entry.type === 'connection') {
+            this.log(`Cannot use 'from_sql()' with a connection '${this.refName}'`);
+            return;
+        }
         else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { declaredSQLBlock, ...newEntry } = entry;

package/dist/lang/ast/sources/table-source.d.ts

@@ -1,8 +1,25 @@
 import { StructDef } from '../../../model/malloy_types';
 import { Source } from '../elements/source';
-export declare class TableSource extends Source {
-    readonly name: string;
-    elementType: string;
-    constructor(name: string);
+import { ModelEntryReference } from '../types/malloy-element';
+declare type TableInfo = {
+    tablePath: string;
+    connectionName?: string | undefined;
+};
+export declare abstract class TableSource extends Source {
+    abstract getTableInfo(): TableInfo | undefined;
     structDef(): StructDef;
 }
+export declare class TableMethodSource extends TableSource {
+    readonly connectionName: ModelEntryReference;
+    readonly tablePath: string;
+    elementType: string;
+    constructor(connectionName: ModelEntryReference, tablePath: string);
+    getTableInfo(): TableInfo | undefined;
+}
+export declare class TableFunctionSource extends TableSource {
+    readonly tableURI: string;
+    elementType: string;
+    constructor(tableURI: string);
+    getTableInfo(): TableInfo | undefined;
+}
+export {};

package/dist/lang/ast/sources/table-source.js

@@ -22,19 +22,21 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableSource = void 0;
+exports.TableFunctionSource = exports.TableMethodSource = exports.TableSource = void 0;
+const find_external_references_1 = require("../../parse-tree-walkers/find-external-references");
 const source_1 = require("../elements/source");
 const error_factory_1 = require("../error-factory");
 class TableSource extends source_1.Source {
-    constructor(name) {
-        super();
-        this.name = name;
-        this.elementType = 'tableSource';
-    }
     structDef() {
         var _a;
-        const tableDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.schemaZone.getEntry(this.name);
-        let msg = `Schema read failure for table '${this.name}'`;
+        const info = this.getTableInfo();
+        if (info === undefined) {
+            return error_factory_1.ErrorFactory.structDef;
+        }
+        const { tablePath, connectionName } = info;
+        const key = (0, find_external_references_1.constructTableKey)(connectionName, tablePath);
+        const tableDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.schemaZone.getEntry(key);
+        let msg = `Schema read failure for table '${tablePath}' for connection '${connectionName}'`;
         if (tableDefEntry) {
             if (tableDefEntry.status === 'present') {
                 tableDefEntry.value.location = this.location;
@@ -59,4 +61,43 @@ class TableSource extends source_1.Source {
     }
 }
 exports.TableSource = TableSource;
+class TableMethodSource extends TableSource {
+    constructor(connectionName, tablePath) {
+        super();
+        this.connectionName = connectionName;
+        this.tablePath = tablePath;
+        this.elementType = 'tableMethodSource';
+        this.has({ connectionName });
+    }
+    getTableInfo() {
+        var _a;
+        const connection = this.modelEntry(this.connectionName);
+        const name = this.connectionName.refString;
+        if (connection === undefined) {
+            (_a = this.namespace()) === null || _a === void 0 ? void 0 : _a.setEntry(name, { entry: { type: 'connection', name }, exported: true }, true);
+        }
+        else if (connection.entry.type !== 'connection') {
+            this.connectionName.log(`${this.connectionName.refString} is not a connection`);
+            return undefined;
+        }
+        return {
+            tablePath: this.tablePath,
+            connectionName: this.connectionName.refString,
+        };
+    }
+}
+exports.TableMethodSource = TableMethodSource;
+class TableFunctionSource extends TableSource {
+    constructor(tableURI) {
+        super();
+        this.tableURI = tableURI;
+        this.elementType = 'tableFunctionSource';
+    }
+    getTableInfo() {
+        // This use of `deprecatedParseTableURI` is ok because it is for handling the
+        // old, soon-to-be-deprecated table syntax.
+        return (0, find_external_references_1.deprecatedParseTableURI)(this.tableURI);
+    }
+}
+exports.TableFunctionSource = TableFunctionSource;
 //# sourceMappingURL=table-source.js.map

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

@@ -181,99 +181,101 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_firstSegment = 23;
     static readonly RULE_pipeElement = 24;
     static readonly RULE_exploreTable = 25;
-    static readonly RULE_queryProperties = 26;
-    static readonly RULE_filterShortcut = 27;
-    static readonly RULE_exploreQueryName = 28;
-    static readonly RULE_queryName = 29;
-    static readonly RULE_sourcePropertyList = 30;
-    static readonly RULE_sourceDefinition = 31;
-    static readonly RULE_explore = 32;
-    static readonly RULE_exploreSource = 33;
-    static readonly RULE_sourceNameDef = 34;
-    static readonly RULE_sourceID = 35;
-    static readonly RULE_exploreProperties = 36;
-    static readonly RULE_exploreStatement = 37;
-    static readonly RULE_defMeasures = 38;
-    static readonly RULE_defDimensions = 39;
-    static readonly RULE_renameList = 40;
-    static readonly RULE_exploreRenameDef = 41;
-    static readonly RULE_defList = 42;
-    static readonly RULE_fieldDef = 43;
-    static readonly RULE_fieldNameDef = 44;
-    static readonly RULE_joinNameDef = 45;
-    static readonly RULE_declareStatement = 46;
-    static readonly RULE_joinStatement = 47;
-    static readonly RULE_queryExtend = 48;
-    static readonly RULE_queryExtendStatement = 49;
-    static readonly RULE_queryExtendStatementList = 50;
-    static readonly RULE_joinList = 51;
-    static readonly RULE_isExplore = 52;
-    static readonly RULE_joinDef = 53;
-    static readonly RULE_joinExpression = 54;
-    static readonly RULE_filterStatement = 55;
-    static readonly RULE_filteredBy = 56;
-    static readonly RULE_filterClauseList = 57;
-    static readonly RULE_whereStatement = 58;
-    static readonly RULE_havingStatement = 59;
-    static readonly RULE_subQueryDefList = 60;
-    static readonly RULE_exploreQueryNameDef = 61;
-    static readonly RULE_exploreQueryDef = 62;
-    static readonly RULE_queryStatement = 63;
-    static readonly RULE_queryJoinStatement = 64;
-    static readonly RULE_groupByStatement = 65;
-    static readonly RULE_queryFieldList = 66;
-    static readonly RULE_queryFieldEntry = 67;
-    static readonly RULE_nestStatement = 68;
-    static readonly RULE_nestedQueryList = 69;
-    static readonly RULE_nestEntry = 70;
-    static readonly RULE_aggregateStatement = 71;
-    static readonly RULE_calculateStatement = 72;
-    static readonly RULE_projectStatement = 73;
-    static readonly RULE_orderByStatement = 74;
-    static readonly RULE_ordering = 75;
-    static readonly RULE_orderBySpec = 76;
-    static readonly RULE_limitStatement = 77;
-    static readonly RULE_bySpec = 78;
-    static readonly RULE_topStatement = 79;
-    static readonly RULE_indexElement = 80;
-    static readonly RULE_indexFields = 81;
-    static readonly RULE_indexStatement = 82;
-    static readonly RULE_sampleStatement = 83;
-    static readonly RULE_timezoneStatement = 84;
-    static readonly RULE_timezoneName = 85;
-    static readonly RULE_queryAnnotation = 86;
-    static readonly RULE_sampleSpec = 87;
-    static readonly RULE_aggregate = 88;
-    static readonly RULE_malloyType = 89;
-    static readonly RULE_compareOp = 90;
-    static readonly RULE_literal = 91;
-    static readonly RULE_dateLiteral = 92;
-    static readonly RULE_tableName = 93;
-    static readonly RULE_id = 94;
-    static readonly RULE_timeframe = 95;
-    static readonly RULE_ungroup = 96;
-    static readonly RULE_fieldExpr = 97;
-    static readonly RULE_partialAllowedFieldExpr = 98;
-    static readonly RULE_pickStatement = 99;
-    static readonly RULE_pick = 100;
-    static readonly RULE_argumentList = 101;
-    static readonly RULE_fieldNameList = 102;
-    static readonly RULE_fieldCollection = 103;
-    static readonly RULE_collectionWildCard = 104;
-    static readonly RULE_taggedRef = 105;
-    static readonly RULE_collectionMember = 106;
-    static readonly RULE_fieldPath = 107;
-    static readonly RULE_joinName = 108;
-    static readonly RULE_fieldName = 109;
-    static readonly RULE_justExpr = 110;
-    static readonly RULE_json = 111;
-    static readonly RULE_jsonValue = 112;
-    static readonly RULE_jsonObject = 113;
-    static readonly RULE_jsonProperty = 114;
-    static readonly RULE_jsonArray = 115;
-    static readonly RULE_sqlExploreNameRef = 116;
-    static readonly RULE_nameSQLBlock = 117;
-    static readonly RULE_connectionName = 118;
+    static readonly RULE_connectionId = 26;
+    static readonly RULE_queryProperties = 27;
+    static readonly RULE_filterShortcut = 28;
+    static readonly RULE_exploreQueryName = 29;
+    static readonly RULE_queryName = 30;
+    static readonly RULE_sourcePropertyList = 31;
+    static readonly RULE_sourceDefinition = 32;
+    static readonly RULE_explore = 33;
+    static readonly RULE_exploreSource = 34;
+    static readonly RULE_sourceNameDef = 35;
+    static readonly RULE_sourceID = 36;
+    static readonly RULE_exploreProperties = 37;
+    static readonly RULE_exploreStatement = 38;
+    static readonly RULE_defMeasures = 39;
+    static readonly RULE_defDimensions = 40;
+    static readonly RULE_renameList = 41;
+    static readonly RULE_exploreRenameDef = 42;
+    static readonly RULE_defList = 43;
+    static readonly RULE_fieldDef = 44;
+    static readonly RULE_fieldNameDef = 45;
+    static readonly RULE_joinNameDef = 46;
+    static readonly RULE_declareStatement = 47;
+    static readonly RULE_joinStatement = 48;
+    static readonly RULE_queryExtend = 49;
+    static readonly RULE_queryExtendStatement = 50;
+    static readonly RULE_queryExtendStatementList = 51;
+    static readonly RULE_joinList = 52;
+    static readonly RULE_isExplore = 53;
+    static readonly RULE_joinDef = 54;
+    static readonly RULE_joinExpression = 55;
+    static readonly RULE_filterStatement = 56;
+    static readonly RULE_filteredBy = 57;
+    static readonly RULE_filterClauseList = 58;
+    static readonly RULE_whereStatement = 59;
+    static readonly RULE_havingStatement = 60;
+    static readonly RULE_subQueryDefList = 61;
+    static readonly RULE_exploreQueryNameDef = 62;
+    static readonly RULE_exploreQueryDef = 63;
+    static readonly RULE_queryStatement = 64;
+    static readonly RULE_queryJoinStatement = 65;
+    static readonly RULE_groupByStatement = 66;
+    static readonly RULE_queryFieldList = 67;
+    static readonly RULE_queryFieldEntry = 68;
+    static readonly RULE_nestStatement = 69;
+    static readonly RULE_nestedQueryList = 70;
+    static readonly RULE_nestEntry = 71;
+    static readonly RULE_aggregateStatement = 72;
+    static readonly RULE_calculateStatement = 73;
+    static readonly RULE_projectStatement = 74;
+    static readonly RULE_orderByStatement = 75;
+    static readonly RULE_ordering = 76;
+    static readonly RULE_orderBySpec = 77;
+    static readonly RULE_limitStatement = 78;
+    static readonly RULE_bySpec = 79;
+    static readonly RULE_topStatement = 80;
+    static readonly RULE_indexElement = 81;
+    static readonly RULE_indexFields = 82;
+    static readonly RULE_indexStatement = 83;
+    static readonly RULE_sampleStatement = 84;
+    static readonly RULE_timezoneStatement = 85;
+    static readonly RULE_timezoneName = 86;
+    static readonly RULE_queryAnnotation = 87;
+    static readonly RULE_sampleSpec = 88;
+    static readonly RULE_aggregate = 89;
+    static readonly RULE_malloyType = 90;
+    static readonly RULE_compareOp = 91;
+    static readonly RULE_literal = 92;
+    static readonly RULE_dateLiteral = 93;
+    static readonly RULE_tablePath = 94;
+    static readonly RULE_tableURI = 95;
+    static readonly RULE_id = 96;
+    static readonly RULE_timeframe = 97;
+    static readonly RULE_ungroup = 98;
+    static readonly RULE_fieldExpr = 99;
+    static readonly RULE_partialAllowedFieldExpr = 100;
+    static readonly RULE_pickStatement = 101;
+    static readonly RULE_pick = 102;
+    static readonly RULE_argumentList = 103;
+    static readonly RULE_fieldNameList = 104;
+    static readonly RULE_fieldCollection = 105;
+    static readonly RULE_collectionWildCard = 106;
+    static readonly RULE_taggedRef = 107;
+    static readonly RULE_collectionMember = 108;
+    static readonly RULE_fieldPath = 109;
+    static readonly RULE_joinName = 110;
+    static readonly RULE_fieldName = 111;
+    static readonly RULE_justExpr = 112;
+    static readonly RULE_json = 113;
+    static readonly RULE_jsonValue = 114;
+    static readonly RULE_jsonObject = 115;
+    static readonly RULE_jsonProperty = 116;
+    static readonly RULE_jsonArray = 117;
+    static readonly RULE_sqlExploreNameRef = 118;
+    static readonly RULE_nameSQLBlock = 119;
+    static readonly RULE_connectionName = 120;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -310,6 +312,7 @@ export declare class MalloyParser extends Parser {
     firstSegment(): FirstSegmentContext;
     pipeElement(): PipeElementContext;
     exploreTable(): ExploreTableContext;
+    connectionId(): ConnectionIdContext;
     queryProperties(): QueryPropertiesContext;
     filterShortcut(): FilterShortcutContext;
     exploreQueryName(): ExploreQueryNameContext;
@@ -377,7 +380,8 @@ export declare class MalloyParser extends Parser {
     compareOp(): CompareOpContext;
     literal(): LiteralContext;
     dateLiteral(): DateLiteralContext;
-    tableName(): TableNameContext;
+    tablePath(): TablePathContext;
+    tableURI(): TableURIContext;
     id(): IdContext;
     timeframe(): TimeframeContext;
     ungroup(): UngroupContext;
@@ -712,10 +716,34 @@ export declare class PipeElementContext extends ParserRuleContext {
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreTableContext extends ParserRuleContext {
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    copyFrom(ctx: ExploreTableContext): void;
+}
+export declare class TableFunctionContext extends ExploreTableContext {
+    TABLE(): TerminalNode;
+    OPAREN(): TerminalNode;
+    tableURI(): TableURIContext;
+    CPAREN(): TerminalNode;
+    constructor(ctx: ExploreTableContext);
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
+export declare class TableMethodContext extends ExploreTableContext {
+    connectionId(): ConnectionIdContext;
+    DOT(): TerminalNode;
     TABLE(): TerminalNode;
     OPAREN(): TerminalNode;
-    tableName(): TableNameContext;
+    tablePath(): TablePathContext;
     CPAREN(): TerminalNode;
+    constructor(ctx: ExploreTableContext);
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
+export declare class ConnectionIdContext extends ParserRuleContext {
+    id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
@@ -1688,7 +1716,15 @@ export declare class LiteralYearContext extends DateLiteralContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class TableNameContext extends ParserRuleContext {
+export declare class TablePathContext extends ParserRuleContext {
+    STRING_LITERAL(): TerminalNode;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
+export declare class TableURIContext extends ParserRuleContext {
     STRING_LITERAL(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;