@staff0rd/assist 0.147.0 → 0.147.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.147.0",
+  version: "0.147.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -7290,6 +7290,18 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
   }
   updateImporters(functionName, sourceFile, plan2.importersToUpdate);
   if (plan2.barrel) {
+    for (const decl of plan2.barrel.getExportDeclarations()) {
+      const named = decl.getNamedExports();
+      const match = named.find((n) => n.getName() === functionName);
+      if (match) {
+        if (named.length === 1) {
+          decl.remove();
+        } else {
+          match.remove();
+        }
+        break;
+      }
+    }
     plan2.barrel.addExportDeclaration({
       moduleSpecifier: plan2.barrelRelPath,
       namedExports: [functionName]
@@ -7298,9 +7310,6 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
   await project.save();
 }
 
-// src/commands/refactor/extract/buildPlan.ts
-import path29 from "path";
-
 // src/commands/refactor/extract/collectDependencies.ts
 import {
   SyntaxKind as SyntaxKind5
@@ -7628,6 +7637,26 @@ function findImporters(functionName, sourceFile, destPath, project) {
   return result;
 }
 
+// src/commands/refactor/extract/resolveBarrel.ts
+import path29 from "path";
+function resolveBarrel(functionName, sourcePath, destPath, project) {
+  const indexPath = path29.join(path29.dirname(destPath), "index.ts");
+  const barrel = project.getSourceFile(indexPath);
+  if (!barrel) return { barrel: void 0, barrelRelPath: "" };
+  const sourceRelFromBarrel = getRelativeImportPath(indexPath, sourcePath);
+  const alreadyExported = barrel.getExportDeclarations().some((decl) => {
+    const specifier = decl.getModuleSpecifierValue();
+    if (specifier !== sourceRelFromBarrel) return false;
+    const named = decl.getNamedExports();
+    return named.some((n) => n.getName() === functionName);
+  });
+  if (!alreadyExported) return { barrel: void 0, barrelRelPath: "" };
+  return {
+    barrel,
+    barrelRelPath: getRelativeImportPath(indexPath, destPath)
+  };
+}
+
 // src/commands/refactor/extract/sourceReferencesName.ts
 import { SyntaxKind as SyntaxKind10 } from "ts-morph";
 var DECLARATION_KINDS = /* @__PURE__ */ new Set([
@@ -7660,13 +7689,6 @@ function sourceReferencesName(sourceFile, functionName, extractedNames) {
 }
 
 // src/commands/refactor/extract/buildPlan.ts
-function resolveBarrel(destPath, project) {
-  const indexPath = path29.join(path29.dirname(destPath), "index.ts");
-  return {
-    barrel: project.getSourceFile(indexPath),
-    barrelRelPath: getRelativeImportPath(indexPath, destPath)
-  };
-}
 function buildPlan(functionName, sourceFile, sourcePath, destPath, project) {
   const analysis = analyseTarget(sourceFile, functionName);
   const sourceRelPath = getRelativeImportPath(destPath, sourcePath);
@@ -7687,7 +7709,7 @@ function buildPlan(functionName, sourceFile, sourcePath, destPath, project) {
       analysis.extractedNames
     ),
     importersToUpdate: analysis.target.isExported() ? findImporters(functionName, sourceFile, destPath, project) : [],
-    ...resolveBarrel(destPath, project)
+    ...resolveBarrel(functionName, sourcePath, destPath, project)
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.147.0",
+	"version": "0.147.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {