@malloydata/malloy 0.0.80-dev230906223653 → 0.0.80-dev230907131802

package/dist/lang/ast/elements/import-statement.d.ts

@@ -1,6 +1,17 @@
 import { ModelDataRequest } from '../../translate-response';
-import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
-export declare class ImportStatement extends MalloyElement implements DocStatement {
+import { DocStatement, Document, ListOf, MalloyElement } from '../types/malloy-element';
+export declare class ImportSourceName extends MalloyElement {
+    readonly text: string;
+    elementType: string;
+    constructor(text: string);
+}
+export declare class ImportSelect extends MalloyElement {
+    readonly text: string;
+    readonly from: ImportSourceName | undefined;
+    elementType: string;
+    constructor(text: string, from: ImportSourceName | undefined);
+}
+export declare class ImportStatement extends ListOf<ImportSelect> implements DocStatement {
     readonly url: string;
     elementType: string;
     fullURL?: string;

package/dist/lang/ast/elements/import-statement.js

@@ -22,9 +22,29 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportStatement = void 0;
+exports.ImportStatement = exports.ImportSelect = exports.ImportSourceName = void 0;
 const malloy_element_1 = require("../types/malloy-element");
-class ImportStatement extends malloy_element_1.MalloyElement {
+class ImportSourceName extends malloy_element_1.MalloyElement {
+    constructor(text) {
+        super();
+        this.text = text;
+        this.elementType = 'importSourceName';
+    }
+}
+exports.ImportSourceName = ImportSourceName;
+class ImportSelect extends malloy_element_1.MalloyElement {
+    constructor(text, from) {
+        super();
+        this.text = text;
+        this.from = from;
+        this.elementType = 'importName';
+        if (from) {
+            this.has({ from });
+        }
+    }
+}
+exports.ImportSelect = ImportSelect;
+class ImportStatement extends malloy_element_1.ListOf {
     /*
      * At the time of writng this comment, it is guaranteed that if an AST
      * node for an import statement is created, the translator has already
@@ -34,7 +54,7 @@ class ImportStatement extends malloy_element_1.MalloyElement {
      * there are other ways to contruct an AST.
      */
     constructor(url, baseURL) {
-        super();
+        super([]);
         this.url = url;
         this.elementType = 'import statement';
         try {
@@ -64,12 +84,35 @@ class ImportStatement extends malloy_element_1.MalloyElement {
         else if (this.fullURL) {
             const src = trans.root.importZone.getEntry(this.fullURL);
             if (src.status === 'present') {
-                for (const [importing, entry] of Object.entries(trans.getChildExports(this.fullURL))) {
-                    if (doc.getEntry(importing)) {
-                        this.log(`Cannot redefine '${importing}'`);
+                const importable = trans.getChildExports(this.fullURL);
+                if (this.notEmpty()) {
+                    // just import the named objects
+                    for (const importOne of this.list) {
+                        const fetchName = importOne.from || importOne;
+                        if (doc.getEntry(importOne.text)) {
+                            importOne.log(`Cannot redefine '${importOne.text}'`);
+                        }
+                        else if (importable[fetchName.text]) {
+                            const importMe = { ...importable[fetchName.text] };
+                            if (importOne.from) {
+                                importMe.as = importOne.text;
+                            }
+                            doc.setEntry(importOne.text, { entry: importMe, exported: false });
+                        }
+                        else {
+                            fetchName.log(`Cannot find '${fetchName.text}', not imported`);
+                        }
                     }
-                    else {
-                        doc.setEntry(importing, { entry, exported: false });
+                }
+                else {
+                    // import everything
+                    for (const [importing, entry] of Object.entries(trans.getChildExports(this.fullURL))) {
+                        if (doc.getEntry(importing)) {
+                            this.log(`Cannot redefine '${importing}'`);
+                        }
+                        else {
+                            doc.setEntry(importing, { entry, exported: false });
+                        }
                     }
                 }
             }

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

@@ -172,118 +172,120 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_sqlString = 11;
     static readonly RULE_sqlInterpolation = 12;
     static readonly RULE_importStatement = 13;
-    static readonly RULE_importURL = 14;
-    static readonly RULE_docAnnotations = 15;
-    static readonly RULE_ignoredObjectAnnotations = 16;
-    static readonly RULE_ignoredModelAnnotations = 17;
-    static readonly RULE_topLevelQueryDefs = 18;
-    static readonly RULE_topLevelQueryDef = 19;
-    static readonly RULE_refineOperator = 20;
-    static readonly RULE_queryRefinement = 21;
-    static readonly RULE_sourceExtension = 22;
-    static readonly RULE_query = 23;
-    static readonly RULE_unrefinableQuery = 24;
-    static readonly RULE_refinableQuery = 25;
-    static readonly RULE_unextendableSource = 26;
-    static readonly RULE_extendableSource = 27;
-    static readonly RULE_sqlSource = 28;
-    static readonly RULE_pipelineFromName = 29;
-    static readonly RULE_firstSegment = 30;
-    static readonly RULE_pipeElement = 31;
-    static readonly RULE_exploreTable = 32;
-    static readonly RULE_connectionId = 33;
-    static readonly RULE_queryProperties = 34;
-    static readonly RULE_filterShortcut = 35;
-    static readonly RULE_exploreQueryName = 36;
-    static readonly RULE_queryName = 37;
-    static readonly RULE_sourcePropertyList = 38;
-    static readonly RULE_sourceDefinition = 39;
-    static readonly RULE_explore = 40;
-    static readonly RULE_sourceNameDef = 41;
-    static readonly RULE_sourceID = 42;
-    static readonly RULE_exploreProperties = 43;
-    static readonly RULE_exploreStatement = 44;
-    static readonly RULE_defMeasures = 45;
-    static readonly RULE_defDimensions = 46;
-    static readonly RULE_renameList = 47;
-    static readonly RULE_exploreRenameDef = 48;
-    static readonly RULE_defList = 49;
-    static readonly RULE_fieldDef = 50;
-    static readonly RULE_fieldNameDef = 51;
-    static readonly RULE_joinNameDef = 52;
-    static readonly RULE_declareStatement = 53;
-    static readonly RULE_joinStatement = 54;
-    static readonly RULE_queryExtend = 55;
-    static readonly RULE_queryExtendStatement = 56;
-    static readonly RULE_queryExtendStatementList = 57;
-    static readonly RULE_joinList = 58;
-    static readonly RULE_isExplore = 59;
-    static readonly RULE_joinDef = 60;
-    static readonly RULE_joinExpression = 61;
-    static readonly RULE_filterStatement = 62;
-    static readonly RULE_filteredBy = 63;
-    static readonly RULE_filterClauseList = 64;
-    static readonly RULE_whereStatement = 65;
-    static readonly RULE_havingStatement = 66;
-    static readonly RULE_subQueryDefList = 67;
-    static readonly RULE_exploreQueryNameDef = 68;
-    static readonly RULE_exploreQueryDef = 69;
-    static readonly RULE_queryStatement = 70;
-    static readonly RULE_queryJoinStatement = 71;
-    static readonly RULE_groupByStatement = 72;
-    static readonly RULE_queryFieldList = 73;
-    static readonly RULE_queryFieldEntry = 74;
-    static readonly RULE_nestStatement = 75;
-    static readonly RULE_nestedQueryList = 76;
-    static readonly RULE_nestEntry = 77;
-    static readonly RULE_aggregateStatement = 78;
-    static readonly RULE_calculateStatement = 79;
-    static readonly RULE_projectStatement = 80;
-    static readonly RULE_orderByStatement = 81;
-    static readonly RULE_ordering = 82;
-    static readonly RULE_orderBySpec = 83;
-    static readonly RULE_limitStatement = 84;
-    static readonly RULE_bySpec = 85;
-    static readonly RULE_topStatement = 86;
-    static readonly RULE_indexElement = 87;
-    static readonly RULE_indexFields = 88;
-    static readonly RULE_indexStatement = 89;
-    static readonly RULE_sampleStatement = 90;
-    static readonly RULE_timezoneStatement = 91;
-    static readonly RULE_queryAnnotation = 92;
-    static readonly RULE_sampleSpec = 93;
-    static readonly RULE_aggregate = 94;
-    static readonly RULE_malloyType = 95;
-    static readonly RULE_compareOp = 96;
-    static readonly RULE_string = 97;
-    static readonly RULE_shortString = 98;
-    static readonly RULE_numericLiteral = 99;
-    static readonly RULE_literal = 100;
-    static readonly RULE_dateLiteral = 101;
-    static readonly RULE_tablePath = 102;
-    static readonly RULE_tableURI = 103;
-    static readonly RULE_id = 104;
-    static readonly RULE_timeframe = 105;
-    static readonly RULE_ungroup = 106;
-    static readonly RULE_malloyOrSQLType = 107;
-    static readonly RULE_fieldExpr = 108;
-    static readonly RULE_partialAllowedFieldExpr = 109;
-    static readonly RULE_pickStatement = 110;
-    static readonly RULE_pick = 111;
-    static readonly RULE_argumentList = 112;
-    static readonly RULE_fieldNameList = 113;
-    static readonly RULE_fieldCollection = 114;
-    static readonly RULE_collectionWildCard = 115;
-    static readonly RULE_taggedRef = 116;
-    static readonly RULE_refExpr = 117;
-    static readonly RULE_collectionMember = 118;
-    static readonly RULE_fieldPath = 119;
-    static readonly RULE_joinName = 120;
-    static readonly RULE_fieldName = 121;
-    static readonly RULE_justExpr = 122;
-    static readonly RULE_sqlExploreNameRef = 123;
-    static readonly RULE_nameSQLBlock = 124;
-    static readonly RULE_connectionName = 125;
+    static readonly RULE_importSelect = 14;
+    static readonly RULE_importItem = 15;
+    static readonly RULE_importURL = 16;
+    static readonly RULE_docAnnotations = 17;
+    static readonly RULE_ignoredObjectAnnotations = 18;
+    static readonly RULE_ignoredModelAnnotations = 19;
+    static readonly RULE_topLevelQueryDefs = 20;
+    static readonly RULE_topLevelQueryDef = 21;
+    static readonly RULE_refineOperator = 22;
+    static readonly RULE_queryRefinement = 23;
+    static readonly RULE_sourceExtension = 24;
+    static readonly RULE_query = 25;
+    static readonly RULE_unrefinableQuery = 26;
+    static readonly RULE_refinableQuery = 27;
+    static readonly RULE_unextendableSource = 28;
+    static readonly RULE_extendableSource = 29;
+    static readonly RULE_sqlSource = 30;
+    static readonly RULE_pipelineFromName = 31;
+    static readonly RULE_firstSegment = 32;
+    static readonly RULE_pipeElement = 33;
+    static readonly RULE_exploreTable = 34;
+    static readonly RULE_connectionId = 35;
+    static readonly RULE_queryProperties = 36;
+    static readonly RULE_filterShortcut = 37;
+    static readonly RULE_exploreQueryName = 38;
+    static readonly RULE_queryName = 39;
+    static readonly RULE_sourcePropertyList = 40;
+    static readonly RULE_sourceDefinition = 41;
+    static readonly RULE_explore = 42;
+    static readonly RULE_sourceNameDef = 43;
+    static readonly RULE_sourceID = 44;
+    static readonly RULE_exploreProperties = 45;
+    static readonly RULE_exploreStatement = 46;
+    static readonly RULE_defMeasures = 47;
+    static readonly RULE_defDimensions = 48;
+    static readonly RULE_renameList = 49;
+    static readonly RULE_exploreRenameDef = 50;
+    static readonly RULE_defList = 51;
+    static readonly RULE_fieldDef = 52;
+    static readonly RULE_fieldNameDef = 53;
+    static readonly RULE_joinNameDef = 54;
+    static readonly RULE_declareStatement = 55;
+    static readonly RULE_joinStatement = 56;
+    static readonly RULE_queryExtend = 57;
+    static readonly RULE_queryExtendStatement = 58;
+    static readonly RULE_queryExtendStatementList = 59;
+    static readonly RULE_joinList = 60;
+    static readonly RULE_isExplore = 61;
+    static readonly RULE_joinDef = 62;
+    static readonly RULE_joinExpression = 63;
+    static readonly RULE_filterStatement = 64;
+    static readonly RULE_filteredBy = 65;
+    static readonly RULE_filterClauseList = 66;
+    static readonly RULE_whereStatement = 67;
+    static readonly RULE_havingStatement = 68;
+    static readonly RULE_subQueryDefList = 69;
+    static readonly RULE_exploreQueryNameDef = 70;
+    static readonly RULE_exploreQueryDef = 71;
+    static readonly RULE_queryStatement = 72;
+    static readonly RULE_queryJoinStatement = 73;
+    static readonly RULE_groupByStatement = 74;
+    static readonly RULE_queryFieldList = 75;
+    static readonly RULE_queryFieldEntry = 76;
+    static readonly RULE_nestStatement = 77;
+    static readonly RULE_nestedQueryList = 78;
+    static readonly RULE_nestEntry = 79;
+    static readonly RULE_aggregateStatement = 80;
+    static readonly RULE_calculateStatement = 81;
+    static readonly RULE_projectStatement = 82;
+    static readonly RULE_orderByStatement = 83;
+    static readonly RULE_ordering = 84;
+    static readonly RULE_orderBySpec = 85;
+    static readonly RULE_limitStatement = 86;
+    static readonly RULE_bySpec = 87;
+    static readonly RULE_topStatement = 88;
+    static readonly RULE_indexElement = 89;
+    static readonly RULE_indexFields = 90;
+    static readonly RULE_indexStatement = 91;
+    static readonly RULE_sampleStatement = 92;
+    static readonly RULE_timezoneStatement = 93;
+    static readonly RULE_queryAnnotation = 94;
+    static readonly RULE_sampleSpec = 95;
+    static readonly RULE_aggregate = 96;
+    static readonly RULE_malloyType = 97;
+    static readonly RULE_compareOp = 98;
+    static readonly RULE_string = 99;
+    static readonly RULE_shortString = 100;
+    static readonly RULE_numericLiteral = 101;
+    static readonly RULE_literal = 102;
+    static readonly RULE_dateLiteral = 103;
+    static readonly RULE_tablePath = 104;
+    static readonly RULE_tableURI = 105;
+    static readonly RULE_id = 106;
+    static readonly RULE_timeframe = 107;
+    static readonly RULE_ungroup = 108;
+    static readonly RULE_malloyOrSQLType = 109;
+    static readonly RULE_fieldExpr = 110;
+    static readonly RULE_partialAllowedFieldExpr = 111;
+    static readonly RULE_pickStatement = 112;
+    static readonly RULE_pick = 113;
+    static readonly RULE_argumentList = 114;
+    static readonly RULE_fieldNameList = 115;
+    static readonly RULE_fieldCollection = 116;
+    static readonly RULE_collectionWildCard = 117;
+    static readonly RULE_taggedRef = 118;
+    static readonly RULE_refExpr = 119;
+    static readonly RULE_collectionMember = 120;
+    static readonly RULE_fieldPath = 121;
+    static readonly RULE_joinName = 122;
+    static readonly RULE_fieldName = 123;
+    static readonly RULE_justExpr = 124;
+    static readonly RULE_sqlExploreNameRef = 125;
+    static readonly RULE_nameSQLBlock = 126;
+    static readonly RULE_connectionName = 127;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -308,6 +310,8 @@ export declare class MalloyParser extends Parser {
     sqlString(): SqlStringContext;
     sqlInterpolation(): SqlInterpolationContext;
     importStatement(): ImportStatementContext;
+    importSelect(): ImportSelectContext;
+    importItem(): ImportItemContext;
     importURL(): ImportURLContext;
     docAnnotations(): DocAnnotationsContext;
     ignoredObjectAnnotations(): IgnoredObjectAnnotationsContext;
@@ -589,6 +593,31 @@ export declare class SqlInterpolationContext extends ParserRuleContext {
 export declare class ImportStatementContext extends ParserRuleContext {
     IMPORT(): TerminalNode;
     importURL(): ImportURLContext;
+    importSelect(): ImportSelectContext | undefined;
+    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 ImportSelectContext extends ParserRuleContext {
+    OCURLY(): TerminalNode;
+    importItem(): ImportItemContext[];
+    importItem(i: number): ImportItemContext;
+    CCURLY(): TerminalNode;
+    FROM(): TerminalNode;
+    COMMA(): TerminalNode[];
+    COMMA(i: number): 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 ImportItemContext extends ParserRuleContext {
+    id(): IdContext[];
+    id(i: number): IdContext;
+    IS(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
@@ -740,8 +769,9 @@ export declare class QueryByNameContext extends RefinableQueryContext {
 }
 export declare class QueryByTurtleNameContext extends RefinableQueryContext {
     unextendableSource(): UnextendableSourceContext;
-    ARROW(): TerminalNode;
     id(): IdContext;
+    ARROW(): TerminalNode | undefined;
+    DOT(): TerminalNode | undefined;
     constructor(ctx: RefinableQueryContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;