tests for compiler flags

malloydata · Aug 10, 2023 · 879f7fc · 879f7fc
1 parent 94c82a0
commit 879f7fc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/packages/malloy/src/lang/ast/types/annotation-elements.ts b/packages/malloy/src/lang/ast/types/annotation-elements.ts
@@ -23,6 +23,7 @@
 
 import {Note} from '../../../model/malloy_types';
 import {Tag} from '../../../tags';
+import {MessageLogger} from '../../parse-log';
 import {Document, DocStatement, MalloyElement} from './malloy-element';
 import {QueryPropertyInterface} from './query-property-interface';
 
@@ -44,18 +45,15 @@ export class ObjectAnnotation
 export class ModelAnnotation extends ObjectAnnotation implements DocStatement {
   elementType = 'modelAnnotation';
 
-  getCompilerFlags(existing: Tag): Tag {
+  getCompilerFlags(existing: Tag, logTo: MessageLogger): Tag {
     const tagParse = Tag.annotationToTag(
       {notes: this.notes},
       {
         prefix: /^##! /,
         extending: existing,
       }
     );
-    const logTo = this.logger();
-    if (logTo) {
-      tagParse.log.forEach(err => logTo.log(err));
-    }
+    tagParse.log.forEach(err => logTo.log(err));
     return tagParse.tag;
   }
 

diff --git a/packages/malloy/src/lang/malloy-to-ast.ts b/packages/malloy/src/lang/malloy-to-ast.ts
@@ -1714,7 +1714,7 @@ export class MalloyToAST
       };
     });
     const tags = new ast.ModelAnnotation(allNotes);
-    this.compilerFlags = tags.getCompilerFlags(this.compilerFlags);
+    this.compilerFlags = tags.getCompilerFlags(this.compilerFlags, this.msgLog);
     return tags;
   }
 

diff --git a/packages/malloy/src/lang/test/annotation.spec.ts b/packages/malloy/src/lang/test/annotation.spec.ts
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import {TestTranslator, getFieldDef} from './test-translator';
+import {TestTranslator, getFieldDef, model} from './test-translator';
 import './parse-expects';
 import {diff} from 'jest-diff';
 import {Annotation} from '../../model/malloy_types';
@@ -265,6 +265,18 @@ describe('document annotation', () => {
       'Object annotation not connected to any object'
     );
   });
+  test('errors reported from compiler flags', () => {
+    expect(`
+      ##! missingCloseQuote="...
+    `).translationToFailWith(/no viable alternative at input/);
+  });
+  test('checking compiler flags', () => {
+    const m = model`
+      ##! flagThis
+    `;
+    expect(m).toTranslate();
+    expect(m.translator.compilerFlags.has('flagThis')).toBeTruthy();
+  });
 });
 describe('source definition annotations', () => {
   test('turtle block annotation', () => {