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

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

@@ -1 +1 @@
-{"version":3,"file":"CallSignature.d.ts","sourceRoot":"","sources":["../../../src/components/CallSignature.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAMT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAAC;IACvD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,YAmD1E;AA+ED,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,UAAU,CAAC,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAAC;IAE9C;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;CACvB;AACD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,YAyBtD"}
+{"version":3,"file":"CallSignature.d.ts","sourceRoot":"","sources":["../../../src/components/CallSignature.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAAC;IACvD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,YAmD1E;AAsED,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,UAAU,CAAC,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAAC;IAE9C;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;CACvB;AACD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,YAyBtD"}

package/dist/src/components/CallSignature.js

@@ -66,8 +66,7 @@ export function CallSignatureParameters(props) {
   });
 }
 function parameter(param) {
-  const SymbolSlot = createSymbolSlot();
-  SymbolSlot.instantiateInto(param.symbol);
+  const TypeSlot = param.TypeSlot; // TypeSlot will always be present when param.type is true.
   return _$createIntrinsic("group", {
     get children() {
       return [_$memo(() => param.symbol.name), _$createComponent(Show, {
@@ -75,7 +74,7 @@ function parameter(param) {
           return !!param.type;
         },
         get children() {
-          return [": ", _$createComponent(SymbolSlot, {
+          return [": ", _$createComponent(TypeSlot, {
             get children() {
               return param.type;
             }
@@ -128,16 +127,12 @@ function parameter(param) {
   });
 }
 function normalizeAndDeclareParameters(parameters) {
-  const sfContext = useContext(PythonSourceFileContext);
-  const module = sfContext?.module;
   if (parameters.length === 0) {
     return [];
   }
   if (typeof parameters[0] === "string") {
     return parameters.map(paramName => {
-      const symbol = createPythonSymbol(paramName, {
-        module: module
-      }, "parameter", false);
+      const symbol = createPythonSymbol(paramName, {}, "parameter");
       return {
         refkeys: symbol.refkeys,
         symbol
@@ -145,13 +140,15 @@ function normalizeAndDeclareParameters(parameters) {
     });
   } else {
     return parameters.map(param => {
+      const TypeSlot = createSymbolSlot();
       const symbol = createPythonSymbol(param.name, {
         refkeys: param.refkey,
-        module: module
-      }, "parameter", false);
+        type: TypeSlot.firstSymbol
+      }, "parameter");
       return {
         ...param,
-        symbol
+        symbol,
+        TypeSlot
       };
     });
   }

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

@@ -1 +1 @@
-{"version":3,"file":"ClassDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/ClassDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE;;OAEG;IACH,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,YA6C5D"}
+{"version":3,"file":"ClassDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/ClassDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAmC,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAe,MAAM,kBAAkB,CAAC;AAIrE,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE;;OAEG;IACH,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,YA8B5D"}

package/dist/src/components/ClassDeclaration.js

@@ -1,7 +1,8 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { List, Name, OutputSymbolFlags, Scope, Show, childrenArray, takeSymbols } from "@alloy-js/core";
+import { List, Name, Show, childrenArray } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { Declaration } from "./Declaration.js";
+import { MemberScope } from "./MemberScope.js";
 import { PythonBlock } from "./PythonBlock.js";
 /**
  * Create a Python class declaration.
@@ -39,29 +40,14 @@ export function ClassDeclaration(props) {
     space: true
   }), ")"];
   const sym = createPythonSymbol(props.name, {
-    refkeys: props.refkey,
-    flags: (props.flags ?? OutputSymbolFlags.None) | OutputSymbolFlags.MemberContainer
-  }, "class", true);
-  takeSymbols(memberSymbol => {
-    // Transform emitted symbols into instance/class members
-    memberSymbol.flags |= OutputSymbolFlags.InstanceMember;
-  });
-
-  // Propagate the name after the name policy was applied
-  const updatedProps = {
-    ...props,
-    name: sym.name,
-    nameKind: "class"
-  };
+    refkeys: props.refkey
+  }, "class");
   const hasChildren = childrenArray(() => props.children).filter(c => Boolean(c)).length > 0;
   return _$createComponent(Declaration, {
     symbol: sym,
     get children() {
-      return ["class ", _$createComponent(Name, {}), _$createComponent(Scope, {
-        get name() {
-          return updatedProps.name;
-        },
-        kind: "class",
+      return ["class ", _$createComponent(Name, {}), _$createComponent(MemberScope, {
+        ownerSymbol: sym,
         get children() {
           return [basesPart, _$createComponent(PythonBlock, {
             opener: ":",

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

@@ -1 +1 @@
-{"version":3,"file":"ClassInstantiation.d.ts","sourceRoot":"","sources":["../../../src/components/ClassInstantiation.tsx"],"names":[],"mappings":"AAOA,OAAO,EAEL,2BAA2B,EAC5B,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,uBAAwB,SAAQ,2BAA2B;CAAG;AAE/E;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,qCAmBhE"}
+{"version":3,"file":"ClassInstantiation.d.ts","sourceRoot":"","sources":["../../../src/components/ClassInstantiation.tsx"],"names":[],"mappings":"AAMA,OAAO,EAEL,2BAA2B,EAC5B,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,uBAAwB,SAAQ,2BAA2B;CAAG;AAE/E;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,qCAchE"}

package/dist/src/components/ClassInstantiation.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { emitSymbol, instantiateTakenMembersTo as instantiateTakenSymbolsTo, OutputSymbolFlags, useContext } from "@alloy-js/core";
+import { emitSymbol, instantiateTakenMembersTo, useContext } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { FunctionCallExpression } from "./FunctionCallExpression.js";
 import { PythonSourceFileContext } from "./SourceFile.js";
@@ -26,10 +26,10 @@ export function ClassInstantiation(props) {
   const sfContext = useContext(PythonSourceFileContext);
   const module = sfContext?.module;
   const sym = createPythonSymbol("", {
-    flags: OutputSymbolFlags.Transient,
+    transient: true,
     module: module
-  }, undefined, false);
-  instantiateTakenSymbolsTo(sym);
+  });
+  instantiateTakenMembersTo(sym, "static", "instance");
   emitSymbol(sym);
   return [_$createComponent(FunctionCallExpression, props)];
 }

package/dist/src/components/Declaration.d.ts

@@ -1,4 +1,4 @@
-import { Children, OutputSymbolFlags, Refkey } from "@alloy-js/core";
+import { Children, Refkey } from "@alloy-js/core";
 import { PythonElements } from "../name-policy.js";
 import { PythonOutputSymbol } from "../symbols/index.js";
 export interface BaseDeclarationProps {
@@ -11,10 +11,6 @@ export interface BaseDeclarationProps {
      * The refkey or array of refkeys for this declaration.
      */
     refkey?: Refkey | Refkey[];
-    /**
-     * Flags for the symbol created by this component.
-     */
-    flags?: OutputSymbolFlags;
     children?: Children;
     /**
      * Documentation for this declaration

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

@@ -1 +1 @@
-{"version":3,"file":"Declaration.d.ts","sourceRoot":"","sources":["../../../src/components/Declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,iBAAiB,EACjB,MAAM,EACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAE1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,MAAM,WAAW,gBAAiB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC1E;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B;;OAEG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YA4BlD"}
+{"version":3,"file":"Declaration.d.ts","sourceRoot":"","sources":["../../../src/components/Declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,MAAM,EACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,MAAM,WAAW,gBAAiB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC1E;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B;;OAEG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAgBlD"}

package/dist/src/components/Declaration.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { Declaration as CoreDeclaration, MemberScope, OutputSymbolFlags } from "@alloy-js/core";
+import { Declaration as CoreDeclaration } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 /**
  * A Python declaration, which can be a class, function, variable, etc.
@@ -16,22 +16,13 @@ export function Declaration(props) {
     sym = props.symbol;
   } else {
     sym = createPythonSymbol(props.name, {
-      refkeys: props.refkey,
-      flags: props.flags
-    }, props.nameKind, true);
-  }
-  function withMemberScope(children) {
-    return _$createComponent(MemberScope, {
-      owner: sym,
-      children: children
-    });
-  }
-  let children = () => props.children;
-  if (sym.flags & OutputSymbolFlags.MemberContainer) {
-    children = withMemberScope(children);
+      refkeys: props.refkey
+    }, props.nameKind);
   }
   return _$createComponent(CoreDeclaration, {
     symbol: sym,
-    children: children
+    get children() {
+      return props.children;
+    }
   });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"EnumDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/EnumDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,MAAM,WAAW,SAAU,SAAQ,oBAAoB;IACrD;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC/D;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IACH;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,YAAY,CAAC;IAC1C;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,YAM/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,YA+CzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,YAwDpD"}
+{"version":3,"file":"EnumDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/EnumDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAMxD,MAAM,WAAW,SAAU,SAAQ,oBAAoB;IACrD;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC/D;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IACH;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,YAAY,CAAC;IAC1C;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,YAM/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,YAoCzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,YAgDpD"}

package/dist/src/components/EnumDeclaration.js

@@ -1,11 +1,11 @@
 import { createComponent as _$createComponent, memo as _$memo, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
-import { Declaration as CoreDeclaration, For, MemberScope, OutputSymbolFlags, Scope, Show, useBinder } from "@alloy-js/core";
+import { Declaration as CoreDeclaration, For, Show } from "@alloy-js/core";
 import { enumModule } from "../builtins/python.js";
 import { createPythonSymbol } from "../symbol-creation.js";
-import { usePythonScope } from "../symbols/scopes.js";
 import { EnumMember } from "./EnumMember.js";
-import { PythonBlock } from "./PythonBlock.js";
 import { SimpleCommentBlock } from "./index.js";
+import { MemberScope } from "./MemberScope.js";
+import { PythonBlock } from "./PythonBlock.js";
 /**
  * A Python enum declaration, following https://docs.python.org/3.11/library/enum.html.
  *
@@ -80,14 +80,9 @@ export function EnumDeclaration(props) {
  * ```
  */
 export function FunctionalEnumDeclaration(props) {
-  const binder = useBinder();
-  const scope = usePythonScope();
   const sym = createPythonSymbol(props.name, {
-    binder: binder,
-    scope: scope,
-    refkeys: props.refkey,
-    flags: OutputSymbolFlags.StaticMemberContainer
-  }, "enum", false);
+    refkeys: props.refkey
+  }, "enum");
   const members = props.members ?? [];
   let opener, ender;
   if (members.length && members.every(m => m.value === undefined)) {
@@ -116,16 +111,8 @@ export function FunctionalEnumDeclaration(props) {
     symbol: sym,
     get children() {
       return [_$memo(() => sym.name), " = ", _$memo(() => enumModule["."].Enum), "('", _$memo(() => sym.name), "',", " ", _$createComponent(MemberScope, {
-        owner: sym,
-        get children() {
-          return _$createComponent(Scope, {
-            get name() {
-              return props.name;
-            },
-            kind: "enum",
-            children: memberExpr
-          });
-        }
+        ownerSymbol: sym,
+        children: memberExpr
       }), ")"];
     }
   })];
@@ -202,14 +189,9 @@ export function FunctionalEnumDeclaration(props) {
  */
 export function ClassEnumDeclaration(props) {
   const baseType = props.baseType || "Enum";
-  const binder = useBinder();
-  const scope = usePythonScope();
   const sym = createPythonSymbol(props.name, {
-    binder: binder,
-    scope: scope,
-    refkeys: props.refkey,
-    flags: OutputSymbolFlags.StaticMemberContainer
-  }, "enum", false);
+    refkeys: props.refkey
+  }, "enum");
   let memberList = (props.members ?? []).map(m => m.value === undefined ? {
     ...m,
     auto: false
@@ -235,40 +217,32 @@ export function ClassEnumDeclaration(props) {
           }), _$createIntrinsic("hbr", {})];
         }
       }), "class ", _$memo(() => sym.name), "(", _$memo(() => enumModule["."][baseType]), ")", _$createComponent(MemberScope, {
-        owner: sym,
+        ownerSymbol: sym,
         get children() {
-          return _$createComponent(Scope, {
-            get name() {
-              return sym.name;
-            },
-            kind: "enum",
+          return _$createComponent(PythonBlock, {
+            opener: ":",
             get children() {
-              return _$createComponent(PythonBlock, {
-                opener: ":",
-                get children() {
-                  return [_$createComponent(For, {
-                    each: memberList,
-                    hardline: true,
-                    children: member => _$createComponent(EnumMember, {
-                      get name() {
-                        return member.name;
-                      },
-                      get value() {
-                        return member.value;
-                      },
-                      get jsValue() {
-                        return member.jsValue;
-                      },
-                      get auto() {
-                        return member.auto;
-                      },
-                      get doc() {
-                        return member.doc;
-                      }
-                    })
-                  }), _$memo(() => props.children)];
-                }
-              });
+              return [_$createComponent(For, {
+                each: memberList,
+                hardline: true,
+                children: member => _$createComponent(EnumMember, {
+                  get name() {
+                    return member.name;
+                  },
+                  get value() {
+                    return member.value;
+                  },
+                  get jsValue() {
+                    return member.jsValue;
+                  },
+                  get auto() {
+                    return member.auto;
+                  },
+                  get doc() {
+                    return member.doc;
+                  }
+                })
+              }), _$memo(() => props.children)];
             }
           });
         }

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

@@ -1 +1 @@
-{"version":3,"file":"EnumMember.d.ts","sourceRoot":"","sources":["../../../src/components/EnumMember.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAqB,MAAM,EAAQ,MAAM,gBAAgB,CAAC;AAO3E,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,QAAQ,CAAC;IAEjB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAkChD"}
+{"version":3,"file":"EnumMember.d.ts","sourceRoot":"","sources":["../../../src/components/EnumMember.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAQ,MAAM,gBAAgB,CAAC;AAOxD,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,QAAQ,CAAC;IAEjB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAgChD"}

package/dist/src/components/EnumMember.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { OutputSymbolFlags, Show } from "@alloy-js/core";
+import { Show } from "@alloy-js/core";
 import { enumModule } from "../builtins/python.js";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { Atom } from "./Atom.js";
@@ -20,9 +20,8 @@ export function EnumMember(props) {
   const autoReference = props.auto === true ? enumModule["."].auto : undefined;
   const value = props.auto === true ? [autoReference, "()"] : props.value;
   const sym = createPythonSymbol(props.name, {
-    refkeys: props.refkey,
-    flags: OutputSymbolFlags.StaticMember
-  }, "enum-member", true);
+    refkeys: props.refkey
+  }, "enum-member");
   const valueCode = props.jsValue !== undefined ? _$createComponent(Atom, {
     get jsValue() {
       return props.jsValue;

package/dist/src/components/FunctionDeclaration.d.ts

@@ -22,6 +22,8 @@ export interface FunctionDeclarationProps extends BaseDeclarationProps, CallSign
  * ```
  */
 export declare function FunctionDeclaration(props: FunctionDeclarationProps): import("@alloy-js/core").Children;
+export interface InitFunctionDeclarationProps extends Omit<FunctionDeclarationProps, "name" | "instanceFunction" | "classFunction"> {
+}
 /**
  * A Python `__init__` function declaration.
  *
@@ -43,5 +45,5 @@ export declare function FunctionDeclaration(props: FunctionDeclarationProps): im
  * an instance function, and forces the name to be `__init__` without applying
  * the name policy.
  */
-export declare function InitFunctionDeclaration(props: Omit<FunctionDeclarationProps, "name" | "instanceFunction" | "classFunction">): import("@alloy-js/core").Children;
+export declare function InitFunctionDeclaration(props: InitFunctionDeclarationProps): import("@alloy-js/core").Children;
 //# sourceMappingURL=FunctionDeclaration.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"FunctionDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/FunctionDeclaration.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAiB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAe,MAAM,kBAAkB,CAAC;AAIrE,MAAM,WAAW,wBACf,SAAQ,oBAAoB,EAC1B,kBAAkB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCAwClE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,IAAI,CACT,wBAAwB,EACxB,MAAM,GAAG,kBAAkB,GAAG,eAAe,CAC9C,qCAYF"}
+{"version":3,"file":"FunctionDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/FunctionDeclaration.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAiB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAe,MAAM,kBAAkB,CAAC;AAIrE,MAAM,WAAW,wBACf,SAAQ,oBAAoB,EAC1B,kBAAkB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCA8BlE;AAED,MAAM,WAAW,4BACf,SAAQ,IAAI,CACV,wBAAwB,EACxB,MAAM,GAAG,kBAAkB,GAAG,eAAe,CAC9C;CAAG;AAEN;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,qCAW1E"}

package/dist/src/components/FunctionDeclaration.js

@@ -1,11 +1,11 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { emitSymbol, Name, OutputSymbolFlags, Scope, Show, useMemberScope, useScope } from "@alloy-js/core";
+import { emitSymbol, Name, Show } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { getCallSignatureProps } from "../utils.js";
 import { CallSignature } from "./CallSignature.js";
 import { Declaration } from "./Declaration.js";
 import { PythonBlock } from "./PythonBlock.js";
-import { NoNamePolicy } from "./index.js";
+import { LexicalScope, NoNamePolicy } from "./index.js";
 /**
  * A Python function declaration.
  *
@@ -27,28 +27,19 @@ import { NoNamePolicy } from "./index.js";
 export function FunctionDeclaration(props) {
   const asyncKwd = props.async ? "async " : "";
   const callSignatureProps = getCallSignatureProps(props, {});
-  const memberScope = useMemberScope();
-  let scope = undefined;
-  if (memberScope !== undefined) {
-    scope = memberScope.instanceMembers;
-  } else {
-    scope = useScope();
-  }
   const sym = createPythonSymbol(props.name, {
-    scope: scope,
-    refkeys: props.refkey,
-    flags: props.flags ?? OutputSymbolFlags.None
-  }, "function", false);
+    instance: props.instanceFunction,
+    refkeys: props.refkey
+  }, "function");
   emitSymbol(sym);
   return [_$createComponent(Declaration, _$mergeProps(props, {
     nameKind: "function",
     symbol: sym,
     get children() {
-      return [asyncKwd, "def ", _$createComponent(Name, {}), _$createComponent(Scope, {
+      return [asyncKwd, "def ", _$createComponent(Name, {}), _$createComponent(LexicalScope, {
         get name() {
           return sym.name;
         },
-        kind: "function",
         get children() {
           return [_$createComponent(CallSignature, _$mergeProps(callSignatureProps, {
             get returnType() {
@@ -72,7 +63,6 @@ export function FunctionDeclaration(props) {
     }
   }))];
 }
-
 /**
  * A Python `__init__` function declaration.
  *

package/dist/src/components/LexicalScope.d.ts

@@ -0,0 +1,8 @@
+import { ScopePropsWithInfo, ScopePropsWithValue } from "@alloy-js/core";
+export interface LexicalScopePropsWithScopeValue extends ScopePropsWithValue {
+}
+export interface LeixcalScopePropsWithScopeInfo extends ScopePropsWithInfo {
+}
+export type LexicalScopeProps = LexicalScopePropsWithScopeValue | LeixcalScopePropsWithScopeInfo;
+export declare function LexicalScope(props: LexicalScopeProps): import("@alloy-js/core").Children;
+//# sourceMappingURL=LexicalScope.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LexicalScope.d.ts","sourceRoot":"","sources":["../../../src/components/LexicalScope.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIhF,MAAM,WAAW,+BAAgC,SAAQ,mBAAmB;CAAG;AAC/E,MAAM,WAAW,8BAA+B,SAAQ,kBAAkB;CAAG;AAE7E,MAAM,MAAM,iBAAiB,GACzB,+BAA+B,GAC/B,8BAA8B,CAAC;AAEnC,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,qCAYpD"}

package/dist/src/components/LexicalScope.js

@@ -0,0 +1,21 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { Scope } from "@alloy-js/core";
+import { createLexicalScope } from "../symbol-creation.js";
+import { PythonLexicalScope } from "../symbols/python-lexical-scope.js";
+export function LexicalScope(props) {
+  let scope;
+  if ("value" in props) {
+    if (!(props.value instanceof PythonLexicalScope)) {
+      throw new Error("LexicalScope value must be a TSLexicalScope instance");
+    }
+    scope = props.value;
+  } else {
+    scope = createLexicalScope(props.name ?? "Lexical scope", props);
+  }
+  return _$createComponent(Scope, {
+    value: scope,
+    get children() {
+      return props.children;
+    }
+  });
+}

package/dist/src/components/MemberScope.d.ts

@@ -0,0 +1,8 @@
+import { Children } from "@alloy-js/core";
+import { PythonOutputSymbol } from "../symbols/python-output-symbol.js";
+export interface MemberScopeProps {
+    children: Children;
+    ownerSymbol: PythonOutputSymbol;
+}
+export declare function MemberScope(props: MemberScopeProps): Children;
+//# sourceMappingURL=MemberScope.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MemberScope.d.ts","sourceRoot":"","sources":["../../../src/components/MemberScope.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkC,MAAM,gBAAgB,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,kBAAkB,CAAC;CACjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAQlD"}

package/dist/src/components/MemberScope.js

@@ -0,0 +1,15 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { MemberScope as CoreMemberScope } from "@alloy-js/core";
+import { PythonMemberScope } from "../symbols/python-member-scope.js";
+import { usePythonScope } from "../symbols/scopes.js";
+export function MemberScope(props) {
+  const memberScope = new PythonMemberScope("member-scope", usePythonScope(), {
+    ownerSymbol: props.ownerSymbol
+  });
+  return _$createComponent(CoreMemberScope, {
+    value: memberScope,
+    get children() {
+      return props.children;
+    }
+  });
+}

package/dist/src/components/PythonBlock.d.ts

@@ -1,4 +1,8 @@
 import { Children } from "@alloy-js/core";
+export interface PythonBlockProps {
+    children: Children;
+    opener?: string;
+}
 /**
  * A Python block component that can be used to render a block of Python code.
  *
@@ -16,8 +20,5 @@ import { Children } from "@alloy-js/core";
  *   y: str = None
  * ```
  */
-export declare function PythonBlock(props: {
-    children: Children;
-    opener?: string;
-}): Children;
+export declare function PythonBlock(props: PythonBlockProps): Children;
 //# sourceMappingURL=PythonBlock.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PythonBlock.d.ts","sourceRoot":"","sources":["../../../src/components/PythonBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,YAMzE"}
+{"version":3,"file":"PythonBlock.d.ts","sourceRoot":"","sources":["../../../src/components/PythonBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAMlD"}

package/dist/src/components/PythonBlock.js

@@ -1,6 +1,5 @@
 import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import { Block } from "@alloy-js/core";
-
 /**
  * A Python block component that can be used to render a block of Python code.
  *

package/dist/src/components/SourceFile.js

@@ -30,7 +30,7 @@ export function SourceFile(props) {
   const currentDir = directoryContext.path;
   // Name of the scope is derived from the file path, minus the .py extension, and with slashes replaced by dots
   const path = join(currentDir, props.path).replace(/\.py$/, "").replace(/\//g, ".");
-  const scope = new PythonModuleScope(path);
+  const scope = new PythonModuleScope(path, undefined);
   const sfContext = {
     scope: scope,
     module: path
@@ -58,7 +58,6 @@ export function SourceFile(props) {
         get children() {
           return _$createComponent(Scope, {
             value: scope,
-            kind: "source-file",
             get children() {
               return _$createComponent(List, {
                 doubleHardline: true,

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

@@ -1 +1 @@
-{"version":3,"file":"VariableDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/VariableDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;IACpE;;OAEG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,YAqGlE"}
+{"version":3,"file":"VariableDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/VariableDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOT,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;IACpE;;OAEG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,YA8ElE"}

package/dist/src/components/VariableDeclaration.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { Declaration as CoreDeclaration, Name, OutputSymbolFlags, Show, createSymbolSlot, effect, emitSymbol, memo, useMemberScope, useScope } from "@alloy-js/core";
+import { Declaration as CoreDeclaration, Name, Show, createSymbolSlot, emitSymbol, memo } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { Atom } from "./Atom.js";
 import { SimpleCommentBlock } from "./index.js";
@@ -38,21 +38,16 @@ import { SimpleCommentBlock } from "./index.js";
  * ```
  */
 export function VariableDeclaration(props) {
-  const instanceVariable = props.instanceVariable ?? false;
   const TypeSymbolSlot = createSymbolSlot();
   const ValueTypeSymbolSlot = createSymbolSlot();
-  const memberScope = useMemberScope();
-  let scope = undefined;
-  // Only consider the member scope if this is an instance variable
-  if (memberScope !== undefined && instanceVariable) {
-    scope = memberScope.instanceMembers;
-  } else {
-    scope = useScope();
-  }
   const sym = createPythonSymbol(props.name, {
-    scope: scope,
-    refkeys: props.refkey
-  }, "variable", true);
+    instance: props.instanceVariable,
+    refkeys: props.refkey,
+    type: props.type ? TypeSymbolSlot.firstSymbol : undefined
+  }, "variable");
+  if (!props.type) {
+    ValueTypeSymbolSlot.moveMembersTo(sym);
+  }
   emitSymbol(sym);
   // Handle optional type annotation
   const type = memo(() => {
@@ -63,24 +58,6 @@ export function VariableDeclaration(props) {
       }
     })];
   });
-  effect(() => {
-    if (TypeSymbolSlot.ref.value) {
-      const takenSymbols = TypeSymbolSlot.ref.value;
-      for (const symbol of takenSymbols) {
-        // If the symbol is a type, instantiate it
-        symbol.instantiateTo(sym);
-      }
-    } else if (ValueTypeSymbolSlot.ref.value) {
-      const takenSymbols = ValueTypeSymbolSlot.ref.value;
-      for (const symbol of takenSymbols) {
-        // ignore non-transient symbols (likely not the result of an
-        // expression).
-        if (symbol.flags & OutputSymbolFlags.Transient) {
-          symbol.moveTo(sym);
-        }
-      }
-    }
-  });
 
   // If we receive a symbol, resolve it to a name
   const value = typeof props.initializer === "object" ? memo(() => props.initializer) : props.initializer;

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

@@ -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.jsx";
 export * from "./NoNamePolicy.js";
 export * from "./PyDoc.js";
 export * from "./PythonBlock.js";