Merge pull request #62 from LumaKernel/ext

fix: check file extensions
frouriojs · Feb 10, 2021 · 321dae2 · 321dae2
2 parents 50a8da5 + d12843b
commit 321dae2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/servers/basic/entity/README.md b/servers/basic/entity/README.md
@@ -0,0 +1,5 @@
+# Entities
+
+## Task
+
+blah blah
diff --git a/servers/basic/subscriber/.gitkeep b/servers/basic/subscriber/.gitkeep
diff --git a/src/createText.ts b/src/createText.ts
@@ -38,21 +38,21 @@ export class ${getFileName(e)} {
       (e, i) =>
         `\nimport { ${getFileName(e)} as Entity${i} } from '${e
           .replace(inputDir, '.')
-          .replace('.ts', '')}'`
+          .replace(/\.(?:ts|js)$/, '')}'`
     )
     .join('')}${migrations
     .map((m, i) => {
       const names = getFileName(m).split('-')
       return `\nimport { ${names[1]}${names[0]} as Migration${i} } from '${m
         .replace(inputDir, '.')
-        .replace('.ts', '')}'`
+        .replace(/\.(?:ts|js)$/, '')}'`
     })
     .join('')}${subscribers
     .map(
       (s, i) =>
         `\nimport { ${getFileName(s)} as Subscriber${i} } from '${s
           .replace(inputDir, '.')
-          .replace('.ts', '')}'`
+          .replace(/\.(?:ts|js)$/, '')}'`
     )
     .join('')}`
 

diff --git a/src/listFiles.ts b/src/listFiles.ts
@@ -5,6 +5,8 @@ export const listFiles = (targetDir: string): string[] =>
   fs.readdirSync(targetDir, { withFileTypes: true }).reduce<string[]>((prev, dirent) => {
     const target = path.posix.join(targetDir, dirent.name)
     return dirent.isFile()
-      ? [...prev, targetDir.startsWith('.') ? `./${target}` : target]
+      ? target.match(/\.(?:ts|js)$/)
+        ? [...prev, targetDir.startsWith('.') ? `./${target}` : target]
+        : prev
       : [...prev, ...listFiles(target)]
   }, [])