@malloydata/malloy 0.0.86-dev230920165629 → 0.0.86-dev230922170928

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -197,6 +197,7 @@ import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
 import { CollectionWildCardContext } from "./MalloyParser";
+import { StarQualifiedContext } from "./MalloyParser";
 import { TaggedRefContext } from "./MalloyParser";
 import { RefExprContext } from "./MalloyParser";
 import { CollectionMemberContext } from "./MalloyParser";
@@ -2352,6 +2353,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitCollectionWildCard?: (ctx: CollectionWildCardContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.starQualified`.
+     * @param ctx the parse tree
+     */
+    enterStarQualified?: (ctx: StarQualifiedContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.starQualified`.
+     * @param ctx the parse tree
+     */
+    exitStarQualified?: (ctx: StarQualifiedContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.taggedRef`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -197,6 +197,7 @@ import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
 import { CollectionWildCardContext } from "./MalloyParser";
+import { StarQualifiedContext } from "./MalloyParser";
 import { TaggedRefContext } from "./MalloyParser";
 import { RefExprContext } from "./MalloyParser";
 import { CollectionMemberContext } from "./MalloyParser";
@@ -1483,6 +1484,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitCollectionWildCard?: (ctx: CollectionWildCardContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.starQualified`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitStarQualified?: (ctx: StarQualifiedContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.taggedRef`.
      * @param ctx the parse tree

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

@@ -737,11 +737,19 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return stmt;
     }
     visitCollectionWildCard(pcx) {
+        var _a;
         const nameCx = pcx.fieldPath();
         const join = nameCx
             ? this.getFieldPath(nameCx, ast.ProjectFieldReference)
             : undefined;
-        return this.astAt(new ast.WildcardFieldReference(join), pcx);
+        const wild = this.astAt(new ast.WildcardFieldReference(join), pcx);
+        const exceptStmts = ((_a = pcx.starQualified()) === null || _a === void 0 ? void 0 : _a.fieldNameList()) || [];
+        for (const except of exceptStmts) {
+            for (const exceptThis of except.fieldName()) {
+                wild.except.add((0, parse_utils_1.getId)(exceptThis));
+            }
+        }
+        return wild;
     }
     visitIndexFields(pcx) {
         const refList = pcx.indexElement().map(el => {

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

@@ -654,6 +654,15 @@ describe('query:', () => {
             const fields = query.pipeline[0].fields;
             expect(fields.sort()).toEqual(afields.map(f => `b.${f}`));
         });
+        test('expands star with exclusions', () => {
+            const selstar = (0, test_translator_1.model) `run: ab->{select: * { except: ai, except: aun, aweird }}`;
+            const filterdFields = afields.filter(f => f !== 'ai' && f !== 'aun' && f !== 'aweird');
+            expect(selstar).toTranslate();
+            const query = selstar.translator.getQuery(0);
+            expect(query).toBeDefined();
+            const fields = query.pipeline[0].fields;
+            expect(fields.sort()).toEqual(filterdFields);
+        });
         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'");

package/dist/malloy.js

@@ -178,10 +178,13 @@ class Malloy {
         }
     }
     static compileSQLBlock(partialModel, toCompile) {
-        let queryModel;
-        const sqlStrings = toCompile.select.map(segment => {
+        let queryModel = undefined;
+        let selectStr = '';
+        let parenAlready = false;
+        for (const segment of toCompile.select) {
             if ((0, model_1.isSQLFragment)(segment)) {
-                return segment.sql;
+                selectStr += segment.sql;
+                parenAlready = segment.sql.match(/\(\s*$/) !== null;
             }
             else {
                 // TODO catch exceptions and throw errors ...
@@ -191,16 +194,13 @@ class Malloy {
                     }
                     queryModel = new model_1.QueryModel(partialModel);
                 }
-                return queryModel.compileQuery(segment, false).sql;
+                const compiledSql = queryModel.compileQuery(segment, false).sql;
+                selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
+                parenAlready = false;
             }
-        });
+        }
         const { name, connection } = toCompile;
-        return {
-            type: 'sqlBlock',
-            name,
-            connection,
-            selectStr: sqlStrings.join(''),
-        };
+        return { type: 'sqlBlock', name, connection, selectStr };
     }
     static async run({ connections, preparedResult, sqlStruct, connection, options, }) {
         const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;

package/package.json

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