@malloydata/malloy 0.0.99-dev231102173733 → 0.0.99-dev231102201226

package/dist/lang/ast/types/annotation-elements.js

@@ -50,7 +50,10 @@ class ModelAnnotation extends ObjectAnnotation {
         return tagParse.tag;
     }
     execute(doc) {
-        doc.notes = doc.notes.concat(this.notes);
+        if (doc.annotation.notes === undefined) {
+            doc.annotation.notes = [];
+        }
+        doc.annotation.notes.push(...this.notes);
     }
 }
 exports.ModelAnnotation = ModelAnnotation;

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

@@ -1,4 +1,4 @@
-import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Note, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
+import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
 import { Tag } from '../../../tags';
 import { LogSeverity, MessageLogger } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
@@ -120,13 +120,14 @@ export declare class Document extends MalloyElement implements NameSpace {
     sqlBlocks: SQLBlockStructDef[];
     statements: DocStatementList;
     didInitModel: boolean;
-    notes: Note[];
+    annotation: Annotation;
     experiments: Tag;
     constructor(statements: (DocStatement | DocStatementList)[]);
     initModelDef(extendingModelDef: ModelDef | undefined): void;
     compile(): DocumentCompileResult;
     private modelAnnotationTodoList;
     rememberToAddModelAnnotations(sd: StructDef): void;
+    hasAnnotation(): boolean;
     currentModelAnnotation(): ModelAnnotation | undefined;
     modelDef(): ModelDef;
     defineSQL(sql: SQLBlockStructDef, name?: string): boolean;

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

@@ -434,7 +434,7 @@ class Document extends MalloyElement {
         this.queryList = [];
         this.sqlBlocks = [];
         this.didInitModel = false;
-        this.notes = [];
+        this.annotation = {};
         this.experiments = new tags_1.Tag({});
         this.modelAnnotationTodoList = [];
         this.statements = new DocStatementList(statements);
@@ -448,6 +448,9 @@ class Document extends MalloyElement {
         this.queryList = [];
         this.sqlBlocks = [];
         if (extendingModelDef) {
+            if (extendingModelDef.annotation) {
+                this.annotation.inherits = extendingModelDef.annotation;
+            }
             for (const [nm, orig] of Object.entries(extendingModelDef.contents)) {
                 const entry = (0, cloneDeep_1.default)(orig);
                 if (entry.type === 'struct' ||
@@ -491,16 +494,20 @@ class Document extends MalloyElement {
     rememberToAddModelAnnotations(sd) {
         this.modelAnnotationTodoList.push(sd);
     }
+    hasAnnotation() {
+        return ((this.annotation.notes && this.annotation.notes.length > 0) ||
+            this.annotation.inherits !== undefined);
+    }
     currentModelAnnotation() {
-        if (this.notes.length > 0) {
-            const ret = { id: '', notes: this.notes };
+        if (this.hasAnnotation()) {
+            const ret = { ...this.annotation, id: '' };
             ret.id = annotationID(ret);
             return ret;
         }
     }
     modelDef() {
         const def = { name: '', exports: [], contents: {} };
-        if (this.notes.length > 0) {
+        if (this.hasAnnotation()) {
             def.annotation = this.currentModelAnnotation();
         }
         for (const entry in this.documentModel) {

package/dist/lang/parse-malloy.d.ts

@@ -86,7 +86,7 @@ declare class HelpContextStep implements TranslationStep {
 declare class TranslateStep implements TranslationStep {
     readonly astStep: ASTStep;
     response?: TranslateResponse;
-    importedFlags: boolean;
+    importedAnnotations: boolean;
     constructor(astStep: ASTStep);
     step(that: MalloyTranslation, extendingModel?: ModelDef): TranslateResponse;
 }

package/dist/lang/parse-malloy.js

@@ -450,19 +450,19 @@ class HelpContextStep {
 class TranslateStep {
     constructor(astStep) {
         this.astStep = astStep;
-        this.importedFlags = false;
+        this.importedAnnotations = false;
     }
     step(that, extendingModel) {
         if (this.response) {
             return this.response;
         }
         // begin with the compiler flags of the model we are extending
-        if (extendingModel && !this.importedFlags) {
+        if (extendingModel && !this.importedAnnotations) {
             const tagParse = tags_1.Tag.annotationToTag(extendingModel.annotation, {
                 prefix: /^##! /,
             });
             that.compilerFlags = tagParse.tag;
-            this.importedFlags = true;
+            this.importedAnnotations = true;
         }
         const astResponse = this.astStep.step(that);
         if ((0, translate_response_1.isNeedResponse)(astResponse)) {

package/package.json

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