@malloydata/malloy 0.0.80-dev230903192621 → 0.0.80-dev230905212201

package/dist/lang/malloy-to-ast.js

@@ -734,24 +734,22 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitCollectionWildCard(pcx) {
         const nameCx = pcx.fieldPath();
-        const stars = pcx.STAR() ? '*' : '**';
         const join = nameCx
             ? this.getFieldPath(nameCx, ast.ProjectFieldReference)
             : undefined;
-        return new ast.WildcardFieldReference(join, stars);
+        return this.astAt(new ast.WildcardFieldReference(join), pcx);
     }
     visitIndexFields(pcx) {
         const refList = pcx.indexElement().map(el => {
-            const hasStar = el.STAR() !== undefined;
             const pathCx = el.fieldPath();
             if (!pathCx) {
-                return new ast.WildcardFieldReference(undefined, '*');
+                return this.astAt(new ast.WildcardFieldReference(undefined), pcx);
             }
             const path = this.getFieldPath(pathCx, ast.IndexFieldReference);
-            if (!hasStar) {
+            if (!el.STAR()) {
                 return this.astAt(path, pcx);
             }
-            return this.astAt(new ast.WildcardFieldReference(path, '*'), pcx);
+            return this.astAt(new ast.WildcardFieldReference(path), pcx);
         });
         return new ast.FieldReferences(refList);
     }

package/dist/lang/test/parse-expects.js

@@ -24,7 +24,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_translator_1 = require("./test-translator");
-const util_1 = require("util");
+function rangeToStr(loc) {
+    if (loc) {
+        const from = `#${loc.start.line}:${loc.start.character}`;
+        const to = `#${loc.end.line}:${loc.end.character}`;
+        return `${from}-${to}`;
+    }
+    return 'undefined';
+}
 function ensureNoProblems(trans) {
     if (trans.logger === undefined) {
         throw new Error('JESTERY BROKEN, CANT FIND ERORR LOG');
@@ -223,8 +230,8 @@ function checkForProblems(context, expectCompiles, s, defaultSeverity, ...msgs)
                     const have = (_a = err.at) === null || _a === void 0 ? void 0 : _a.range;
                     const want = mSrc.locations[i].range;
                     if (!context.equals(have, want)) {
-                        explain.push(`Expected '${msg.message}' at location: ${(0, util_1.inspect)(want)}\n` +
-                            `Actual location: ${(0, util_1.inspect)(have)}`);
+                        explain.push(`Expected '${msg.message}' at location: ${rangeToStr(want)}\n` +
+                            `Actual location: ${rangeToStr(have)}`);
                     }
                 }
             }
@@ -243,7 +250,7 @@ function checkForProblems(context, expectCompiles, s, defaultSeverity, ...msgs)
         }
         return {
             pass: false,
-            message: () => `Compiler did not generated expected errors\n${explain.join('\n')}`,
+            message: () => `Compiler errors did not match expected errors\n${explain.join('\n')}`,
         };
     }
 }

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

@@ -629,8 +629,67 @@ describe('query:', () => {
         test('project ref', () => {
             expect('query:ab->{ project: b.astr }').toTranslate();
         });
-        test('project *', () => {
-            expect('query:ab->{ project: * }').toTranslate();
+        const afields = test_translator_1.aTableDef.fields
+            .filter(f => (0, model_1.isAtomicFieldType)(f.type))
+            .map(f => f.name)
+            .sort();
+        test('expands star correctly', () => {
+            const selstar = (0, test_translator_1.model) `run: ab->{select: *}`;
+            expect(selstar).toTranslate();
+            const query = selstar.translator.getQuery(0);
+            expect(query).toBeDefined();
+            const fields = query.pipeline[0].fields;
+            expect(fields.sort()).toEqual(afields);
+        });
+        test('expands join dot star correctly', () => {
+            const selstar = (0, test_translator_1.model) `run: ab->{select: b.*}`;
+            expect(selstar).toTranslate();
+            const query = selstar.translator.getQuery(0);
+            expect(query).toBeDefined();
+            const fields = query.pipeline[0].fields;
+            expect(fields.sort()).toEqual(afields.map(f => `b.${f}`));
+        });
+        test('star error checking', () => {
+            expect((0, test_translator_1.markSource) `run: a->{select: ${'zzz'}.*}`).translationToFailWith("No such field as 'zzz'");
+            expect((0, test_translator_1.markSource) `run: ab->{select: b.${'zzz'}.*}`).translationToFailWith("No such field as 'zzz'");
+            expect((0, test_translator_1.markSource) `run: a->{select: ${'ai'}.*}`).translationToFailWith("Field 'ai' does not contain rows and cannot be expanded with '*'");
+            expect((0, test_translator_1.markSource) `run: a->{select:ai,${'*'}}`).translationToFailWith("Cannot expand 'ai' in '*' because a field with that name already exists");
+            expect((0, test_translator_1.markSource) `run: ab->{select:ai,${'b.*'}}`).translationToFailWith("Cannot expand 'ai' in 'b.*' because a field with that name already exists");
+            const m = `
+        source: nab is a extend {
+          accept: ai
+          join_one: b is a extend {accept: ai} on ai=b.ai
+        }
+        run: nab->{select: b.*,*}
+      `;
+            expect(m).translationToFailWith("Cannot expand 'ai' in '*' because a field with that name already exists (conflicts with b.ai)");
+        });
+        test('regress check extend: and star', () => {
+            const m = (0, test_translator_1.model) `run: ab->{ extend: {dimension: x is 1} select: * }`;
+            expect(m).toTranslate();
+            const q = m.translator.getQuery(0);
+            expect(q).toBeDefined();
+            const fields = q.pipeline[0].fields;
+            expect(fields.sort()).toEqual(afields.concat('x'));
+        });
+        test('project def', () => {
+            expect('query:ab->{ project: one is 1 }').toTranslate();
+        });
+        test('project multiple', () => {
+            expect(`
+        query: a->{
+          project: one is 1, astr
+        }
+      `).toTranslate();
+        });
+        test('index single', () => { });
+        test('regress check extend: and star', () => {
+            const m = (0, test_translator_1.model) `run: ab->{ extend: {dimension: x is 1} select: * }`;
+            expect(m).toTranslate();
+            const q = m.translator.getQuery(0);
+            expect(q).toBeDefined();
+            const fields = q.pipeline[0].fields;
+            expect(fields.sort()).toEqual(afields.concat('x'));
         });
         test('project def', () => {
             expect('query:ab->{ project: one is 1 }').toTranslate();

package/package.json

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