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

package/src/symbols/custom-output-scope.ts

@@ -1,35 +0,0 @@
-import { OutputScope, OutputScopeOptions, SymbolTable } from "@alloy-js/core";
-
-// This is named as CustomOutputScope and not PythonOutputScope to avoid confusion with the one defined in scopes.ts
-// We are creating a custom output scope so we can add out custom name conflict resolution logic.
-export class CustomOutputScope extends OutputScope {
-  #symbols: SymbolTable;
-  /**
-   * The symbols defined within this scope.
-   */
-  get symbols() {
-    return this.#symbols;
-  }
-
-  constructor(name: string, options: OutputScopeOptions = {}) {
-    super(name, options);
-    this.#symbols = new SymbolTable(this, {
-      nameConflictResolver: (_, 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] as unknown as {
-            originalName: string;
-            name: string;
-            module?: string;
-          };
-          symbol.name =
-            symbol.originalName +
-            "_" +
-            (i + 1) +
-            "_" +
-            (symbols[i].aliasTarget?.scope?.name ?? symbol.module ?? "");
-        }
-      },
-    });
-  }
-}

package/src/symbols/reference.ts

@@ -1,99 +0,0 @@
-import {
-  memo,
-  OutputSymbolFlags,
-  Refkey,
-  resolve,
-  untrack,
-  useContext,
-  useMemberScope,
-} from "@alloy-js/core";
-import { PythonSourceFileContext } from "../components/SourceFile.jsx";
-import {
-  PythonMemberScope,
-  PythonModuleScope,
-  PythonOutputScope,
-  PythonOutputSymbol,
-} from "./index.js";
-
-export function ref(
-  refkey: Refkey,
-): () => [string, PythonOutputSymbol | undefined] {
-  const sourceFile = useContext(PythonSourceFileContext);
-  const resolveResult = resolve<PythonOutputScope, PythonOutputSymbol>(
-    refkey as Refkey,
-  );
-  const currentScope = useMemberScope();
-
-  return memo(() => {
-    if (resolveResult.value === undefined) {
-      return ["<Unresolved Symbol>", undefined];
-    }
-
-    const { targetDeclaration, 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";
-    let localSymbol: PythonOutputSymbol | undefined;
-
-    if (targetLocation === "module") {
-      // Handling of targets in other modules, either created with createModule()
-      // or from other files.
-      const symbolPath = [
-        ...(pathDown.slice(1) as PythonMemberScope[]).map((s) => s.owner),
-        targetDeclaration,
-      ];
-
-      const importSymbol = symbolPath[0];
-
-      localSymbol = untrack(() =>
-        sourceFile!.scope.addImport(
-          importSymbol,
-          pathDown[0] as PythonModuleScope,
-        ),
-      );
-    }
-
-    if (memberPath && memberPath.length > 0) {
-      if (localSymbol) {
-        memberPath[0] = localSymbol;
-      }
-
-      return [buildMemberExpression(memberPath), memberPath.at(-1)];
-    } else {
-      return [
-        buildMemberExpression([localSymbol ?? targetDeclaration]),
-        localSymbol ?? targetDeclaration,
-      ];
-    }
-  });
-}
-
-function buildMemberExpression(path: PythonOutputSymbol[]) {
-  let memberExpr = "";
-
-  const base: PythonOutputSymbol = 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;
-}