@malloydata/malloy 0.0.38-dev230609221655 → 0.0.38-dev230612191503

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

@@ -78,17 +78,17 @@ function badModel(s, msg) {
     };
 }
 describe('model statements', () => {
-    describe('explore:', () => {
-        test('explore table', modelOK("explore: testA is table('aTable')"));
-        test('explore shorcut fitlered table', () => {
-            expect("explore: testA is table('aTable') {? astr ~ 'a%' } ").toCompile();
+    describe('source:', () => {
+        test('table', modelOK("source: testA is table('aTable')"));
+        test('shorcut fitlered table', () => {
+            expect("source: testA is table('aTable') {? astr ~ 'a%' } ").toCompile();
         });
-        test('explore fitlered table', modelOK(`
-        explore: testA is table('aTable') { where: astr ~ 'a%' }
+        test('fitlered table', modelOK(`
+        source: testA is table('aTable') { where: astr ~ 'a%' }
       `));
-        test('explore explore', modelOK('explore: testA is a'));
-        test('explore query', modelOK('explore: testA is from(a->{group_by: astr})'));
-        test('refine explore', modelOK('explore: aa is a { dimension: a is astr }'));
+        test('ref source with no refinement', modelOK('source: testA is a'));
+        test('from(query)', modelOK('source: testA is from(a->{group_by: astr})'));
+        test('refine source', modelOK('source: aa is a { dimension: a is astr }'));
         test('source refinement preserves original', () => {
             const x = new test_translator_1.TestTranslator('source: na is a + { dimension: one is 1 }');
             expect(x).modelCompiled();
@@ -116,7 +116,7 @@ describe('model statements', () => {
           -> { group_by: astr; aggregate: acount }
           -> { top: 5; where: astr ~ 'a%' group_by: astr }
       `));
-        test('query from explore from query', modelOK('query: from(ab -> {group_by: astr}) { dimension: bigstr is UPPER(astr) } -> { group_by: bigstr }'));
+        test('from(query) refined into query', modelOK('query: from(ab -> {group_by: astr}) { dimension: bigstr is UPPER(astr) } -> { group_by: bigstr }'));
         test('query with shortcut filtered turtle', modelOK("query: allA is ab->aturtle {? astr ~ 'a%' }"));
         test('query with filtered turtle', modelOK("query: allA is ab->aturtle { where: astr ~ 'a%' }"));
         test('nest: in group_by:', modelOK(`
@@ -228,34 +228,34 @@ describe('model statements', () => {
         expect('query: q1 is a -> { project: * }, q1 is a -> { project: * }').compileToFailWith("Query 'q1' is already defined, cannot redefine");
     });
 });
-describe('explore properties', () => {
-    test('single dimension', modelOK('explore: aa is a { dimension: x is 1 }'));
+describe('source properties', () => {
+    test('single dimension', modelOK('source: aa is a { dimension: x is 1 }'));
     test('multiple dimensions', modelOK(`
-      explore: aa is a {
+      source: aa is a {
         dimension:
           x is 1
           y is 2
       }
     `));
-    test('single declare', modelOK('explore: aa is a { declare: x is 1 }'));
+    test('single declare', modelOK('source: aa is a { declare: x is 1 }'));
     test('multiple declare', modelOK(`
-      explore: aa is a {
+      source: aa is a {
         declare:
           x is 1
           y is 2
       }
     `));
-    test('single measure', modelOK('explore: aa is a { measure: x is count() }'));
+    test('single measure', modelOK('source: aa is a { measure: x is count() }'));
     test('multiple measures', modelOK(`
-      explore: aa is a {
+      source: aa is a {
         dimension:
           x is count()
           y is x * x
       }
     `));
-    test('single where', modelOK('explore: aa is a { where: ai > 10 }'));
+    test('single where', modelOK('source: aa is a { where: ai > 10 }'));
     test('multiple where', modelOK(`
-      explore: aa is a {
+      source: aa is a {
         where:
           ai > 10,
           af < 1000
@@ -271,18 +271,18 @@ describe('explore properties', () => {
       }
     }`));
     describe('joins', () => {
-        test('with', modelOK('explore: x is a { join_one: b with astr }'));
-        test('with', modelOK('explore: x is a { join_one: y is b with astr }'));
-        test('with dotted ref', modelOK('explore: x is ab { join_one: xz is a with b.astr }'));
-        test('one on', modelOK('explore: x is a { join_one: b on astr = b.astr }'));
-        test('one is on', modelOK('explore: x is a { join_one: y is b on astr = y.astr }'));
-        test('many on', modelOK('explore: nab is a { join_many: b on astr = b.astr }'));
-        test('many is on', modelOK('explore: y is a { join_many: x is b on astr = x.astr }'));
-        test('cross', modelOK('explore: nab is a { join_cross: b }'));
-        test('cross is', modelOK('explore: nab is a { join_cross: xb is b }'));
-        test('cross on', modelOK('explore: nab is a { join_cross: b on true}'));
+        test('with', modelOK('source: x is a { join_one: b with astr }'));
+        test('with', modelOK('source: x is a { join_one: y is b with astr }'));
+        test('with dotted ref', modelOK('source: x is ab { join_one: xz is a with b.astr }'));
+        test('one on', modelOK('source: x is a { join_one: b on astr = b.astr }'));
+        test('one is on', modelOK('source: x is a { join_one: y is b on astr = y.astr }'));
+        test('many on', modelOK('source: nab is a { join_many: b on astr = b.astr }'));
+        test('many is on', modelOK('source: y is a { join_many: x is b on astr = x.astr }'));
+        test('cross', modelOK('source: nab is a { join_cross: b }'));
+        test('cross is', modelOK('source: nab is a { join_cross: xb is b }'));
+        test('cross on', modelOK('source: nab is a { join_cross: b on true}'));
         test('multiple joins', modelOK(`
-        explore: nab is a {
+        source: nab is a {
           join_one:
             b with astr,
             br is b with astr
@@ -296,19 +296,19 @@ describe('explore properties', () => {
         `).compileToFailWith('join_one: Cannot use with unless source has a primary key');
         });
     });
-    test('primary_key', modelOK('explore: c is a { primary_key: ai }'));
-    test('rename', modelOK('explore: c is a { rename: nn is ai }'));
+    test('primary_key', modelOK('source: c is a { primary_key: ai }'));
+    test('rename', modelOK('source: c is a { rename: nn is ai }'));
     test('accept single', () => {
-        const onlyAstr = new test_translator_1.TestTranslator('explore: c is a { accept: astr }');
+        const onlyAstr = new test_translator_1.TestTranslator('source: c is a { accept: astr }');
         expect(onlyAstr).modelCompiled();
         const c = onlyAstr.getSourceDef('c');
         if (c) {
             expect(c.fields.length).toBe(1);
         }
     });
-    test('accept multi', modelOK('explore: c is a { accept: astr, af }'));
+    test('accept multi', modelOK('source: c is a { accept: astr, af }'));
     test('except single', () => {
-        const noAstr = new test_translator_1.TestTranslator('explore: c is a { except: astr }');
+        const noAstr = new test_translator_1.TestTranslator('source: c is a { except: astr }');
         expect(noAstr).modelCompiled();
         const c = noAstr.getSourceDef('c');
         if (c) {
@@ -316,15 +316,15 @@ describe('explore properties', () => {
             expect(foundAstr).toBeUndefined();
         }
     });
-    test('except multi', modelOK('explore: c is a { except: astr, af }'));
-    test('explore-query', modelOK('explore: c is a {query: q is { group_by: astr } }'));
+    test('except multi', modelOK('source: c is a { except: astr, af }'));
+    test('explore-query', modelOK('source: c is a {query: q is { group_by: astr } }'));
     test('refined explore-query', modelOK(`
-      explore: abNew is ab {
+      source: abNew is ab {
         query: for1 is aturtle {? ai = 1 }
       }
     `));
     test('chained explore-query', modelOK(`
-      explore: c is a {
+      source: c is a {
         query: chain is {
           group_by: astr
         } -> {
@@ -334,7 +334,7 @@ describe('explore properties', () => {
       }
     `));
     test('multiple explore-query', modelOK(`
-      explore: abNew is ab {
+      source: abNew is ab {
         query:
           q1 is { group_by: astr },
           q2 is { group_by: ai }
@@ -751,14 +751,14 @@ describe('expressions', () => {
       `));
         test('n-ary without else', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           pick 7 when true and true
         }
       `).compileToFailWith("pick incomplete, missing 'else'", "Cannot define 'd', value has unknown type");
         });
         test('n-ary with mismatch when clauses', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           pick 7 when true and true
           pick '7' when true or true
           else 7
@@ -767,7 +767,7 @@ describe('expressions', () => {
         });
         test('n-ary with mismatched else clause', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           pick 7 when true and true
           else '7'
         }
@@ -775,21 +775,21 @@ describe('expressions', () => {
         });
         test('applied else mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           7 ? pick 7 when 7 else 'not seven'
         }
       `).compileToFailWith("else type 'string', expected 'number'", "Cannot define 'd', value has unknown type");
         });
         test('applied default mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           7 ? pick 'seven' when 7
         }
       `).compileToFailWith("pick default type 'number', expected 'string'", "Cannot define 'd', value has unknown type");
         });
         test('applied when mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        explore: na is a + { dimension: d is
+        source: na is a + { dimension: d is
           7 ? pick 'seven' when 7 pick 6 when 6
         }
       `).compileToFailWith("pick type 'number', expected 'string'", "Cannot define 'd', value has unknown type");
@@ -893,12 +893,12 @@ describe('error handling', () => {
     });
     test('join reference before definition', () => {
         expect((0, test_translator_1.markSource) `
-        explore: newAB is a { join_one: newB is ${'bb'} on astring }
-        explore: newB is b
+        source: newAB is a { join_one: newB is ${'bb'} on astring }
+        source: newB is b
       `).compileToFailWith("Undefined source 'bb'");
     });
-    test('non-rename rename', badModel('explore: na is a { rename: astr is astr }', "Can't rename field to itself"));
-    test('reference to field in its definition', badModel('explore: na is a { dimension: ustr is UPPER(ustr) } ', "Circular reference to 'ustr' in definition"));
+    test('non-rename rename', badModel('source: na is a { rename: astr is astr }', "Can't rename field to itself"));
+    test('reference to field in its definition', badModel('source: na is a { dimension: ustr is UPPER(ustr) } ', "Circular reference to 'ustr' in definition"));
     test('empty model', modelOK(''));
     test('one line model ', modelOK('\n'));
     test('query without fields', badModel('query: a -> { top: 5 }', "Can't determine query type (group_by/aggregate/nest,project,index)"));
@@ -906,7 +906,7 @@ describe('error handling', () => {
     test('undefined field ref in query', badModel('query: ab -> { aggregate: xyzzy }', "'xyzzy' is not defined"));
     test('query on source with errors', () => {
         expect((0, test_translator_1.markSource) `
-        explore: na is a { join_one: ${'n'} on astr }
+        source: na is a { join_one: ${'n'} on astr }
       `).compileToFailWith("Undefined source 'n'");
     });
     test('detect duplicate output field names', () => {
@@ -945,7 +945,7 @@ describe('error handling', () => {
     }
     `));
     test('popping out of embedding when not embedded', () => {
-        expect('}%').compileToFailWith("extraneous input '}%' expecting {<EOF>, EXPLORE, QUERY, SOURCE, SQL, IMPORT, ';'}");
+        expect('}%').compileToFailWith(/extraneous input '}%' expecting/);
     });
     test('bad sql in sql block', () => {
         const badModel = new test_translator_1.TestTranslator('sql: { select: """)""" }');
@@ -987,20 +987,20 @@ function getSelectOneStruct(sqlBlock) {
     };
 }
 describe('source locations', () => {
-    test('renamed explore location', () => {
-        const source = (0, test_translator_1.markSource) `explore: ${'na is a'}`;
+    test('renamed source location', () => {
+        const source = (0, test_translator_1.markSource) `source: ${'na is a'}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         expect((0, test_translator_1.getExplore)(m.modelDef, 'na').location).toMatchObject(source.locations[0]);
     });
-    test('refined explore location', () => {
-        const source = (0, test_translator_1.markSource) `explore: ${'na is a {}'}`;
+    test('refined source location', () => {
+        const source = (0, test_translator_1.markSource) `source: ${'na is a {}'}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         expect((0, test_translator_1.getExplore)(m.modelDef, 'na').location).toMatchObject(source.locations[0]);
     });
     test('location of defined dimension', () => {
-        const source = (0, test_translator_1.markSource) `explore: na is a { dimension: ${'x is 1'} }`;
+        const source = (0, test_translator_1.markSource) `source: na is a { dimension: ${'x is 1'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
@@ -1008,7 +1008,7 @@ describe('source locations', () => {
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined measure', () => {
-        const source = (0, test_translator_1.markSource) `explore: na is a { measure: ${'x is count()'} }`;
+        const source = (0, test_translator_1.markSource) `source: na is a { measure: ${'x is count()'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
@@ -1016,7 +1016,7 @@ describe('source locations', () => {
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined query', () => {
-        const source = (0, test_translator_1.markSource) `explore: na is a { query: ${'x is { group_by: y is 1 }'} }`;
+        const source = (0, test_translator_1.markSource) `source: na is a { query: ${'x is { group_by: y is 1 }'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
@@ -1025,7 +1025,7 @@ describe('source locations', () => {
     });
     test('location of defined field inside a query', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         query: x is {
           group_by: ${'y is 1'}
         }
@@ -1039,7 +1039,7 @@ describe('source locations', () => {
     });
     test('location of filtered field inside a query', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         measure: y is count()
         query: x is {
           group_by: ${'z is y { where: true }'}
@@ -1053,7 +1053,7 @@ describe('source locations', () => {
         expect(z.location).toMatchObject(source.locations[0]);
     });
     test('location of field inherited from table', () => {
-        const source = (0, test_translator_1.markSource) `explore: na is ${"table('aTable')"}`;
+        const source = (0, test_translator_1.markSource) `source: na is ${"table('aTable')"}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
@@ -1063,7 +1063,7 @@ describe('source locations', () => {
     test('location of field inherited from sql block', () => {
         const source = (0, test_translator_1.markSource) `--- comment
       sql: s is { select: ${'"""SELECT 1 as one """'} }
-      explore: na is from_sql(s)
+      source: na is from_sql(s)
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
@@ -1081,7 +1081,7 @@ describe('source locations', () => {
     });
     test('location of fields inherited from a query', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is from(
+      source: na is from(
         ${"table('aTable')"} -> {
           group_by:
             abool
@@ -1129,7 +1129,7 @@ describe('source locations', () => {
     });
     test('location of renamed field', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         rename: ${'bbool is abool'}
       }
     `;
@@ -1141,7 +1141,7 @@ describe('source locations', () => {
     });
     test('location of join on', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: ${'x is a { primary_key: abool } on abool'}
       }
     `;
@@ -1153,7 +1153,7 @@ describe('source locations', () => {
     });
     test('location of join with', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: ${'x is a { primary_key: astr } with astr'}
       }
     `;
@@ -1165,7 +1165,7 @@ describe('source locations', () => {
     });
     test('location of field in join', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: x is a {
           primary_key: abool
           dimension: ${'y is 1'}
@@ -1196,7 +1196,7 @@ describe('source locations', () => {
 describe('source references', () => {
     test('reference to explore', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: ${'na is a'}
+      source: ${'na is a'}
       query: ${'na'} -> { project: * }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1212,7 +1212,7 @@ describe('source references', () => {
     });
     test('reference to query in query', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: t is a {
+      source: t is a {
         query: ${'q is { project: * }'}
       }
       query: t -> ${'q'}
@@ -1230,7 +1230,7 @@ describe('source references', () => {
     });
     test('reference to query in query (version 2)', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a { query: ${'x is { group_by: y is 1 }'} }
+      source: na is a { query: ${'x is { group_by: y is 1 }'} }
       query: na -> ${'x'}
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1247,7 +1247,7 @@ describe('source references', () => {
     test('reference to sql block', () => {
         const source = (0, test_translator_1.markSource) `
       ${'sql: s is {select:"""SELECT 1 as one"""}'}
-      explore: na is from_sql(${'s'})
+      source: na is from_sql(${'s'})
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
@@ -1273,7 +1273,7 @@ describe('source references', () => {
     test('reference to query in from', () => {
         const source = (0, test_translator_1.markSource) `
       query: ${'q is a -> { project: * }'}
-      explore: na is from(-> ${'q'})
+      source: na is from(-> ${'q'})
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
@@ -1320,7 +1320,7 @@ describe('source references', () => {
     });
     test('reference to field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is ${"table('aTable')"}
+      source: na is ${"table('aTable')"}
       query: na -> { project: bbool is not ${'abool'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1336,7 +1336,7 @@ describe('source references', () => {
     });
     test('reference to quoted field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         dimension: ${"`name` is 'name'"}
       }
       query: na -> { project: ${'`name`'} }
@@ -1354,7 +1354,7 @@ describe('source references', () => {
     });
     test('reference to joined field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: self is ${"table('aTable')"}
           on astr = self.astr
       }
@@ -1373,7 +1373,7 @@ describe('source references', () => {
     });
     test('reference to joined join in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: ${'self is a on astr = self.astr'}
       }
       query: na -> { project: bstr is ${'self'}.astr }
@@ -1406,7 +1406,7 @@ describe('source references', () => {
     });
     test('reference to field not in expression (project)', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is ${"table('aTable')"}
+      source: na is ${"table('aTable')"}
       query: na -> { project: ${'abool'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1476,7 +1476,7 @@ describe('source references', () => {
     });
     test('reference to field in measure', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: e is a {
+      source: e is a {
         measure: ${'c is count()'}
         measure: c2 is ${'c'}
       }
@@ -1548,7 +1548,7 @@ describe('source references', () => {
     });
     test('reference to field in aggregate source', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is ${"table('aTable')"}
+      source: na is ${"table('aTable')"}
       query: na -> { aggregate: ai_sum is ${'ai'}.sum() }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1567,7 +1567,7 @@ describe('source references', () => {
     }
     test('reference to join in aggregate source', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: ${'self is a on astr = self.astr'}
       }
       query: na -> { aggregate: ai_sum is ${'self'}.sum(self.ai) }
@@ -1585,7 +1585,7 @@ describe('source references', () => {
     });
     test('reference to join in aggregate in expr', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is a {
+      source: na is a {
         join_one: ${'self is a on astr = self.astr'}
       }
       query: na -> { aggregate: ai_sum is self.sum(${'self'}.ai) }
@@ -1601,10 +1601,10 @@ describe('source references', () => {
             },
         });
     });
-    test('reference to explore in join', () => {
+    test('reference to sourcein join', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: ${'exp1 is a'}
-      explore: exp2 is a {
+      source: ${'exp1 is a'}
+      source: exp2 is a {
         join_one: ${'exp1'} on astr = exp1.astr
       }
     `;
@@ -1621,7 +1621,7 @@ describe('source references', () => {
     });
     test('reference to field in aggregate (in expr)', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is ${"table('aTable')"}
+      source: na is ${"table('aTable')"}
       query: na -> { aggregate: ai_sum is sum(${'ai'}) }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -1637,7 +1637,7 @@ describe('source references', () => {
     });
     test('reference to field in rename', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: na is ${"table('aTable')"} {
+      source: na is ${"table('aTable')"} {
         rename: bbool is ${'abool'}
       }
     `;
@@ -1654,8 +1654,8 @@ describe('source references', () => {
     });
     test('reference to field in join with', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: exp1 is a { primary_key: astr }
-      explore: exp2 is ${"table('aTable')"} {
+      source: exp1 is a { primary_key: astr }
+      source: exp2 is ${"table('aTable')"} {
         join_one: exp1 with ${'astr'}
       }
     `;
@@ -1702,7 +1702,7 @@ describe('translation need error locations', () => {
     });
     test('table struct error location', () => {
         const source = (0, test_translator_1.markSource) `
-      explore: bad_explore is ${"table('malloy-data.bad.table')"}
+      source: bad_explore is ${"table('malloy-data.bad.table')"}
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         const result = m.translate();
@@ -1719,7 +1719,7 @@ describe('translation need error locations', () => {
 });
 describe('pipeline comprehension', () => {
     test('second query gets namespace from first', modelOK(`
-      explore: aq is a {
+      source: aq is a {
         query: t1 is {
           group_by: t1int is ai, t1str is astr
         } -> {
@@ -1728,7 +1728,7 @@ describe('pipeline comprehension', () => {
       }
     `));
     test("second query doesn't have access to original fields", badModel((0, test_translator_1.markSource) `
-        explore: aq is a {
+        source: aq is a {
           query: t1 is {
             group_by: t1int is ai, t1str is astr
           } -> {
@@ -1737,7 +1737,7 @@ describe('pipeline comprehension', () => {
         }
       `, "'ai' is not defined"));
     test('new query can append ops to existing query', modelOK(`
-      explore: aq is a {
+      source: aq is a {
         query: t0 is {
           group_by: t1int is ai, t1str is astr
         }
@@ -1747,7 +1747,7 @@ describe('pipeline comprehension', () => {
       }
     `));
     test('new query can refine and append to exisiting query', modelOK(`
-      explore: aq is table('aTable') {
+      source: aq is table('aTable') {
         query: by_region is { group_by: astr }
         query: by_region2 is by_region {
           nest: dateNest is { group_by: ad }
@@ -1762,9 +1762,9 @@ describe('pipeline comprehension', () => {
         nest: aturtle { limit: 1 }
       }
     `));
-    test('Querying an explore based on a query', modelOK(`
+    test('Querying an sourcebased on a query', modelOK(`
       query: q is a -> { group_by: astr; aggregate: strsum is ai.sum() }
-      explore: aq is a {
+      source: aq is a {
         join_one: aq is from(->q) on astr = aq.astr
       }
       query: aqf is aq -> { project: * }

package/dist/lang/test/sql-block.spec.js

@@ -108,7 +108,7 @@ describe('sql:', () => {
             }
         }
     });
-    test('explore from imported sql-based-source', () => {
+    test('source from imported sql-based-source', () => {
         const createModel = `
       sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
@@ -161,7 +161,7 @@ describe('sql:', () => {
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).modelCompiled();
     });
-    test('explore from extended sql-based-source', () => {
+    test('source from extended sql-based-source', () => {
         var _a, _b;
         const model = new test_translator_1.TestTranslator(`
       sql: sql_block IS { select: """${selStmt}""" }

package/dist/lang/test/test-translator.js

@@ -307,7 +307,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         if (explore && explore.type === 'struct') {
             return explore;
         }
-        throw new Error(`Expected model to contain explore '${exploreName}'`);
+        throw new Error(`Expected model to contain source '${exploreName}'`);
     }
     compile() {
         const compileTo = this.translate();

package/dist/malloy.js

@@ -1305,7 +1305,7 @@ class ExploreField extends Explore {
             case 'nested':
                 return JoinRelationship.ManyToOne;
             default:
-                throw new Error('An explore field must have a join relationship.');
+                throw new Error('A source field must have a join relationship.');
         }
     }
     isQueryField() {

package/dist/model/malloy_query.js

@@ -1286,13 +1286,13 @@ class QueryQuery extends QueryField {
                     while (path.length > 0 && (pathElementName = path.shift())) {
                         const structNode = struct.getChildByName(pathElementName);
                         if (structNode === undefined) {
-                            throw new Error(`Nested explore not found '${pathElementName}'`);
+                            throw new Error(`Nested source not found '${pathElementName}'`);
                         }
                         if (structNode instanceof QueryStruct) {
                             struct = structNode;
                         }
                         else {
-                            throw new Error(`'${pathElementName}' is not an explore object`);
+                            throw new Error(`'${pathElementName}' is not a source object`);
                         }
                     }
                     ret = ret.concat(this.expandWildCardStruct(struct, expandChildren, filter));

package/package.json

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