mobx-tanstack-query-api 0.35.1 → 0.36.1

package/cli.js

@@ -382,17 +382,17 @@ const allEndpointPerFileTmpl = async (params) => {
   } = params;
   const { _ } = utils;
   const dataContractNamesInThisFile = [];
+  const dataContactNames = new Set(
+    Object.keys(
+      configuration.config.swaggerSchema?.components?.schemas
+    ).map((schemaName) => utils.formatModelName(schemaName))
+  );
   const newEndpointTemplates = routes.map((route) => {
     const newEndpointTemplateData = newEndpointTmpl({
       ...params,
       route
     });
     const { reservedDataContractNames } = newEndpointTemplateData;
-    const dataContactNames = new Set(
-      Object.keys(
-        configuration.config.swaggerSchema?.components?.schemas
-      ).map((schemaName) => utils.formatModelName(schemaName))
-    );
     reservedDataContractNames.forEach((reservedDataContractName) => {
       if (!dataContactNames.has(reservedDataContractName)) {
         dataContractNamesInThisFile.push(reservedDataContractName);
@@ -435,14 +435,14 @@ const allEndpointPerFileTmpl = async (params) => {
       }
     )
   );
+  const endpointTemplatesContent = endpointTemplates.filter(Boolean).join("\n\n");
   if (metaInfo) {
     extraImportLines.push(
       `import { ${[groupName && "Group", metaInfo?.namespace && "namespace", "Tag"].filter(Boolean).join(",")} } from "${groupName ? "../" : "./"}meta-info";`
     );
   }
-  return {
-    reservedDataContractNames: dataContractNamesInThisFile,
-    content: await formatTSContent(`${LINTERS_IGNORE}
+  const dataContractImportToken = "/*__DATA_CONTRACT_IMPORTS__*/";
+  const contentWithImportToken = await formatTSContent(`${LINTERS_IGNORE}
       import {
         RequestParams,
         HttpResponse,
@@ -452,32 +452,40 @@ const allEndpointPerFileTmpl = async (params) => {
       import { ${importFileParams.httpClient.exportName} } from "${importFileParams.httpClient.path}";
       import { ${importFileParams.queryClient.exportName} } from "${importFileParams.queryClient.path}";
       ${extraImportLines.join("\n")}
-
-      ${configuration.modelTypes.length > 0 ? `
-      import { ${configuration.modelTypes.map((it) => it.name).filter(
-      (it) => !dataContractNamesInThisFile.includes(it)
-    )} } from "${relativePathDataContracts}";
-      ` : ""}
+      ${dataContractImportToken}
 
       ${(await Promise.all(
-      dataContractNamesInThisFile.map(async (dataContractName) => {
-        const modelType = configuration.modelTypes.find(
-          (modelType2) => modelType2.name === dataContractName
-        );
-        if (!modelType) {
-          return "";
-        }
-        const contractType = await dataContractTmpl({
-          ...params,
-          contract: modelType,
-          addExportKeyword: true
-        });
-        return contractType;
-      })
-    )).filter(Boolean).join("\n\n")}
+    dataContractNamesInThisFile.map(async (dataContractName) => {
+      const modelType = configuration.modelTypes.find(
+        (modelType2) => modelType2.name === dataContractName
+      );
+      if (!modelType) {
+        return "";
+      }
+      const contractType = await dataContractTmpl({
+        ...params,
+        contract: modelType,
+        addExportKeyword: true
+      });
+      return contractType;
+    })
+  )).filter(Boolean).join("\n\n")}
 
-      ${endpointTemplates.filter(Boolean).join("\n\n")}
-      `)
+      ${endpointTemplatesContent}
+      `);
+  const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const usedDataContractNames = configuration.modelTypes.map((modelType) => modelType.name).filter(
+    (modelTypeName) => !dataContractNamesInThisFile.includes(modelTypeName) && dataContactNames.has(modelTypeName) && new RegExp(`\\b${escapeRegExp(modelTypeName)}\\b`).test(
+      contentWithImportToken
+    )
+  );
+  const dataContractImportLine = usedDataContractNames.length > 0 ? `import { ${usedDataContractNames.join(", ")} } from "${relativePathDataContracts}";` : "";
+  return {
+    reservedDataContractNames: dataContractNamesInThisFile,
+    content: contentWithImportToken.replace(
+      dataContractImportToken,
+      dataContractImportLine
+    )
   };
 };
 const allExportsTmpl = async ({
@@ -562,9 +570,8 @@ const endpointPerFileTmpl = async (params) => {
       `import { ${requestInfoMeta.typeName} } from "${requestInfoMeta.typeNameImportPath}";`
     );
   }
-  return {
-    reservedDataContractNames: dataContractNamesInThisFile,
-    content: await formatTSContent(`${LINTERS_IGNORE}
+  const dataContractImportToken = "/*__DATA_CONTRACT_IMPORTS__*/";
+  const contentWithImportToken = await formatTSContent(`${LINTERS_IGNORE}
       import {
         RequestParams,
         HttpResponse,
@@ -574,47 +581,55 @@ const endpointPerFileTmpl = async (params) => {
       import { ${importFileParams.httpClient.exportName} } from "${importFileParams.httpClient.path}";
       import { ${importFileParams.queryClient.exportName} } from "${importFileParams.queryClient.path}";
       ${extraImportLines.join("\n")}
-
-      ${configuration.modelTypes.length > 0 ? `
-      import { ${configuration.modelTypes.map((it) => it.name).filter(
-      (it) => !dataContractNamesInThisFile.includes(it)
-    )} } from "${relativePathDataContracts}";
-      ` : ""}
+      ${dataContractImportToken}
 
       ${(await Promise.all(
-      dataContractNamesInThisFile.map(async (dataContractName) => {
-        const modelType = configuration.modelTypes.find(
-          (modelType2) => modelType2.name === dataContractName
-        );
-        if (!modelType) {
-          return "";
-        }
-        const contractType = await dataContractTmpl({
-          ...params,
-          contract: modelType,
-          addExportKeyword: true
-        });
-        return contractType;
-      })
-    )).filter(Boolean).join("\n\n")}
+    dataContractNamesInThisFile.map(async (dataContractName) => {
+      const modelType = configuration.modelTypes.find(
+        (modelType2) => modelType2.name === dataContractName
+      );
+      if (!modelType) {
+        return "";
+      }
+      const contractType = await dataContractTmpl({
+        ...params,
+        contract: modelType,
+        addExportKeyword: true
+      });
+      return contractType;
+    })
+  )).filter(Boolean).join("\n\n")}
 
       ${(await Promise.all(
-      localModelTypes.map(async (modelType) => {
-        const contractType = await dataContractTmpl({
-          ...params,
-          contract: modelType,
-          addExportKeyword: true
-        });
-        return contractType;
-      })
-    )).filter(Boolean).join("\n\n")}
+    localModelTypes.map(async (modelType) => {
+      const contractType = await dataContractTmpl({
+        ...params,
+        contract: modelType,
+        addExportKeyword: true
+      });
+      return contractType;
+    })
+  )).filter(Boolean).join("\n\n")}
       
       ${endpointJSDocTmpl({
-      ...params,
-      route
-    })}
+    ...params,
+    route
+  })}
       export const ${_.camelCase(route.routeName.usage)} = ${requestInfoInstanceContent}
