@alloy-js/python 0.1.0-dev.3 → 0.1.0-dev.5

package/dist/src/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC"}

package/dist/src/components/index.js

@@ -8,7 +8,9 @@ export * from "./EnumMember.js";
 export * from "./FunctionCallExpression.js";
 export * from "./FunctionDeclaration.js";
 export * from "./ImportStatement.js";
+export * from "./LexicalScope.js";
 export * from "./MemberExpression.js";
+export * from "./MemberScope.js";
 export * from "./NoNamePolicy.js";
 export * from "./PyDoc.js";
 export * from "./PythonBlock.js";

package/dist/src/create-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-module.d.ts","sourceRoot":"","sources":["../../src/create-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EAEX,aAAa,EACd,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,gBAAgB;IAC/B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,gBAAgB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,CAAC,CAAC;CACf;AAED,MAAM,MAAM,QAAQ,CAAC,WAAW,SAAS,SAAS,MAAM,EAAE,IAAI;KAC3D,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI;KAC9D,CAAC,IAAI,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AA2DF,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,gBAAgB,EAC3D,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC1B,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAelC"}
+{"version":3,"file":"create-module.d.ts","sourceRoot":"","sources":["../../src/create-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EAEX,aAAa,EACd,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,gBAAgB;IAC/B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,gBAAgB;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,CAAC,CAAC;CACf;AAED,MAAM,MAAM,QAAQ,CAAC,WAAW,SAAS,SAAS,MAAM,EAAE,IAAI;KAC3D,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI;KAC9D,CAAC,IAAI,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAqDF,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,gBAAgB,EAC3D,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC1B,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAelC"}

package/dist/src/create-module.js

@@ -8,8 +8,7 @@ function createSymbols(binder, props, refkeys) {
     // Otherwise, we append the path to the module name
     const fullModuleScopeName = props.name + (path === "." ? "" : `.${path}`);
     const keys = refkeys[path];
-    const moduleScope = new PythonModuleScope(fullModuleScopeName, {
-      parent: undefined,
+    const moduleScope = new PythonModuleScope(fullModuleScopeName, undefined, {
       binder: binder
     });
 
@@ -17,11 +16,11 @@ function createSymbols(binder, props, refkeys) {
     for (const exportedName of symbols ?? []) {
       const key = keys[exportedName];
       const _ = createPythonSymbol(exportedName, {
+        space: moduleScope.symbols,
         binder: binder,
-        scope: moduleScope,
         refkeys: key,
         module: moduleScope.name
-      }, undefined, false);
+      });
     }
   }
 }

package/dist/src/name-conflict-resolver.d.ts

@@ -0,0 +1,3 @@
+import { PythonOutputSymbol } from "./symbols/python-output-symbol.js";
+export declare function pythonNameConflictResolver(_: string, symbols: PythonOutputSymbol[]): void;
+//# sourceMappingURL=name-conflict-resolver.d.ts.map

package/dist/src/name-conflict-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"name-conflict-resolver.d.ts","sourceRoot":"","sources":["../../src/name-conflict-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,wBAAgB,0BAA0B,CACxC,CAAC,EAAE,MAAM,EACT,OAAO,EAAE,kBAAkB,EAAE,QAgB9B"}

package/dist/src/name-conflict-resolver.js

@@ -0,0 +1,7 @@
+export function pythonNameConflictResolver(_, symbols) {
+  for (let i = 1; i < symbols.length; i++) {
+    // Rename all but the first symbol to have a suffix of _2, _3, plus the scope name if available.
+    const symbol = symbols[i];
+    symbol.name = symbol.originalName + "_" + (i + 1) + "_" + (symbols[i].aliasTarget?.scope?.name ?? symbol.module ?? "");
+  }
+}

package/dist/src/symbol-creation.d.ts

@@ -1,4 +1,15 @@
+import { OutputScopeOptions, OutputSpace } from "@alloy-js/core";
 import { PythonElements } from "./name-policy.js";
-import { CreatePythonSymbolOptions, PythonOutputSymbol } from "./symbols/index.js";
-export declare function createPythonSymbol(name: string, options: CreatePythonSymbolOptions, kind?: PythonElements, createRefkeyIfNeeded?: boolean): PythonOutputSymbol;
+import { PythonOutputSymbol, PythonOutputSymbolOptions } from "./symbols/index.js";
+import { PythonLexicalScope } from "./symbols/python-lexical-scope.js";
+interface CreatePythonSymbolOptions extends PythonOutputSymbolOptions {
+    space?: OutputSpace;
+    instance?: boolean;
+}
+/**
+ * Creates a symbol for a python declaration in the current scope.
+ */
+export declare function createPythonSymbol(name: string, options?: CreatePythonSymbolOptions, kind?: PythonElements): PythonOutputSymbol;
+export declare function createLexicalScope(name: string, options?: OutputScopeOptions): PythonLexicalScope;
+export {};
 //# sourceMappingURL=symbol-creation.d.ts.map

package/dist/src/symbol-creation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"symbol-creation.d.ts","sourceRoot":"","sources":["../../src/symbol-creation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAuB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,yBAAyB,EAClC,IAAI,CAAC,EAAE,cAAc,EACrB,oBAAoB,UAAQ,GAC3B,kBAAkB,CAsBpB"}
+{"version":3,"file":"symbol-creation.d.ts","sourceRoot":"","sources":["../../src/symbol-creation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,cAAc,EAAuB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EAE1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,UAAU,yBAA0B,SAAQ,yBAAyB;IACnE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,yBAA8B,EACvC,IAAI,CAAC,EAAE,cAAc,GACpB,kBAAkB,CAuCpB;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,kBAAuB,sBAKjC"}

package/dist/src/symbol-creation.js

@@ -1,8 +1,12 @@
-import { refkey, useContext } from "@alloy-js/core";
+import { useBinder, useContext } from "@alloy-js/core";
 import { PythonSourceFileContext } from "./components/SourceFile.js";
 import { usePythonNamePolicy } from "./name-policy.js";
-import { PythonOutputSymbol } from "./symbols/index.js";
-export function createPythonSymbol(name, options, kind, createRefkeyIfNeeded = false) {
+import { PythonOutputSymbol, usePythonScope } from "./symbols/index.js";
+import { PythonLexicalScope } from "./symbols/python-lexical-scope.js";
+/**
+ * Creates a symbol for a python declaration in the current scope.
+ */
+export function createPythonSymbol(name, options = {}, kind) {
   let processedName = name;
   const sfContext = useContext(PythonSourceFileContext);
   // Only apply the name policy if a kind is provided and name policy context is available
@@ -12,13 +16,33 @@ export function createPythonSymbol(name, options, kind, createRefkeyIfNeeded = f
       processedName = namePolicy.getName(name, kind);
     }
   }
-  return new PythonOutputSymbol(processedName, {
-    binder: options.binder,
+  const currentScope = usePythonScope();
+  let targetSpace = options.space ?? undefined;
+  if (!options.space && currentScope) {
+    if (currentScope.isMemberScope) {
+      if (options.instance) {
+        targetSpace = currentScope.ownerSymbol.instanceMembers;
+      } else {
+        targetSpace = currentScope.ownerSymbol.staticMembers;
+      }
+    } else {
+      if (options.instance) {
+        throw new Error(`Cannot declare instance variable ${name} outside of a member scope`);
+      }
+      targetSpace = currentScope.symbols;
+    }
+  }
+  const binder = options.binder ?? currentScope?.binder ?? useBinder();
+  return new PythonOutputSymbol(processedName, targetSpace, {
+    binder: binder,
     aliasTarget: options.aliasTarget,
-    scope: options.scope,
-    refkeys: options.refkeys ?? (createRefkeyIfNeeded ? refkey(processedName) : undefined),
-    flags: options.flags,
+    refkeys: options.refkeys,
     metadata: options.metadata,
-    module: sfContext?.module
+    module: sfContext?.module,
+    type: options.type
   });
+}
+export function createLexicalScope(name, options = {}) {
+  const parent = usePythonScope();
+  return new PythonLexicalScope(name, parent, options);
 }

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

@@ -1,4 +1,4 @@
-export * from "./custom-output-scope.js";
+export * from "./python-lexical-scope.js";
 export * from "./python-member-scope.js";
 export * from "./python-module-scope.js";
 export * from "./python-output-symbol.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/symbols/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/symbols/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}

package/dist/src/symbols/index.js

@@ -1,4 +1,4 @@
-export * from "./custom-output-scope.js";
+export * from "./python-lexical-scope.js";
 export * from "./python-member-scope.js";
 export * from "./python-module-scope.js";
 export * from "./python-output-symbol.js";

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

@@ -0,0 +1,7 @@
+import { OutputScope } from "@alloy-js/core";
+export declare class PythonLexicalScope extends OutputScope {
+    static readonly declarationSpaces: readonly string[];
+    get symbols(): import("@alloy-js/core").OutputSpace;
+    get ownerSymbol(): undefined;
+}
+//# sourceMappingURL=python-lexical-scope.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"python-lexical-scope.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-lexical-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,gBAAuB,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAe;IAE1E,IAAI,OAAO,yCAEV;IAKD,IAAI,WAAW,IAAI,SAAS,CAE3B;CACF"}

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

@@ -0,0 +1,14 @@
+import { OutputScope } from "@alloy-js/core";
+export class PythonLexicalScope extends OutputScope {
+  static declarationSpaces = ["symbols"];
+  get symbols() {
+    return this.spaceFor("symbols");
+  }
+
+  // Lexical scopes do not have an owner symbol. This ensures that we get the
+  // correct type when using `usePythonScope` (i.e. we don't get the
+  // OutputScope's `OutputSymbol | undefined` type).
+  get ownerSymbol() {
+    return undefined;
+  }
+}

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

@@ -1,7 +1,6 @@
-import { CustomOutputScope } from "./custom-output-scope.js";
+import { OutputScope } from "@alloy-js/core";
 import { PythonOutputSymbol } from "./python-output-symbol.js";
-export declare class PythonMemberScope extends CustomOutputScope {
-    get kind(): "member";
-    get owner(): PythonOutputSymbol;
+export declare class PythonMemberScope extends OutputScope {
+    get ownerSymbol(): PythonOutputSymbol;
 }
 //# sourceMappingURL=python-member-scope.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"python-member-scope.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-member-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,IAAI,IAAI,IACC,QAAQ,CAChB;IAED,IAAI,KAAK,IACe,kBAAkB,CACzC;CACF"}
+{"version":3,"file":"python-member-scope.d.ts","sourceRoot":"","sources":["../../../src/symbols/python-member-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,IAAI,WAAW,IACe,kBAAkB,CAC/C;CACF"}

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

@@ -1,9 +1,6 @@
-import { CustomOutputScope } from "./custom-output-scope.js";
-export class PythonMemberScope extends CustomOutputScope {
-  get kind() {
-    return "member";
-  }
-  get owner() {
-    return super.owner;
+import { OutputScope } from "@alloy-js/core";
+export class PythonMemberScope extends OutputScope {
+  get ownerSymbol() {
+    return super.ownerSymbol;
   }
 }

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,

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,26 @@ 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;
   }
 }

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,60 @@
-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;
 }

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,12 @@
 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;
 }