@malloydata/malloy 0.0.86-dev230921221205 → 0.0.86-dev230922233440

package/dist/lang/ast/field-space/query-spaces.js

@@ -142,6 +142,9 @@ class QuerySpace extends refined_space_1.RefinedSpace {
         }
         const dialect = this.dialectObj();
         for (const [name, entry] of current.entries()) {
+            if (wild.except.has(name)) {
+                continue;
+            }
             if (this.entry(name)) {
                 const conflict = (_a = this.expandedWild[name]) === null || _a === void 0 ? void 0 : _a.join('.');
                 wild.log(`Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ''}`);

package/dist/lang/ast/query-items/field-references.d.ts

@@ -66,6 +66,7 @@ export declare class WildcardFieldReference extends MalloyElement implements Not
     note?: Annotation;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
+    except: Set<string>;
     constructor(joinPath: FieldReference | undefined);
     getFieldDef(): FieldDef;
     get refString(): string;

package/dist/lang/ast/query-items/field-references.js

@@ -183,6 +183,7 @@ class WildcardFieldReference extends malloy_element_1.MalloyElement {
         this.elementType = 'wildcardFieldReference';
         this.isNoteableObj = true;
         this.extendNote = noteable_1.extendNoteMethod;
+        this.except = new Set();
         this.has({ joinPath: joinPath });
     }
     getFieldDef() {

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

@@ -278,16 +278,17 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_fieldNameList = 115;
     static readonly RULE_fieldCollection = 116;
     static readonly RULE_collectionWildCard = 117;
-    static readonly RULE_taggedRef = 118;
-    static readonly RULE_refExpr = 119;
-    static readonly RULE_collectionMember = 120;
-    static readonly RULE_fieldPath = 121;
-    static readonly RULE_joinName = 122;
-    static readonly RULE_fieldName = 123;
-    static readonly RULE_justExpr = 124;
-    static readonly RULE_sqlExploreNameRef = 125;
-    static readonly RULE_nameSQLBlock = 126;
-    static readonly RULE_connectionName = 127;
+    static readonly RULE_starQualified = 118;
+    static readonly RULE_taggedRef = 119;
+    static readonly RULE_refExpr = 120;
+    static readonly RULE_collectionMember = 121;
+    static readonly RULE_fieldPath = 122;
+    static readonly RULE_joinName = 123;
+    static readonly RULE_fieldName = 124;
+    static readonly RULE_justExpr = 125;
+    static readonly RULE_sqlExploreNameRef = 126;
+    static readonly RULE_nameSQLBlock = 127;
+    static readonly RULE_connectionName = 128;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -417,6 +418,7 @@ export declare class MalloyParser extends Parser {
     fieldNameList(): FieldNameListContext;
     fieldCollection(): FieldCollectionContext;
     collectionWildCard(): CollectionWildCardContext;
+    starQualified(): StarQualifiedContext;
     taggedRef(): TaggedRefContext;
     refExpr(): RefExprContext;
     collectionMember(): CollectionMemberContext;
@@ -771,9 +773,8 @@ export declare class QueryByNameContext extends RefinableQueryContext {
 }
 export declare class QueryByTurtleNameContext extends RefinableQueryContext {
     unextendableSource(): UnextendableSourceContext;
+    ARROW(): TerminalNode;
     id(): IdContext;
-    ARROW(): TerminalNode | undefined;
-    DOT(): TerminalNode | undefined;
     constructor(ctx: RefinableQueryContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
@@ -2279,6 +2280,22 @@ export declare class CollectionWildCardContext extends ParserRuleContext {
     STAR(): TerminalNode;
     fieldPath(): FieldPathContext | undefined;
     DOT(): TerminalNode | undefined;
+    starQualified(): StarQualifiedContext | undefined;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
+export declare class StarQualifiedContext extends ParserRuleContext {
+    OCURLY(): TerminalNode;
+    CCURLY(): TerminalNode;
+    COMMA(): TerminalNode[];
+    COMMA(i: number): TerminalNode;
+    EXCEPT(): TerminalNode[];
+    EXCEPT(i: number): TerminalNode;
+    fieldNameList(): FieldNameListContext[];
+    fieldNameList(i: number): FieldNameListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;