@malloydata/malloy 0.0.398 → 0.0.399

package/dist/lang/ast/index.d.ts

@@ -67,6 +67,7 @@ export * from './expressions/range';
 export * from './expressions/time-frame';
 export * from './expressions/unary';
 export * from './statements/import-statement';
+export * from './statements/export-statement';
 export * from './query-properties/extend';
 export * from './parameters/argument';
 export * from './parameters/has-parameter';

package/dist/lang/ast/index.js

@@ -105,6 +105,7 @@ __exportStar(require("./expressions/range"), exports);
 __exportStar(require("./expressions/time-frame"), exports);
 __exportStar(require("./expressions/unary"), exports);
 __exportStar(require("./statements/import-statement"), exports);
+__exportStar(require("./statements/export-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./parameters/argument"), exports);
 __exportStar(require("./parameters/has-parameter"), exports);

package/dist/lang/ast/statements/export-statement.d.ts

@@ -0,0 +1,12 @@
+import type { DocStatement, Document } from '../types/malloy-element';
+import { ListOf, MalloyElement } from '../types/malloy-element';
+export declare class ExportItem extends MalloyElement {
+    readonly name: string;
+    elementType: string;
+    constructor(name: string);
+}
+export declare class ExportStatement extends ListOf<ExportItem> implements DocStatement {
+    elementType: string;
+    constructor(items: ExportItem[]);
+    execute(doc: Document): void;
+}

package/dist/lang/ast/statements/export-statement.js

@@ -0,0 +1,53 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportStatement = exports.ExportItem = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const malloy_element_1 = require("../types/malloy-element");
+class ExportItem extends malloy_element_1.MalloyElement {
+    constructor(name) {
+        super();
+        this.name = name;
+        this.elementType = 'exportItem';
+    }
+}
+exports.ExportItem = ExportItem;
+class ExportStatement extends malloy_element_1.ListOf {
+    constructor(items) {
+        super(items);
+        this.elementType = 'export statement';
+    }
+    execute(doc) {
+        if (doc.explicitExports === undefined) {
+            doc.explicitExports = new Set();
+        }
+        const explicit = doc.explicitExports;
+        for (const item of this.list) {
+            const name = item.name;
+            if (explicit.has(name)) {
+                item.logError('duplicate-export-name', `'${name}' already appears in an export statement`);
+                continue;
+            }
+            const entry = doc.documentModel.get(name);
+            if (entry === undefined) {
+                item.logError('export-name-not-defined', `Cannot export '${name}': no such definition above this statement`);
+                continue;
+            }
+            const def = entry.entry;
+            const exportable = (0, malloy_types_1.isSourceDef)(def) ||
+                def.type === 'query' ||
+                def.type === 'userType' ||
+                def.type === 'given';
+            if (!exportable) {
+                item.logError('export-name-not-exportable', `Cannot export '${name}': only sources, queries, given declarations, and user types may be exported`);
+                continue;
+            }
+            explicit.add(name);
+        }
+    }
+}
+exports.ExportStatement = ExportStatement;
+//# sourceMappingURL=export-statement.js.map

package/dist/lang/ast/types/malloy-element.d.ts

