@malloydata/malloy 0.0.43 → 0.0.44-dev230623185845

package/dist/lang/test/annotation.spec.js

@@ -0,0 +1,565 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_translator_1 = require("./test-translator");
+require("./parse-expects");
+const defaultTags = {
+    blockNotes: ['# blockNote\n'],
+    notes: ['# note\n', '# b4-is\n', '# after-is\n'],
+};
+const turtleDef = `
+source: na is a {
+  # blockNote
+  query:
+  # note
+    note_a
+    # b4-is
+    is
+    # after-is
+    {project: *}
+}
+`;
+describe('document annotation', () => {
+    test('every source annotation point', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # blockNote
+      source:
+      # note
+      note_a
+      # b4-is
+      is
+      # after-is
+      a
+      # note1
+      note_b is a
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getSourceDef('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual(defaultTags);
+        }
+        const note_b = m.getSourceDef('note_b');
+        expect(note_b).toBeDefined();
+        if (note_b) {
+            expect(note_b.annotation).toEqual({
+                blockNotes: defaultTags.blockNotes,
+                notes: ['# note1\n'],
+            });
+        }
+    });
+    test('multi line source annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note1
+      # note1.1
+      source: note_a is a
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getSourceDef('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                blockNotes: ['# note1\n', '# note1.1\n'],
+            });
+        }
+    });
+    test('inherited annotation source', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note0
+      source: note_b is a
+      # note1
+      source: note_a is note_b { primary_key: ai }
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getSourceDef('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                inherits: { blockNotes: ['# note0\n'] },
+                blockNotes: ['# note1\n'],
+            });
+        }
+    });
+    test('define full query annotation points', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # blockNote
+      query:
+      # note
+      note_a
+      # b4-is
+      is
+      # after-is
+      a -> {project: *}
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('anonymous query annotation points', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note1
+      query:
+        # note2
+        a -> {project: *}
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery(0);
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                blockNotes: ['# note1\n'],
+                notes: ['# note2\n'],
+            });
+        }
+    });
+    test('run statement annotation points', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note1
+      run:
+        # note2
+        a -> {project: *}
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery(0);
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                blockNotes: ['# note1\n'],
+                notes: ['# note2\n'],
+            });
+        }
+    });
+    test('multi line query annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note1
+      # note2
+      query: note_a is a -> {project: *}
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                blockNotes: ['# note1\n', '# note2\n'],
+            });
+        }
+    });
+    test('inherited annotation query', () => {
+        const m = new test_translator_1.TestTranslator(`
+    # noteb0
+      query:
+    # noteb1
+        note_b is a -> { project: * }
+    # note1
+      query: note_a is -> note_b { where: astr = 'a' }
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery('note_a');
+        expect(note_a).toBeDefined();
+        if (note_a) {
+            expect(note_a.annotation).toEqual({
+                inherits: { blockNotes: ['# noteb0\n'], notes: ['# noteb1\n'] },
+                blockNotes: ['# note1\n'],
+            });
+        }
+    });
+    test('query from turtle inherits turtle annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      ${turtleDef}
+      query: na->note_a
+    `);
+        expect(m).toTranslate();
+        const note_a = m.getQuery(0);
+        expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toBeDefined();
+        expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual({ inherits: defaultTags });
+    });
+    test('model annotations', () => {
+        var _a;
+        const m = new test_translator_1.TestTranslator(`
+      ## model1
+      ## model2
+    `);
+        expect(m).toTranslate();
+        const model = (_a = m.translate()) === null || _a === void 0 ? void 0 : _a.translated;
+        expect(model).toBeDefined();
+        const notes = model === null || model === void 0 ? void 0 : model.modelDef.annotation;
+        expect(notes).toEqual({ notes: ['## model1\n', '## model2\n'] });
+    });
+    test('ignores objectless object annotations', () => {
+        const m = new test_translator_1.TestTranslator(`
+      # note1
+      ## model1
+    `);
+        expect(m).toTranslate();
+    });
+});
+describe('source definition annotations', () => {
+    test('turtle block annotation', () => {
+        const m = new test_translator_1.TestTranslator(turtleDef);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'note_a');
+            expect(note_a).toBeDefined();
+            expect(note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('refined turtle inherits annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      ${turtleDef}
+      source: new_na is na + {
+        query: new_note_a is note_a
+      }
+    `);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('new_na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'new_note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toBeDefined();
+            expect(note_a.annotation).toEqual({ inherits: defaultTags });
+        }
+    });
+    test('dimension block annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: na is a {
+        # blockNote
+        dimension:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          astr
+      }
+    `);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('measure block annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: na is a {
+        # blockNote
+        measure:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          max(astr)
+      }
+    `);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('join_one-with block annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: na is a {
+        # blockNote
+        join_one:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          ab with astr
+      }
+    `);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('join_many-on block annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: na is a {
+        # blockNote
+        join_many:
+        # note
+        note_a
+        # b4-is
+        is
+        # after-is
+        a on note_a.astr = astr
+      }
+    `);
+        expect(m).toTranslate();
+        const na = m.getSourceDef('na');
+        expect(na).toBeDefined();
+        if (na) {
+            const note_a = (0, test_translator_1.getFieldDef)(na, 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('ignores model annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: na is a {
+        ## model1
+      }
+    `);
+        expect(m).toTranslate();
+    });
+});
+describe('query operation annotations', () => {
+    test('ignores model annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: a -> {
+        ## model1
+        project: *
+      }
+    `);
+        expect(m).toTranslate();
+    });
+    test('project new definition annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: findme is a -> {
+        # blockNote
+        project:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          astr
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('project ref inherits annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: a + {
+        # blockNote
+        dimension:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          astr
+      } -> {
+        # note1
+        project:
+          # note2
+          note_a
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery(0);
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual({
+                inherits: defaultTags,
+                blockNotes: ['# note1\n'],
+                notes: ['# note2\n'],
+            });
+        }
+    });
+    test('group_by def', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: findme is a -> {
+        # blockNote
+        group_by:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          astr
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('caculate def', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: findme is a -> {
+        group_by: astr, ai
+        # blockNote
+        calculate:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          lag(ai)
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('group_by ref inherits', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: aa is a + {
+        # blockNote
+        dimension:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          astr
+      }
+      query: findme is aa -> {
+        # note1
+        group_by:
+        # note2
+        note_a
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual({
+                blockNotes: ['# note1\n'],
+                inherits: defaultTags,
+                notes: ['# note2\n'],
+            });
+        }
+    });
+    test('aggregate def', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: findme is a -> {
+        # blockNote
+        aggregate:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          max(astr)
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('aggregate ref inherits', () => {
+        const m = new test_translator_1.TestTranslator(`
+      source: aa is a + {
+        # blockNote
+        measure:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          max(astr)
+      }
+      query: findme is aa -> {
+        # note1
+        aggregate:
+        # note2
+        note_a
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual({
+                blockNotes: ['# note1\n'],
+                inherits: defaultTags,
+                notes: ['# note2\n'],
+            });
+        }
+    });
+    test('nest annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: findme is ab -> {
+        # blockNote
+        nest:
+          # note
+          note_a
+          # b4-is
+          is
+          # after-is
+          aturtle
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery('findme');
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).toEqual(defaultTags);
+        }
+    });
+    test('nest from existing inherits annotation', () => {
+        const m = new test_translator_1.TestTranslator(`
+      ${turtleDef}
+      query: na -> {
+        nest: note_b is note_a
+      }
+    `);
+        expect(m).toTranslate();
+        const foundYou = m.getQuery(0);
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_b = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_b');
+            expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).toEqual({ inherits: defaultTags });
+        }
+    });
+});
+//# sourceMappingURL=annotation.spec.js.map

