mobx-tanstack-query-api 0.0.82 → 0.0.84

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":"AAmFA,eAAO,MAAM,iBAAiB,GAAU,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAM/D,CAAC"}
+{"version":3,"file":"remove-unused-types.d.ts","sourceRoot":"","sources":["../../../src/codegen/utils/remove-unused-types.ts"],"names":[],"mappings":"AAqIA,eAAO,MAAM,iBAAiB,GAAU,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAK/D,CAAC"}

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

@@ -1,4 +1,5 @@
-import { Project, SyntaxKind } from 'ts-morph';
+/* eslint-disable no-constant-condition */
+import { Project, SyntaxKind, Node } from 'ts-morph';
 import path from 'node:path';
 const removeUnusedTypesItteration = async ({ dir }) => {
     const project = new Project();
@@ -13,7 +14,8 @@ const removeUnusedTypesItteration = async ({ dir }) => {
     const candidateTypes = new Map();
     for (const [name, declarations] of exportedDeclarations) {
         const validDeclarations = declarations.filter((decl) => decl.getKind() === SyntaxKind.InterfaceDeclaration ||
-            decl.getKind() === SyntaxKind.TypeAliasDeclaration);
+            decl.getKind() === SyntaxKind.TypeAliasDeclaration ||
+            decl.getKind() === SyntaxKind.EnumDeclaration);
         if (validDeclarations.length > 0) {
             candidateTypes.set(name, validDeclarations);
         }
@@ -21,22 +23,63 @@ const removeUnusedTypesItteration = async ({ dir }) => {
     if (candidateTypes.size === 0)
         return;
     const usedTypes = new Set();
-    const sourceFiles = project.getSourceFiles();
-    for (const file of sourceFiles) {
+    const externalFiles = project
+        .getSourceFiles()
+        .filter((sf) => sf !== dataContractsSourceFile);
+    for (const file of externalFiles) {
         const identifiers = file.getDescendantsOfKind(SyntaxKind.Identifier);
         for (const identifier of identifiers) {
             const name = identifier.getText();
-            if (!candidateTypes.has(name))
-                continue;
-            if (file === dataContractsSourceFile) {
-                const parent = identifier.getParent();
-                const isDeclaration = parent?.getKind() === SyntaxKind.InterfaceDeclaration ||
-                    parent?.getKind() === SyntaxKind.TypeAliasDeclaration;
-                const isExport = parent?.getKind() === SyntaxKind.ExportSpecifier;
-                if (isDeclaration || isExport)
-                    continue;
+            if (candidateTypes.has(name)) {
+                usedTypes.add(name);
+            }
+        }
+        const memberAccessExpressions = file.getDescendantsOfKind(SyntaxKind.PropertyAccessExpression);
+        for (const expr of memberAccessExpressions) {
+            const expression = expr.getExpression();
+            if (Node.isIdentifier(expression)) {
+                const name = expression.getText();
+                if (candidateTypes.has(name)) {
+                    usedTypes.add(name);
+                }
+            }
+        }
+    }
+    const dependencyGraph = new Map();
+    for (const [name, declarations] of candidateTypes) {
+        const dependencies = new Set();
+        for (const decl of declarations) {
+            const typeReferences = decl.getDescendantsOfKind(SyntaxKind.TypeReference);
+            for (const ref of typeReferences) {
+                const typeName = ref.getTypeName().getText();
+                if (candidateTypes.has(typeName)) {
+                    dependencies.add(typeName);
+                }
+            }
+            if (decl.getKind() === SyntaxKind.EnumDeclaration) {
+                const initializers = decl.getDescendantsOfKind(SyntaxKind.Identifier);
+                for (const init of initializers) {
+                    const text = init.getText();
+                    if (candidateTypes.has(text)) {
+                        dependencies.add(text);
+                    }
+                }
+            }
+        }
+        dependencyGraph.set(name, dependencies);
+    }
+    const queue = Array.from(usedTypes);
+    const visited = new Set(usedTypes);
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (dependencyGraph.has(current)) {
+            for (const dep of dependencyGraph.get(current)) {
+                if (!visited.has(dep)) {
+                    visited.add(dep);
+                    usedTypes.add(dep);
+                    queue.push(dep);
+                }
             }
-            usedTypes.add(name);
         }
     }
     let removedCount = 0;
@@ -56,7 +99,6 @@ const removeUnusedTypesItteration = async ({ dir }) => {
     return removedCount;
 };
 export const removeUnusedTypes = async ({ dir }) => {
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         const removedCount = (await removeUnusedTypesItteration({ dir })) ?? 0;
         if (removedCount === 0)

package/package.json

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