Merge pull request #1 from garaio/improvingFileSearch

Improved file search (replaced recursiveSearchSync)
garaio · Sep 16, 2021 · 12c1d89 · 12c1d89
2 parents 1d5999c + 9a18ba1
commit 12c1d89
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 14 deletions.
diff --git a/dist/Resources/_generated/TestResources.js b/dist/Resources/_generated/TestResources.js
diff --git a/dist/Resources/_generated/TestResources.js.map b/dist/Resources/_generated/TestResources.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/test.js b/dist/test.js
diff --git a/dist/test.js.map b/dist/test.js.map
diff --git a/index.ts b/index.ts
@@ -64,7 +64,12 @@ function getFilesFromFolder(virtualResxFolder: string, fileNameRegex: any): any
             safeVirtualFolder = safeVirtualFolder.substr(0, safeVirtualFolder.length - 1);
         }
 
-        files = search.recursiveSearchSync(fileNameRegex, __dirname + virtualProjectRoot + safeVirtualFolder);
+        const directory = __dirname + virtualProjectRoot + safeVirtualFolder + "\\";
+        console.log("directory: ", directory);
+        console.log("fileNameRegex: ", fileNameRegex);
+        const filenames = fs.readdirSync(__dirname + virtualProjectRoot + safeVirtualFolder).filter((fn:string) => fn.match(fileNameRegex));
+        files = filenames.map((file:any) => directory + file);
+        console.log("Matching filepaths: ", files);
     }
 
     if (files !== undefined && files !== null) {

diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "resx-to-ts-json",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Converts resx files to TypeScript definitions and json files",
   "main": "dist/index.js",
   "scripts": {
     "test": "node dist/test.js",
     "build": "tsc -p ./"
   },
   "author": {
-    "name": "Hasan Afzal",
-    "originalAuthor": "Martijn van der Corput"
+    "name": "Fabian Gander",
+    "originalAuthor": "Hasan Afzal"
   },
   "devDependencies": {
     "typescript": "^1.8.10"
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/hmafzal/resx-to-ts-json.git"
+    "url": "git+https://github.com/garaio/resx-to-ts-json.git"
   },
   "keywords": [
     "typescript",
@@ -35,7 +35,7 @@
   ],
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/hmafzal/resx-to-ts-json/issues"
+    "url": "https://github.com/garaio/resx-to-ts-json/issues"
   },
-  "homepage": "https://github.com/hmafzal/resx-to-ts-json#readme"
+  "homepage": "https://github.com/garaio/resx-to-ts-json#readme"
 }
diff --git a/test.ts b/test.ts
@@ -2,4 +2,4 @@ import program = require('./index');
 
 program.executeResxToTs('testnamespace', '/Resources', '/Resources/_generated');
 program.executeResxToJson('/Resources', '/Resources/_generated/');
-program.executeResxToTsTranslationKeys('Reka.RekaNet.EmployerPortal.Web.VueResources.', '/Resources', '/Resources/_generated/keysOnly', /VueResources.resx$/);
+program.executeResxToTsTranslationKeys('Reka.RekaNet.EmployerPortal.Web.VueResources.', '/Resources', '/Resources/_generated/keysOnly', /TestResources\.resx$/);