@alloy-js/python 0.1.0-dev.4 → 0.1.0-dev.6

package/dist/src/symbols/python-member-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["OutputScope","PythonMemberScope","ownerSymbol"],"sources":["../../../src/symbols/python-member-scope.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,gBAAgB;AAG5C,OAAO,MAAMC,iBAAiB,SAASD,WAAW,CAAC;EACjD,IAAIE,WAAWA,CAAA,EAAG;IAChB,OAAO,KAAK,CAACA,WAAW;EAC1B;AACF","ignoreList":[]}

package/dist/src/symbols/python-module-scope.d.ts

@@ -1,4 +1,4 @@
-import { CustomOutputScope } from "./custom-output-scope.js";
+import { PythonLexicalScope } from "./python-lexical-scope.js";
 import { PythonOutputSymbol } from "./python-output-symbol.js";
 export declare class ImportedSymbol {
     local: PythonOutputSymbol;
@@ -9,15 +9,10 @@ export declare class ImportedSymbol {
 export interface ImportRecordProps {
     symbols: Set<ImportedSymbol>;
 }
-export type ImportRecords = Map<PythonModuleScope, ImportRecordProps>;
-export declare const ImportRecords: {
-    new (): ImportRecords;
-    new (entries?: readonly (readonly [PythonModuleScope, ImportRecordProps])[] | null): ImportRecords;
-    prototype: Map<PythonModuleScope, ImportRecordProps>;
-};
-export declare class PythonModuleScope extends CustomOutputScope {
+export declare class ImportRecords extends Map<PythonModuleScope, ImportRecordProps> {
+}
+export declare class PythonModuleScope extends PythonLexicalScope {
     #private;
-    get kind(): "module";
     get importedSymbols(): Map<PythonOutputSymbol, PythonOutputSymbol>;
     get importedModules(): ImportRecords;
     addImport(targetSymbol: PythonOutputSymbol, targetModule: PythonModuleScope): PythonOutputSymbol;

package/dist/src/symbols/python-module-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"python-module-scope.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-module-scope.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,qBAAa,cAAc;IACzB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,MAAM,EAAE,kBAAkB,CAAC;gBAEf,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB;IAKjE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB;CAGlE;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC9B;AAED,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;AAEtE,eAAO,MAAM,aAAa,EAAU;IAClC,QAAQ,aAAa,CAAC;IACtB,KACE,OAAO,CAAC,EACJ,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,EAAE,GAC5D,IAAI,GACP,aAAa,CAAC;IACjB,SAAS,EAAE,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;CACtD,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,iBAAiB;;IACtD,IAAI,IAAI,IACC,QAAQ,CAChB;IAID,IAAI,eAAe,gDAElB;IAGD,IAAI,eAAe,kBAElB;IAED,SAAS,CAAC,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB;CAqC5E"}
+{"version":3,"file":"python-module-scope.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-module-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,qBAAa,cAAc;IACzB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,MAAM,EAAE,kBAAkB,CAAC;gBAEf,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB;IAKjE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB;CAGlE;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC9B;AAED,qBAAa,aAAc,SAAQ,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;CAAG;AAE/E,qBAAa,iBAAkB,SAAQ,kBAAkB;;IAGvD,IAAI,eAAe,gDAElB;IAGD,IAAI,eAAe,kBAElB;IAED,SAAS,CAAC,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB;CA0B5E"}

package/dist/src/symbols/python-module-scope.js

@@ -1,6 +1,6 @@
 import { reactive, shallowReactive } from "@alloy-js/core";
-import { createPythonSymbol } from "../symbol-creation.js";
-import { CustomOutputScope } from "./custom-output-scope.js";
+import { PythonLexicalScope } from "./python-lexical-scope.js";
+import { PythonOutputSymbol } from "./python-output-symbol.js";
 export class ImportedSymbol {
   constructor(target, local) {
     this.target = target;
@@ -10,11 +10,8 @@ export class ImportedSymbol {
     return new ImportedSymbol(target, local);
   }
 }
-export const ImportRecords = Map;
-export class PythonModuleScope extends CustomOutputScope {
-  get kind() {
-    return "module";
-  }
+export class ImportRecords extends Map {}
+export class PythonModuleScope extends PythonLexicalScope {
   #importedSymbols = shallowReactive(new Map());
   get importedSymbols() {
     return this.#importedSymbols;
@@ -28,20 +25,15 @@ export class PythonModuleScope extends CustomOutputScope {
     if (existing) {
       return existing;
     }
-    if (targetModule.kind !== "module") {
-      throw new Error("Cannot import symbol that isn't in module scope");
-    }
     if (!this.importedModules.has(targetModule)) {
       this.importedModules.set(targetModule, {
         symbols: new Set()
       });
     }
-    const localSymbol = createPythonSymbol(targetSymbol.name, {
+    const localSymbol = new PythonOutputSymbol(targetSymbol.name, this.symbols, {
       binder: this.binder,
-      scope: this,
       aliasTarget: targetSymbol
-    }, undefined, false);
-    targetSymbol.copyTo(localSymbol);
+    });
     this.importedSymbols.set(targetSymbol, localSymbol);
     this.importedModules.get(targetModule).symbols?.add({
       local: localSymbol,
@@ -49,4 +41,5 @@ export class PythonModuleScope extends CustomOutputScope {
     });
     return localSymbol;
   }
-}
+}
+//# sourceMappingURL=python-module-scope.js.map

package/dist/src/symbols/python-module-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["reactive","shallowReactive","PythonLexicalScope","PythonOutputSymbol","ImportedSymbol","constructor","target","local","from","ImportRecords","Map","PythonModuleScope","importedSymbols","importedModules","addImport","targetSymbol","targetModule","existing","get","has","set","symbols","Set","localSymbol","name","binder","aliasTarget","add"],"sources":["../../../src/symbols/python-module-scope.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAQ,EAAEC,eAAe,QAAQ,gBAAgB;AAC1D,SAASC,kBAAkB,QAAQ,2BAA2B;AAC9D,SAASC,kBAAkB,QAAQ,2BAA2B;AAE9D,OAAO,MAAMC,cAAc,CAAC;EAI1BC,WAAWA,CAACC,MAA0B,EAAEC,KAAyB,EAAE;IACjE,IAAI,CAACD,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACC,KAAK,GAAGA,KAAK;EACpB;EAEA,OAAOC,IAAIA,CAACF,MAA0B,EAAEC,KAAyB,EAAE;IACjE,OAAO,IAAIH,cAAc,CAACE,MAAM,EAAEC,KAAK,CAAC;EAC1C;AACF;AAMA,OAAO,MAAME,aAAa,SAASC,GAAG,CAAuC;AAE7E,OAAO,MAAMC,iBAAiB,SAAST,kBAAkB,CAAC;EACxD,CAACU,eAAe,GACdX,eAAe,CAAC,IAAIS,GAAG,CAAC,CAAC,CAAC;EAC5B,IAAIE,eAAeA,CAAA,EAAG;IACpB,OAAO,IAAI,CAAC,CAACA,eAAe;EAC9B;EAEA,CAACC,eAAe,GAAkBb,QAAQ,CAAC,IAAIU,GAAG,CAAC,CAAC,CAAC;EACrD,IAAIG,eAAeA,CAAA,EAAG;IACpB,OAAO,IAAI,CAAC,CAACA,eAAe;EAC9B;EAEAC,SAASA,CAACC,YAAgC,EAAEC,YAA+B,EAAE;IAC3E,MAAMC,QAAQ,GAAG,IAAI,CAACL,eAAe,CAACM,GAAG,CAACH,YAAY,CAAC;IACvD,IAAIE,QAAQ,EAAE;MACZ,OAAOA,QAAQ;IACjB;IAEA,IAAI,CAAC,IAAI,CAACJ,eAAe,CAACM,GAAG,CAACH,YAAY,CAAC,EAAE;MAC3C,IAAI,CAACH,eAAe,CAACO,GAAG,CAACJ,YAAY,EAAE;QACrCK,OAAO,EAAE,IAAIC,GAAG,CAAiB;MACnC,CAAC,CAAC;IACJ;IAEA,MAAMC,WAAW,GAAG,IAAIpB,kBAAkB,CACxCY,YAAY,CAACS,IAAI,EACjB,IAAI,CAACH,OAAO,EACZ;MAAEI,MAAM,EAAE,IAAI,CAACA,MAAM;MAAEC,WAAW,EAAEX;IAAa,CACnD,CAAC;IAED,IAAI,CAACH,eAAe,CAACQ,GAAG,CAACL,YAAY,EAAEQ,WAAW,CAAC;IACnD,IAAI,CAACV,eAAe,CAACK,GAAG,CAACF,YAAY,CAAC,CAAEK,OAAO,EAAEM,GAAG,CAAC;MACnDpB,KAAK,EAAEgB,WAAW;MAClBjB,MAAM,EAAES;IACV,CAAC,CAAC;IAEF,OAAOQ,WAAW;EACpB;AACF","ignoreList":[]}

package/dist/src/symbols/python-output-symbol.d.ts

@@ -1,9 +1,8 @@
-import { OutputSymbol, OutputSymbolOptions } from "@alloy-js/core";
-import { PythonMemberScope } from "./python-member-scope.js";
-export interface CreatePythonSymbolOptions extends OutputSymbolOptions {
+import { OutputSpace, OutputSymbol, OutputSymbolOptions } from "@alloy-js/core";
+export interface PythonOutputSymbolOptions extends OutputSymbolOptions {
     module?: string;
 }
-export interface CreatePythonSymbolFunctionOptions extends CreatePythonSymbolOptions {
+export interface CreatePythonSymbolFunctionOptions extends PythonOutputSymbolOptions {
     name: string;
 }
 /**
@@ -11,9 +10,13 @@ export interface CreatePythonSymbolFunctionOptions extends CreatePythonSymbolOpt
  */
 export declare class PythonOutputSymbol extends OutputSymbol {
     #private;
-    constructor(name: string, options: CreatePythonSymbolOptions);
+    static readonly memberSpaces: readonly ["static", "instance"];
+    constructor(name: string, spaces: OutputSpace[] | OutputSpace | undefined, options: PythonOutputSymbolOptions);
     get module(): string | undefined;
-    set module(value: string | undefined);
-    get instanceMemberScope(): PythonMemberScope | undefined;
+    get staticMembers(): import("@alloy-js/core").OutputMemberSpace;
+    get instanceMembers(): import("@alloy-js/core").OutputMemberSpace;
+    get isStaticMemberSymbol(): boolean;
+    get isInstanceMemberSymbol(): boolean;
+    copy(): PythonOutputSymbol;
 }
 //# sourceMappingURL=python-output-symbol.d.ts.map

package/dist/src/symbols/python-output-symbol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"python-output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-output-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iCACf,SAAQ,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;;gBACtC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB;IAQ5D,IAAI,MAAM,IAIQ,MAAM,GAAG,SAAS,CAFnC;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEnC;IAED,IAAI,mBAAmB,IACe,iBAAiB,GAAG,SAAS,CAClE;CACF"}
+{"version":3,"file":"python-output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-output-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEhF,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iCACf,SAAQ,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;;IAClD,MAAM,CAAC,QAAQ,CAAC,YAAY,kCAAmC;gBAG7D,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,GAAG,SAAS,EAC/C,OAAO,EAAE,yBAAyB;IASpC,IAAI,MAAM,uBAET;IAED,IAAI,aAAa,+CAEhB;IAED,IAAI,eAAe,+CAElB;IAED,IAAI,oBAAoB,YAEvB;IAED,IAAI,sBAAsB,YAEzB;IAED,IAAI;CAYL"}

package/dist/src/symbols/python-output-symbol.js

@@ -3,8 +3,9 @@ import { OutputSymbol } from "@alloy-js/core";
  * Represents an 'exported' symbol from a .py file. Class, enum, interface etc.
  */
 export class PythonOutputSymbol extends OutputSymbol {
-  constructor(name, options) {
-    super(name, options);
+  static memberSpaces = ["static", "instance"];
+  constructor(name, spaces, options) {
+    super(name, spaces, options);
     this.#module = options.module ?? undefined;
   }
 
@@ -13,10 +14,27 @@ export class PythonOutputSymbol extends OutputSymbol {
   get module() {
     return this.#module;
   }
-  set module(value) {
-    this.#module = value;
+  get staticMembers() {
+    return this.memberSpaceFor("static");
   }
-  get instanceMemberScope() {
-    return super.instanceMemberScope;
+  get instanceMembers() {
+    return this.memberSpaceFor("instance");
   }
-}
+  get isStaticMemberSymbol() {
+    return !this.isInstanceMemberSymbol;
+  }
+  get isInstanceMemberSymbol() {
+    return this.spaces.some(s => s.key === "instance");
+  }
+  copy() {
+    const copy = new PythonOutputSymbol(this.name, undefined, {
+      binder: this.binder,
+      aliasTarget: this.aliasTarget,
+      module: this.module,
+      metadata: this.metadata
+    });
+    this.initializeCopy(copy);
+    return copy;
+  }
+}
+//# sourceMappingURL=python-output-symbol.js.map

package/dist/src/symbols/python-output-symbol.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["OutputSymbol","PythonOutputSymbol","memberSpaces","constructor","name","spaces","options","module","undefined","staticMembers","memberSpaceFor","instanceMembers","isStaticMemberSymbol","isInstanceMemberSymbol","some","s","key","copy","binder","aliasTarget","metadata","initializeCopy"],"sources":["../../../src/symbols/python-output-symbol.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAsBA,YAAY,QAA6B,gBAAgB;AAW/E;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,SAASD,YAAY,CAAC;EACnD,OAAgBE,YAAY,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;EAErDC,WAAWA,CACTC,IAAY,EACZC,MAA+C,EAC/CC,OAAkC,EAClC;IACA,KAAK,CAACF,IAAI,EAAEC,MAAM,EAAEC,OAAO,CAAC;IAC5B,IAAI,CAAC,CAACC,MAAM,GAAGD,OAAO,CAACC,MAAM,IAAIC,SAAS;EAC5C;;EAEA;EACA,CAACD,MAAM;EAEP,IAAIA,MAAMA,CAAA,EAAG;IACX,OAAO,IAAI,CAAC,CAACA,MAAM;EACrB;EAEA,IAAIE,aAAaA,CAAA,EAAG;IAClB,OAAO,IAAI,CAACC,cAAc,CAAC,QAAQ,CAAC;EACtC;EAEA,IAAIC,eAAeA,CAAA,EAAG;IACpB,OAAO,IAAI,CAACD,cAAc,CAAC,UAAU,CAAC;EACxC;EAEA,IAAIE,oBAAoBA,CAAA,EAAG;IACzB,OAAO,CAAC,IAAI,CAACC,sBAAsB;EACrC;EAEA,IAAIA,sBAAsBA,CAAA,EAAG;IAC3B,OAAO,IAAI,CAACR,MAAM,CAACS,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAK,UAAU,CAAC;EACtD;EAEAC,IAAIA,CAAA,EAAG;IACL,MAAMA,IAAI,GAAG,IAAIhB,kBAAkB,CAAC,IAAI,CAACG,IAAI,EAAEI,SAAS,EAAE;MACxDU,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBC,WAAW,EAAE,IAAI,CAACA,WAAW;MAC7BZ,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBa,QAAQ,EAAE,IAAI,CAACA;IACjB,CAAC,CAAC;IAEF,IAAI,CAACC,cAAc,CAACJ,IAAI,CAAC;IAEzB,OAAOA,IAAI;EACb;AACF","ignoreList":[]}

package/dist/src/symbols/reference.d.ts

@@ -1,4 +1,4 @@
-import { Refkey } from "@alloy-js/core";
+import { Children, Refkey } from "@alloy-js/core";
 import { PythonOutputSymbol } from "./index.js";
-export declare function ref(refkey: Refkey): () => [string, PythonOutputSymbol | undefined];
+export declare function ref(refkey: Refkey): () => [Children, PythonOutputSymbol | undefined];
 //# sourceMappingURL=reference.d.ts.map

package/dist/src/symbols/reference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/symbols/reference.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAKP,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAIL,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,GAAG,CACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,SAAS,CAAC,CA6DhD"}
+{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/symbols/reference.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,MAAM,EAIP,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAGL,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,GAAG,CACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,CAAC,CAmDlD"}

package/dist/src/symbols/reference.js

@@ -1,60 +1,61 @@
-import { memo, OutputSymbolFlags, resolve, untrack, useContext, useMemberScope } from "@alloy-js/core";
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { memo, resolve, untrack, useContext } from "@alloy-js/core";
+import { MemberExpression } from "../components/MemberExpression.js";
 import { PythonSourceFileContext } from "../components/SourceFile.js";
+import { PythonModuleScope } from "./index.js";
 export function ref(refkey) {
   const sourceFile = useContext(PythonSourceFileContext);
   const resolveResult = resolve(refkey);
-  const currentScope = useMemberScope();
   return memo(() => {
     if (resolveResult.value === undefined) {
       return ["<Unresolved Symbol>", undefined];
     }
     const {
-      targetDeclaration,
+      commonScope,
+      lexicalDeclaration,
+      symbol,
       pathDown,
       memberPath
     } = resolveResult.value;
 
-    // if we resolved a instance member, check if we should be able to access
-    // it.
-    if (targetDeclaration.flags & OutputSymbolFlags.InstanceMember) {
-      if (currentScope?.instanceMembers !== targetDeclaration.scope) {
-        throw new Error("Cannot resolve member symbols from a different member scope");
-      }
-    }
-
     // Where the target declaration is relative to the referencing scope.
     // * module: target symbol is in a different module
     // * local: target symbol is within the current module
-    const targetLocation = pathDown[0]?.kind ?? "local";
+    const targetLocation = pathDown[0] instanceof PythonModuleScope ? "module" : "local";
     let localSymbol;
     if (targetLocation === "module") {
-      // Handling of targets in other modules, either created with createModule()
-      // or from other files.
-      const symbolPath = [...pathDown.slice(1).map(s => s.owner), targetDeclaration];
-      const importSymbol = symbolPath[0];
-      localSymbol = untrack(() => sourceFile.scope.addImport(importSymbol, pathDown[0]));
+      localSymbol = untrack(() => sourceFile.scope.addImport(lexicalDeclaration, pathDown[0]));
     }
-    if (memberPath && memberPath.length > 0) {
-      if (localSymbol) {
-        memberPath[0] = localSymbol;
+    const parts = [];
+    if (commonScope && commonScope.isMemberScope) {
+      // we are referencing a member of a type we are inside
+      if (lexicalDeclaration.isInstanceMemberSymbol) {
+        parts.push(_$createComponent(MemberExpression.Part, {
+          id: "self"
+        }));
+      } else {
+        parts.push(_$createComponent(MemberExpression.Part, {
+          get symbol() {
+            return commonScope.ownerSymbol;
+          }
+        }));
       }
-      return [buildMemberExpression(memberPath), memberPath.at(-1)];
+      parts.push(_$createComponent(MemberExpression.Part, {
+        symbol: lexicalDeclaration
+      }));
     } else {
-      return [buildMemberExpression([localSymbol ?? targetDeclaration]), localSymbol ?? targetDeclaration];
+      parts.push(_$createComponent(MemberExpression.Part, {
+        symbol: localSymbol ?? lexicalDeclaration
+      }));
+    }
+    for (const part of memberPath) {
+      parts.push(_$createComponent(MemberExpression.Part, {
+        symbol: part
+      }));
     }
+    return [_$createComponent(MemberExpression, {
+      children: parts
+    }), localSymbol ?? symbol];
   });
 }
-function buildMemberExpression(path) {
-  let memberExpr = "";
-  const base = path[0];
-  if (base.flags & OutputSymbolFlags.InstanceMember) {
-    memberExpr += "self";
-  } else {
-    memberExpr += base.name;
-    path = path.slice(1);
-  }
-  for (const sym of path) {
-    memberExpr += `.${sym.name}`;
-  }
-  return memberExpr;
-}
+//# sourceMappingURL=reference.js.map

package/dist/src/symbols/reference.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["memo","resolve","untrack","useContext","MemberExpression","PythonSourceFileContext","PythonModuleScope","ref","refkey","sourceFile","resolveResult","value","undefined","commonScope","lexicalDeclaration","symbol","pathDown","memberPath","targetLocation","localSymbol","scope","addImport","parts","isMemberScope","isInstanceMemberSymbol","push","_$createComponent","Part","id","ownerSymbol","part","children"],"sources":["../../../src/symbols/reference.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAEEA,IAAI,EAEJC,OAAO,EACPC,OAAO,EACPC,UAAU,QACL,gBAAgB;AACvB,SAASC,gBAAgB;AACzB,SAASC,uBAAuB;AAChC,SACEC,iBAAiB,QAGZ,YAAY;AAEnB,OAAO,SAASC,GAAGA,CACjBC,MAAc,EACoC;EAClD,MAAMC,UAAU,GAAGN,UAAU,CAACE,uBAAuB,CAAC;EACtD,MAAMK,aAAa,GAAGT,OAAO,CAC3BO,MACF,CAAC;EAED,OAAOR,IAAI,CAAC,MAAM;IAChB,IAAIU,aAAa,CAACC,KAAK,KAAKC,SAAS,EAAE;MACrC,OAAO,CAAC,qBAAqB,EAAEA,SAAS,CAAC;IAC3C;IAEA,MAAM;MAAEC,WAAW;MAAEC,kBAAkB;MAAEC,MAAM;MAAEC,QAAQ;MAAEC;IAAW,CAAC,GACrEP,aAAa,CAACC,KAAK;;IAErB;IACA;IACA;IACA,MAAMO,cAAc,GAClBF,QAAQ,CAAC,CAAC,CAAC,YAAYV,iBAAiB,GAAG,QAAQ,GAAG,OAAO;IAC/D,IAAIa,WAA2C;IAE/C,IAAID,cAAc,KAAK,QAAQ,EAAE;MAC/BC,WAAW,GAAGjB,OAAO,CAAC,MACpBO,UAAU,CAAEW,KAAK,CAACC,SAAS,CACzBP,kBAAkB,EAClBE,QAAQ,CAAC,CAAC,CACZ,CACF,CAAC;IACH;IAEA,MAAMM,KAAK,GAAG,EAAE;IAEhB,IAAIT,WAAW,IAAIA,WAAW,CAACU,aAAa,EAAE;MAC5C;MACA,IAAIT,kBAAkB,CAACU,sBAAsB,EAAE;QAC7CF,KAAK,CAACG,IAAI,CAAAC,iBAAA,CAAEtB,gBAAgB,CAACuB,IAAI;UAACC,EAAE;QAAA,EAAU,CAAC;MACjD,CAAC,MAAM;QACLN,KAAK,CAACG,IAAI,CAAAC,iBAAA,CAAEtB,gBAAgB,CAACuB,IAAI;UAAA,IAACZ,MAAMA,CAAA;YAAA,OAAEF,WAAW,CAACgB,WAAW;UAAA;QAAA,EAAI,CAAC;MACxE;MACAP,KAAK,CAACG,IAAI,CAAAC,iBAAA,CAAEtB,gBAAgB,CAACuB,IAAI;QAACZ,MAAM,EAAED;MAAkB,EAAI,CAAC;IACnE,CAAC,MAAM;MACLQ,KAAK,CAACG,IAAI,CAAAC,iBAAA,CACPtB,gBAAgB,CAACuB,IAAI;QAACZ,MAAM,EAAEI,WAAW,IAAIL;MAAkB,EAClE,CAAC;IACH;IACA,KAAK,MAAMgB,IAAI,IAAIb,UAAU,EAAE;MAC7BK,KAAK,CAACG,IAAI,CAAAC,iBAAA,CAAEtB,gBAAgB,CAACuB,IAAI;QAACZ,MAAM,EAAEe;MAAI,EAAI,CAAC;IACrD;IAEA,OAAO,CAAAJ,iBAAA,CAAEtB,gBAAgB;MAAC2B,QAAQ,EAAET;IAAK,IAAMH,WAAW,IAAIJ,MAAM,CAAC;EACvE,CAAC,CAAC;AACJ","ignoreList":[]}

package/dist/src/symbols/scopes.d.ts

@@ -1,5 +1,7 @@
+import { PythonLexicalScope } from "./python-lexical-scope.js";
 import { PythonMemberScope } from "./python-member-scope.js";
 import { PythonModuleScope } from "./python-module-scope.js";
-export type PythonOutputScope = PythonModuleScope | PythonMemberScope;
+export type PythonOutputScope = PythonLexicalScope | PythonModuleScope | PythonMemberScope;
 export declare function usePythonScope(): PythonOutputScope;
+export declare function usePythonLexicalScope(): PythonLexicalScope | PythonModuleScope;
 //# sourceMappingURL=scopes.d.ts.map

package/dist/src/symbols/scopes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/symbols/scopes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAEtE,wBAAgB,cAAc,IACP,iBAAiB,CACvC"}
+{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/symbols/scopes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GACzB,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,CAAC;AAEtB,wBAAgB,cAAc,IACP,iBAAiB,CACvC;AAED,wBAAgB,qBAAqB,2CAQpC"}

package/dist/src/symbols/scopes.js

@@ -1,4 +1,13 @@
 import { useScope } from "@alloy-js/core";
+import { PythonLexicalScope } from "./python-lexical-scope.js";
 export function usePythonScope() {
   return useScope();
-}
+}
+export function usePythonLexicalScope() {
+  const scope = usePythonScope();
+  if (!(scope instanceof PythonLexicalScope)) {
+    throw new Error("Expected a PythonLexicalScope, but got " + scope.constructor.name);
+  }
+  return scope;
+}
+//# sourceMappingURL=scopes.js.map

package/dist/src/symbols/scopes.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useScope","PythonLexicalScope","usePythonScope","usePythonLexicalScope","scope","Error","constructor","name"],"sources":["../../../src/symbols/scopes.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,kBAAkB,QAAQ,2BAA2B;AAS9D,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,OAAOF,QAAQ,CAAC,CAAC;AACnB;AAEA,OAAO,SAASG,qBAAqBA,CAAA,EAAG;EACtC,MAAMC,KAAK,GAAGF,cAAc,CAAC,CAAC;EAC9B,IAAI,EAAEE,KAAK,YAAYH,kBAAkB,CAAC,EAAE;IAC1C,MAAM,IAAII,KAAK,CACb,yCAAyC,GAAGD,KAAK,CAACE,WAAW,CAACC,IAChE,CAAC;EACH;EACA,OAAOH,KAAK;AACd","ignoreList":[]}

package/dist/src/utils.js

@@ -9,4 +9,5 @@ export function getCallSignatureProps(props, defaults) {
     return callSignatureProps;
   }
   return defaultProps(callSignatureProps, defaults);
-}
+}
+//# sourceMappingURL=utils.js.map

package/dist/src/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["defaultProps","splitProps","getCallSignatureProps","props","defaults","callSignatureProps"],"sources":["../../src/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAY,EAAEC,UAAU,QAAQ,gBAAgB;AAGzD;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CACnCC,KAAyB,EACzBC,QAAsC,EACtC;EACA,MAAM,CAACC,kBAAkB,CAAC,GAAGJ,UAAU,CAACE,KAAK,EAAE,CAC7C,YAAY,EACZ,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,YAAY,CACb,CAAC;EAEF,IAAI,CAACC,QAAQ,EAAE;IACb,OAAOC,kBAAkB;EAC3B;EAEA,OAAOL,YAAY,CAACK,kBAAkB,EAAED,QAAQ,CAAC;AACnD","ignoreList":[]}

package/dist/test/callsignatures.test.js

@@ -273,4 +273,5 @@ describe("Call Signature - Parameter Descriptors", () => {
       [T, U](a: int, b: str = "default_value") -> int
     `);
   });
-});
+});
+//# sourceMappingURL=callsignatures.test.js.map

package/dist/test/callsignatures.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["d","describe","expect","it","py","toSourceText","result","_$createComponent","CallSignatureParameters","parameters","toRenderTo","name","type","optional","default","CallSignature","args","kwargs","typeParameters","returnType","classFunction","instanceFunction","toThrowError"],"sources":["../../test/callsignatures.test.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAASA,CAAC,QAAQ,wBAAwB;AAC1C,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,QAAQ;AAC7C,OAAO,KAAKC,EAAE,MAAM,iBAAiB;AACrC,SAASC,YAAY;AAErBJ,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1CE,EAAE,CAAC,oCAAoC,EAAE,MAAM;IAC7C,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MAACC,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG;IAAC,GACnD,CAAC;IACFP,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,wCAAwC,EAAE,MAAM;IACjD,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MACzBC,UAAU,EAAE,CAAC;QAAEE,IAAI,EAAE;MAAI,CAAC,EAAE;QAAEA,IAAI,EAAE;MAAI,CAAC;IAAC,GAE7C,CAAC;IACFT,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,mDAAmD,EAAE,MAAM;IAC5D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MACzBC,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC;IAC3B,GAEJ,CAAC;IACFV,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,4DAA4D,EAAE,MAAM;IACrE,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MACzBC,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE;MAAK,CAAC,EAC1C;QAAEF,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE;MAAK,CAAC;IAC3C,GAEJ,CAAC;IACFX,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,yDAAyD,EAAE,MAAM;IAClE,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MACzBC,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEG,OAAO,EAAE;MAAE,CAAC,EACzB;QAAEH,IAAI,EAAE,GAAG;QAAEG,OAAO,EAAE;MAAQ,CAAC;IAChC,GAEJ,CAAC;IACFZ,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,wEAAwE,EAAE,MAAM;IACjF,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACI,uBAAuB;MACzBC,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE,IAAI;QAAEC,OAAO,EAAE;MAAE,CAAC,EACtD;QAAEH,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE,IAAI;QAAEC,OAAO,EAAE;MAAQ,CAAC;IAC7D,GAEJ,CAAC;IACFZ,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEFC,QAAQ,CAAC,gBAAgB,EAAE,MAAM;EAC/BE,EAAE,CAAC,iCAAiC,EAAE,MAAM;IAC1C,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CAAEH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG;IAAC,GAAK,CAAC;IAC3EP,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,sDAAsD,EAAE,MAAM;IAC/D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAAEO,IAAI;MAACC,MAAM;IAAA,GACtD,CAAC;IACFf,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,sDAAsD,EAAE,MAAM;IAC/D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAAES,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG;IAAC,GACrE,CAAC;IACFhB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,kDAAkD,EAAE,MAAM;IAC3D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAAEU,UAAU;IAAA,GACrD,CAAC;IACFjB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,sDAAsD,EAAE,MAAM;IAC/D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAAEW,aAAa;IAAA,GACxD,CAAC;IACFlB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,0DAA0D,EAAE,MAAM;IACnE,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MAACN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAAEY,gBAAgB;IAAA,GAC3D,CAAC;IACFnB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,0FAA0F,EAAE,MAAM;IACnGD,MAAM,CAAC,MACLG,YAAY,CAAC,CAAAE,iBAAA,CACVH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MACtBY,gBAAgB;MAChBD,aAAa;IAAA,GAEhB,CACH,CAAC,CAACE,YAAY,CAAC,0DAA0D,CAAC;EAC5E,CAAC,CAAC;EACFnB,EAAE,CAAC,qDAAqD,EAAE,MAAM;IAC9D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MACtBY,gBAAgB;MAChBL,IAAI;MACJC,MAAM;MACNE,UAAU;IAAA,GAEb,CAAC;IACFjB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEFC,QAAQ,CAAC,wCAAwC,EAAE,MAAM;EACvDE,EAAE,CAAC,qDAAqD,EAAE,MAAM;IAC9D,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC;IAC3B,GAEJ,CAAC;IACFV,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,sEAAsE,EAAE,MAAM;IAC/E,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAC3B;MACDI,IAAI;MACJC,MAAM;IAAA,GAET,CAAC;IACFf,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,qEAAqE,EAAE,MAAM;IAC9E,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAC3B;MACDO,UAAU;IAAA,GAEb,CAAC;IACFjB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,0EAA0E,EAAE,MAAM;IACnF,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAC3B;MACDQ,aAAa;IAAA,GAEhB,CAAC;IACFlB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,8EAA8E,EAAE,MAAM;IACvF,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAC3B;MACDS,gBAAgB;IAAA,GAEnB,CAAC;IACFnB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,mCAAmC,EAAE,MAAM;IAC5C,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfN,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAC3B;MACDS,gBAAgB;MAChBL,IAAI;MACJC,MAAM;MACNE,UAAU;IAAA,GAEb,CAAC;IACFjB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;EACFG,EAAE,CAAC,kEAAkE,EAAE,MAAM;IAC3E,MAAMG,MAAM,GAAGD,YAAY,CAAC,CAAAE,iBAAA,CACzBH,EAAE,CAACW,aAAa;MACfG,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;MAC1BT,UAAU,EAAE,CACV;QAAEE,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,EAC1B;QAAED,IAAI,EAAE,GAAG;QAAEC,IAAI,EAAE,KAAK;QAAEE,OAAO,EAAE;MAAgB,CAAC,CACrD;MACDK,UAAU;IAAA,GAEb,CAAC;IACFjB,MAAM,CAACI,MAAM,CAAC,CAACI,UAAU,CAACV,CAAC;AAC/B;AACA,KAAK,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/dist/test/classdeclarations.test.js

@@ -32,9 +32,15 @@ describe("Python Class", () => {
     const result = toSourceText([_$createComponent(py.StatementList, {
       get children() {
         return [_$createComponent(py.ClassDeclaration, {
-          name: "Base1"
+          name: "Base1",
+          get refkey() {
+            return refkey("Base1");
+          }
         }), _$createComponent(py.ClassDeclaration, {
-          name: "Base2"
+          name: "Base2",
+          get refkey() {
+            return refkey("Base2");
+          }
         }), _$createComponent(py.ClassDeclaration, {
           name: "Baz",
           get bases() {
@@ -75,7 +81,10 @@ describe("Python Class", () => {
       path: "mod1.py",
       get children() {
         return _$createComponent(py.ClassDeclaration, {
-          name: "A"
+          name: "A",
+          get refkey() {
+            return refkey("A");
+          }
         });
       }
     }), _$createComponent(py.SourceFile, {
@@ -83,6 +92,9 @@ describe("Python Class", () => {
       get children() {
         return _$createComponent(py.ClassDeclaration, {
           name: "B",
+          get refkey() {
+            return refkey("B");
+          },
           get bases() {
             return [refkey("A")];
           }
@@ -135,7 +147,10 @@ describe("Python Class", () => {
     const result = toSourceText([_$createComponent(py.StatementList, {
       get children() {
         return [_$createComponent(py.ClassDeclaration, {
-          name: "A"
+          name: "A",
+          get refkey() {
+            return refkey("A");
+          }
         }), _$createComponent(py.ClassDeclaration, {
           name: "B",
           get children() {
@@ -171,6 +186,8 @@ describe("Python Class", () => {
     expect(result).toRenderTo(expected);
   });
   it("renders a class with class variables like foo: str, and another identical class", () => {
+    const fooKey = refkey();
+    const barKey = refkey();
     const result = toSourceText([_$createComponent(py.StatementList, {
       get children() {
         return [_$createComponent(py.ClassDeclaration, {
@@ -181,6 +198,7 @@ describe("Python Class", () => {
                 return _$createComponent(py.VariableDeclaration, {
                   name: "foo",
                   type: "str",
+                  refkey: fooKey,
                   omitNone: true
                 });
               }
@@ -194,12 +212,13 @@ describe("Python Class", () => {
                 return _$createComponent(py.VariableDeclaration, {
                   name: "foo",
                   type: "str",
+                  refkey: barKey,
                   omitNone: true
                 });
               }
             });
           }
-        })];
+        }), fooKey, barKey];
       }
     })]);
     const expected = d`
@@ -209,7 +228,8 @@ describe("Python Class", () => {
       class B:
           foo: str
 
-
+      A.foo
+      B.foo
     `;
     expect(result).toRenderTo(expected);
   });
@@ -219,22 +239,32 @@ describe("Python Class - VariableDeclaration", () => {
     const result = toSourceText([_$createComponent(py.StatementList, {
       get children() {
         return [_$createComponent(py.ClassDeclaration, {
+          get refkey() {
+            return refkey("Base");
+          },
           name: "Base"
         }), _$createComponent(py.ClassDeclaration, {
+          get refkey() {
+            return refkey("A");
+          },
           name: "A",
           get children() {
             return _$createComponent(py.StatementList, {
               get children() {
                 return [_$createComponent(py.VariableDeclaration, {
+                  instanceVariable: true,
                   name: "just_name"
                 }), _$createComponent(py.VariableDeclaration, {
+                  instanceVariable: true,
                   name: "name_and_type",
                   type: "number"
                 }), _$createComponent(py.VariableDeclaration, {
+                  instanceVariable: true,
                   name: "name_type_and_value",
                   type: "number",
                   initializer: 12
                 }), _$createComponent(py.VariableDeclaration, {
+                  instanceVariable: true,
                   name: "class_based",
                   get type() {
                     return refkey("Base");
@@ -275,14 +305,8 @@ describe("Python Class - VariableDeclaration", () => {
               refkey: v1Rk,
               type: classRk,
               get initializer() {
-                return _$createComponent(py.MemberExpression, {
-                  get children() {
-                    return [_$createComponent(py.MemberExpression.Part, {
-                      refkey: classRk
-                    }), _$createComponent(py.MemberExpression.Part, {
-                      args: true
-                    })];
-                  }
+                return _$createComponent(py.ClassInstantiation, {
+                  target: classRk
                 });
               }
             }), [_$memo(() => memberRefkey(v1Rk, classMemberRk))], [_$memo(() => memberRefkey(v1Rk, classMethodRk)), "()"]];
@@ -336,46 +360,56 @@ describe("Python Class - VariableDeclaration", () => {
 });
 describe("Python Class - FunctionDeclaration", () => {
   it("renders a class with class fields and method", () => {
-    const result = toSourceText([[_$createComponent(py.ClassDeclaration, {
-      name: "MyClass",
-      bases: ["BaseClass"],
+    const methodRefkey = refkey();
+    const classMethodRefkey = refkey();
+    const staticMethodRefkey = refkey();
+    const result = toSourceText([_$createComponent(py.StatementList, {
       get children() {
-        return _$createComponent(py.StatementList, {
+        return [_$createComponent(py.ClassDeclaration, {
+          name: "MyClass",
+          bases: ["BaseClass"],
           get children() {
-            return [_$createComponent(py.VariableDeclaration, {
-              name: "a",
-              type: "int"
-            }), _$createComponent(py.VariableDeclaration, {
-              name: "b",
-              type: "int"
-            }), _$createComponent(py.FunctionDeclaration, {
-              name: "my_method",
-              parameters: [{
-                name: "a",
-                type: "int"
-              }, {
-                name: "b",
-                type: "int"
-              }],
-              returnType: "int",
-              instanceFunction: true,
-              children: "return a + b"
-            }), _$createComponent(py.FunctionDeclaration, {
-              name: "my_class_method",
-              instanceFunction: false,
-              classFunction: true,
-              returnType: "int",
-              children: "pass"
-            }), _$createComponent(py.FunctionDeclaration, {
-              name: "my_standalone_function",
-              instanceFunction: false,
-              returnType: "int",
-              children: "pass"
-            })];
+            return _$createComponent(py.StatementList, {
+              get children() {
+                return [_$createComponent(py.VariableDeclaration, {
+                  name: "a",
+                  type: "int",
+                  instanceVariable: true
+                }), _$createComponent(py.VariableDeclaration, {
+                  name: "b",
+                  type: "int",
+                  instanceVariable: true
+                }), _$createComponent(py.FunctionDeclaration, {
+                  name: "my_method",
+                  parameters: [{
+                    name: "a",
+                    type: "int"
+                  }, {
+                    name: "b",
+                    type: "int"
+                  }],
+                  returnType: "int",
+                  instanceFunction: true,
+                  refkey: methodRefkey,
+                  children: "return a + b"
+                }), _$createComponent(py.FunctionDeclaration, {
+                  name: "my_class_method",
+                  classFunction: true,
+                  returnType: "int",
+                  refkey: classMethodRefkey,
+                  children: "pass"
+                }), _$createComponent(py.FunctionDeclaration, {
+                  name: "my_standalone_function",
+                  returnType: "int",
+                  refkey: staticMethodRefkey,
+                  children: "pass"
+                })];
+              }
+            });
           }
-        });
+        }), classMethodRefkey, staticMethodRefkey];
       }
-    })]]);
+    })]);
     const expected = d`
       class MyClass(BaseClass):
           a: int = None
@@ -389,9 +423,11 @@ describe("Python Class - FunctionDeclaration", () => {
           def my_standalone_function() -> int:
               pass
 
-
-          
+      
+      MyClass.my_class_method
+      MyClass.my_standalone_function
     `;
     expect(result).toRenderTo(expected);
   });
-});
+});
+//# sourceMappingURL=classdeclarations.test.js.map