@@ -111,6 +111,7 @@ export declare class Document extends MalloyElement implements NameSpace {
     documentModel: Map<string, ModelEntry>;
     documentSrcRegistry: Record<SourceID, SourceRegistryValue>;
     documentGivens: Map<string, Given>;
+    explicitExports: Set<string> | undefined;
     queryList: Query[];
     statements: DocStatementList;
     didInitModel: boolean;

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

@@ -477,6 +477,7 @@ class Document extends MalloyElement {
         this.documentModel = new Map();
         this.documentSrcRegistry = {};
         this.documentGivens = new Map();
+        this.explicitExports = undefined;
         this.queryList = [];
         if (extendingModelDef) {
             if (extendingModelDef.annotation) {
@@ -623,12 +624,14 @@ class Document extends MalloyElement {
         if (this.hasAnnotation()) {
             def.annotation = this.currentModelAnnotation();
         }
+        const explicit = this.explicitExports;
+        const isExported = (name, modelEntry) => explicit ? explicit.has(name) : modelEntry.exported === true;
         for (const [name, modelEntry] of this.documentModel) {
             const entryDef = modelEntry.entry;
             if ((0, malloy_types_1.isSourceDef)(entryDef) ||
                 entryDef.type === 'query' ||
                 entryDef.type === 'userType') {
-                if (modelEntry.exported) {
+                if (isExported(name, modelEntry)) {
                     def.exports.push(name);
                 }
                 if (entryDef.type === 'userType') {
@@ -643,7 +646,7 @@ class Document extends MalloyElement {
                 }
             }
             else if (entryDef.type === 'given') {
-                if (modelEntry.exported) {
+                if (isExported(name, modelEntry)) {
                     def.exports.push(name);
                 }
                 def.contents[name] = { ...entryDef };

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

@@ -62,129 +62,130 @@ export declare class MalloyLexer extends Lexer {
     static readonly ELSE = 56;
     static readonly END = 57;
     static readonly EXCLUDE = 58;
-    static readonly EXTEND = 59;
-    static readonly FALSE = 60;
-    static readonly FILTER = 61;
-    static readonly FULL = 62;
-    static readonly FOR = 63;
-    static readonly FROM = 64;
-    static readonly HAS = 65;
-    static readonly HOUR = 66;
-    static readonly IMPORT = 67;
-    static readonly INCLUDE = 68;
-    static readonly INNER = 69;
-    static readonly IS = 70;
-    static readonly IN = 71;
-    static readonly INTERNAL_KW = 72;
-    static readonly JSON = 73;
-    static readonly LAST = 74;
-    static readonly LEFT = 75;
-    static readonly LIKE = 76;
-    static readonly MAX = 77;
-    static readonly MIN = 78;
-    static readonly MINUTE = 79;
-    static readonly MONTH = 80;
-    static readonly NOT = 81;
-    static readonly NOW = 82;
-    static readonly NULL = 83;
-    static readonly NUMBER = 84;
-    static readonly ON = 85;
-    static readonly OR = 86;
-    static readonly PICK = 87;
-    static readonly PRIVATE_KW = 88;
-    static readonly PUBLIC_KW = 89;
-    static readonly QUARTER = 90;
-    static readonly RIGHT = 91;
-    static readonly SECOND = 92;
-    static readonly STRING = 93;
-    static readonly SOURCE_KW = 94;
-    static readonly SUM = 95;
-    static readonly SQL = 96;
-    static readonly TABLE = 97;
-    static readonly THEN = 98;
-    static readonly THIS = 99;
-    static readonly TIMESTAMPTZ = 100;
-    static readonly TIMESTAMP = 101;
-    static readonly TO = 102;
-    static readonly TRUE = 103;
-    static readonly TURTLE = 104;
-    static readonly WEEK = 105;
-    static readonly WHEN = 106;
-    static readonly WITH = 107;
-    static readonly YEAR = 108;
-    static readonly UNGROUPED = 109;
-    static readonly VIRTUAL = 110;
-    static readonly HACKY_REGEX = 111;
-    static readonly RAW_SQ = 112;
-    static readonly RAW_DQ = 113;
-    static readonly SQ3_FILTER = 114;
-    static readonly SQ_FILTER = 115;
-    static readonly DQ3_FILTER = 116;
-    static readonly DQ_FILTER = 117;
-    static readonly BQ3_FILTER = 118;
-    static readonly BQ_FILTER = 119;
-    static readonly SQ_STRING = 120;
-    static readonly DQ_STRING = 121;
-    static readonly BQ_STRING = 122;
-    static readonly DOC_BLOCK_ANNOTATION_BEGIN = 123;
-    static readonly BLOCK_ANNOTATION_BEGIN = 124;
-    static readonly DOC_ANNOTATION = 125;
-    static readonly ANNOTATION = 126;
-    static readonly AMPER = 127;
-    static readonly ARROW = 128;
-    static readonly FAT_ARROW = 129;
-    static readonly OPAREN = 130;
-    static readonly CPAREN = 131;
-    static readonly OBRACK = 132;
-    static readonly CBRACK = 133;
-    static readonly OCURLY = 134;
-    static readonly CCURLY = 135;
-    static readonly DOUBLECOLON = 136;
-    static readonly TRIPLECOLON = 137;
-    static readonly EXCLAM = 138;
-    static readonly COLON = 139;
-    static readonly COMMA = 140;
-    static readonly DOT = 141;
-    static readonly LT = 142;
-    static readonly GT = 143;
-    static readonly EQ = 144;
-    static readonly NE = 145;
-    static readonly LTE = 146;
-    static readonly GTE = 147;
-    static readonly PLUS = 148;
-    static readonly MINUS = 149;
-    static readonly STAR = 150;
-    static readonly STARSTAR = 151;
-    static readonly SLASH = 152;
-    static readonly BAR = 153;
-    static readonly SEMI = 154;
-    static readonly NOT_MATCH = 155;
-    static readonly MATCH = 156;
-    static readonly PERCENT = 157;
-    static readonly DOUBLE_QMARK = 158;
-    static readonly QMARK = 159;
-    static readonly LITERAL_TIMESTAMP = 160;
-    static readonly LITERAL_HOUR = 161;
-    static readonly LITERAL_DAY = 162;
-    static readonly LITERAL_QUARTER = 163;
-    static readonly LITERAL_MONTH = 164;
-    static readonly LITERAL_WEEK = 165;
-    static readonly LITERAL_YEAR = 166;
-    static readonly GIVEN_REF = 167;
-    static readonly IDENTIFIER = 168;
-    static readonly PERCENT_LITERAL = 169;
-    static readonly NUMERIC_LITERAL = 170;
-    static readonly INTEGER_LITERAL = 171;
-    static readonly BLOCK_COMMENT = 172;
-    static readonly COMMENT_TO_EOL = 173;
-    static readonly WHITE_SPACE = 174;
-    static readonly SQL_BEGIN = 175;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 176;
-    static readonly UNEXPECTED_CHAR = 177;
-    static readonly OPEN_CODE = 178;
-    static readonly SQL_END = 179;
-    static readonly BLOCK_ANNOTATION_END = 180;
-    static readonly BLOCK_ANNOTATION_TEXT = 181;
+    static readonly EXPORT = 59;
+    static readonly EXTEND = 60;
+    static readonly FALSE = 61;
+    static readonly FILTER = 62;
+    static readonly FULL = 63;
+    static readonly FOR = 64;
+    static readonly FROM = 65;
+    static readonly HAS = 66;
+    static readonly HOUR = 67;
+    static readonly IMPORT = 68;
+    static readonly INCLUDE = 69;
+    static readonly INNER = 70;
+    static readonly IS = 71;
+    static readonly IN = 72;
+    static readonly INTERNAL_KW = 73;
+    static readonly JSON = 74;
+    static readonly LAST = 75;
+    static readonly LEFT = 76;
+    static readonly LIKE = 77;
+    static readonly MAX = 78;
+    static readonly MIN = 79;
+    static readonly MINUTE = 80;
+    static readonly MONTH = 81;
+    static readonly NOT = 82;
+    static readonly NOW = 83;
+    static readonly NULL = 84;
+    static readonly NUMBER = 85;
+    static readonly ON = 86;
+    static readonly OR = 87;
+    static readonly PICK = 88;
+    static readonly PRIVATE_KW = 89;
+    static readonly PUBLIC_KW = 90;
+    static readonly QUARTER = 91;
+    static readonly RIGHT = 92;
+    static readonly SECOND = 93;
+    static readonly STRING = 94;
+    static readonly SOURCE_KW = 95;
+    static readonly SUM = 96;
+    static readonly SQL = 97;
+    static readonly TABLE = 98;
+    static readonly THEN = 99;
+    static readonly THIS = 100;
+    static readonly TIMESTAMPTZ = 101;
+    static readonly TIMESTAMP = 102;
+    static readonly TO = 103;
+    static readonly TRUE = 104;
+    static readonly TURTLE = 105;
+    static readonly WEEK = 106;
+    static readonly WHEN = 107;
+    static readonly WITH = 108;
+    static readonly YEAR = 109;
+    static readonly UNGROUPED = 110;
+    static readonly VIRTUAL = 111;
+    static readonly HACKY_REGEX = 112;
+    static readonly RAW_SQ = 113;
+    static readonly RAW_DQ = 114;
+    static readonly SQ3_FILTER = 115;
+    static readonly SQ_FILTER = 116;
+    static readonly DQ3_FILTER = 117;
+    static readonly DQ_FILTER = 118;
+    static readonly BQ3_FILTER = 119;
+    static readonly BQ_FILTER = 120;
+    static readonly SQ_STRING = 121;
+    static readonly DQ_STRING = 122;
+    static readonly BQ_STRING = 123;
+    static readonly DOC_BLOCK_ANNOTATION_BEGIN = 124;
+    static readonly BLOCK_ANNOTATION_BEGIN = 125;
+    static readonly DOC_ANNOTATION = 126;
+    static readonly ANNOTATION = 127;
+    static readonly AMPER = 128;
+    static readonly ARROW = 129;
+    static readonly FAT_ARROW = 130;
+    static readonly OPAREN = 131;
+    static readonly CPAREN = 132;
+    static readonly OBRACK = 133;
+    static readonly CBRACK = 134;
+    static readonly OCURLY = 135;
+    static readonly CCURLY = 136;
+    static readonly DOUBLECOLON = 137;
+    static readonly TRIPLECOLON = 138;
+    static readonly EXCLAM = 139;
+    static readonly COLON = 140;
+    static readonly COMMA = 141;
+    static readonly DOT = 142;
+    static readonly LT = 143;
+    static readonly GT = 144;
+    static readonly EQ = 145;
+    static readonly NE = 146;
+    static readonly LTE = 147;
+    static readonly GTE = 148;
+    static readonly PLUS = 149;
+    static readonly MINUS = 150;
+    static readonly STAR = 151;
+    static readonly STARSTAR = 152;
+    static readonly SLASH = 153;
+    static readonly BAR = 154;
+    static readonly SEMI = 155;
+    static readonly NOT_MATCH = 156;
+    static readonly MATCH = 157;
+    static readonly PERCENT = 158;
+    static readonly DOUBLE_QMARK = 159;
+    static readonly QMARK = 160;
+    static readonly LITERAL_TIMESTAMP = 161;
+    static readonly LITERAL_HOUR = 162;
+    static readonly LITERAL_DAY = 163;
+    static readonly LITERAL_QUARTER = 164;
+    static readonly LITERAL_MONTH = 165;
+    static readonly LITERAL_WEEK = 166;
+    static readonly LITERAL_YEAR = 167;
+    static readonly GIVEN_REF = 168;
+    static readonly IDENTIFIER = 169;
+    static readonly PERCENT_LITERAL = 170;
+    static readonly NUMERIC_LITERAL = 171;
+    static readonly INTEGER_LITERAL = 172;
+    static readonly BLOCK_COMMENT = 173;
+    static readonly COMMENT_TO_EOL = 174;
+    static readonly WHITE_SPACE = 175;
+    static readonly SQL_BEGIN = 176;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 177;
+    static readonly UNEXPECTED_CHAR = 178;
+    static readonly OPEN_CODE = 179;
+    static readonly SQL_END = 180;
+    static readonly BLOCK_ANNOTATION_END = 181;
+    static readonly BLOCK_ANNOTATION_TEXT = 182;
     static readonly SQL_MODE = 1;
     static readonly BLOCK_ANNOTATION_MODE = 2;
     static readonly channelNames: string[];