mobx-tanstack-query-api 0.0.80 → 0.0.82

package/codegen/utils/remove-unused-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-unused-types.d.ts","sourceRoot":"","sources":["../../../src/codegen/utils/remove-unused-types.ts"],"names":[],"mappings":"AAyGA,eAAO,MAAM,iBAAiB,GAAU,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAS/D,CAAC"}
+{"version":3,"file":"remove-unused-types.d.ts","sourceRoot":"","sources":["../../../src/codegen/utils/remove-unused-types.ts"],"names":[],"mappings":"AAmFA,eAAO,MAAM,iBAAiB,GAAU,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAM/D,CAAC"}

package/codegen/utils/remove-unused-types.js

@@ -1,87 +1,65 @@
-import { Project, SyntaxKind, } from 'ts-morph';
+import { Project, SyntaxKind } from 'ts-morph';
 import path from 'node:path';
 const removeUnusedTypesItteration = async ({ dir }) => {
-    // Создаем проект в памяти
     const project = new Project();
-    // Добавляем все TS/TSX файлы из указанной директории
     project.addSourceFilesAtPaths([
         path.join(dir, '**/*.ts'),
         path.join(dir, '**/*.tsx'),
     ]);
-    const sourceFiles = project.getSourceFiles();
-    const typeDeclarations = new Map();
-    const usedTypes = new Set();
-    let dataContractsSourceFile;
-    // Шаг 1: Собираем все объявления типов
-    for (const file of sourceFiles) {
-        if (file.getFilePath().includes(`${dir}/data-contracts.ts`)) {
-            dataContractsSourceFile = file;
-        }
-        // Интерфейсы
-        for (const intf of file.getInterfaces()) {
-            const name = intf.getName();
-            typeDeclarations.set(name, {
-                node: intf,
-                file: file.getFilePath(),
-                line: intf.getStartLineNumber(),
-            });
-        }
-        // Type-алиасы
-        for (const typeAlias of file.getTypeAliases()) {
-            const name = typeAlias.getName();
-            typeDeclarations.set(name, {
-                node: typeAlias,
-                file: file.getFilePath(),
-                line: typeAlias.getStartLineNumber(),
-            });
+    const dataContractsSourceFile = project.getSourceFile((sourceFile) => sourceFile.getFilePath().includes(`${dir}/data-contracts.ts`));
+    if (!dataContractsSourceFile)
+        return;
+    const exportedDeclarations = dataContractsSourceFile.getExportedDeclarations();
+    const candidateTypes = new Map();
+    for (const [name, declarations] of exportedDeclarations) {
+        const validDeclarations = declarations.filter((decl) => decl.getKind() === SyntaxKind.InterfaceDeclaration ||
+            decl.getKind() === SyntaxKind.TypeAliasDeclaration);
+        if (validDeclarations.length > 0) {
+            candidateTypes.set(name, validDeclarations);
         }
     }
-    // Шаг 2: Ищем использования типов
+    if (candidateTypes.size === 0)
+        return;
+    const usedTypes = new Set();
+    const sourceFiles = project.getSourceFiles();
     for (const file of sourceFiles) {
-        // Проверяем все идентификаторы в файле
         const identifiers = file.getDescendantsOfKind(SyntaxKind.Identifier);
         for (const identifier of identifiers) {
             const name = identifier.getText();
-            if (typeDeclarations.has(name)) {
+            if (!candidateTypes.has(name))
+                continue;
+            if (file === dataContractsSourceFile) {
                 const parent = identifier.getParent();
-                const declaration = typeDeclarations.get(name).node;
-                // Игнорируем само объявление типа
-                const isDeclaration = parent === declaration;
-                // Игнорируем экспорт типа
+                const isDeclaration = parent?.getKind() === SyntaxKind.InterfaceDeclaration ||
+                    parent?.getKind() === SyntaxKind.TypeAliasDeclaration;
                 const isExport = parent?.getKind() === SyntaxKind.ExportSpecifier;
-                if (!isDeclaration && !isExport) {
-                    usedTypes.add(name);
-                }
+                if (isDeclaration || isExport)
+                    continue;
             }
+            usedTypes.add(name);
         }
     }
-    if (!dataContractsSourceFile) {
-        return;
-    }
     let removedCount = 0;
-    const exportedDeclarations = dataContractsSourceFile.getExportedDeclarations();
-    // Шаг 3: Фильтруем неиспользуемые типы
-    for (const [name] of typeDeclarations) {
-        if (!usedTypes.has(name) && exportedDeclarations.has(name)) {
-            const declarations = exportedDeclarations.get(name);
-            declarations?.forEach((declaration) => {
-                if ('remove' in declaration) {
-                    declaration.remove();
-                    removedCount++;
-                }
-            });
+    for (const [name, declarations] of candidateTypes) {
+        if (usedTypes.has(name))
+            continue;
+        for (const decl of declarations) {
+            if ('remove' in decl) {
+                decl.remove();
+                removedCount++;
+            }
         }
     }
     if (removedCount > 0) {
-        dataContractsSourceFile.saveSync();
+        await dataContractsSourceFile.save();
     }
+    return removedCount;
 };
 export const removeUnusedTypes = async ({ dir }) => {
-    const itterations = Array.from({ length: 3 })
-        .fill(null)
-        // eslint-disable-next-line unicorn/consistent-function-scoping
-        .map(() => () => removeUnusedTypesItteration({ dir }));
-    for await (const itteration of itterations) {
-        itteration();
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const removedCount = (await removeUnusedTypesItteration({ dir })) ?? 0;
+        if (removedCount === 0)
+            break;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",