@malloydata/malloy 0.0.398 → 0.0.400

package/dist/lang/ast/types/literal.d.ts

@@ -4,4 +4,4 @@ import { LiteralDay, LiteralHour, LiteralMonth, LiteralTimestamp, LiteralYear }
 import { ExprNumber } from '../expressions/expr-number';
 import type { ExpressionDef } from './expression-def';
 export type Literal = LiteralTimestamp | LiteralHour | LiteralMonth | LiteralDay | LiteralYear | ExprNumber | ExprString | Boolean;
-export declare function isLiteral(value: ExpressionDef): value is ExprString | ExprNumber | Boolean | LiteralTimestamp | LiteralHour | LiteralDay | LiteralMonth | LiteralYear;
+export declare function isLiteral(value: ExpressionDef): value is ExprString | Boolean | LiteralTimestamp | LiteralHour | LiteralDay | LiteralMonth | LiteralYear | ExprNumber;

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

@@ -1,4 +1,4 @@
-import type { Annotation, DocumentLocation, DocumentReference, Given, ModelDef, ModelAnnotation, NamedModelObject, Query, SourceID, SourceRegistryValue, StructDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, DocumentLocation, DocumentReference, Given, ModelDef, ModelAnnotationsDef, NamedModelObject, Query, SourceID, SourceRegistryValue, StructDef } from '../../../model/malloy_types';
 import { Tag } from '@malloydata/malloy-tag';
 import type { LogMessageOptions, MessageLogger, MessageParameterType, MessageCode } from '../../parse-log';
 import type { MalloyTranslation } from '../../parse-malloy';
@@ -101,7 +101,7 @@ export declare class DocStatementList extends ListOf<DocStatement | DocStatement
     execCursor: number;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
-    note?: Annotation;
+    note?: AnnotationsDef;
     noteCursor: number;
     executeList(doc: Document): ModelDataRequest;
 }
@@ -111,11 +111,12 @@ 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;
     modelWasModified: boolean;
-    annotation: Annotation;
+    annotations: AnnotationsDef;
     experiments: Tag;
     constructor(statements: (DocStatement | DocStatementList)[]);
     initModelDef(extendingModelDef: ModelDef | undefined): void;
