@staff0rd/assist 0.238.0 → 0.238.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.238.0",
+  version: "0.238.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -11407,14 +11407,42 @@ import path36 from "path";
 import chalk132 from "chalk";
 
 // src/commands/refactor/extract/applyExtraction.ts
-import { SyntaxKind as SyntaxKind3 } from "ts-morph";
+import { SyntaxKind as SyntaxKind4 } from "ts-morph";
+
+// src/commands/refactor/extract/addImportPreservingSuppressions.ts
+import {
+  SyntaxKind as SyntaxKind2
+} from "ts-morph";
+var suppressionPattern = /^\s*(\/\/|\/\*)\s*biome-ignore(-all)?\b/;
+function countLeadingSuppressions(sourceFile) {
+  let count6 = 0;
+  for (const stmt of sourceFile.getStatementsWithComments()) {
+    const kind = stmt.getKind();
+    if ((kind === SyntaxKind2.SingleLineCommentTrivia || kind === SyntaxKind2.MultiLineCommentTrivia) && suppressionPattern.test(stmt.getText())) {
+      count6++;
+    } else {
+      break;
+    }
+  }
+  return count6;
+}
+function addImportPreservingSuppressions(sourceFile, structure) {
+  if (sourceFile.getImportDeclarations().length > 0) {
+    sourceFile.addImportDeclaration(structure);
+    return;
+  }
+  sourceFile.insertImportDeclaration(
+    countLeadingSuppressions(sourceFile),
+    structure
+  );
+}
 
 // src/commands/refactor/extract/removeStaleImports.ts
-import { SyntaxKind as SyntaxKind2 } from "ts-morph";
+import { SyntaxKind as SyntaxKind3 } from "ts-morph";
 function collectReferencedNames(sourceFile) {
   const names = /* @__PURE__ */ new Set();
-  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind2.Identifier)) {
-    if (id.getFirstAncestorByKind(SyntaxKind2.ImportDeclaration)) continue;
+  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind3.Identifier)) {
+    if (id.getFirstAncestorByKind(SyntaxKind3.ImportDeclaration)) continue;
     names.add(id.getText());
   }
   return names;
@@ -11457,7 +11485,7 @@ function updateImporters(functionName, sourceFile, importers) {
         importDecl.remove();
       }
     }
