(feat) update dependencies and add a filename to the BaseFileException (

#41) * (feat) update dependencies and add a filename to the BaseFileException Signed-off-by: Dan Selman <[email protected]> * (fix) merge issues Signed-off-by: Dan Selman <[email protected]>
accordproject · Jun 25, 2019 · 533b80f · 533b80f
1 parent bde4353
commit 533b80f
Show file tree

Hide file tree

Showing 8 changed files with 1,445 additions and 1,090 deletions.
diff --git a/lib/basefileexception.js b/lib/basefileexception.js
@@ -27,16 +27,18 @@ const BaseException = require('./baseexception');
 class BaseFileException extends BaseException {
 
     /**
-     * Create an IllegalModelException
+     * Create an BaseFileException
      * @param {string} message - the message for the exception
      * @param {string} fileLocation - the optional file location associated with the exception
      * @param {string} fullMessage - the optional full message text
-     * @param {string} component - the optional component which throws this error
+     * @param {string} fileName - the optional file name
+      * @param {string} component - the optional component which throws this error
      */
-  constructor(message, fileLocation, fullMessage, component) {
+    constructor(message, fileLocation, fullMessage, fileName, component) {
         super(fullMessage ? fullMessage : message, component);
         this.fileLocation = fileLocation;
         this.shortMessage = message;
+        this.fileName = fileName;
     }
 
     /**
@@ -54,6 +56,14 @@ class BaseFileException extends BaseException {
     getShortMessage() {
         return this.shortMessage;
     }
+
+    /**
+     * Returns the fileName for the error
+     * @returns {string} the file name or null
+     */
+    getFileName() {
+        return this.fileName;
+    }
 }
 
 module.exports = BaseFileException;
diff --git a/lib/codegen/parsejs.js b/lib/codegen/parsejs.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const fs = require('fs-extra');
+const klaw = require('klaw');
 const path = require('path');
 const program = require('commander');
 const PlantUMLGenerator = require('./fromjs/plantumlgenerator');
@@ -48,7 +49,7 @@ function processFile(file, fileProcessor) {
  */
 function processDirectory(path, fileProcessor) {
     let items = [];
-    fs.walk(path)
+    klaw(path)
         .on('readable', function (item) {
             while ((item = this.read())) {
                 if (item.stats.isFile()) {

diff --git a/lib/introspect/illegalmodelexception.js b/lib/introspect/illegalmodelexception.js
@@ -40,7 +40,9 @@ class IllegalModelException extends BaseFileException {
     constructor(message, modelFile, fileLocation, component) {
 
         let messageSuffix = '';
+        let fileName = null;
         if(modelFile && modelFile.getName()) {
+            fileName = modelFile.getName();
             messageSuffix = 'File \'' + modelFile.getName() + '\': ' ;
         }
 
@@ -53,7 +55,7 @@ class IllegalModelException extends BaseFileException {
         // First character to be uppercase
         messageSuffix = messageSuffix.charAt(0).toUpperCase() + messageSuffix.slice(1);
 
-        super(message, fileLocation, message + ' ' + messageSuffix, component);
+        super(message, fileLocation, message + ' ' + messageSuffix, fileName, component);
         this.modelFile = modelFile;
     }
 

diff --git a/lib/introspect/parseexception.js b/lib/introspect/parseexception.js
@@ -43,7 +43,7 @@ class ParseException extends BaseFileException {
         }
 
         // The parser does not give us back the end location of an invalid token.
-        // Making the end column equal to the end column makes use of
+        // Making the end column equal to the start column makes use of
         // vscodes default behaviour of selecting an entire word
         if (fileLocation) {
             if (fileLocation.end && fileLocation.start) {
@@ -65,9 +65,8 @@ class ParseException extends BaseFileException {
         }
 
         fullMessage += suffix;
-        super(message, fileLocation, fullMessage, component);
+        super(message, fileLocation, fullMessage, fileName, component);
     }
-
 }
 
 module.exports = ParseException;