@alloy-js/python 0.4.0-dev.0 → 0.4.0-dev.3

package/dist/src/components/ImportStatement.js

@@ -1,4 +1,4 @@
-import { createComponent as _$createComponent, memo as _$memo, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import { computed, mapJoin, memo } from "@alloy-js/core";
 /**
  * A component that renders import statements based on the provided import records.
@@ -29,7 +29,7 @@ export function ImportStatements(props) {
         return sortedSymbols.map((symbol, idx, arr) => [_$createComponent(ImportStatement, {
           path: targetPath,
           symbols: new Set([symbol])
-        }), _$memo(() => _$memo(() => idx < arr.length - 1)() && _$createIntrinsic("hbr", {}))]);
+        }), idx < arr.length - 1 && _$createIntrinsic("hbr", {})]);
       }
     } else {
       // If no symbols are specified, it's either a wildcard import or a module import

package/dist/src/components/ImportStatement.js.map

@@ -1 +1 @@
-{"version":3,"names":["computed","mapJoin","memo","ImportStatements","props","imports","records","sort","a","b","name","localeCompare","value","module","properties","targetPath","symbols","size","sortedSymbols","Array","from","local","joinImportsFromSameModule","_$createComponent","ImportStatement","path","Set","map","symbol","idx","arr","_$memo","length","_$createIntrinsic","importSymbols","sym","push","parts","target","nis","ImportBinding","importedSymbol","joiner","text","localName","targetName"],"sources":["../../../src/components/ImportStatement.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["computed","mapJoin","memo","ImportStatements","props","imports","records","sort","a","b","name","localeCompare","value","module","properties","targetPath","symbols","size","sortedSymbols","Array","from","local","joinImportsFromSameModule","_$createComponent","ImportStatement","path","Set","map","symbol","idx","arr","length","_$createIntrinsic","importSymbols","sym","push","parts","target","nis","ImportBinding","importedSymbol","joiner","text","localName","targetName","_$memo"],"sources":["../../../src/components/ImportStatement.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -33,7 +33,7 @@ export interface MemberExpressionProps {
  */
 export declare function MemberExpression(props: MemberExpressionProps): Children;
 export declare namespace MemberExpression {
-    var Part: (props: MemberExpressionPartProps) => void;
+    var Part: (_props: MemberExpressionPartProps) => void;
 }
 export interface MemberExpressionPartProps {
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"MemberExpression.d.ts","sourceRoot":"","sources":["../../../src/components/MemberExpression.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAMR,YAAY,EAGZ,MAAM,EAKP,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAoCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CAcvE;yBAde,gBAAgB;sBA8RS,yBAAyB;;AArDlE,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;OAGG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;OAGG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;IAEF;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;CAC7B;AAuCD,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;OAGG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;CACH"}
+{"version":3,"file":"MemberExpression.d.ts","sourceRoot":"","sources":["../../../src/components/MemberExpression.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,YAAY,EACZ,MAAM,EAEP,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AA+GD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CAEvE;yBAFe,gBAAgB;;;AAgBhC,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;OAGG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;OAGG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;IAEF;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;OAGG;IACH,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACjB,CAAC;CACH"}

package/dist/src/components/MemberExpression.js

@@ -1,10 +1,89 @@
 import { createIntrinsic as _$createIntrinsic, memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { childrenArray, computed, For, isComponentCreator, List, reactive, ref, Show, takeSymbols, useBinder } from "@alloy-js/core";
-const MEMBER_ACCESS_TYPES = {
-  ATTRIBUTE: "attribute",
-  SUBSCRIPTION: "subscription",
-  CALL: "call"
-};
+import { computed, createAccessExpression, For, List, Show } from "@alloy-js/core";
+const exclusiveParts = ["args", "refkey", "symbol", "id", "key", "keys", "slice"];
+const {
+  Expression,
+  Part,
+  registerOuterComponent
+} = createAccessExpression({
+  createDescriptor(partProps, sym, first) {
+    const foundProps = exclusiveParts.filter(key => key in partProps);
+    if (foundProps.length > 1) {
+      throw new Error(`Only one of ${foundProps.join(", ")} can be used for a MemberExpression part at a time`);
+    }
+
+    // Validate slice syntax
+    if (partProps.slice) {
+      const {
+        start,
+        stop,
+        step
+      } = partProps.slice;
+      if (!start && !stop && !step) {
+        throw new Error("MemberExpression.Part: slice object cannot be empty");
+      }
+    }
+
+    // Validate keys array
+    if (partProps.keys?.length === 0) {
+      throw new Error("MemberExpression.Part: keys array cannot be empty");
+    }
+    if (partProps.args !== undefined) {
+      return {
+        type: "call",
+        name: undefined,
+        expression: undefined,
+        quoted: false,
+        args: partProps.args === true ? [] : partProps.args
+      };
+    } else if (partProps.key !== undefined || partProps.keys !== undefined || partProps.slice !== undefined) {
+      return {
+        type: "subscription",
+        name: undefined,
+        expression: getSubscriptionValue(partProps),
+        quoted: partProps.key !== undefined && typeof partProps.key === "string",
+        args: undefined
+      };
+    } else {
+      let name;
+      if (first && partProps.refkey) {
+        name = partProps.refkey;
+      } else if (partProps.id !== undefined) {
+        if (!isValidIdentifier(partProps.id)) {
+          throw new Error(`Invalid identifier: ${partProps.id}`);
+        }
+        name = partProps.id;
+      } else if (sym) {
+        name = sym.name;
+      } else {
+        name = "<unresolved symbol>";
+      }
+      return {
+        type: "attribute",
+        name,
+        expression: undefined,
+        quoted: false,
+        args: undefined
+      };
+    }
+  },
+  getBase(part) {
+    if (part.type !== "attribute") {
+      throw new Error("The first part of a MemberExpression must be an id or refkey");
+    }
+    return part.name;
+  },
+  formatPart(part, _prevPart, _inCallChain) {
+    if (part.type === "call") {
+      return formatCallOutput(part);
+    } else if (part.type === "attribute") {
+      return formatAttributeOutput(part);
+    } else {
+      return formatSubscriptionOutput(part);
+    }
+  }
+});
+
 /**
  * Create a member expression from parts. Each part can provide one of
  * the following:
@@ -35,162 +114,22 @@ const MEMBER_ACCESS_TYPES = {
  * ```
  */
 export function MemberExpression(props) {
-  const children = childrenArray(() => props.children);
-  const parts = childrenToPartDescriptors(children);
-  // any symbols emitted from the children won't be relevant to
-  // parent scopes. TODO: emit the proper symbol if we know it?
-  takeSymbols();
-  if (parts.length === 0) {
-    return [];
-  }
-  return computed(() => {
-    return formatChain(parts);
-  });
+  return Expression(props);
 }
 
 /**
- * Build part descriptors from the children of a MemberExpression.
- */
-function childrenToPartDescriptors(children) {
-  const parts = [];
-  for (const child of children) {
-    if (!isComponentCreator(child, MemberExpression.Part)) {
-      // we ignore non-parts
-      continue;
-    }
-    parts.push(createPartDescriptorFromProps(child.props, child === children[0]));
-  }
-  return parts;
-}
-const exclusiveParts = ["args", "refkey", "symbol", "id", "key", "keys", "slice"];
-/**
- * Creates a reactive part descriptor from the given part props.
+ * A part of a member expression. Each part can provide one of the following
+ * props:
  *
- * @param partProps The props for the part.
- * @param first Whether this is the first part in the expression. Refkeys are
- * handled specially for the first part.
- */
-function createPartDescriptorFromProps(partProps, first) {
-  const foundProps = exclusiveParts.filter(key => {
-    return key in partProps;
-  });
-  if (foundProps.length > 1) {
-    throw new Error(`Only one of ${foundProps.join(", ")} can be used for a MemberExpression part at a time`);
-  }
-
-  // Validate slice syntax
-  if (partProps.slice) {
-    const {
-      start,
-      stop,
-      step
-    } = partProps.slice;
-    if (!start && !stop && !step) {
-      throw new Error("MemberExpression.Part: slice object cannot be empty");
-    }
-  }
-
-  // Validate keys array
-  if (partProps.keys?.length === 0) {
-    throw new Error("MemberExpression.Part: keys array cannot be empty");
-  }
-  const symbolSource = computed(() => {
-    if (partProps.refkey) {
-      return getSymbolForRefkey(partProps.refkey).value;
-    } else if (partProps.symbol) {
-      return partProps.symbol;
-    } else {
-      return undefined;
-    }
-  });
-
-  // Return different descriptor types based on what props are provided
-  let part;
-  if (partProps.args !== undefined) {
-    // CallDescriptor
-    part = {
-      type: computed(() => {
-        return "call";
-      }),
-      args: ref(partProps.args === true ? [] : partProps.args)
-    };
-  } else if (partProps.key !== undefined || partProps.keys !== undefined || partProps.slice !== undefined) {
-    // SubscriptionDescriptor
-    part = {
-      type: computed(() => {
-        return "subscription";
-      }),
-      expression: computed(() => {
-        return getSubscriptionValue(partProps);
-      }),
-      quoted: computed(() => {
-        return partProps.key !== undefined && typeof partProps.key === "string";
-      })
-    };
-  } else {
-    // IdentifierDescriptor
-    part = {
-      type: computed(() => {
-        return "attribute";
-      }),
-      name: computed(() => {
-        if (first && partProps.refkey) {
-          return partProps.refkey;
-        } else if (partProps.id !== undefined) {
-          if (!isValidIdentifier(partProps.id)) {
-            throw new Error(`Invalid identifier: ${partProps.id}`);
-          }
-          return partProps.id;
-        } else if (symbolSource.value) {
-          return symbolSource.value.name;
-        } else {
-          return "<unresolved symbol>";
-        }
-      })
-    };
-  }
-  return reactive(part);
-}
-
-/**
- * Convert a refkey to a symbol ref using the current binder.
- */
-function getSymbolForRefkey(refkey) {
-  const binder = useBinder();
-  return binder.getSymbolForRefkey(refkey);
-}
-
-/**
- * Format a chain of parts into a MemberExpression.
+ * * **id**: The identifier for the member expression part
+ * * **refkey**: A refkey for a symbol whose name becomes the identifier
+ * * **symbol**: a symbol whose name becomes the identifier part
+ * * **args**: create a method call with the given args
  */
-function formatChain(parts) {
-  return computed(() => {
-    const expression = [];
-    for (let i = 0; i < parts.length; i++) {
-      const part = parts[i];
-      if (i === 0) {
-        if (!isAttributeDescriptor(part)) {
-          throw new Error("The first part of a MemberExpression must be an id or refkey");
-        }
-        expression.push(part.name);
-      } else {
-        if (isCallDescriptor(part)) {
-          expression.push(formatCallOutput(part));
-        } else if (isAttributeDescriptor(part)) {
-          expression.push(formatAttributeOutput(part));
-        } else if (isSubscriptionDescriptor(part)) {
-          expression.push(formatSubscriptionOutput(part));
-        }
-      }
-    }
-    return expression;
-  });
-}
+MemberExpression.Part = Part;
+registerOuterComponent(MemberExpression);
+// --- Formatting helpers ---
 
-/**
- * Format a part of a member expression that is an array access.
- * This is used for parts like `foo[0]` or `foo["bar"]`.
- */
 function formatSubscriptionOutput(part) {
   return _$createIntrinsic("group", {
     get children() {
@@ -248,36 +187,15 @@ function formatCallOutput(part) {
     }
   });
 }
-/**
- * A part of a member expression. Each part can provide one of the following
- * props:
- *
- * * **id**: The identifier for the member expression part
- * * **refkey**: A refkey for a symbol whose name becomes the identifier
- * * **symbol**: a symbol whose name becomes the identifier part
- * * **args**: create a method call with the given args
- */
-MemberExpression.Part = function (props) {
-  /**
-   * This component does nothing except hold props which are retrieved by
-   * the `MemberExpression` component.
-   */
-};
+
+// --- Utilities ---
+
 function isValidIdentifier(id) {
   if (typeof id === "string" && id.includes('"')) {
     return false;
   }
   return true;
 }
-function isCallDescriptor(part) {
-  return "type" in part && part.type === MEMBER_ACCESS_TYPES.CALL;
-}
-function isAttributeDescriptor(part) {
-  return "type" in part && part.type === MEMBER_ACCESS_TYPES.ATTRIBUTE;
-}
-function isSubscriptionDescriptor(part) {
-  return "type" in part && part.type === MEMBER_ACCESS_TYPES.SUBSCRIPTION;
-}
 function getSubscriptionValue(partProps) {
   // Handle tuple keys: obj[a, b] → (a, b)
   if (partProps.keys?.length) {

package/dist/src/components/MemberExpression.js.map

@@ -1 +1 @@
-{"version":3,"names":["childrenArray","computed","For","isComponentCreator","List","reactive","ref","Show","takeSymbols","useBinder","MEMBER_ACCESS_TYPES","ATTRIBUTE","SUBSCRIPTION","CALL","MemberExpression","props","children","parts","childrenToPartDescriptors","length","formatChain","child","Part","push","createPartDescriptorFromProps","exclusiveParts","partProps","first","foundProps","filter","key","Error","join","slice","start","stop","step","keys","symbolSource","refkey","getSymbolForRefkey","value","symbol","undefined","part","args","type","expression","getSubscriptionValue","quoted","name","id","isValidIdentifier","binder","i","isAttributeDescriptor","isCallDescriptor","formatCallOutput","formatAttributeOutput","isSubscriptionDescriptor","formatSubscriptionOutput","_$createIntrinsic","_$memo","_$createComponent","when","each","comma","line","arg","includes","Object"],"sources":["../../../src/components/MemberExpression.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["computed","createAccessExpression","For","List","Show","exclusiveParts","Expression","Part","registerOuterComponent","createDescriptor","partProps","sym","first","foundProps","filter","key","length","Error","join","slice","start","stop","step","keys","args","undefined","type","name","expression","quoted","getSubscriptionValue","refkey","id","isValidIdentifier","getBase","part","formatPart","_prevPart","_inCallChain","formatCallOutput","formatAttributeOutput","formatSubscriptionOutput","MemberExpression","props","_$createIntrinsic","children","_$memo","_$createComponent","when","value","each","comma","line","arg","includes","Object","parts","push"],"sources":["../../../src/components/MemberExpression.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -1 +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"}
+{"version":3,"file":"MemberScope.d.ts","sourceRoot":"","sources":["../../../src/components/MemberScope.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGT,MAAM,gBAAgB,CAAC;AAExB,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,YAgBlD"}

package/dist/src/components/MemberScope.js

@@ -1,10 +1,13 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { MemberScope as CoreMemberScope } from "@alloy-js/core";
+import { MemberScope as CoreMemberScope, createScope } 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
+  const parentScope = usePythonScope();
+  const binder = props.ownerSymbol.binder ?? parentScope?.binder;
+  const memberScope = createScope(PythonMemberScope, "member-scope", parentScope, {
+    ownerSymbol: props.ownerSymbol,
+    binder
   });
   return _$createComponent(CoreMemberScope, {
     value: memberScope,

package/dist/src/components/MemberScope.js.map

@@ -1 +1 @@
-{"version":3,"names":["MemberScope","CoreMemberScope","PythonMemberScope","usePythonScope","props","memberScope","ownerSymbol","_$createComponent","value","children"],"sources":["../../../src/components/MemberScope.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAAmBA,WAAW,IAAIC,eAAe,QAAQ,gBAAgB;AACzE,SAASC,iBAAiB,QAAQ,mCAAmC;AAErE,SAASC,cAAc,QAAQ,sBAAsB;AAMrD,OAAO,SAASH,WAAWA,CAACI,KAAuB,EAAE;EACnD,MAAMC,WAAW,GAAG,IAAIH,iBAAiB,CAAC,cAAc,EAAEC,cAAc,CAAC,CAAC,EAAE;IAC1EG,WAAW,EAAEF,KAAK,CAACE;EACrB,CAAC,CAAC;EAEF,OAAAC,iBAAA,CACGN,eAAe;IAACO,KAAK,EAAEH,WAAW;IAAA,IAAAI,SAAA;MAAA,OAAGL,KAAK,CAACK,QAAQ;IAAA;EAAA;AAExD","ignoreList":[]}
+{"version":3,"names":["MemberScope","CoreMemberScope","createScope","PythonMemberScope","usePythonScope","props","parentScope","binder","ownerSymbol","memberScope","_$createComponent","value","children"],"sources":["../../../src/components/MemberScope.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAEEA,WAAW,IAAIC,eAAe,EAC9BC,WAAW,QACN,gBAAgB;AACvB,SAASC,iBAAiB,QAAQ,mCAAmC;AAErE,SAASC,cAAc,QAAQ,sBAAsB;AAMrD,OAAO,SAASJ,WAAWA,CAACK,KAAuB,EAAE;EACnD,MAAMC,WAAW,GAAGF,cAAc,CAAC,CAAC;EACpC,MAAMG,MAAM,GAAGF,KAAK,CAACG,WAAW,CAACD,MAAM,IAAID,WAAW,EAAEC,MAAM;EAC9D,MAAME,WAAW,GAAGP,WAAW,CAC7BC,iBAAiB,EACjB,cAAc,EACdG,WAAW,EACX;IACEE,WAAW,EAAEH,KAAK,CAACG,WAAW;IAC9BD;EACF,CACF,CAAC;EAED,OAAAG,iBAAA,CACGT,eAAe;IAACU,KAAK,EAAEF,WAAW;IAAA,IAAAG,SAAA;MAAA,OAAGP,KAAK,CAACO,QAAQ;IAAA;EAAA;AAExD","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../../../src/components/SourceFile.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAShB,KAAK,QAAQ,EACd,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA+CxD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,iBAAiB,CAAC;IACzB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,CAAC,uBAAuB,CAC3B,CAAC;AAEpD,wBAAgB,aAAa,4BAE5B;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;;OAGG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAqGhD"}
+{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../../../src/components/SourceFile.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAUhB,KAAK,QAAQ,EACd,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA+CxD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,iBAAiB,CAAC;IACzB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,CAAC,uBAAuB,CAC3B,CAAC;AAEpD,wBAAgB,aAAa,4BAE5B;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;;OAGG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAqGhD"}

package/dist/src/components/SourceFile.js

@@ -1,5 +1,5 @@
 import { memo as _$memo, createIntrinsic as _$createIntrinsic, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { childrenArray, SourceFile as CoreSourceFile, createNamedContext, isComponentCreator, List, Scope, Show, SourceDirectoryContext, useContext } from "@alloy-js/core";
+import { childrenArray, SourceFile as CoreSourceFile, createNamedContext, createScope, isComponentCreator, List, Scope, Show, SourceDirectoryContext, useContext } from "@alloy-js/core";
 import { join } from "pathe";
 import { PythonModuleScope } from "../symbols/index.js";
 import { ImportStatements } from "./ImportStatement.js";
@@ -86,7 +86,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, undefined);
+  const scope = createScope(PythonModuleScope, path, undefined);
   const sfContext = {
     scope: scope,
     module: path

package/dist/src/components/SourceFile.js.map

@@ -1 +1 @@
-{"version":3,"names":["childrenArray","SourceFile","CoreSourceFile","createNamedContext","isComponentCreator","List","Scope","Show","SourceDirectoryContext","useContext","join","PythonModuleScope","ImportStatements","SimpleCommentBlock","Reference","NON_DEFINITION_NAMES","Set","WRAPPER_COMPONENT_NAMES","firstChildIsDefinition","children","arr","length","first","name","component","has","props","PythonSourceFileContext","useSourceFile","directoryContext","currentDir","path","replace","scope","undefined","sfContext","module","hasChildren","needsExtraSpacing","hasPreamble","header","headerComment","doc","futureImports","_$createComponent","filetype","reference","when","_$createIntrinsic","_$memo","importedModules","size","records","Provider","value","doubleHardline"],"sources":["../../../src/components/SourceFile.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["childrenArray","SourceFile","CoreSourceFile","createNamedContext","createScope","isComponentCreator","List","Scope","Show","SourceDirectoryContext","useContext","join","PythonModuleScope","ImportStatements","SimpleCommentBlock","Reference","NON_DEFINITION_NAMES","Set","WRAPPER_COMPONENT_NAMES","firstChildIsDefinition","children","arr","length","first","name","component","has","props","PythonSourceFileContext","useSourceFile","directoryContext","currentDir","path","replace","scope","undefined","sfContext","module","hasChildren","needsExtraSpacing","hasPreamble","header","headerComment","doc","futureImports","_$createComponent","filetype","reference","when","_$createIntrinsic","_$memo","importedModules","size","records","Provider","value","doubleHardline"],"sources":["../../../src/components/SourceFile.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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;AAqDF,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,EAIL,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;AAwDF,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

@@ -1,4 +1,4 @@
-import { getSymbolCreatorSymbol, refkey } from "@alloy-js/core";
+import { createScope, getSymbolCreatorSymbol, refkey } from "@alloy-js/core";
 import { createPythonSymbol } from "./symbol-creation.js";
 import { PythonModuleScope } from "./symbols/index.js";
 function createSymbols(binder, props, refkeys) {
@@ -8,8 +8,8 @@ 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, undefined, {
-      binder: binder
+    const moduleScope = createScope(PythonModuleScope, fullModuleScopeName, undefined, {
+      binder
     });
 
     // Create a symbol for each exported name

package/dist/src/create-module.js.map

@@ -1 +1 @@
-{"version":3,"names":["getSymbolCreatorSymbol","refkey","createPythonSymbol","PythonModuleScope","createSymbols","binder","props","refkeys","path","symbols","Object","entries","descriptor","fullModuleScopeName","name","keys","moduleScope","undefined","exportedName","key","_","space","module","createModule","named"],"sources":["../../src/create-module.ts"],"sourcesContent":[null],"mappings":"AAAA,SAEEA,sBAAsB,EAEtBC,MAAM,QAED,gBAAgB;AACvB,SAASC,kBAAkB,QAAQ,sBAAsB;AACzD,SAASC,iBAAiB,QAAQ,oBAAoB;AAmBtD,SAASC,aAAaA,CACpBC,MAAc,EACdC,KAA0C,EAC1CC,OAA4B,EAC5B;EACA;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,KAAK,CAACM,UAAU,CAAC,EAAE;IAC9D;IACA;IACA,MAAMC,mBAAmB,GAAGP,KAAK,CAACQ,IAAI,IAAIN,IAAI,KAAK,GAAG,GAAG,EAAE,GAAG,IAAIA,IAAI,EAAE,CAAC;IACzE,MAAMO,IAAI,GAAGR,OAAO,CAACC,IAAI,CAAC;IAC1B,MAAMQ,WAAW,GAAG,IAAIb,iBAAiB,CAACU,mBAAmB,EAAEI,SAAS,EAAE;MACxEZ,MAAM,EAAEA;IACV,CAAC,CAAC;;IAEF;IACA,KAAK,MAAMa,YAAY,IAAIT,OAAO,IAAI,EAAE,EAAE;MACxC,MAAMU,GAAG,GAAGJ,IAAI,CAACG,YAAY,CAAC;MAE9B,MAAME,CAAC,GAAGlB,kBAAkB,CAACgB,YAAY,EAAE;QACzCG,KAAK,EAAEL,WAAW,CAACP,OAAO;QAC1BJ,MAAM,EAAEA,MAAM;QACdE,OAAO,EAAEY,GAAG;QACZG,MAAM,EAAEN,WAAW,CAACF;MACtB,CAAC,CAAC;IACJ;EACF;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,YAAYA,CAC1BjB,KAA2B,EACO;EAClC,MAAMC,OAAY,GAAG;IACnB,CAACP,sBAAsB,CAAC,CAAC,EAAEK,MAAc,EAAE;MACzCD,aAAa,CAACC,MAAM,EAAEC,KAAK,EAAEC,OAAO,CAAC;IACvC;EACF,CAAC;EAED,KAAK,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,KAAK,CAACM,UAAU,CAAC,EAAE;IAC9D,MAAMG,IAA4B,GAAIR,OAAO,CAACC,IAAI,CAAC,GAAG,CAAC,CAAE;IACzD,KAAK,MAAMgB,KAAK,IAAIf,OAAO,IAAI,EAAE,EAAE;MACjCM,IAAI,CAACS,KAAK,CAAC,GAAGvB,MAAM,CAACK,KAAK,CAACM,UAAU,EAAEJ,IAAI,EAAEgB,KAAK,CAAC;IACrD;EACF;EAEA,OAAOjB,OAAO;AAChB","ignoreList":[]}
+{"version":3,"names":["createScope","getSymbolCreatorSymbol","refkey","createPythonSymbol","PythonModuleScope","createSymbols","binder","props","refkeys","path","symbols","Object","entries","descriptor","fullModuleScopeName","name","keys","moduleScope","undefined","exportedName","key","_","space","module","createModule","named"],"sources":["../../src/create-module.ts"],"sourcesContent":[null],"mappings":"AAAA,SAEEA,WAAW,EACXC,sBAAsB,EAEtBC,MAAM,QAED,gBAAgB;AACvB,SAASC,kBAAkB,QAAQ,sBAAsB;AACzD,SAASC,iBAAiB,QAAQ,oBAAoB;AAmBtD,SAASC,aAAaA,CACpBC,MAAc,EACdC,KAA0C,EAC1CC,OAA4B,EAC5B;EACA;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,KAAK,CAACM,UAAU,CAAC,EAAE;IAC9D;IACA;IACA,MAAMC,mBAAmB,GAAGP,KAAK,CAACQ,IAAI,IAAIN,IAAI,KAAK,GAAG,GAAG,EAAE,GAAG,IAAIA,IAAI,EAAE,CAAC;IACzE,MAAMO,IAAI,GAAGR,OAAO,CAACC,IAAI,CAAC;IAC1B,MAAMQ,WAAW,GAAGjB,WAAW,CAC7BI,iBAAiB,EACjBU,mBAAmB,EACnBI,SAAS,EACT;MAAEZ;IAAO,CACX,CAAC;;IAED;IACA,KAAK,MAAMa,YAAY,IAAIT,OAAO,IAAI,EAAE,EAAE;MACxC,MAAMU,GAAG,GAAGJ,IAAI,CAACG,YAAY,CAAC;MAE9B,MAAME,CAAC,GAAGlB,kBAAkB,CAACgB,YAAY,EAAE;QACzCG,KAAK,EAAEL,WAAW,CAACP,OAAO;QAC1BJ,MAAM,EAAEA,MAAM;QACdE,OAAO,EAAEY,GAAG;QACZG,MAAM,EAAEN,WAAW,CAACF;MACtB,CAAC,CAAC;IACJ;EACF;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,YAAYA,CAC1BjB,KAA2B,EACO;EAClC,MAAMC,OAAY,GAAG;IACnB,CAACP,sBAAsB,CAAC,CAAC,EAAEK,MAAc,EAAE;MACzCD,aAAa,CAACC,MAAM,EAAEC,KAAK,EAAEC,OAAO,CAAC;IACvC;EACF,CAAC;EAED,KAAK,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,KAAK,CAACM,UAAU,CAAC,EAAE;IAC9D,MAAMG,IAA4B,GAAIR,OAAO,CAACC,IAAI,CAAC,GAAG,CAAC,CAAE;IACzD,KAAK,MAAMgB,KAAK,IAAIf,OAAO,IAAI,EAAE,EAAE;MACjCM,IAAI,CAACS,KAAK,CAAC,GAAGvB,MAAM,CAACK,KAAK,CAACM,UAAU,EAAEJ,IAAI,EAAEgB,KAAK,CAAC;IACrD;EACF;EAEA,OAAOjB,OAAO;AAChB","ignoreList":[]}

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":"AAAA,OAAO,EACL,OAAO,EACP,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;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,WAAW,GACxB,kBAAkB,GAAG,SAAS,CAOhC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,GAAG,OAAO,EACtB,OAAO,GAAE,yBAA8B,EACvC,IAAI,CAAC,EAAE,cAAc,GACpB,kBAAkB,CAiCpB;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,kBAAuB,sBAKjC"}
+{"version":3,"file":"symbol-creation.d.ts","sourceRoot":"","sources":["../../src/symbol-creation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,kBAAkB,EAClB,WAAW,EAIZ,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;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,WAAW,GACxB,kBAAkB,GAAG,SAAS,CAOhC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,GAAG,OAAO,EACtB,OAAO,GAAE,yBAA8B,EACvC,IAAI,CAAC,EAAE,cAAc,GACpB,kBAAkB,CAiCpB;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,kBAAuB,sBASjC"}

package/dist/src/symbol-creation.js

@@ -1,4 +1,4 @@
-import { useBinder, useContext } from "@alloy-js/core";
+import { createScope, createSymbol, useContext } from "@alloy-js/core";
 import { PythonSourceFileContext } from "./components/SourceFile.js";
 import { usePythonNamePolicy } from "./name-policy.js";
 import { PythonOutputSymbol, usePythonScope } from "./symbols/index.js";
@@ -35,9 +35,9 @@ export function createPythonSymbol(name, options = {}, kind) {
       targetSpace = currentScope.symbols;
     }
   }
-  const binder = options.binder ?? currentScope?.binder ?? useBinder();
-  return new PythonOutputSymbol(name, targetSpace, {
-    binder: binder,
+  const binder = options.binder ?? currentScope?.binder;
+  return createSymbol(PythonOutputSymbol, name, targetSpace, {
+    binder,
     aliasTarget: options.aliasTarget,
     refkeys: options.refkeys,
     metadata: options.metadata,
@@ -49,6 +49,10 @@ export function createPythonSymbol(name, options = {}, kind) {
 }
 export function createLexicalScope(name, options = {}) {
   const parent = usePythonScope();
-  return new PythonLexicalScope(name, parent, options);
+  const binder = options.binder ?? parent?.binder;
+  return createScope(PythonLexicalScope, name, parent, {
+    ...options,
+    binder
+  });
 }
 //# sourceMappingURL=symbol-creation.js.map

package/dist/src/symbol-creation.js.map

@@ -1 +1 @@
-{"version":3,"names":["useBinder","useContext","PythonSourceFileContext","usePythonNamePolicy","PythonOutputSymbol","usePythonScope","PythonLexicalScope","findExistingSymbol","name","targetSpace","undefined","existingSymbol","symbolNames","get","createPythonSymbol","options","kind","sfContext","currentScope","space","isMemberScope","instance","ownerSymbol","instanceMembers","staticMembers","Error","symbols","binder","aliasTarget","refkeys","metadata","module","type","ignoreNameConflict","namePolicy","for","createLexicalScope","parent"],"sources":["../../src/symbol-creation.ts"],"sourcesContent":[null],"mappings":"AAAA,SAIEA,SAAS,EACTC,UAAU,QACL,gBAAgB;AACvB,SAASC,uBAAuB,QAAQ,4BAA4B;AACpE,SAAyBC,mBAAmB,QAAQ,kBAAkB;AACtE,SACEC,kBAAkB,EAElBC,cAAc,QACT,oBAAoB;AAC3B,SAASC,kBAAkB,QAAQ,mCAAmC;AAOtE;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAChCC,IAAY,EACZC,WAAyB,EACO;EAChC,IAAI,CAACA,WAAW,EAAE;IAChB,OAAOC,SAAS;EAClB;EAEA,MAAMC,cAAc,GAAGF,WAAW,CAACG,WAAW,CAACC,GAAG,CAACL,IAAI,CAAC;EACxD,OAAOG,cAAc;AACvB;;AAEA;AACA;AACA;AACA,OAAO,SAASG,kBAAkBA,CAChCN,IAAsB,EACtBO,OAAkC,GAAG,CAAC,CAAC,EACvCC,IAAqB,EACD;EACpB,MAAMC,SAAS,GAAGhB,UAAU,CAACC,uBAAuB,CAAC;EACrD,MAAMgB,YAAY,GAAGb,cAAc,CAAC,CAAC;EACrC,IAAII,WAAW,GAAGM,OAAO,CAACI,KAAK,IAAIT,SAAS;EAC5C,IAAI,CAACK,OAAO,CAACI,KAAK,IAAID,YAAY,EAAE;IAClC,IAAIA,YAAY,CAACE,aAAa,EAAE;MAC9B,IAAIL,OAAO,CAACM,QAAQ,EAAE;QACpBZ,WAAW,GAAGS,YAAY,CAACI,WAAW,CAAEC,eAAe;MACzD,CAAC,MAAM;QACLd,WAAW,GAAGS,YAAY,CAACI,WAAW,CAAEE,aAAa;MACvD;IACF,CAAC,MAAM;MACL,IAAIT,OAAO,CAACM,QAAQ,EAAE;QACpB,MAAM,IAAII,KAAK,CACb,oCAAoCjB,IAAI,4BAC1C,CAAC;MACH;MACAC,WAAW,GAAIS,YAAY,CAAwBQ,OAAO;IAC5D;EACF;EAEA,MAAMC,MAAM,GAAGZ,OAAO,CAACY,MAAM,IAAIT,YAAY,EAAES,MAAM,IAAI3B,SAAS,CAAC,CAAC;EAEpE,OAAO,IAAII,kBAAkB,CAACI,IAAI,EAAEC,WAAW,EAAE;IAC/CkB,MAAM,EAAEA,MAAM;IACdC,WAAW,EAAEb,OAAO,CAACa,WAAW;IAChCC,OAAO,EAAEd,OAAO,CAACc,OAAO;IACxBC,QAAQ,EAAEf,OAAO,CAACe,QAAQ;IAC1BC,MAAM,EAAEd,SAAS,EAAEc,MAAM;IACzBC,IAAI,EAAEjB,OAAO,CAACiB,IAAI;IAClBC,kBAAkB,EAAElB,OAAO,CAACkB,kBAAkB;IAC9CC,UAAU,EAAE/B,mBAAmB,CAAC,CAAC,CAACgC,GAAG,CAACnB,IAAI;EAC5C,CAAC,CAAC;AACJ;AAEA,OAAO,SAASoB,kBAAkBA,CAChC5B,IAAY,EACZO,OAA2B,GAAG,CAAC,CAAC,EAChC;EACA,MAAMsB,MAAM,GAAGhC,cAAc,CAAC,CAAC;EAE/B,OAAO,IAAIC,kBAAkB,CAACE,IAAI,EAAE6B,MAAM,EAAEtB,OAAO,CAAC;AACtD","ignoreList":[]}
+{"version":3,"names":["createScope","createSymbol","useContext","PythonSourceFileContext","usePythonNamePolicy","PythonOutputSymbol","usePythonScope","PythonLexicalScope","findExistingSymbol","name","targetSpace","undefined","existingSymbol","symbolNames","get","createPythonSymbol","options","kind","sfContext","currentScope","space","isMemberScope","instance","ownerSymbol","instanceMembers","staticMembers","Error","symbols","binder","aliasTarget","refkeys","metadata","module","type","ignoreNameConflict","namePolicy","for","createLexicalScope","parent"],"sources":["../../src/symbol-creation.ts"],"sourcesContent":[null],"mappings":"AAAA,SAIEA,WAAW,EACXC,YAAY,EACZC,UAAU,QACL,gBAAgB;AACvB,SAASC,uBAAuB,QAAQ,4BAA4B;AACpE,SAAyBC,mBAAmB,QAAQ,kBAAkB;AACtE,SACEC,kBAAkB,EAElBC,cAAc,QACT,oBAAoB;AAC3B,SAASC,kBAAkB,QAAQ,mCAAmC;AAOtE;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAChCC,IAAY,EACZC,WAAyB,EACO;EAChC,IAAI,CAACA,WAAW,EAAE;IAChB,OAAOC,SAAS;EAClB;EAEA,MAAMC,cAAc,GAAGF,WAAW,CAACG,WAAW,CAACC,GAAG,CAACL,IAAI,CAAC;EACxD,OAAOG,cAAc;AACvB;;AAEA;AACA;AACA;AACA,OAAO,SAASG,kBAAkBA,CAChCN,IAAsB,EACtBO,OAAkC,GAAG,CAAC,CAAC,EACvCC,IAAqB,EACD;EACpB,MAAMC,SAAS,GAAGhB,UAAU,CAACC,uBAAuB,CAAC;EACrD,MAAMgB,YAAY,GAAGb,cAAc,CAAC,CAAC;EACrC,IAAII,WAAW,GAAGM,OAAO,CAACI,KAAK,IAAIT,SAAS;EAC5C,IAAI,CAACK,OAAO,CAACI,KAAK,IAAID,YAAY,EAAE;IAClC,IAAIA,YAAY,CAACE,aAAa,EAAE;MAC9B,IAAIL,OAAO,CAACM,QAAQ,EAAE;QACpBZ,WAAW,GAAGS,YAAY,CAACI,WAAW,CAAEC,eAAe;MACzD,CAAC,MAAM;QACLd,WAAW,GAAGS,YAAY,CAACI,WAAW,CAAEE,aAAa;MACvD;IACF,CAAC,MAAM;MACL,IAAIT,OAAO,CAACM,QAAQ,EAAE;QACpB,MAAM,IAAII,KAAK,CACb,oCAAoCjB,IAAI,4BAC1C,CAAC;MACH;MACAC,WAAW,GAAIS,YAAY,CAAwBQ,OAAO;IAC5D;EACF;EAEA,MAAMC,MAAM,GAAGZ,OAAO,CAACY,MAAM,IAAIT,YAAY,EAAES,MAAM;EAErD,OAAO3B,YAAY,CAACI,kBAAkB,EAAEI,IAAI,EAAEC,WAAW,EAAE;IACzDkB,MAAM;IACNC,WAAW,EAAEb,OAAO,CAACa,WAAW;IAChCC,OAAO,EAAEd,OAAO,CAACc,OAAO;IACxBC,QAAQ,EAAEf,OAAO,CAACe,QAAQ;IAC1BC,MAAM,EAAEd,SAAS,EAAEc,MAAM;IACzBC,IAAI,EAAEjB,OAAO,CAACiB,IAAI;IAClBC,kBAAkB,EAAElB,OAAO,CAACkB,kBAAkB;IAC9CC,UAAU,EAAE/B,mBAAmB,CAAC,CAAC,CAACgC,GAAG,CAACnB,IAAI;EAC5C,CAAC,CAAC;AACJ;AAEA,OAAO,SAASoB,kBAAkBA,CAChC5B,IAAY,EACZO,OAA2B,GAAG,CAAC,CAAC,EAChC;EACA,MAAMsB,MAAM,GAAGhC,cAAc,CAAC,CAAC;EAC/B,MAAMsB,MAAM,GAAGZ,OAAO,CAACY,MAAM,IAAIU,MAAM,EAAEV,MAAM;EAE/C,OAAO5B,WAAW,CAACO,kBAAkB,EAAEE,IAAI,EAAE6B,MAAM,EAAE;IACnD,GAAGtB,OAAO;IACVY;EACF,CAAC,CAAC;AACJ","ignoreList":[]}

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

@@ -16,5 +16,6 @@ export declare class PythonModuleScope extends PythonLexicalScope {
     get importedSymbols(): Map<PythonOutputSymbol, PythonOutputSymbol>;
     get importedModules(): ImportRecords;
     addImport(targetSymbol: PythonOutputSymbol, targetModule: PythonModuleScope): PythonOutputSymbol;
+    get debugInfo(): Record<string, unknown>;
 }
 //# sourceMappingURL=python-module-scope.d.ts.map

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":"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"}
+{"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;IA4B3E,IAAa,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMhD;CACF"}