feat(compiler): enhance support for declare statements

- fix #145 - support declare statements even when other statements are present in the file - except when there are export statements - change peer dependencies version
imjuni · Aug 12, 2024 · a6a82b7 · a6a82b7
1 parent 8159292
commit a6a82b7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -151,9 +151,9 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "prettier": "^3",
-    "prettier-plugin-organize-imports": "^3",
-    "typescript": "^5"
+    "prettier": ">=3",
+    "prettier-plugin-organize-imports": ">=3",
+    "typescript": ">=5"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [

diff --git a/src/compilers/isDeclaration.ts b/src/compilers/isDeclaration.ts
@@ -1,7 +1,6 @@
 import * as tsm from 'ts-morph';
 
 const declarationKindMap: Map<tsm.SyntaxKind, boolean> = new Map([
-  [tsm.SyntaxKind.ImportDeclaration, true],
   [tsm.SyntaxKind.ModuleDeclaration, true],
 ]);
 

diff --git a/src/compilers/isDeclarationFile.ts b/src/compilers/isDeclarationFile.ts
@@ -11,5 +11,5 @@ export function isDeclarationFile(sourceFile: tsm.SourceFile) {
     };
   });
 
-  return statements.every((statement) => statement.isDeclaration);
+  return statements.some((statement) => statement.isDeclaration);
 }
diff --git a/src/modules/commands/bundling.ts b/src/modules/commands/bundling.ts
@@ -190,31 +190,33 @@ export async function bundling(buildOptions: TCommandBuildOptions, bundleOption:
       return { renderData, ...style };
     });
 
-  const importsRendered = await TemplateContainer.evaluate(
+  const inlineDeclarationsRendered = await TemplateContainer.evaluate(
     CE_TEMPLATE_NAME.DECLARATION_FILE_TEMPLATE,
     {
       options: { quote: bundleOption.quote },
       declarations: await Promise.all(
-        inlineDeclarations.map((declaration) => {
-          const relativePath =
-            bundleOption.output != null
-              ? addCurrentDirPrefix(
-                  posixRelative(
-                    bundleOption.output,
-                    path.join(
+        inlineDeclarations
+          .filter((inlineDeclaration) => statementMap.get(inlineDeclaration.filePath) == null)
+          .map((declaration) => {
+            const relativePath =
+              bundleOption.output != null
+                ? addCurrentDirPrefix(
+                    posixRelative(
+                      bundleOption.output,
+                      path.join(
+                        path.dirname(declaration.filePath),
+                        path.basename(declaration.filePath, path.extname(declaration.filePath)),
+                      ),
+                    ),
+                  )
+                : replaceSepToPosix(
+                    `.${path.posix.sep}${path.join(
                       path.dirname(declaration.filePath),
                       path.basename(declaration.filePath, path.extname(declaration.filePath)),
-                    ),
-                  ),
-                )
-              : replaceSepToPosix(
-                  `.${path.posix.sep}${path.join(
-                    path.dirname(declaration.filePath),
-                    path.basename(declaration.filePath, path.extname(declaration.filePath)),
-                  )}`,
-                );
-          return { ...declaration, relativePath };
-        }),
+                    )}`,
+                  );
+            return { ...declaration, relativePath };
+          }),
       ),
     },
   );
@@ -232,7 +234,7 @@ export async function bundling(buildOptions: TCommandBuildOptions, bundleOption:
   Spinner.it.start('output file exists check, ...');
 
   const outputMap = new Map<string, string>();
-  outputMap.set(output, [importsRendered, ...exportsRendered].join('\n'));
+  outputMap.set(output, [inlineDeclarationsRendered, ...exportsRendered].join('\n'));
   const fileExistReason = await checkOutputFile(outputMap);
 
   if (!bundleOption.overwrite && !bundleOption.backup && fileExistReason.length > 0) {