@malloydata/malloy 0.0.73 → 0.0.74-dev230815162117

package/dist/index.d.ts

@@ -8,4 +8,4 @@ export type { RunSQLOptions } from './run_sql_options';
 export { DialectProvider } from './runtime_types';
 export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';
 export { toAsyncGenerator } from './connection_utils';
-export { Tags, type MalloyTags, type MalloyTagProperties, type TagParse, Tag, type TagDict, } from './tags';
+export { type TagParse, Tag, type TagDict } from './tags';

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.Tag = exports.Tags = exports.toAsyncGenerator = exports.DialectProvider = 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;
+exports.Tag = exports.toAsyncGenerator = exports.DialectProvider = 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; } });
@@ -60,6 +60,5 @@ Object.defineProperty(exports, "DialectProvider", { enumerable: true, get: funct
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
 var tags_1 = require("./tags");
-Object.defineProperty(exports, "Tags", { enumerable: true, get: function () { return tags_1.Tags; } });
 Object.defineProperty(exports, "Tag", { enumerable: true, get: function () { return tags_1.Tag; } });
 //# sourceMappingURL=index.js.map

package/dist/lang/ast/elements/refined-source.js

@@ -53,6 +53,7 @@ class RefinedSource extends source_1.Source {
         return this.withParameters([]);
     }
     withParameters(pList) {
+        var _a;
         let primaryKey;
         let fieldListEdit;
         const fields = [];
@@ -130,6 +131,7 @@ class RefinedSource extends source_1.Source {
         if (moreFilters) {
             return { ...retStruct, filterList };
         }
+        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(retStruct);
         return retStruct;
     }
 }

package/dist/lang/ast/query-properties/joins.js

@@ -50,6 +50,7 @@ class KeyJoin extends Join {
         this.elementType = 'joinOnKey';
     }
     structDef() {
+        var _a;
         const sourceDef = this.source.structDef();
         const joinStruct = {
             ...sourceDef,
@@ -69,6 +70,7 @@ class KeyJoin extends Join {
         if (this.note) {
             joinStruct.annotation = this.note;
         }
+        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
         return joinStruct;
     }
     fixupJoinOn(outer, inStruct) {
@@ -134,6 +136,7 @@ class ExpressionJoin extends Join {
         }
     }
     structDef() {
+        var _a;
         const sourceDef = this.source.structDef();
         const joinStruct = {
             ...sourceDef,
@@ -151,6 +154,7 @@ class ExpressionJoin extends Join {
         if (this.note) {
             joinStruct.annotation = this.note;
         }
+        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
         return joinStruct;
     }
 }

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

@@ -56,12 +56,15 @@ class NamedSourceOrQuery extends source_1.Source {
         }
     }
     structDef() {
+        var _a;
         const source = this.getSource();
         this.has({ source });
         if (source === undefined) {
             return error_factory_1.ErrorFactory.structDef;
         }
-        return source.structDef();
+        const ret = source.structDef();
+        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(ret);
+        return ret;
     }
 }
 exports.NamedSourceOrQuery = NamedSourceOrQuery;

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

@@ -105,7 +105,7 @@ class NamedSource extends source_1.Source {
           can do other translations and link them into a partial translation
           which might result in a full translation.
         */
-        var _a;
+        var _a, _b;
         const ret = this.modelStruct();
         if (!ret) {
             const notFound = error_factory_1.ErrorFactory.structDef;
@@ -148,6 +148,7 @@ class NamedSource extends source_1.Source {
                 this.log(`Value not provided for required parameter ${checkDef}`);
             }
         }
+        (_b = this.document()) === null || _b === void 0 ? void 0 : _b.rememberToAddModelAnnotations(ret);
         return ret;
     }
 }

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

@@ -31,9 +31,11 @@ class QuerySource extends source_1.Source {
         this.elementType = 'querySource';
     }
     structDef() {
+        var _a;
         const comp = this.query.queryComp(false);
         const queryStruct = comp.outputStruct;
         queryStruct.structSource = { type: 'query', query: comp.query };
+        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(queryStruct);
         return queryStruct;
     }
 }

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

@@ -28,7 +28,7 @@ const source_1 = require("../elements/source");
 const error_factory_1 = require("../error-factory");
 class TableSource extends source_1.Source {
     structDef() {
-        var _a;
+        var _a, _b;
         const info = this.getTableInfo();
         if (info === undefined) {
             return error_factory_1.ErrorFactory.structDef;
@@ -43,7 +43,7 @@ class TableSource extends source_1.Source {
                 tableDefEntry.value.fields.forEach(field => {
                     field.location = this.location;
                 });
-                return {
+                const ret = {
                     ...tableDefEntry.value,
                     fields: tableDefEntry.value.fields.map(field => ({
                         ...field,
@@ -51,6 +51,8 @@ class TableSource extends source_1.Source {
                     })),
                     location: this.location,
                 };
+                (_b = this.document()) === null || _b === void 0 ? void 0 : _b.rememberToAddModelAnnotations(ret);
+                return ret;
             }
             if (tableDefEntry.status === 'error') {
                 msg = tableDefEntry.message;

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

@@ -1,4 +1,4 @@
-import { Annotation, DocumentLocation, DocumentReference, ModelDef, Note, Query, SQLBlockStructDef } from '../../../model/malloy_types';
+import { Annotation, DocumentLocation, DocumentReference, ModelDef, Note, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
 import { LogSeverity, MessageLogger } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
 import { ModelDataRequest } from '../../translate-response';
@@ -23,6 +23,7 @@ export declare abstract class MalloyElement {
     has(kids: Record<string, ChildBody | undefined>): void;
     get location(): DocumentLocation;
     set location(loc: DocumentLocation | undefined);
+    protected document(): Document | undefined;
     protected namespace(): NameSpace | undefined;
     modelEntry(reference: string | ModelEntryReference): ModelEntry | undefined;
     private xlate?;
@@ -109,6 +110,8 @@ export declare class Document extends MalloyElement implements NameSpace {
     constructor(statements: (DocStatement | DocStatementList)[]);
     initModelDef(extendingModelDef: ModelDef | undefined): void;
     compile(): DocumentCompileResult;
+    private modelAnnotationTodoList;
+    rememberToAddModelAnnotations(sd: StructDef): void;
     modelDef(): ModelDef;
     defineSQL(sql: SQLBlockStructDef, name?: string): boolean;
     getEntry(str: string): ModelEntry;

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

@@ -30,6 +30,7 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const malloy_types_1 = require("../../../model/malloy_types");
 const global_name_space_1 = require("./global-name-space");
 const noteable_1 = require("./noteable");
+const uuid_1 = require("uuid");
 class MalloyElement {
     /**
      * @param kids All children passed to the constructor are not optional
@@ -81,6 +82,13 @@ class MalloyElement {
     set location(loc) {
         this.codeLocation = loc;
     }
+    document() {
+        var _a;
+        if (this instanceof Document) {
+            return this;
+        }
+        return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.document();
+    }
     namespace() {
         if (this instanceof Document) {
             return this;
@@ -350,6 +358,21 @@ class DocStatementList extends ListOf {
     }
 }
 exports.DocStatementList = DocStatementList;
+const docAnnotationNameSpace = '5a79a191-06bc-43cf-9b12-58741cd82970';
+function annotationNotes(an) {
+    const ret = an.inherits ? annotationNotes(an.inherits) : [];
+    if (an.blockNotes) {
+        ret.push(...an.blockNotes.map(n => n.text));
+    }
+    if (an.notes) {
+        ret.push(...an.notes.map(n => n.text));
+    }
+    return ret;
+}
+function annotationID(a) {
+    const allStrs = annotationNotes(a).join('');
+    return (0, uuid_1.v5)(allStrs, docAnnotationNameSpace);
+}
 /**
  * The Document class is a little weird because we might need to bounce back
  * to the requestor, which might be on the other side of a wire, to get
@@ -373,6 +396,7 @@ class Document extends MalloyElement {
         this.sqlBlocks = [];
         this.didInitModel = false;
         this.notes = [];
+        this.modelAnnotationTodoList = [];
         this.statements = new DocStatementList(statements);
         this.has({ statements: statements });
     }
@@ -398,16 +422,41 @@ class Document extends MalloyElement {
     }
     compile() {
         const needs = this.statements.executeList(this);
+        const modelDef = this.modelDef();
+        if (needs === undefined) {
+            for (const q of this.queryList) {
+                if (q.modelAnnotation === undefined && modelDef.annotation) {
+                    q.modelAnnotation = modelDef.annotation;
+                }
+            }
+            for (const q of this.sqlBlocks) {
+                if (q.modelAnnotation === undefined && modelDef.annotation) {
+                    q.modelAnnotation = modelDef.annotation;
+                }
+            }
+        }
+        if (modelDef.annotation) {
+            for (const sd of this.modelAnnotationTodoList) {
+                sd.modelAnnotation || (sd.modelAnnotation = modelDef.annotation);
+            }
+        }
         const ret = {
-            modelDef: this.modelDef(),
+            modelDef,
             queryList: this.queryList,
             sqlBlocks: this.sqlBlocks,
             needs,
         };
         return ret;
     }
+    rememberToAddModelAnnotations(sd) {
+        this.modelAnnotationTodoList.push(sd);
+    }
     modelDef() {
         const def = { name: '', exports: [], contents: {} };
+        if (this.notes.length > 0) {
+            def.annotation = { id: '', notes: this.notes };
+            def.annotation.id = annotationID(def.annotation);
+        }
         for (const entry in this.documentModel) {
             const entryDef = this.documentModel[entry].entry;
             if (entryDef.type === 'struct' || entryDef.type === 'query') {
@@ -415,11 +464,11 @@ class Document extends MalloyElement {
                     def.exports.push(entry);
                 }
                 def.contents[entry] = (0, cloneDeep_1.default)(entryDef);
+                if (entryDef.modelAnnotation === undefined && def.annotation) {
+                    entryDef.modelAnnotation = def.annotation;
+                }
             }
         }
-        if (this.notes.length > 0) {
-            def.annotation = { notes: this.notes };
-        }
         return def;
     }
     defineSQL(sql, name) {

package/dist/malloy.d.ts

@@ -4,7 +4,7 @@ import { DocumentCompletion as DocumentCompletionDefinition, DocumentHighlight a
 import { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-context-walker';
 import { CompiledQuery, DocumentReference, FieldBooleanDef, FieldDateDef, FieldJSONDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SQLBlock, SQLBlockStructDef, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, FieldUnsupportedDef, QueryRunStats, ImportLocation } from './model';
 import { Connection, InfoConnection, LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
-import { TagParse, TagParseSpec, Taggable, Tags } from './tags';
+import { Tag, TagParse, TagParseSpec, Taggable } from './tags';
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
@@ -152,7 +152,6 @@ export declare class Model implements Taggable {
     _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
     readonly problems: LogMessage[];
     constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
@@ -229,7 +228,6 @@ export declare class PreparedQuery implements Taggable {
     _query: InternalQuery | NamedQuery;
     name?: string;
     constructor(query: InternalQuery, model: ModelDef, name?: string);
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
@@ -414,7 +412,6 @@ export declare class PreparedResult implements Taggable {
     protected inner: CompiledQuery;
     protected modelDef: ModelDef;
     constructor(query: CompiledQuery, modelDef: ModelDef);
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
@@ -528,6 +525,8 @@ export declare class Explore extends Entity {
     constructor(structDef: StructDef, parentExplore?: Explore, source?: Explore);
     get source(): Explore | undefined;
     isIntrinsic(): boolean;
+    private parsedModelTag?;
+    get modelTag(): Tag;
     /**
      * @return The name of the entity.
      */
@@ -568,7 +567,6 @@ export declare class AtomicField extends Entity implements Taggable {
     protected parent: Explore;
     constructor(fieldTypeDef: FieldTypeDef, parent: Explore, source?: AtomicField);
     get type(): AtomicFieldType;
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     isIntrinsic(): boolean;
@@ -649,7 +647,6 @@ export declare class Query extends Entity {
 export declare class QueryField extends Query implements Taggable {
     protected parent: Explore;
     constructor(turtleDef: TurtleDef, parent: Explore, source?: Query);
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     isQueryField(): this is QueryField;
@@ -669,7 +666,6 @@ export declare class ExploreField extends Explore implements Taggable {
     protected _parentExplore: Explore;
     constructor(structDef: StructDef, parentExplore: Explore, source?: Explore);
     get joinRelationship(): JoinRelationship;
-    getTags(): Tags;
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     isQueryField(): this is QueryField;

package/dist/malloy.js

@@ -326,9 +326,6 @@ class Model {
         this._importAt = importAt;
         this.problems = problems;
     }
-    getTags() {
-        return new tags_1.Tags(this.modelDef.annotation);
-    }
     tagParse(spec) {
         return tags_1.Tag.annotationToTag(this.modelDef.annotation, spec);
     }
@@ -465,14 +462,9 @@ class PreparedQuery {
         this._modelDef = model;
         this.name = name;
     }
-    getTags() {
-        return new tags_1.Tags(this._query.annotation);
-    }
     tagParse(spec) {
-        if (spec === undefined) {
-            const modelScope = tags_1.Tag.annotationToTag(this._modelDef.annotation);
-            spec = { scopes: [modelScope.tag] };
-        }
+        const modelScope = tags_1.Tag.annotationToTag(this._modelDef.annotation).tag;
+        spec = tags_1.Tag.addModelScope(spec, modelScope);
         return tags_1.Tag.annotationToTag(this._query.annotation, spec);
     }
     getTaglines(prefix) {
@@ -718,14 +710,9 @@ class PreparedResult {
         this.inner = query;
         this.modelDef = modelDef;
     }
-    getTags() {
-        return new tags_1.Tags(this.inner.annotation);
-    }
     tagParse(spec) {
-        if (spec === undefined) {
-            const modelScope = tags_1.Tag.annotationToTag(this.modelDef.annotation);
-            spec = { scopes: [modelScope.tag] };
-        }
+        const modelScope = tags_1.Tag.annotationToTag(this.modelDef.annotation).tag;
+        spec = tags_1.Tag.addModelScope(spec, modelScope);
         return tags_1.Tag.annotationToTag(this.inner.annotation, spec);
     }
     getTaglines(prefix) {
@@ -933,6 +920,10 @@ class Explore extends Entity {
     isIntrinsic() {
         return (0, model_1.FieldIsIntrinsic)(this._structDef);
     }
+    get modelTag() {
+        this.parsedModelTag || (this.parsedModelTag = tags_1.Tag.annotationToTag(this._structDef.modelAnnotation).tag);
+        return this.parsedModelTag;
+    }
     /**
      * @return The name of the entity.
      */
@@ -1157,11 +1148,8 @@ class AtomicField extends Entity {
                 return AtomicFieldType.Error;
         }
     }
-    getTags() {
-        return new tags_1.Tags(this.fieldTypeDef.annotation);
-    }
     tagParse(spec) {
-        // mtoy todo spec.scopes ||= [Model.getTag(somehow.find.modelDef)] ;
+        spec = tags_1.Tag.addModelScope(spec, this.parent.modelTag);
         return tags_1.Tag.annotationToTag(this.fieldTypeDef.annotation, spec);
     }
     getTaglines(prefix) {
@@ -1366,11 +1354,8 @@ class QueryField extends Query {
         super(turtleDef, parent, source);
         this.parent = parent;
     }
-    getTags() {
-        return new tags_1.Tags(this.turtleDef.annotation);
-    }
     tagParse(spec) {
-        // mtoy todo spec.scopes ||= [Model.getTag(somehow.find.modelDef)] ;
+        spec = tags_1.Tag.addModelScope(spec, this.parent.modelTag);
         return tags_1.Tag.annotationToTag(this.turtleDef.annotation, spec);
     }
     getTaglines(prefix) {
@@ -1426,11 +1411,8 @@ class ExploreField extends Explore {
                 throw new Error('A source field must have a join relationship.');
         }
     }
-    getTags() {
-        return new tags_1.Tags(this._structDef.annotation);
-    }
     tagParse(spec) {
-        // mtoy todo spec.scopes ||= [Model.getTag(somehow.find.modelDef)] ;
+        spec = tags_1.Tag.addModelScope(spec, this._parentExplore.modelTag);
         return tags_1.Tag.annotationToTag(this._structDef.annotation, spec);
     }
     getTaglines(prefix) {

package/dist/model/malloy_query.js

@@ -1851,6 +1851,9 @@ class QueryQuery extends QueryField {
             type: 'struct',
             queryTimezone: resultStruct.getQueryInfo().queryTimezone,
         };
+        if (this.parent.fieldDef.modelAnnotation) {
+            outputStruct.modelAnnotation = this.parent.fieldDef.modelAnnotation;
+        }
         return outputStruct;
     }
     generateSQLJoinBlock(stageWriter, ji) {
@@ -2726,7 +2729,7 @@ class QueryQueryIndex extends QueryQuery {
     }
     /**  All Indexes have the same output schema */
     getResultStructDef() {
-        return {
+        const ret = {
             type: 'struct',
             name: this.resultStage || 'result',
             dialect: this.parent.fieldDef.dialect,
@@ -2742,6 +2745,10 @@ class QueryQueryIndex extends QueryQuery {
             },
             structSource: { type: 'query_result' },
         };
+        if (this.parent.fieldDef.modelAnnotation) {
+            ret.modelAnnotation = this.parent.fieldDef.modelAnnotation;
+        }
+        return ret;
     }
 }
 /** Structure object as it is used to build a query */

package/dist/model/malloy_types.d.ts

@@ -379,6 +379,7 @@ export interface Query extends Pipeline, Filtered, HasLocation {
     type?: 'query';
     structRef: StructRef;
     annotation?: Annotation;
+    modelAnnotation?: Annotation;
 }
 export declare type NamedQuery = Query & NamedObject;
 export declare type PipeSegment = QuerySegment | IndexSegment;
@@ -495,6 +496,7 @@ export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {
     queryTimezone?: string;
     dialect: string;
     annotation?: Annotation;
+    modelAnnotation?: ModelAnnotation;
 }
 export declare type ExpressionValueType = AtomicFieldType | 'null' | 'duration' | 'any' | 'regular expression';
 export declare type FieldValueType = ExpressionValueType | 'turtle' | 'struct';
@@ -575,21 +577,25 @@ export interface ModelDef {
     name: string;
     exports: string[];
     contents: Record<string, NamedModelObject>;
-    annotation?: Annotation;
+    annotation?: ModelAnnotation;
 }
 /** Very common record type */
 export declare type NamedStructDefs = Record<string, StructDef>;
 export declare type NamedModelObjects = Record<string, NamedModelObject>;
 /** Malloy source annotations attached to objects */
-export interface Note {
-    text: string;
-    at: DocumentLocation;
-}
 export interface Annotation {
     inherits?: Annotation;
     blockNotes?: Note[];
     notes?: Note[];
 }
+export interface Note {
+    text: string;
+    at: DocumentLocation;
+}
+/** Annotations with a uuid to make it easier to stream */
+export interface ModelAnnotation extends Annotation {
+    id: string;
+}
 export declare type QueryScalar = string | boolean | number | Date | Buffer | null;
 /** One value in one column of returned data. */
 export declare type QueryValue = QueryScalar | QueryData | QueryDataRow;

package/dist/tags.d.ts

@@ -16,7 +16,6 @@ export interface TagParseSpec {
     scopes?: Tag[];
 }
 export interface Taggable {
-    getTags: () => Tags;
     tagParse: (spec?: TagParseSpec) => TagParse;
     getTaglines: (prefix?: RegExp) => string[];
 }
@@ -25,11 +24,14 @@ export interface Taggable {
  * containing the Malloy tag language. Used by the parser to
  * generate parsed data, and as an API to that data.
  * ```
- * tag.text(p?)        => string value of tag.p or ''
- * tag.array(p?)       => Tag[] value of tag.p or []
- * tag.numeric(p?)     => numeric value of tag.p or NaN
- * tag.dict            => Record<string, Tag> of tag properties
- * tag.tag(p)          => Tag value of tag.p
+ * tag.text(p?)         => string value of tag.p or undefined
+ * tag.array(p?)        => Tag[] value of tag.p or undefined
+ * tag.numeric(p?)      => numeric value of tag.p or undefined
+ * tag.textArray(p ?)   => string[] value of elements in tag.p or undefined
+ * tag.numericArray(p?) => string[] value of elements in tag.p or undefined
+ * tag.tag(p)           => Tag value of tag.p
+ * tag.has(p)           => boolean "tag contains tag.p"
+ * tag.dict             => Record<string,Tag> of tag properties
  * ```
  */
 export declare class Tag implements TagInterface {
@@ -49,6 +51,7 @@ export declare class Tag implements TagInterface {
      * @returns Something shaped like { tag: Tag  , log: ParseErrors[] }
      */
     static fromTagline(str: string, extending: Tag | undefined, ...importing: Tag[]): TagParse;
+    static addModelScope(spec: TagParseSpec | undefined, modelScope: Tag): TagParseSpec;
     static annotationToTaglines(annote: Annotation | undefined, prefix?: RegExp): string[];
     static annotationToTag(annote: Annotation | undefined, spec?: TagParseSpec): TagParse;
     constructor(from?: TagInterface);
@@ -59,24 +62,9 @@ export declare class Tag implements TagInterface {
     numeric(...at: string[]): number | undefined;
     get dict(): Record<string, Tag>;
     array(...at: string[]): Tag[] | undefined;
+    textArray(...at: string[]): string[] | undefined;
+    numericArray(...at: string[]): number[] | undefined;
     getProperties(): TagDict;
     clone(): Tag;
 }
-export declare type MalloyTagProperties = Record<string, string | boolean>;
-interface PropertyTag {
-    properties: MalloyTagProperties;
-}
-export interface MalloyTags extends PropertyTag {
-    docStrings: string[];
-}
-/**
- * Collection of useful functions for handing tag data ...
- */
-export declare class Tags {
-    private tags;
-    constructor(annotation: Annotation | undefined);
-    getMalloyTags(): MalloyTags;
-    getTagList(): string[];
-}
-export declare function parseTagProperties(src: string, tagProp: MalloyTagProperties): MalloyTagProperties | undefined;
 export {};

package/dist/tags.js

@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTagProperties = exports.Tags = exports.Tag = void 0;
+exports.Tag = void 0;
 const tree_1 = require("antlr4ts/tree");
 const MalloyTagLexer_1 = require("./lang/lib/Malloy/MalloyTagLexer");
 const MalloyTagParser_1 = require("./lang/lib/Malloy/MalloyTagParser");
@@ -37,11 +37,14 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
  * containing the Malloy tag language. Used by the parser to
  * generate parsed data, and as an API to that data.
  * ```
- * tag.text(p?)        => string value of tag.p or ''
- * tag.array(p?)       => Tag[] value of tag.p or []
- * tag.numeric(p?)     => numeric value of tag.p or NaN
- * tag.dict            => Record<string, Tag> of tag properties
- * tag.tag(p)          => Tag value of tag.p
+ * tag.text(p?)         => string value of tag.p or undefined
+ * tag.array(p?)        => Tag[] value of tag.p or undefined
+ * tag.numeric(p?)      => numeric value of tag.p or undefined
+ * tag.textArray(p ?)   => string[] value of elements in tag.p or undefined
+ * tag.numericArray(p?) => string[] value of elements in tag.p or undefined
+ * tag.tag(p)           => Tag value of tag.p
+ * tag.has(p)           => boolean "tag contains tag.p"
+ * tag.dict             => Record<string,Tag> of tag properties
  * ```
  */
 class Tag {
@@ -97,6 +100,16 @@ class Tag {
     static fromTagline(str, extending, ...importing) {
         return parseTagline(str, extending, importing, __filename, 0, 0);
     }
+    static addModelScope(spec, modelScope) {
+        const useSpec = spec ? { ...spec } : {};
+        if (useSpec.scopes) {
+            useSpec.scopes = useSpec.scopes.concat(modelScope);
+        }
+        else {
+            useSpec.scopes = [modelScope];
+        }
+        return useSpec;
+    }
     static annotationToTaglines(annote, prefix) {
         annote || (annote = {});
         const tagLines = annote.inherits
@@ -140,21 +153,21 @@ class Tag {
         return { tag: extending, log: allErrs };
     }
     find(at) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        let findIn = this;
+        let lookAt = Tag.tagFrom(this);
         for (const seg of at) {
-            findIn = findIn.properties && Tag.tagFrom(findIn.properties[seg]);
-            if (!findIn) {
-                return undefined;
+            const lookup = lookAt.properties && lookAt.properties[seg];
+            if (!lookup) {
+                return;
             }
+            lookAt = Tag.tagFrom(lookup);
         }
-        return findIn;
+        return lookAt;
     }
     tag(...at) {
         return this.find(at);
     }
     has(...at) {
-        return !!this.find(at);
+        return this.find(at) !== undefined;
     }
     text(...at) {
         var _a;
@@ -190,6 +203,30 @@ class Tag {
         }
         return array.map(el => typeof el === 'string' ? new Tag({ eq: el }) : Tag.tagFrom(el));
     }
+    textArray(...at) {
+        var _a;
+        const array = (_a = this.find(at)) === null || _a === void 0 ? void 0 : _a.eq;
+        if (array === undefined || typeof array === 'string') {
+            return undefined;
+        }
+        return array.reduce((allStrs, el) => typeof el.eq === 'string' ? allStrs.concat(el.eq) : allStrs, []);
+    }
+    numericArray(...at) {
+        var _a;
+        const array = (_a = this.find(at)) === null || _a === void 0 ? void 0 : _a.eq;
+        if (array === undefined || typeof array === 'string') {
+            return undefined;
+        }
+        return array.reduce((allNums, el) => {
+            if (typeof el.eq === 'string') {
+                const num = Number.parseFloat(el.eq);
+                if (!Number.isNaN(num)) {
+                    return allNums.concat(num);
+                }
+            }
+            return allNums;
+        }, []);
+    }
     // Has the sometimes desireable side effect of initalizing properties
     getProperties() {
         if (this.properties === undefined) {
@@ -205,140 +242,6 @@ exports.Tag = Tag;
 // --- Just for debugging ---
 Tag.ids = new Map();
 Tag.nextTagId = 1000;
-function isDocTag(a) {
-    return (a === null || a === void 0 ? void 0 : a.docString) !== undefined;
-}
-/**
- * Collection of useful functions for handing tag data ...
- */
-class Tags {
-    constructor(annotation) {
-        this.tags = annotation;
-    }
-    getMalloyTags() {
-        const ret = { docStrings: [], properties: {} };
-        for (const tagLine of tagList(this.tags)) {
-            const tag = parseTag(tagLine, ret.properties);
-            if (isDocTag(tag)) {
-                ret.docStrings.push(tag.docString);
-            }
-        }
-        return ret;
-    }
-    getTagList() {
-        return tagList(this.tags);
-    }
-}
-exports.Tags = Tags;
-function tagList(tagNode) {
-    if (!tagNode) {
-        return [];
-    }
-    const justText = tagNode.inherits ? tagList(tagNode.inherits) : [];
-    if (tagNode.blockNotes) {
-        justText.push(...tagNode.blockNotes.map(bn => bn.text));
-    }
-    if (tagNode.notes) {
-        justText.push(...tagNode.notes.map(n => n.text));
-    }
-    return justText;
-}
-/**
- * Lines which start '#"' are doc strings
- * Lines which start '# ' are property lines ... The property parser is
- * pretty simple, the langauge is:
- * Property can be
- *   name       -- set the value to "true"
- *   -name      -- delete a value from the property
- *   name=value -- assign value to the name
- * Name can be any sequence of non space characters, or a string
- * A value is any sequence of non space characters, or a string
- * A string is " enclosing and ending in " with \" allowed inside
- */
-function parseTag(src, tagProp) {
-    const docMatch = src.match(/^##?" /);
-    if (docMatch) {
-        return { docString: src.slice(docMatch[0].length) };
-    }
-    const propMatch = src.match(/^##? /);
-    if (!propMatch) {
-        return;
-    }
-    const newProps = parseTagProperties(src.slice(propMatch[0].length), tagProp);
-    if (newProps) {
-        return { properties: newProps };
-    }
-}
-function parseTagProperties(src, tagProp) {
-    const tokens = tokenize(src);
-    let tn = 0;
-    const lastToken = tokens.length - 1;
-    while (tn <= lastToken) {
-        let token = tokens[tn];
-        if (token === '=') {
-            return undefined;
-        }
-        if (token[0] === '"') {
-            token = token.slice(1, -1);
-        }
-        if (tn !== lastToken && tokens[tn + 1] === '=') {
-            if (tn + 2 <= lastToken) {
-                let value = tokens[tn + 2];
-                if (value !== '=') {
-                    if (value[0] === '"') {
-                        value = value.slice(1, -1);
-                    }
-                    tagProp[token] = value;
-                    tn += 3;
-                    continue;
-                }
-            }
-            return undefined;
-        }
-        if (token.startsWith('-')) {
-            delete tagProp[token.slice(1)];
-        }
-        else {
-            tagProp[token] = true;
-        }
-        tn += 1;
-    }
-    return tagProp;
-}
-exports.parseTagProperties = parseTagProperties;
-function tokenize(src) {
-    const parts = [];
-    src = src.trim();
-    while (src) {
-        const skipSpace = src.match(/^\s*(.+$)/);
-        if (skipSpace === null) {
-            break;
-        }
-        src = skipSpace[1];
-        if (src[0] === '=') {
-            parts.push('=');
-            src = src.slice(1);
-            continue;
-        }
-        if (src[0] === '"') {
-            const matchString = src.match(/^"(\\.|[^"\\])*"/);
-            if (!matchString) {
-                break;
-            }
-            parts.push(matchString[0].replace(/\\/g, ''));
-            src = src.slice(matchString[0].length);
-            continue;
-        }
-        const token = src.match(/^[^\s "=]+/);
-        if (token) {
-            parts.push(token[0]);
-            src = src.slice(token[0].length);
-            continue;
-        }
-        break;
-    }
-    return parts;
-}
 class TagErrorListener {
     constructor(sourceURL, atLine, fromChar) {
         this.sourceURL = sourceURL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.73",
+  "version": "0.0.74-dev230815162117",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",