package/dist/lang/test/parse.spec.js

@@ -1641,12 +1641,13 @@ describe('error handling', () => {
         expect('}%').translationToFailWith(/extraneous input '}%' expecting/);
     });
     test('bad sql in sql block', () => {
-        const badModel = new test_translator_1.TestTranslator('sql: { select: """)""" }');
-        expect(badModel).toParse();
-        const needSchema = badModel.translate();
+        const badSelect = (0, test_translator_1.model) `sql: someName is { select: """)""" }`;
+        const badTrans = badSelect.translator;
+        expect(badSelect).toParse();
+        const needSchema = badTrans.translate();
         expect(needSchema.compileSQL).toBeDefined();
         if (needSchema.compileSQL) {
-            badModel.update({
+            badTrans.update({
                 errors: {
                     compileSQL: {
                         [needSchema.compileSQL.name]: 'ZZZZ',
@@ -1654,7 +1655,7 @@ describe('error handling', () => {
                 },
             });
         }
-        expect(badModel).translationToFailWith('Invalid SQL, ZZZZ');
+        expect(badTrans).translationToFailWith('Invalid SQL, ZZZZ');
     });
 });
 function getSelectOneStruct(sqlBlock) {
@@ -1697,7 +1698,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const x = (0, test_translator_1.getField)(na, 'x');
+        const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined measure', () => {
@@ -1705,7 +1706,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const x = (0, test_translator_1.getField)(na, 'x');
+        const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined query', () => {
@@ -1713,7 +1714,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const x = (0, test_translator_1.getField)(na, 'x');
+        const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined field inside a query', () => {
@@ -1727,7 +1728,7 @@ describe('source locations', () => {
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
-        const y = (0, test_translator_1.getField)(x.pipeline[0], 'y');
+        const y = (0, test_translator_1.getFieldDef)(x.pipeline[0], 'y');
         expect(y.location).toMatchObject(source.locations[0]);
     });
     test('location of filtered field inside a query', () => {
@@ -1742,7 +1743,7 @@ describe('source locations', () => {
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
-        const z = (0, test_translator_1.getField)(x.pipeline[0], 'z');
+        const z = (0, test_translator_1.getFieldDef)(x.pipeline[0], 'z');
         expect(z.location).toMatchObject(source.locations[0]);
     });
     test('location of field inherited from table', () => {
@@ -1750,7 +1751,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const abool = (0, test_translator_1.getField)(na, 'abool');
+        const abool = (0, test_translator_1.getFieldDef)(na, 'abool');
         expect(abool.location).toMatchObject(source.locations[0]);
     });
     test('location of field inherited from sql block', () => {
@@ -1768,7 +1769,7 @@ describe('source locations', () => {
             });
             expect(m).toTranslate();
             const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-            const one = (0, test_translator_1.getField)(na, 'one');
+            const one = (0, test_translator_1.getFieldDef)(na, 'one');
             expect(one.location).isLocationIn(source.locations[0], source.code);
         }
     });
@@ -1785,9 +1786,9 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const abool = (0, test_translator_1.getField)(na, 'abool');
+        const abool = (0, test_translator_1.getFieldDef)(na, 'abool');
         expect(abool.location).toMatchObject(source.locations[0]);
-        const y = (0, test_translator_1.getField)(na, 'y');
+        const y = (0, test_translator_1.getFieldDef)(na, 'y');
         expect(y.location).toMatchObject(source.locations[1]);
     });
     test('location of named query', () => {
@@ -1802,7 +1803,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const q = (0, test_translator_1.getModelQuery)(m.modelDef, 'q');
-        const a = (0, test_translator_1.getField)(q.pipeline[0], 'b');
+        const a = (0, test_translator_1.getFieldDef)(q.pipeline[0], 'b');
         expect(a.location).toMatchObject(source.locations[0]);
     });
     test('location of named SQL block', () => {
@@ -1829,7 +1830,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const bbool = (0, test_translator_1.getField)(na, 'bbool');
+        const bbool = (0, test_translator_1.getFieldDef)(na, 'bbool');
         expect(bbool.location).toMatchObject(source.locations[0]);
     });
     test('location of join on', () => {
@@ -1841,7 +1842,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const x = (0, test_translator_1.getField)(na, 'x');
+        const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of join with', () => {
@@ -1853,7 +1854,7 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
-        const x = (0, test_translator_1.getField)(na, 'x');
+        const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of field in join', () => {
@@ -1869,7 +1870,7 @@ describe('source locations', () => {
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getJoinField)(na, 'x');
-        const y = (0, test_translator_1.getField)(x, 'y');
+        const y = (0, test_translator_1.getFieldDef)(x, 'y');
         expect(y.location).toMatchObject(source.locations[0]);
     });
     // Since """ strings are not single tokens, I don't know how to do this.