Merge pull request #19 from MatthewBlanski/feature/moreJSONConfig

Fixed bug with relative path parsing
MatthewBlanski · Aug 23, 2020 · d98e487 · d98e487
2 parents 8786f3a + b6c5dee
commit d98e487
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/apexDoc.js b/src/apexDoc.js
@@ -21,7 +21,6 @@ class ApexDoc {
         const sfdxProjectJsonParser = new SFDXProjectJsonParser(this.sourceDirectory);
         this.packageDirectories = sfdxProjectJsonParser.getPackageDirectories();
 
-        this.apexParser = new ApexParser(apexDocJsonParser);
         this.fm = new FileManager(apexDocJsonParser);
     }
 
@@ -42,6 +41,7 @@ class ApexDoc {
 
     //TODO: Name this better
     mainLogic() {
+        this.apexParser = new ApexParser(this.accessModifiers,this.sourceDirectory);
         const filesArray = this.getClassFilesFromPackageDirectories();
 
         //Create a new array of ClassModels

diff --git a/src/apexParsing/apexParser.js b/src/apexParsing/apexParser.js
@@ -5,8 +5,9 @@ const MethodModel = require('../apexmodels/methodModel.js');
 const PropertyModel = require('../apexmodels/propertyModel.js');
 
 class ApexParser {
-    constructor(apexDocJsonParser) {
-        this.accessModifiers = apexDocJsonParser.getAccessModifiers();
+    constructor(accessModifiers,sourceDirectory) {
+        this.accessModifiers = accessModifiers;
+        this.sourceDirectory = sourceDirectory;
     }
 
     parseFileContents(filePath) {

diff --git a/src/config/apexDocJsonParser.js b/src/config/apexDocJsonParser.js
@@ -21,7 +21,7 @@ class ApexDocJSONParser {
         if(!this.apexDocJSON) {
             const rawJSON = this.readApexDocJSON();
             if(rawJSON) {
-                this.apexDocJSON = JSON.parse();
+                this.apexDocJSON = JSON.parse(rawJSON);
             } else {
                 this.apexDocJSON = {};
             }