-      `)
+      `);
+  const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const usedDataContractNames = configuration.modelTypes.map((modelType) => modelType.name).filter(
+    (modelTypeName) => !dataContractNamesInThisFile.includes(modelTypeName) && dataContactNames.has(modelTypeName) && new RegExp(`\\b${escapeRegExp(modelTypeName)}\\b`).test(
+      contentWithImportToken
+    )
+  );
+  const dataContractImportLine = usedDataContractNames.length > 0 ? `import { ${usedDataContractNames.join(", ")} } from "${relativePathDataContracts}";` : "";
+  return {
+    reservedDataContractNames: dataContractNamesInThisFile,
+    content: contentWithImportToken.replace(
+      dataContractImportToken,
+      dataContractImportLine
+    )
   };
 };
 const indexTsForEndpointPerFileTmpl = async ({
@@ -728,15 +743,11 @@ const removeUnusedTypesItteration = async ({
     }
   }
   let removedCount = 0;
-  const isNeedToRemoveType = unpackFilterOption(
-    keepTypes,
-    (name) => name,
-    false
-  );
+  const isKeepType = unpackFilterOption(keepTypes, (name) => name, false);
   for (const [name, declarations] of candidateTypes) {
     if (usedTypes.has(name)) continue;
     for (const decl of declarations) {
-      if ("remove" in decl && isNeedToRemoveType(name)) {
+      if ("remove" in decl && !isKeepType(name)) {
         decl.remove();
         removedCount++;
       }
@@ -927,6 +938,7 @@ const generateApi = async (params) => {
   });
   const utils = codegenProcess.getRenderTemplateData().utils;
   const { _ } = utils;
+  const outputType = params.outputType ?? "one-endpoint-per-file";
   const shouldGenerateBarrelFiles = !params.noBarrelFiles;
   let namespace = null;
   if (params.namespace) {
@@ -937,8 +949,8 @@ const generateApi = async (params) => {
     }
   }
   const codegenFs = codegenProcess.fileSystem;
-  codegenFs.cleanDir(params.output);
-  codegenFs.createDir(params.output);
+  codegenFs.cleanDir(paths.outputDir);
+  codegenFs.createDir(paths.outputDir);
   const filterTypes = unpackFilterOption(
     params.filterTypes,
     (modelType) => modelType.name
@@ -970,7 +982,7 @@ const generateApi = async (params) => {
   const tagsSet = /* @__PURE__ */ new Set();
   if (params.groupBy == null) {
     collectedExportFilesFromIndexFile.push("endpoints");
-    if (params.outputType === "one-endpoint-per-file") {
+    if (outputType === "one-endpoint-per-file") {
       codegenFs.createDir(path.resolve(params.output, "endpoints"));
       const fileNamesWithRequestInfo = [];
       for await (const route of allRoutes) {
@@ -1050,7 +1062,7 @@ const generateApi = async (params) => {
         const fileName = "endpoints.ts";
         collectedExportFilesFromIndexFile.push("endpoints");
         codegenFs.createFile({
-          path: params.output,
+          path: paths.outputDir,
           fileName,
           withPrefix: false,
           content: requestInfoPerFileContent
@@ -1092,7 +1104,7 @@ const generateApi = async (params) => {
       );
       codegenFs.createDir(groupDirectory);
       let hasFilteredRoutes = false;
-      if (params.outputType === "one-endpoint-per-file") {
+      if (outputType === "one-endpoint-per-file") {
         codegenFs.createDir(path.resolve(groupDirectory, "endpoints"));
         for await (const route of routes) {
           const {
@@ -1189,7 +1201,7 @@ export * as ${exportGroupName} from './endpoints';
 `
           });
         }
-        if (shouldGenerateBarrelFiles && params.outputType === "one-endpoint-per-file") {
+        if (shouldGenerateBarrelFiles && outputType === "one-endpoint-per-file") {
           codegenFs.createFile({
             path: path.resolve(groupDirectory, "endpoints"),
             fileName: "index.ts",
@@ -1272,8 +1284,8 @@ export * as ${namespace} from './__exports';
     }
   }
   if (params.removeUnusedTypes) {
-    removeUnusedTypes({
-      directory: params.output,
+    await removeUnusedTypes({
+      directory: paths.outputDir,
       keepTypes: params.removeUnusedTypes === true ? void 0 : params.removeUnusedTypes.keepTypes
     });
   }