-    importerFile.addImportDeclaration({
+    addImportPreservingSuppressions(importerFile, {
       moduleSpecifier: relPath2,
       namedImports: [alias ? { name: functionName, alias } : functionName]
     });
@@ -11466,7 +11494,7 @@ function updateImporters(functionName, sourceFile, importers) {
 
 // src/commands/refactor/extract/applyExtraction.ts
 function isNameReferencedInSource(sourceFile, name) {
-  return sourceFile.getDescendantsOfKind(SyntaxKind3.Identifier).some((id) => id.getText() === name);
+  return sourceFile.getDescendantsOfKind(SyntaxKind4.Identifier).some((id) => id.getText() === name);
 }
 async function applyExtraction(functionName, sourceFile, destPath, plan2, project) {
   project.createSourceFile(destPath, plan2.destContent, { overwrite: false });
@@ -11478,7 +11506,7 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
   }
   removeStaleImports(sourceFile);
   if (isNameReferencedInSource(sourceFile, functionName)) {
-    sourceFile.addImportDeclaration({
+    addImportPreservingSuppressions(sourceFile, {
       moduleSpecifier: plan2.destRelPath,
       namedImports: [functionName]
     });
@@ -11507,19 +11535,19 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
 
 // src/commands/refactor/extract/collectDependencies.ts
 import {
-  SyntaxKind as SyntaxKind7
+  SyntaxKind as SyntaxKind8
 } from "ts-morph";
 
 // src/commands/refactor/extract/collectPrivateFunctions.ts
-import { SyntaxKind as SyntaxKind4 } from "ts-morph";
+import { SyntaxKind as SyntaxKind5 } from "ts-morph";
 function isPrivate(fn) {
   return !fn.isExported() && !fn.isDefaultExport();
 }
 function getCalledFunctionNames(fn) {
   const names = /* @__PURE__ */ new Set();
-  for (const call of fn.getDescendantsOfKind(SyntaxKind4.CallExpression)) {
+  for (const call of fn.getDescendantsOfKind(SyntaxKind5.CallExpression)) {
     const expr = call.getExpression();
-    if (expr.getKind() === SyntaxKind4.Identifier) {
+    if (expr.getKind() === SyntaxKind5.Identifier) {
       names.add(expr.getText());
     }
   }
@@ -11547,10 +11575,10 @@ function collectPrivateFunctions(target, fnMap) {
 }
 
 // src/commands/refactor/extract/collectPrivateStatements.ts
-import { SyntaxKind as SyntaxKind5 } from "ts-morph";
+import { SyntaxKind as SyntaxKind6 } from "ts-morph";
 function getReferencedIdentifiers(fn) {
   const names = /* @__PURE__ */ new Set();
-  for (const id of fn.getDescendantsOfKind(SyntaxKind5.Identifier)) {
+  for (const id of fn.getDescendantsOfKind(SyntaxKind6.Identifier)) {
     names.add(id.getText());
   }
   return names;
@@ -11568,12 +11596,12 @@ function collectPrivateStatements(functions, stmtMap) {
 
 // src/commands/refactor/extract/getFunctionMap.ts
 import {
-  SyntaxKind as SyntaxKind6
+  SyntaxKind as SyntaxKind7
 } from "ts-morph";
 function getFunctionMap(sourceFile) {
   const map = /* @__PURE__ */ new Map();
   for (const fn of sourceFile.getDescendantsOfKind(
-    SyntaxKind6.FunctionDeclaration
+    SyntaxKind7.FunctionDeclaration
   )) {
     const name = fn.getName();
     if (name) map.set(name, fn);
@@ -11599,7 +11627,7 @@ function getPrivateStatementMap(sourceFile) {
 
 // src/commands/refactor/extract/collectDependencies.ts
 function getRemainingFunctions(sourceFile, extracted) {
-  return sourceFile.getDescendantsOfKind(SyntaxKind7.FunctionDeclaration).filter((fn) => !extracted.has(fn));
+  return sourceFile.getDescendantsOfKind(SyntaxKind8.FunctionDeclaration).filter((fn) => !extracted.has(fn));
 }
 function collectFnsUsedByRemaining(remaining, fnMap) {
   const used = /* @__PURE__ */ new Set();
@@ -11634,25 +11662,25 @@ function collectDependencies(target, sourceFile) {
 
 // src/commands/refactor/extract/findFunction.ts
 import {
-  SyntaxKind as SyntaxKind8
+  SyntaxKind as SyntaxKind9
 } from "ts-morph";
 function findFunction(sourceFile, functionName) {
-  return sourceFile.getDescendantsOfKind(SyntaxKind8.FunctionDeclaration).find((fn) => fn.getName() === functionName);
+  return sourceFile.getDescendantsOfKind(SyntaxKind9.FunctionDeclaration).find((fn) => fn.getName() === functionName);
 }
 
 // src/commands/refactor/extract/getExportedDependencyNames.ts
-import { SyntaxKind as SyntaxKind9 } from "ts-morph";
+import { SyntaxKind as SyntaxKind10 } from "ts-morph";
 function getExportedDependencyNames(target, sourceFile) {
   const calledNames = /* @__PURE__ */ new Set();
-  for (const call of target.getDescendantsOfKind(SyntaxKind9.CallExpression)) {
+  for (const call of target.getDescendantsOfKind(SyntaxKind10.CallExpression)) {
     const expr = call.getExpression();
-    if (expr.getKind() === SyntaxKind9.Identifier) {
+    if (expr.getKind() === SyntaxKind10.Identifier) {
       calledNames.add(expr.getText());
     }
   }
   const exported = [];
   for (const fn of sourceFile.getDescendantsOfKind(
-    SyntaxKind9.FunctionDeclaration
+    SyntaxKind10.FunctionDeclaration
   )) {
     const name = fn.getName();
     if (name && calledNames.has(name) && fn.isExported()) {
@@ -11663,9 +11691,9 @@ function getExportedDependencyNames(target, sourceFile) {
 }
 
 // src/commands/refactor/extract/getStatementNames.ts
-import { SyntaxKind as SyntaxKind10 } from "ts-morph";
+import { SyntaxKind as SyntaxKind11 } from "ts-morph";
 function getStatementNames(node) {
-  if (node.getKind() === SyntaxKind10.VariableStatement) {
+  if (node.getKind() === SyntaxKind11.VariableStatement) {
     const stmt = node;
     return stmt.getDeclarations().map((d) => d.getName());
   }
@@ -11675,7 +11703,7 @@ function getStatementNames(node) {
 
 // src/commands/refactor/extract/resolveImports.ts
 import {
-  SyntaxKind as SyntaxKind11
+  SyntaxKind as SyntaxKind12
 } from "ts-morph";
 
 // src/commands/refactor/extract/matchImport.ts
@@ -11719,7 +11747,7 @@ function matchImport(importDecl, neededNames) {
 function getReferencedNames(nodes) {
   const names = /* @__PURE__ */ new Set();
   for (const node of nodes) {
-    for (const id of node.getDescendantsOfKind(SyntaxKind11.Identifier)) {
+    for (const id of node.getDescendantsOfKind(SyntaxKind12.Identifier)) {
       names.add(id.getText());
     }
   }
@@ -11734,7 +11762,7 @@ function getLocallyDeclaredNames(functions) {
       names.add(param.getName());
     }
     for (const varDecl of fn.getDescendantsOfKind(
-      SyntaxKind11.VariableDeclaration
+      SyntaxKind12.VariableDeclaration
     )) {
       names.add(varDecl.getName());
     }
@@ -11889,16 +11917,16 @@ function rewriteImportPaths(imports, sourcePath, destPath) {
 }
 
 // src/commands/refactor/extract/sourceReferencesName.ts
-import { SyntaxKind as SyntaxKind12 } from "ts-morph";
+import { SyntaxKind as SyntaxKind13 } from "ts-morph";
 var DECLARATION_KINDS = /* @__PURE__ */ new Set([
-  SyntaxKind12.FunctionDeclaration,
-  SyntaxKind12.ImportSpecifier,
-  SyntaxKind12.ExportSpecifier
+  SyntaxKind13.FunctionDeclaration,
+  SyntaxKind13.ImportSpecifier,
+  SyntaxKind13.ExportSpecifier
 ]);
 function isInsideExtractedFunction(node, extracted) {
   let current = node;
   while (current) {
-    if (current.getKind() !== SyntaxKind12.FunctionDeclaration) {
+    if (current.getKind() !== SyntaxKind13.FunctionDeclaration) {
       current = current.getParent();
       continue;
     }
@@ -11910,7 +11938,7 @@ function isInsideExtractedFunction(node, extracted) {
 }
 function sourceReferencesName(sourceFile, functionName, extractedNames) {
   const extracted = new Set(extractedNames);
-  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind12.Identifier)) {
+  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind13.Identifier)) {
     if (id.getText() !== functionName) continue;
     const parent = id.getParent();
     if (!parent || DECLARATION_KINDS.has(parent.getKind())) continue;
@@ -12141,24 +12169,24 @@ async function rename(source, destination, options2 = {}) {
 import chalk135 from "chalk";
 
 // src/commands/refactor/renameSymbol/findSymbol.ts
-import { SyntaxKind as SyntaxKind13 } from "ts-morph";
+import { SyntaxKind as SyntaxKind14 } from "ts-morph";
 var declarationKinds = [
-  SyntaxKind13.VariableDeclaration,
-  SyntaxKind13.FunctionDeclaration,
-  SyntaxKind13.ClassDeclaration,
-  SyntaxKind13.InterfaceDeclaration,
-  SyntaxKind13.TypeAliasDeclaration,
-  SyntaxKind13.EnumDeclaration,
-  SyntaxKind13.PropertyDeclaration,
-  SyntaxKind13.MethodDeclaration,
-  SyntaxKind13.Parameter
+  SyntaxKind14.VariableDeclaration,
+  SyntaxKind14.FunctionDeclaration,
+  SyntaxKind14.ClassDeclaration,
+  SyntaxKind14.InterfaceDeclaration,
+  SyntaxKind14.TypeAliasDeclaration,
+  SyntaxKind14.EnumDeclaration,
+  SyntaxKind14.PropertyDeclaration,
+  SyntaxKind14.MethodDeclaration,
+  SyntaxKind14.Parameter
 ];
 function isDeclaration(identifier) {
   const parent = identifier.getParent();
   return parent !== void 0 && declarationKinds.includes(parent.getKind());
 }
 function findSymbol(sourceFile, symbolName) {
-  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind13.Identifier)) {
+  for (const id of sourceFile.getDescendantsOfKind(SyntaxKind14.Identifier)) {
     if (id.getText() === symbolName && isDeclaration(id)) return id;
   }
   return void 0;

package/package.json

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