mobx-tanstack-query-api 0.0.78 → 0.0.80

package/codegen/index.d.ts

@@ -22,6 +22,7 @@ export interface GenerateQueryApiParams {
     requestPathPrefix?: string;
     requestPathSuffix?: string;
     requestInfoPrefix?: string;
+    removeUnusedTypes?: boolean;
     formatExportGroupName?: (groupName: string, utils: CodegenDataUtils) => string;
     /**
      * Group endpoints and collect it into object
@@ -72,6 +73,7 @@ export interface GenerateQueryApiParams {
     libImports?: {
         'mobx-tanstack-query-api'?: string;
     };
+    tsconfigPath?: string;
     transforms?: {
         groupEnumValue?: (group: string, namespace?: Maybe<string>) => string;
         tagEnumValue?: (tag: string, namespace?: Maybe<string>) => string;

package/codegen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"}

package/codegen/index.js

@@ -7,13 +7,19 @@ import { dataContractsFileTmpl } from './templates/data-contracts-file.tmpl.js';
 import { endpointPerFileTmpl } from './templates/endpoint-per-file.tmpl.js';
 import { indexTsForEndpointPerFileTmpl } from './templates/index-ts-for-endpoint-per-file.tmpl.js';
 import { metaInfoTmpl } from './templates/meta-info.tmpl.js';
+import { removeUnusedTypes } from './utils/remove-unused-types.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const __execdirname = process.cwd();
 export const generateApi = async (params) => {
     if (Array.isArray(params)) {
         await Promise.all(params.map((param) => generateApi(param)));
         return;
     }
+    const tsconfigPath = params.tsconfigPath
+        ? path.resolve(__execdirname, params.tsconfigPath)
+        : path.resolve(__execdirname, './tsconfig.json');
+    console.info('using tsconfig', tsconfigPath);
     const importFileParams = {
         queryClient: !params.queryClient || typeof params.queryClient === 'string'
             ? {
@@ -309,7 +315,7 @@ export * as ${exportGroupName} from './endpoints';
         }
         // #endregion
     }
-    const metaInfo = (namespace ?? nonEmptyGroups.size > 0)
+    const metaInfo = (namespace ?? (nonEmptyGroups.size > 0 || tagsSet.size > 0))
         ? {
             namespace,
             groupNames: [...nonEmptyGroups.values()],
@@ -376,4 +382,9 @@ export * as ${namespace} from './__exports';
             }),
         });
     }
+    if (params.removeUnusedTypes) {
+        removeUnusedTypes({
+            dir: params.output,
+        });
+    }
 };

package/codegen/templates/meta-info.tmpl.d.ts

@@ -8,5 +8,5 @@ export interface MetaInfoTmplParams {
 }
 export declare const formatGroupNameEnumKey: (groupName: string, { _ }: CodegenDataUtils) => Capitalize<string>;
 export declare const formatTagNameEnumKey: (tagName: string, utils: CodegenDataUtils) => Capitalize<string>;
-export declare const metaInfoTmpl: ({ metaInfo, utils, formatTSContent, codegenParams, }: MetaInfoTmplParams) => Promise<string>;
+export declare const metaInfoTmpl: ({ metaInfo, utils, formatTSContent, codegenParams, ...other }: MetaInfoTmplParams) => Promise<string>;
 //# sourceMappingURL=meta-info.tmpl.d.ts.map

package/codegen/templates/meta-info.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/meta-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,QAAQ,EACT,MAAM,aAAa,CAAC;AAIrB,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,sBAAsB,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,GACjC,WAAW,MAAM,EACjB,OAAO,gBAAgB,uBACgB,CAAC;AAE1C,eAAO,MAAM,oBAAoB,GAC/B,SAAS,MAAM,EACf,OAAO,gBAAgB,uBACkB,CAAC;AAE5C,eAAO,MAAM,YAAY,GAAU,sDAKhC,kBAAkB,oBAoBpB,CAAC"}
+{"version":3,"file":"meta-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/meta-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,QAAQ,EACT,MAAM,aAAa,CAAC;AAIrB,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,sBAAsB,CAAC;IACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,GACjC,WAAW,MAAM,EACjB,OAAO,gBAAgB,uBACgB,CAAC;AAE1C,eAAO,MAAM,oBAAoB,GAC/B,SAAS,MAAM,EACf,OAAO,gBAAgB,uBACkB,CAAC;AAE5C,eAAO,MAAM,YAAY,GAAU,+DAMhC,kBAAkB,oBA4CpB,CAAC"}

package/codegen/templates/meta-info.tmpl.js

@@ -1,7 +1,11 @@
 import { LINTERS_IGNORE } from './constants.js';
 export const formatGroupNameEnumKey = (groupName, { _ }) => _.upperFirst(_.camelCase(groupName));
 export const formatTagNameEnumKey = (tagName, utils) => formatGroupNameEnumKey(tagName, utils);
-export const metaInfoTmpl = async ({ metaInfo, utils, formatTSContent, codegenParams, }) => {
+export const metaInfoTmpl = async ({ metaInfo, utils, formatTSContent, codegenParams, ...other }) => {
+    const tagsMap = new Map(other.configuration?.apiConfig?.tags?.map((it) => [
+        it.name,
+        it,
+    ]));
     return await formatTSContent(`${LINTERS_IGNORE}
   ${[
         metaInfo?.namespace && `export const namespace = "${metaInfo?.namespace}";`,
@@ -14,7 +18,21 @@ export const enum Group {
         metaInfo?.tags?.length &&
             `
 export const enum Tag {
-  ${metaInfo?.tags.map((tagName) => `${formatTagNameEnumKey(tagName, utils)} = "${codegenParams.transforms?.tagEnumValue?.(tagName) ?? tagName}"`).join(',\n')}
+  ${metaInfo?.tags
+                .map((tagName) => {
+                const tagData = tagsMap.get(tagName);
+                let description = tagData?.description;
+                if (!description) {
+                    description = utils._.words(tagName).join(' ');
+                }
+                return [
+                    description && `/** ${description} */`,
+                    `${formatTagNameEnumKey(tagName, utils)} = "${codegenParams.transforms?.tagEnumValue?.(tagName) ?? tagName}"`,
+                ]
+                    .filter(Boolean)
+                    .join('\n');
+            })
+                .join(',\n')}
 }
 `,
     ]

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

