Merge pull request #156 from docsbydoxdox/hotfix/temp-files

[hotfix] Removed cacheDir from parseString method.
docsbydoxdox · Mar 3, 2022 · 2ac206f · 2ac206f
2 parents a74a059 + ff07ffc
commit 2ac206f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/doxdox-parser-jsdoc/.gitignore b/packages/doxdox-parser-jsdoc/.gitignore
@@ -1,7 +1,5 @@
 node_modules/
 
-cache/
-
 coverage/
 
 dist/
diff --git a/packages/doxdox-parser-jsdoc/package.json b/packages/doxdox-parser-jsdoc/package.json
@@ -27,6 +27,7 @@
     "@types/temp": "0.9.1",
     "@typescript-eslint/eslint-plugin": "5.13.0",
     "@typescript-eslint/parser": "5.13.0",
+    "copyfiles": "2.4.1",
     "eslint": "8.10.0",
     "jest": "27.5.1",
     "rimraf": "3.0.2",
@@ -35,7 +36,7 @@
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --runInBand --passWithNoTests",
-    "build": "rimraf dist/ && tsc",
+    "build": "rimraf dist/ && tsc && copyfiles -u 1 src/config.json dist/",
     "lint": "eslint 'src/**/*.ts'"
   },
   "jest": {

diff --git a/packages/doxdox-parser-jsdoc/src/config.json b/packages/doxdox-parser-jsdoc/src/config.json
@@ -0,0 +1,5 @@
+{
+  "source": {
+    "excludePattern": ""
+  }
+}
diff --git a/packages/doxdox-parser-jsdoc/src/index.ts b/packages/doxdox-parser-jsdoc/src/index.ts
@@ -16,9 +16,9 @@ import { Jsdoc } from './types';
 
 const parser = async (cwd: string, path: string): Promise<File> => {
     try {
-        const nodeModulesDir = await findParentNodeModules(
-            dirname(sanitizePath(import.meta.url))
-        );
+        const parserDir = dirname(sanitizePath(import.meta.url));
+
+        const nodeModulesDir = await findParentNodeModules(parserDir);
 
         if (!nodeModulesDir) {
             throw new Error('node_modules directory was not found');
@@ -29,7 +29,12 @@ const parser = async (cwd: string, path: string): Promise<File> => {
                 nodeModulesDir,
                 `.bin/${platform() === 'win32' ? 'jsdoc.cmd' : 'jsdoc'}`
             ),
-            ['--explain', join(cwd, path)]
+            [
+                '--explain',
+                join(cwd, path),
+                '--configure',
+                join(parserDir, 'config.json')
+            ]
         );
 
         const docs = JSON.parse(output) as Jsdoc[];
@@ -100,12 +105,11 @@ const parser = async (cwd: string, path: string): Promise<File> => {
 
 export const parseString = async (
     path: string,
-    content: string,
-    cacheDir = './cache'
+    content: string
 ): Promise<File> => {
     temp.track();
 
-    const tempDir = await temp.mkdir({ prefix: 'doxdox-', dir: cacheDir });
+    const tempDir = await temp.mkdir({ prefix: 'doxdox-' });
 
     const tempPath = join(tempDir, path);