@malloydata/malloy 0.0.271 → 0.0.273

package/dist/lang/ast/field-space/static-space.d.ts

@@ -1,5 +1,5 @@
 import type { Dialect } from '../../../dialect/dialect';
-import type { FieldDef, StructDef, SourceDef, JoinFieldDef } from '../../../model/malloy_types';
+import type { FieldDef, StructDef, SourceDef, JoinFieldDef, AccessModifierLabel } from '../../../model/malloy_types';
 import type { SpaceEntry } from '../types/space-entry';
 import type { LookupResult } from '../types/lookup-result';
 import type { FieldName, FieldSpace, QueryFieldSpace, SourceFieldSpace } from '../types/field-space';
@@ -15,7 +15,7 @@ export declare class StaticSpace implements FieldSpace {
     dialectObj(): Dialect | undefined;
     defToSpaceField(from: FieldDef): SpaceField;
     private get map();
-    isProtectedAccessSpace(): boolean;
+    accessProtectionLevel(): AccessModifierLabel;
     protected dropEntries(): void;
     protected dropEntry(name: string): void;
     entry(name: string): SpaceEntry | undefined;
@@ -23,7 +23,7 @@ export declare class StaticSpace implements FieldSpace {
     entries(): [string, SpaceEntry][];
     structDef(): StructDef;
     emptyStructDef(): StructDef;
-    lookup(path: FieldName[]): LookupResult;
+    lookup(path: FieldName[], accessLevel?: AccessModifierLabel): LookupResult;
     isQueryFieldSpace(): this is QueryFieldSpace;
 }
 export declare class StructSpaceField extends StructSpaceFieldBase {
@@ -33,7 +33,9 @@ export declare class StructSpaceField extends StructSpaceFieldBase {
 }
 export declare class StaticSourceSpace extends StaticSpace implements SourceFieldSpace {
     protected source: SourceDef;
-    constructor(source: SourceDef);
+    readonly _accessProtectionLevel: AccessModifierLabel;
+    constructor(source: SourceDef, _accessProtectionLevel: AccessModifierLabel);
     structDef(): SourceDef;
     emptyStructDef(): SourceDef;
+    accessProtectionLevel(): AccessModifierLabel;
 }

package/dist/lang/ast/field-space/static-space.js

@@ -75,8 +75,8 @@ class StaticSpace {
         }
         return this.memoMap;
     }
-    isProtectedAccessSpace() {
-        return false;
+    accessProtectionLevel() {
+        return 'internal';
     }
     dropEntries() {
         this.memoMap = {};
@@ -105,7 +105,8 @@ class StaticSpace {
         ret.fields = [];
         return ret;
     }
-    lookup(path) {
+    lookup(path, accessLevel) {
+        accessLevel !== null && accessLevel !== void 0 ? accessLevel : (accessLevel = this.accessProtectionLevel());
         const head = path[0];
         const rest = path.slice(1);
         let found = this.entry(head.refString);
@@ -143,9 +144,8 @@ class StaticSpace {
             }
             if (definition === null || definition === void 0 ? void 0 : definition.accessModifier) {
                 // TODO path.length === 1 will not work with namespaces
-                if (!(this.isProtectedAccessSpace() &&
-                    definition.accessModifier === 'internal' &&
-                    path.length === 1)) {
+                if (!(path.length === 1 &&
+                    accessAllowed(accessLevel, definition.accessModifier))) {
                     return {
                         error: {
                             message: `'${head}' is ${definition === null || definition === void 0 ? void 0 : definition.accessModifier}`,
@@ -161,7 +161,7 @@ class StaticSpace {
             : [];
         if (rest.length) {
             if (found instanceof struct_space_field_base_1.StructSpaceFieldBase) {
-                const restResult = found.fieldSpace.lookup(rest);
+                const restResult = found.fieldSpace.lookup(rest, lessPermissiveAccessLevel(accessLevel, found.fieldSpace.accessProtectionLevel()));
                 if (restResult.found) {
                     return {
                         ...restResult,
@@ -194,7 +194,7 @@ class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
     }
     get fieldSpace() {
         if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
-            return new StaticSourceSpace(this.structDef);
+            return new StaticSourceSpace(this.structDef, 'internal');
         }
         else {
             return new StaticSpace(this.structDef, this.forDialect);
@@ -203,9 +203,10 @@ class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
 }
 exports.StructSpaceField = StructSpaceField;
 class StaticSourceSpace extends StaticSpace {
-    constructor(source) {
+    constructor(source, _accessProtectionLevel) {
         super(source, source.dialect);
         this.source = source;
+        this._accessProtectionLevel = _accessProtectionLevel;
     }
     structDef() {
         return this.source;
@@ -216,6 +217,25 @@ class StaticSourceSpace extends StaticSpace {
         ret.fields = [];
         return ret;
     }
+    accessProtectionLevel() {
+        return this._accessProtectionLevel;
+    }
 }
 exports.StaticSourceSpace = StaticSourceSpace;
+function accessAllowed(accessLevel, accessModifier) {
+    if (accessModifier === 'public')
+        return true;
+    if (accessLevel === 'internal')
+        return accessModifier === 'internal';
+    if (accessLevel === 'private')
+        return true;
+    return false;
+}
+function lessPermissiveAccessLevel(a, b) {
+    if (a === 'public' || b === 'public')
+        return 'public';
+    if (a === 'internal' || b === 'internal')
+        return 'internal';
+    return 'private';
+}
 //# sourceMappingURL=static-space.js.map

package/dist/lang/ast/query-elements/query-arrow.js

@@ -60,14 +60,14 @@ class QueryArrow extends query_base_1.QueryBase {
             inputStruct = (0, malloy_types_1.refIsStructDef)(invoked.structRef)
                 ? invoked.structRef
                 : this.source.getSourceDef(undefined);
-            fieldSpace = new static_space_1.StaticSourceSpace(inputStruct);
+            fieldSpace = new static_space_1.StaticSourceSpace(inputStruct, 'public');
         }
         else {
             // We are adding a second stage to the given "source" query; we get the query and add a segment
             const lhsQuery = this.source.queryComp(isRefOk);
             queryBase = lhsQuery.query;
             inputStruct = lhsQuery.outputStruct;
-            fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct);
+            fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct, 'public');
         }
         const { pipeline, annotation, outputStruct, name } = this.view.pipelineComp(fieldSpace);
         const query = {

package/dist/lang/ast/query-elements/query-refine.js

@@ -40,7 +40,7 @@ class QueryRefine extends query_base_1.QueryBase {
     }
     queryComp(isRefOk) {
         const q = this.base.queryComp(isRefOk);
-        const inputFS = new static_space_1.StaticSourceSpace(q.inputStruct);
+        const inputFS = new static_space_1.StaticSourceSpace(q.inputStruct, 'public');
         const resultPipe = this.refinement.refine(inputFS, q.query.pipeline, undefined);
         const query = {
             ...q.query,

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

@@ -1,5 +1,5 @@
 import type { Dialect } from '../../../dialect/dialect';
-import type { Annotation, StructDef, TypeDesc, FieldDef, AtomicFieldDef } from '../../../model/malloy_types';
+import type { Annotation, StructDef, TypeDesc, FieldDef, AtomicFieldDef, AccessModifierLabel } from '../../../model/malloy_types';
 import type { ExprValue } from '../types/expr-value';
 import type { ExpressionDef } from '../types/expression-def';
 import type { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';
@@ -74,7 +74,7 @@ export declare class DefSpace implements FieldSpace {
     isQueryFieldSpace(): this is QueryFieldSpace;
     outputSpace(): import("../field-space/query-spaces").QueryOperationSpace;
     inputSpace(): import("../types/field-space").SourceFieldSpace;
-    isProtectedAccessSpace(): boolean;
+    accessProtectionLevel(): AccessModifierLabel;
 }
 export declare class FieldDefinitionValue extends SpaceField {
     readonly space: FieldSpace;

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

@@ -280,8 +280,8 @@ class DefSpace {
         }
         throw new Error('Not a query field space');
     }
-    isProtectedAccessSpace() {
-        return true;
+    accessProtectionLevel() {
+        return 'public';
     }
 }
 exports.DefSpace = DefSpace;

package/dist/lang/ast/query-properties/qop-desc.js

@@ -98,7 +98,7 @@ class QOpDesc extends malloy_element_1.ListOf {
             // TODO someday we'd like to get rid of the call to opOutputStruct here.
             // If the `build.resultFS` is correct, then we should be able to just use that
             // in a more direct way.
-            new static_space_1.StaticSourceSpace((0, struct_utils_1.opOutputStruct)(this, inputFS.structDef(), segment)),
+            new static_space_1.StaticSourceSpace((0, struct_utils_1.opOutputStruct)(this, inputFS.structDef(), segment), 'public'),
         };
     }
 }

package/dist/lang/ast/source-elements/refined-source.js

@@ -36,8 +36,7 @@ const annotation_elements_1 = require("../types/annotation-elements");
 const renames_1 = require("../source-properties/renames");
 const parameter_space_1 = require("../field-space/parameter-space");
 const join_1 = require("../source-properties/join");
-const include_item_1 = require("../source-query-elements/include-item");
-const field_references_1 = require("../query-items/field-references");
+const include_utils_1 = require("../field-space/include-utils");
 /**
  * A Source made from a source reference and a set of refinements
  */
@@ -109,10 +108,11 @@ class RefinedSource extends source_1.Source {
         }
         const paramSpace = pList ? new parameter_space_1.ParameterSpace(pList) : undefined;
         const from = structuredClone(this.source.getSourceDef(paramSpace));
-        const { fieldsToInclude, modifiers, renames, notes } = processIncludeList(this.includeList, from);
+        const includeState = (0, include_utils_1.processIncludeList)(this.includeList, from);
+        const thisIncludeState = (0, include_utils_1.getIncludeStateForJoin)([], includeState);
         for (const modifier of inlineAccessModifiers) {
             for (const field of modifier.fields) {
-                modifiers.set(field, modifier.access);
+                thisIncludeState.modifiers.set(field, modifier.access);
             }
         }
         // Note that this is explicitly not:
@@ -121,7 +121,7 @@ class RefinedSource extends source_1.Source {
         if (primaryKey) {
             from.primaryKey = primaryKey.field.name;
         }
-        const fs = refined_space_1.RefinedSpace.filteredFrom(from, fieldListEdit, fieldsToInclude, renames, paramSpace);
+        const fs = refined_space_1.RefinedSpace.filteredFrom(from, fieldListEdit, includeState, paramSpace);
         if (newTimezone) {
             fs.setTimezone(newTimezone);
         }
@@ -135,8 +135,8 @@ class RefinedSource extends source_1.Source {
                 primaryKey.logError(keyDef.error.code, keyDef.error.message);
             }
         }
-        fs.addAccessModifiers(modifiers);
-        fs.addNotes(notes);
+        fs.addAccessModifiers(thisIncludeState.modifiers);
+        fs.addNotes(thisIncludeState.notes);
         const retStruct = fs.structDef();
         const filterList = retStruct.filterList || [];
         let moreFilters = false;
@@ -160,131 +160,4 @@ class RefinedSource extends source_1.Source {
     }
 }
 exports.RefinedSource = RefinedSource;
-function processIncludeList(includeItems, from) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    // TODO error/warning if you include both star and specific fields with the same modifier...
-    const allFields = new Set(from.fields.map(f => f.name));
-    const alreadyPrivateFields = new Set(from.fields.filter(f => f.accessModifier === 'private').map(f => f.name));
-    let mode = undefined;
-    const fieldsMentioned = new Set();
-    let star = undefined;
-    let starNote = undefined;
-    const modifiers = new Map();
-    const renames = [];
-    const notes = new Map();
-    if (includeItems === undefined) {
-        return { fieldsToInclude: undefined, modifiers, renames, notes };
-    }
-    for (const item of includeItems) {
-        if (item instanceof include_item_1.IncludeAccessItem) {
-            for (const f of item.fields) {
-                if (f.name instanceof field_references_1.WildcardFieldReference) {
-                    if (f.name.joinPath) {
-                        f.logError('unsupported-path-in-include', 'Wildcards with paths are not supported in `include` blocks');
-                    }
-                    if (star !== undefined) {
-                        item.logError('already-used-star-in-include', 'Wildcard already used in this include block');
-                    }
-                    else {
-                        star = (_a = item.kind) !== null && _a !== void 0 ? _a : 'inherit';
-                        starNote = {
-                            notes: (_c = (_b = f.note) === null || _b === void 0 ? void 0 : _b.notes) !== null && _c !== void 0 ? _c : [],
-                            blockNotes: (_e = (_d = item.note) === null || _d === void 0 ? void 0 : _d.blockNotes) !== null && _e !== void 0 ? _e : [],
-                        };
-                    }
-                }
-                else {
-                    if (mode === 'exclude') {
-                        item.logError('include-after-exclude', 'Cannot include specific fields if specific fields are already excluded');
-                        continue;
-                    }
-                    mode = 'include';
-                    const name = f.name.refString;
-                    if (alreadyPrivateFields.has(name)) {
-                        f.logError('cannot-expand-access', `Cannot expand access of \`${name}\` from private to ${item.kind}`);
-                    }
-                    if (modifiers.has(name)) {
-                        f.logError('duplicate-include', `Field \`${name}\` already referenced in include list`);
-                    }
-                    else {
-                        if (item.kind !== undefined) {
-                            modifiers.set(name, item.kind);
-                        }
-                        fieldsMentioned.add(name);
-                        if (f.note || item.note) {
-                            notes.set(name, {
-                                notes: (_g = (_f = f.note) === null || _f === void 0 ? void 0 : _f.notes) !== null && _g !== void 0 ? _g : [],
-                                blockNotes: (_j = (_h = item.note) === null || _h === void 0 ? void 0 : _h.blockNotes) !== null && _j !== void 0 ? _j : [],
-                            });
-                        }
-                    }
-                    if (f.as) {
-                        if (f.name instanceof field_references_1.WildcardFieldReference) {
-                            f.logError('wildcard-include-rename', 'Cannot rename a wildcard field in an `include` block');
-                        }
-                        else {
-                            renames.push({
-                                name: f.name,
-                                as: f.as,
-                                location: f.location,
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        else if (item instanceof include_item_1.IncludeExceptItem) {
-            for (const f of item.fields) {
-                if (f instanceof field_references_1.WildcardFieldReference) {
-                    if (f.joinPath) {
-                        f.logError('unsupported-path-in-include', 'Wildcards with paths are not supported in `include` blocks');
-                    }
-                    else {
-                        f.logWarning('wildcard-except-redundant', '`except: *` is implied, unless another clause uses *');
-                    }
-                }
-                else {
-                    if (mode === 'include') {
-                        item.logError('exclude-after-include', 'Cannot exclude specific fields if specific fields are already included');
-                    }
-                    else {
-                        mode = 'exclude';
-                        star = 'inherit';
-                        fieldsMentioned.add(f.refString);
-                    }
-                }
-            }
-        }
-    }
-    const starFields = new Set(allFields);
-    fieldsMentioned.forEach(f => starFields.delete(f));
-    alreadyPrivateFields.forEach(f => starFields.delete(f));
-    let fieldsToInclude;
-    if (star !== undefined) {
-        for (const field of starFields) {
-            if (star !== 'inherit') {
-                modifiers.set(field, star);
-            }
-            if (starNote) {
-                notes.set(field, { ...starNote });
-            }
-        }
-    }
-    if (mode !== 'exclude') {
-        if (star !== undefined) {
-            fieldsToInclude = allFields;
-        }
-        else {
-            fieldsToInclude = fieldsMentioned;
-        }
-    }
-    else {
-        fieldsToInclude = starFields;
-    }
-    // TODO: validate that a field isn't renamed more than once
-    // TODO: validate that excluded fields are not referenced by included fields
-    // TODO: make renames fields work in existing references
-    // TODO: make renames that would replace an excluded field don't do that
-    return { fieldsToInclude, modifiers, renames, notes };
-}
 //# sourceMappingURL=refined-source.js.map

package/dist/lang/ast/types/field-space.d.ts

@@ -1,5 +1,5 @@
 import type { Dialect } from '../../../dialect/dialect';
-import type { SourceDef, StructDef } from '../../../model/malloy_types';
+import type { AccessModifierLabel, SourceDef, StructDef } from '../../../model/malloy_types';
 import type { QueryOperationSpace } from '../field-space/query-spaces';
 import type { LookupResult } from './lookup-result';
 import { MalloyElement } from './malloy-element';
@@ -12,13 +12,13 @@ export interface FieldSpace {
     type: 'fieldSpace';
     structDef(): StructDef;
     emptyStructDef(): StructDef;
-    lookup(symbol: FieldName[]): LookupResult;
+    lookup(symbol: FieldName[], accessLevel?: AccessModifierLabel | undefined): LookupResult;
     entry(symbol: string): SpaceEntry | undefined;
     entries(): [string, SpaceEntry][];
     dialectObj(): Dialect | undefined;
     dialectName(): string;
     isQueryFieldSpace(): this is QueryFieldSpace;
-    isProtectedAccessSpace(): boolean;
+    accessProtectionLevel(): AccessModifierLabel;
 }
 export interface SourceFieldSpace extends FieldSpace {
     structDef(): SourceDef;

package/dist/lang/ast/view-elements/qop-desc-view.js

@@ -89,7 +89,7 @@ class QOpDescView extends view_1.View {
             const last = pipeline.length - 1;
             this.has({ tailRefinements });
             const finalIn = (0, struct_utils_1.getFinalStruct)(this, inputFS.structDef(), pipeline.slice(-1));
-            pipeline[last] = this.getOp(new static_space_1.StaticSourceSpace(finalIn), undefined, tailRefinements, pipeline[last]);
+            pipeline[last] = this.getOp(new static_space_1.StaticSourceSpace(finalIn, 'public'), undefined, tailRefinements, pipeline[last]);
         }
         return pipeline;
     }

package/dist/lang/ast/view-elements/view-arrow.js

@@ -40,7 +40,7 @@ class ViewArrow extends view_1.View {
     }
     pipelineComp(fs) {
         const baseComp = this.base.pipelineComp(fs);
-        const nextFS = new static_space_1.StaticSourceSpace(baseComp.outputStruct);
+        const nextFS = new static_space_1.StaticSourceSpace(baseComp.outputStruct, 'public');
         const finalComp = this.operation.pipelineComp(nextFS);
         return {
             pipeline: [...baseComp.pipeline, ...finalComp.pipeline],

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

@@ -1320,7 +1320,7 @@ export declare class IncludeExceptListContext extends ParserRuleContext {
 }
 export declare class IncludeExceptListItemContext extends ParserRuleContext {
     tags(): TagsContext;
-    fieldName(): FieldNameContext | undefined;
+    fieldPath(): FieldPathContext | undefined;
     collectionWildCard(): CollectionWildCardContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
@@ -1341,11 +1341,11 @@ export declare class IncludeListContext extends ParserRuleContext {
 }
 export declare class IncludeFieldContext extends ParserRuleContext {
     _as: FieldNameContext;
-    _name: FieldNameContext;
+    _name: FieldPathContext;
     tags(): TagsContext;
-    fieldName(): FieldNameContext[];
-    fieldName(i: number): FieldNameContext;
+    fieldPath(): FieldPathContext | undefined;
     isDefine(): IsDefineContext | undefined;
+    fieldName(): FieldNameContext | undefined;
     collectionWildCard(): CollectionWildCardContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;

package/dist/lang/lib/Malloy/MalloyParser.js

@@ -3173,7 +3173,7 @@ class MalloyParser extends Parser_1.Parser {
                         this.state = 770;
                         this.tags();
                         this.state = 771;
-                        this.fieldName();
+                        this.fieldPath();
                     }
                     break;
                 case 2:
@@ -3290,7 +3290,7 @@ class MalloyParser extends Parser_1.Parser {
                                 break;
                         }
                         this.state = 797;
-                        _localctx._name = this.fieldName();
+                        _localctx._name = this.fieldPath();
                     }
                     break;
                 case 2:
@@ -3299,7 +3299,7 @@ class MalloyParser extends Parser_1.Parser {
                         this.state = 799;
                         this.tags();
                         this.state = 800;
-                        _localctx._name = this.fieldName();
+                        _localctx._name = this.fieldPath();
                     }
                     break;
                 case 3:
@@ -9336,7 +9336,7 @@ MalloyParser._serializedATNSegment1 = "\u0156\x05l7\x02\u0156\v\x03\x02\x02\x02\
     "\x03\x02\x02\x02\u02FE\u02FC\x03\x02\x02\x02\u02FE\u02FF\x03\x02\x02\x02" +
     "\u02FF\u0302\x03\x02\x02\x02\u0300\u02FE\x03\x02\x02\x02\u0301\u0303\x07" +
     "\x87\x02\x02\u0302\u0301\x03\x02\x02\x02\u0302\u0303\x03\x02\x02\x02\u0303" +
-    "w\x03\x02\x02\x02\u0304\u0305\x05\f\x07\x02\u0305\u0306\x05\u0128\x95" +
+    "w\x03\x02\x02\x02\u0304\u0305\x05\f\x07\x02\u0305\u0306\x05\u0124\x93" +
     "\x02\u0306\u030B\x03\x02\x02\x02\u0307\u0308\x05\f\x07\x02\u0308\u0309" +
     "\x05\u011A\x8E\x02\u0309\u030B\x03\x02\x02\x02\u030A\u0304\x03\x02\x02" +
     "\x02\u030A\u0307\x03\x02\x02\x02\u030By\x03\x02\x02\x02\u030C\u0313\x05" +
@@ -9348,9 +9348,9 @@ MalloyParser._serializedATNSegment1 = "\u0156\x05l7\x02\u0156\v\x03\x02\x02\x02\
     "\x02\x02\u0317\u0318\x03\x02\x02\x02\u0318{\x03\x02\x02\x02\u0319\u031D" +
     "\x05\f\x07\x02\u031A\u031B\x05\u0128\x95\x02\u031B\u031C\x05\x0E\b\x02" +
     "\u031C\u031E\x03\x02\x02\x02\u031D\u031A\x03\x02\x02\x02\u031D\u031E\x03" +
-    "\x02\x02\x02\u031E\u031F\x03\x02\x02\x02\u031F\u0320\x05\u0128\x95\x02" +
+    "\x02\x02\x02\u031E\u031F\x03\x02\x02\x02\u031F\u0320\x05\u0124\x93\x02" +
     "\u0320\u0328\x03\x02\x02\x02\u0321\u0322\x05\f\x07\x02\u0322\u0323\x05" +
-    "\u0128\x95\x02\u0323\u0328\x03\x02\x02\x02\u0324\u0325\x05\f\x07\x02\u0325" +
+    "\u0124\x93\x02\u0323\u0328\x03\x02\x02\x02\u0324\u0325\x05\f\x07\x02\u0325" +
     "\u0326\x05\u011A\x8E\x02\u0326\u0328\x03\x02\x02\x02\u0327\u0319\x03\x02" +
     "\x02\x02\u0327\u0321\x03\x02\x02\x02\u0327\u0324\x03\x02\x02\x02\u0328" +
     "}\x03\x02\x02\x02\u0329\u032A\b@\x01\x02\u032A\u0331\x05\u0124\x93\x02" +
@@ -12723,8 +12723,8 @@ class IncludeExceptListItemContext extends ParserRuleContext_1.ParserRuleContext
     tags() {
         return this.getRuleContext(0, TagsContext);
     }
-    fieldName() {
-        return this.tryGetRuleContext(0, FieldNameContext);
+    fieldPath() {
+        return this.tryGetRuleContext(0, FieldPathContext);
     }
     collectionWildCard() {
         return this.tryGetRuleContext(0, CollectionWildCardContext);
@@ -12806,17 +12806,15 @@ class IncludeFieldContext extends ParserRuleContext_1.ParserRuleContext {
     tags() {
         return this.getRuleContext(0, TagsContext);
     }
-    fieldName(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(FieldNameContext);
-        }
-        else {
-            return this.getRuleContext(i, FieldNameContext);
-        }
+    fieldPath() {
+        return this.tryGetRuleContext(0, FieldPathContext);
     }
     isDefine() {
         return this.tryGetRuleContext(0, IsDefineContext);
     }
+    fieldName() {
+        return this.tryGetRuleContext(0, FieldNameContext);
+    }
     collectionWildCard() {
         return this.tryGetRuleContext(0, CollectionWildCardContext);
     }

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

@@ -1349,11 +1349,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             if (fcx.tags().ANNOTATION().length > 0) {
                 this.contextError(fcx.tags(), 'cannot-tag-include-except', 'Tags on `except:` are ignored', { severity: 'warn' });
             }
-            const fieldNameCx = fcx.fieldName();
+            const fieldNameCx = fcx.fieldPath();
             if (fieldNameCx) {
-                return this.astAt(new ast.AccessModifierFieldReference([
-                    this.astAt(this.getFieldName(fieldNameCx), fcx),
-                ]), fieldNameCx);
+                return this.astAt(this.getFieldPath(fieldNameCx, ast.AccessModifierFieldReference), fieldNameCx);
             }
             const wildcardCx = fcx.collectionWildCard();
             if (wildcardCx) {
@@ -1367,22 +1365,20 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const wildcard = wildcardCx
             ? this.visitCollectionWildCard(wildcardCx)
             : undefined;
-        const as = pcx._as ? pcx._as.text : undefined;
+        const as = pcx._as ? this.getFieldName(pcx._as) : undefined;
         const tags1cx = pcx.tags();
         const tags1 = tags1cx ? this.getNotes(tags1cx) : [];
         const tags2cx = pcx.isDefine();
         const tags2 = tags2cx ? this.getIsNotes(tags2cx) : [];
         const notes = [...tags1, ...tags2];
         const name = pcx._name
-            ? this.astAt(new ast.AccessModifierFieldReference([
-                this.astAt(this.getFieldName(pcx._name), pcx._name),
-            ]), pcx._name)
+            ? this.astAt(this.getFieldPath(pcx._name, ast.AccessModifierFieldReference), pcx._name)
             : undefined;
         const reference = name !== null && name !== void 0 ? name : wildcard;
         if (reference === undefined) {
             throw this.internalError(pcx, 'Expected a field name or wildcard');
         }
-        const item = this.astAt(new ast.IncludeListItem(reference, as), pcx);
+        const item = this.astAt(new ast.IncludeListItem(reference, as === null || as === void 0 ? void 0 : as.refString), pcx);
         item.extendNote({ notes });
         return item;
     }

package/dist/lang/parse-log.d.ts

@@ -328,6 +328,7 @@ type MessageParameterTypes = {
     'illegal-record-property-type': string;
     'record-literal-needs-keys': string;
     'not-yet-implemented': string;
+    'cannot-rename-join-field': string;
     'sql-case': string;
     'case-then-type-does-not-match': {
         thenType: ExpressionValueType;
@@ -346,6 +347,7 @@ type MessageParameterTypes = {
     };
     'or-choices-only': string;
     'sql-in': string;
+    'except-star-and-list': string;
     'dialect-cast-unsafe-only': string;
     'field-not-accessible': string;
     'cannot-expand-access': string;
@@ -357,6 +359,7 @@ type MessageParameterTypes = {
     'include-after-exclude': string;
     'duplicate-include': string;
     'exclude-after-include': string;
+    'exclude-after-exclude': string;
     'cannot-rename-non-field': string;
     'array-values-incompatible': string;
     'invalid-resolved-type-for-array': string;

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

@@ -319,7 +319,7 @@ function checkForProblems(context, expectCompiles, s, allowAdditionalErrors, ...
             }
         }
         if (i !== msgs.length) {
-            explain.push(...msgs.slice(i).map(m => `Missing: ${m}`));
+            explain.push(...msgs.slice(i).map(m => `Missing: ${JSON.stringify(m)}`));
         }
         if (!allowAdditionalErrors && i !== errList.length) {
             explain.push(...errList.slice(i).map(m => `Unexpected Error: ${m.message}`));

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

@@ -394,7 +394,7 @@ class BetaExpression extends TestTranslator {
     testFS() {
         const aStruct = this.internalModel.contents[this.sourceName];
         if ((0, malloy_types_1.isSourceDef)(aStruct)) {
-            const tstFS = new static_space_1.StaticSourceSpace(aStruct);
+            const tstFS = new static_space_1.StaticSourceSpace(aStruct, 'public');
             return tstFS;
         }
         else {

package/dist/model/composite_source_utils.d.ts

@@ -76,6 +76,7 @@ export declare function emptyFieldUsage(): FieldUsage[];
 export declare function joinedFieldUsage(joinPath: string[], fieldUsage: FieldUsage[]): FieldUsage[];
 export declare function fieldUsageJoinPaths(fieldUsage: FieldUsage[]): string[][];
 export declare function checkRequiredGroupBys(compositeResolvedSourceDef: SourceDef, segment: PipeSegment): RequiredGroupBy[];
+export declare function pathEq(a: string[], b: string[]): boolean;
 export declare function sortFieldUsageByReferenceLocation(usage: FieldUsage[]): FieldUsage[];
 export declare function hasCompositesAnywhere(source: StructDef): boolean;
 export declare function logCompositeError(error: CompositeError, logTo: MalloyElement): void;