@@ -0,0 +1,4 @@
+export declare const removeUnusedTypes: ({ dir }: {
+    dir: string;
+}) => Promise<void>;
+//# sourceMappingURL=remove-unused-types.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,87 @@
+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(),
+            });
+        }
+    }
+    // Шаг 2: Ищем использования типов
+    for (const file of sourceFiles) {
+        // Проверяем все идентификаторы в файле
+        const identifiers = file.getDescendantsOfKind(SyntaxKind.Identifier);
+        for (const identifier of identifiers) {
+            const name = identifier.getText();
+            if (typeDeclarations.has(name)) {
+                const parent = identifier.getParent();
+                const declaration = typeDeclarations.get(name).node;
+                // Игнорируем само объявление типа
+                const isDeclaration = parent === declaration;
+                // Игнорируем экспорт типа
+                const isExport = parent?.getKind() === SyntaxKind.ExportSpecifier;
+                if (!isDeclaration && !isExport) {
+                    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++;
+                }
+            });
+        }
+    }
+    if (removedCount > 0) {
+        dataContractsSourceFile.saveSync();
+    }
+};
+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();
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -25,6 +25,7 @@
     "http-status-code-types": "^0.0.2",
     "mobx-tanstack-query": "^5.3.1",
     "swagger-typescript-api": "13.2.1",
+    "ts-morph": "^26.0.0",
     "yummies": "^3.2.9"
   },
   "devDependencies": {
@@ -112,6 +113,11 @@
       "default": "./codegen/templates/new-endpoint.tmpl.js",
       "types": "./codegen/templates/new-endpoint.tmpl.d.ts"
     },
+    "./codegen/utils/remove-unused-types": {
+      "import": "./codegen/utils/remove-unused-types.js",
+      "default": "./codegen/utils/remove-unused-types.js",
+      "types": "./codegen/utils/remove-unused-types.d.ts"
+    },
     ".": {
       "import": "./index.js",
       "default": "./index.js",