@@ -125,7 +126,7 @@ export declare class Document extends MalloyElement implements NameSpace {
     private checkGivenAliasCollisions;
     private checkQueryGivenSatisfiability;
     hasAnnotation(): boolean;
-    currentModelAnnotation(): ModelAnnotation | undefined;
+    currentModelAnnotation(): ModelAnnotationsDef | undefined;
     modelDef(): ModelDef;
     getEntry(str: string): ModelEntry | undefined;
     setEntry(str: string, ent: ModelEntry): void;

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

@@ -121,7 +121,7 @@ class MalloyElement {
                     text: key,
                     definition: {
                         type: result.entry.type,
-                        annotation: result.entry.annotation,
+                        annotations: result.entry.annotations,
                         location: result.entry.location,
                     },
                     location: reference.location,
@@ -133,7 +133,7 @@ class MalloyElement {
                     text: key,
                     definition: {
                         type: result.entry.type,
-                        annotation: result.entry.annotation,
+                        annotations: result.entry.annotations,
                         location: result.entry.location,
                     },
                     location: reference.location,
@@ -463,7 +463,7 @@ class Document extends MalloyElement {
         this.queryList = [];
         this.didInitModel = false;
         this.modelWasModified = false;
-        this.annotation = {};
+        this.annotations = {};
         this.experiments = new malloy_tag_1.Tag({});
         this.modelAnnotationTodoList = [];
         this.dialectNameSpaces = new Map();
@@ -477,10 +477,11 @@ class Document extends MalloyElement {
         this.documentModel = new Map();
         this.documentSrcRegistry = {};
         this.documentGivens = new Map();
+        this.explicitExports = undefined;
         this.queryList = [];
         if (extendingModelDef) {
-            if (extendingModelDef.annotation) {
-                this.annotation.inherits = extendingModelDef.annotation;
+            if (extendingModelDef.annotations) {
+                this.annotations.inherits = extendingModelDef.annotations;
             }
             for (const [nm, orig] of Object.entries(extendingModelDef.contents)) {
                 const entry = { ...orig };
@@ -508,14 +509,14 @@ class Document extends MalloyElement {
             this.checkGivenAliasCollisions();
             this.checkQueryGivenSatisfiability();
             for (const q of this.queryList) {
-                if (q.modelAnnotation === undefined && modelDef.annotation) {
-                    q.modelAnnotation = modelDef.annotation;
+                if (q.modelAnnotations === undefined && modelDef.annotations) {
+                    q.modelAnnotations = modelDef.annotations;
                 }
             }
         }
-        if (modelDef.annotation) {
+        if (modelDef.annotations) {
             for (const sd of this.modelAnnotationTodoList) {
-                sd.modelAnnotation || (sd.modelAnnotation = modelDef.annotation);
+                sd.modelAnnotations || (sd.modelAnnotations = modelDef.annotations);
             }
         }
         const ret = {
@@ -608,12 +609,12 @@ class Document extends MalloyElement {
         }
     }
     hasAnnotation() {
-        return ((this.annotation.notes && this.annotation.notes.length > 0) ||
-            this.annotation.inherits !== undefined);
+        return ((this.annotations.notes && this.annotations.notes.length > 0) ||
+            this.annotations.inherits !== undefined);
     }
     currentModelAnnotation() {
         if (this.hasAnnotation()) {
-            const ret = { ...this.annotation, id: '' };
+            const ret = { ...this.annotations, id: '' };
             ret.id = annotationID(ret);
             return ret;
         }
@@ -621,14 +622,16 @@ class Document extends MalloyElement {
     modelDef() {
         const def = (0, utils_1.mkModelDef)('');
         if (this.hasAnnotation()) {
-            def.annotation = this.currentModelAnnotation();
+            def.annotations = 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') {
@@ -636,14 +639,14 @@ class Document extends MalloyElement {
                 }
                 else {
                     const newEntry = { ...entryDef };
-                    if (newEntry.modelAnnotation === undefined && def.annotation) {
-                        newEntry.modelAnnotation = def.annotation;
+                    if (newEntry.modelAnnotations === undefined && def.annotations) {
+                        newEntry.modelAnnotations = def.annotations;
                     }
                     def.contents[name] = newEntry;
                 }
             }
             else if (entryDef.type === 'given') {
-                if (modelEntry.exported) {
+                if (isExported(name, modelEntry)) {
                     def.exports.push(name);
                 }
                 def.contents[name] = { ...entryDef };

package/dist/lang/ast/types/noteable.d.ts

@@ -1,12 +1,12 @@
-import type { Annotation } from '../../../model/malloy_types';
+import type { AnnotationsDef } from '../../../model/malloy_types';
 /**
  * An object which can receive annotations is "Noteable"
  */
 export interface Noteable {
     isNoteableObj: true;
-    note?: Annotation;
-    extendNote(ext: Partial<Annotation>): void;
+    note?: AnnotationsDef;
+    extendNote(ext: Partial<AnnotationsDef>): void;
 }
 export declare function isNoteable(el: unknown): el is Noteable;
-export declare function extendNoteMethod(this: Noteable, ext: Partial<Annotation>): void;
-export declare function extendNoteHelper(to: Noteable, ext: Partial<Annotation>): void;
+export declare function extendNoteMethod(this: Noteable, ext: Partial<AnnotationsDef>): void;
+export declare function extendNoteHelper(to: Noteable, ext: Partial<AnnotationsDef>): void;

package/dist/lang/ast/types/pipeline-comp.d.ts

@@ -1,7 +1,7 @@
-import type { Annotation, PipeSegment, SourceDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, PipeSegment, SourceDef } from '../../../model/malloy_types';
 export interface PipelineComp {
     outputStruct: SourceDef;
     pipeline: PipeSegment[];
-    annotation?: Annotation;
+    annotations?: AnnotationsDef;
     name?: string;
 }

package/dist/lang/ast/view-elements/reference-view.js

@@ -123,7 +123,7 @@ class ReferenceView extends view_1.View {
             return {
                 pipeline,
                 name: fieldDef.name,
-                annotation: fieldDef.annotation,
+                annotations: fieldDef.annotations,
                 outputStruct: pipeline[pipeline.length - 1].outputStruct,
             };
         }

package/dist/lang/ast/view-elements/view-refine.js

@@ -44,7 +44,7 @@ class ViewRefine extends view_1.View {
         const resultPipe = this.refinement.refine(fs, query.pipeline, isNestIn);
         return {
             pipeline: resultPipe,
-            annotation: query.annotation,
+            annotations: query.annotations,
             outputStruct: resultPipe.length > 0
                 ? resultPipe[resultPipe.length - 1].outputStruct
                 : error_factory_1.ErrorFactory.structDef,

package/dist/lang/composite-source-utils.d.ts

@@ -1,5 +1,5 @@
 import type { MalloyElement } from './ast';
-import type { FieldUsage, FieldUsageEntry, GivenUsage, PipeSegment, RefSummary, SourceDef, RequiredGroupBy, Annotation, PartitionCompositeDesc, StructDef } from '../model/malloy_types';
+import type { FieldUsage, FieldUsageEntry, GivenUsage, PipeSegment, RefSummary, SourceDef, RequiredGroupBy, AnnotationsDef, PartitionCompositeDesc, StructDef } from '../model/malloy_types';
 type CompositeCouldNotFindFieldError = {
     code: 'could_not_find_field';
     data: {
@@ -51,7 +51,7 @@ interface CompositeFailure {
     issues: CompositeIssue[];
 }
 export declare function getExpandedSegment(segment: PipeSegment, inputSource: SourceDef): PipeSegment;
-export declare function getPartitionCompositeDesc(annotation: Annotation | undefined, structDef: StructDef, logTo: MalloyElement): PartitionCompositeDesc | undefined;
+export declare function getPartitionCompositeDesc(annotations: AnnotationsDef | undefined, structDef: StructDef, logTo: MalloyElement): PartitionCompositeDesc | undefined;
 type SingleNarrowedCompositeFieldResolution = {
     source: SourceDef;
     nested?: SingleNarrowedCompositeFieldResolution | undefined;

package/dist/lang/composite-source-utils.js

@@ -33,7 +33,7 @@ const malloy_filter_1 = require("@malloydata/malloy-filter");
 const malloy_types_1 = require("../model/malloy_types");
 const utils_1 = require("./utils");
 const utils_2 = require("../model/utils");
-const annotation_1 = require("../annotation");
+const annotation_1 = require("../api/foundation/annotation");
 function _resolveCompositeSources(path, source, rootFields, nests, fieldUsage, 
 // for resolving nested composites; the list of sources to try
 sources) {
@@ -115,13 +115,13 @@ sources) {
                 }
                 base = {
                     ...resolveInner.success,
-                    annotation: composeAnnotations(base.annotation, resolveInner.success.annotation),
+                    annotations: composeAnnotations(base.annotations, resolveInner.success.annotations),
                 };
             }
             else {
                 base = {
                     ...inputSource,
-                    annotation: composeAnnotations(base.annotation, inputSource.annotation),
+                    annotations: composeAnnotations(base.annotations, inputSource.annotations),
                 };
             }
             const fields = [...nonCompositeFields, ...base.fields];
@@ -544,10 +544,10 @@ function getPartitionCompositeFilter(partitionComposite, fieldUsage) {
     };
     return { partitionFilter, issues: undefined };
 }
-function getPartitionCompositeDesc(annotation, structDef, logTo) {
-    if (annotation === undefined)
+function getPartitionCompositeDesc(annotations, structDef, logTo) {
+    if (annotations === undefined)
         return undefined;
-    const compilerFlags = new annotation_1.Annotations(annotation).parseAsTag('!').tag;
+    const compilerFlags = new annotation_1.Annotations(annotations).parseAsTag('!').tag;
     const partitionCompositeTag = compilerFlags.tag('experimental', 'partition_composite');
     if (partitionCompositeTag === undefined)
         return undefined;

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[];