@staff0rd/assist 0.215.0 → 0.215.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.215.0",
+  version: "0.215.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -10247,7 +10247,7 @@ async function check(pattern2, options2) {
 }
 
 // src/commands/refactor/extract/index.ts
-import path36 from "path";
+import path37 from "path";
 import chalk120 from "chalk";
 
 // src/commands/refactor/extract/applyExtraction.ts
@@ -10844,35 +10844,63 @@ function displayPlan(functionName, relDest, plan2, cwd) {
 }
 
 // src/commands/refactor/extract/loadProjectFile.ts
+import path36 from "path";
+import chalk119 from "chalk";
+import { Project as Project3 } from "ts-morph";
+
+// src/commands/refactor/extract/findTsConfig.ts
 import fs19 from "fs";
 import path35 from "path";
-import chalk119 from "chalk";
 import { Project as Project2 } from "ts-morph";
 function findTsConfig(sourcePath) {
   const rootConfig = path35.resolve("tsconfig.json");
   if (!fs19.existsSync(rootConfig)) return rootConfig;
-  const raw = fs19.readFileSync(rootConfig, "utf-8");
+  const tried = /* @__PURE__ */ new Set();
+  const candidates = [rootConfig, ...readReferences(rootConfig)];
+  for (const candidate of candidates) {
+    if (tried.has(candidate)) continue;
+    tried.add(candidate);
+    if (projectIncludes(candidate, sourcePath)) return candidate;
+  }
+  const siblings = fs19.readdirSync(path35.dirname(rootConfig)).filter((f) => /^tsconfig.*\.json$/.test(f)).map((f) => path35.resolve(path35.dirname(rootConfig), f));
+  for (const sibling of siblings) {
+    if (tried.has(sibling)) continue;
+    tried.add(sibling);
+    if (projectIncludes(sibling, sourcePath)) return sibling;
+  }
+  return rootConfig;
+}
+function readReferences(configPath) {
+  if (!fs19.existsSync(configPath)) return [];
+  const raw = fs19.readFileSync(configPath, "utf-8");
   const stripped = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
   let parsed;
   try {
     parsed = JSON.parse(stripped);
   } catch {
-    return rootConfig;
+    return [];
   }
-  if (!parsed.references?.length) return rootConfig;
-  for (const ref of parsed.references) {
-    const refPath = path35.resolve(ref.path);
-    const configPath = fs19.statSync(refPath, { throwIfNoEntry: false })?.isDirectory() ? path35.join(refPath, "tsconfig.json") : refPath;
-    if (!fs19.existsSync(configPath)) continue;
+  if (!parsed.references?.length) return [];
+  const cwd = path35.dirname(configPath);
+  return parsed.references.map((ref) => {
+    const refPath = path35.resolve(cwd, ref.path);
+    return fs19.statSync(refPath, { throwIfNoEntry: false })?.isDirectory() ? path35.join(refPath, "tsconfig.json") : refPath;
+  }).filter((p) => fs19.existsSync(p));
+}
+function projectIncludes(configPath, sourcePath) {
+  try {
     const project = new Project2({ tsConfigFilePath: configPath });
-    if (project.getSourceFile(sourcePath)) return configPath;
+    return !!project.getSourceFile(sourcePath);
+  } catch {
+    return false;
   }
-  return rootConfig;
 }
+
+// src/commands/refactor/extract/loadProjectFile.ts
 function loadProjectFile(file) {
-  const sourcePath = path35.resolve(file);
+  const sourcePath = path36.resolve(file);
   const tsConfigPath = findTsConfig(sourcePath);
-  const project = new Project2({
+  const project = new Project3({
     tsConfigFilePath: tsConfigPath
   });
   const sourceFile = project.getSourceFile(sourcePath);
@@ -10885,10 +10913,10 @@ function loadProjectFile(file) {
 
 // src/commands/refactor/extract/index.ts
 async function extract(file, functionName, destination, options2 = {}) {
-  const sourcePath = path36.resolve(file);
-  const destPath = path36.resolve(destination);
+  const sourcePath = path37.resolve(file);
+  const destPath = path37.resolve(destination);
   const cwd = process.cwd();
-  const relDest = path36.relative(cwd, destPath);
+  const relDest = path37.relative(cwd, destPath);
   const { project, sourceFile } = loadProjectFile(file);
   const plan2 = buildPlan(
     functionName,
@@ -10935,13 +10963,13 @@ function ignore(file) {
 }
 
 // src/commands/refactor/rename/index.ts
-import path37 from "path";
+import path38 from "path";
 import chalk122 from "chalk";
 async function rename(source, destination, options2 = {}) {
-  const destPath = path37.resolve(destination);
+  const destPath = path38.resolve(destination);
   const cwd = process.cwd();
-  const relSource = path37.relative(cwd, path37.resolve(source));
-  const relDest = path37.relative(cwd, destPath);
+  const relSource = path38.relative(cwd, path38.resolve(source));
+  const relDest = path38.relative(cwd, destPath);
   const { project, sourceFile } = loadProjectFile(source);
   console.log(chalk122.bold(`Rename: ${relSource} \u2192 ${relDest}`));
   if (options2.apply) {
@@ -10954,9 +10982,7 @@ async function rename(source, destination, options2 = {}) {
 }
 
 // src/commands/refactor/renameSymbol/index.ts
-import path39 from "path";
 import chalk123 from "chalk";
-import { Project as Project3 } from "ts-morph";
 
 // src/commands/refactor/renameSymbol/findSymbol.ts
 import { SyntaxKind as SyntaxKind13 } from "ts-morph";
@@ -10983,12 +11009,12 @@ function findSymbol(sourceFile, symbolName) {
 }
 
 // src/commands/refactor/renameSymbol/groupReferences.ts
-import path38 from "path";
+import path39 from "path";
 function groupReferences(symbol, cwd) {
   const refs = symbol.findReferencesAsNodes();
   const grouped = /* @__PURE__ */ new Map();
   for (const ref of refs) {
-    const refFile = path38.relative(cwd, ref.getSourceFile().getFilePath());
+    const refFile = path39.relative(cwd, ref.getSourceFile().getFilePath());
     const lines = grouped.get(refFile) ?? [];
     if (!grouped.has(refFile)) grouped.set(refFile, lines);
     lines.push(ref.getStartLineNumber());
@@ -10998,15 +11024,8 @@ function groupReferences(symbol, cwd) {
 
 // src/commands/refactor/renameSymbol/index.ts
 async function renameSymbol(file, oldName, newName, options2 = {}) {
-  const filePath = path39.resolve(file);
-  const tsConfigPath = path39.resolve("tsconfig.json");
   const cwd = process.cwd();
-  const project = new Project3({ tsConfigFilePath: tsConfigPath });
-  const sourceFile = project.getSourceFile(filePath);
-  if (!sourceFile) {
-    console.log(chalk123.red(`File not found in project: ${file}`));
-    process.exit(1);
-  }
+  const { project, sourceFile } = loadProjectFile(file);
   const symbol = findSymbol(sourceFile, oldName);
   if (!symbol) {
     console.log(chalk123.red(`Symbol "${oldName}" not found in ${file}`));

package/package.json

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