Completing unit tests for Json2Mo translation

.gitignore

@@ -13,3 +13,4 @@ modelica-json.log
 /outputs
 /objects
 .DS_Store
+.nyc_output

InstallOnWindows.bat

@@ -11,6 +11,7 @@
 :: versions of JRE, add the higher version JRE path to the top of your "Path" environment
 
 :: Download and install Node.js: https://nodejs.org/en/download/
+:: Add nodejs folder to your "Path" environment
 
 :: set MODELICAPATH
 
@@ -19,7 +20,7 @@
 ::*******************************************************************
 :: Download maven
 echo ----------- Downloading Apache Maven ----------- 
-set MVNLink=https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip
+set MVNLink=https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip
 set MVNZip=%CD%\apache_maven.zip
 bitsadmin /transfer "Downloading MVN" %MVNLink% %MVNZip%
 

README.md

@@ -64,6 +64,8 @@ make clean-installation
 
 - Install [Java SE Development Kit (64-bit version)](https://www.oracle.com/java/technologies/javase-downloads.html), [Java Runtime Environment (64-bit version)](https://java.com/en/download/manual.jsp) and [Node.js](https://nodejs.org/en/download/).
 
+- Add `path\to\your\nodejs` to the `Path` environment.
+
 - In batch file `InstallOnWindows.bat`, update `JAVA_HOME` path in line `set JAVA_HOME=path\to\your\jdk`.
 
 - Finally, to install dependencies and compile the Java files, run `InstallOnWindows.bat`.
@@ -91,12 +93,18 @@ The only required input is the path of the file or package to be parsed.
 
 This parser can take a .mo file in input and produce three possible outputs, that can be specified with the argument -o :
 
+<<<<<<< HEAD
+- **raw-json** : detailed transcription of a Modelica file in JSON
+- **json**: simplified JSON format, easier to read an interpret
+- **semantic**: generate semantic model from semantic information included within `annotation` in the Modelica file
+=======
 - **raw-json** : intermediate JSON output, aligning closely with the Modelica syntax
 - **json**: simplified JSON format, to be used by all applications
 - **semantic**: generate a semantic model from the Modelica model, if annotations containing semantic information are present in the Modelica model
 
 This parser can also take a .json file as an input and if it aligns with the simplified JSON output format, a corresponding Modelica or CDL model can be generated using the followed argument in the output format (-o):
 - **modelica**: Generate a Modelica/CDL file (.mo) from a JSON file that conforms to the simplified JSON schema. 
+>>>>>>> ae0dee5722f82ce552a298c4e11fb05b1d90f5d9
 
 ##### --mode / -m
 
@@ -113,6 +121,11 @@ Logging level. The choices are `error`, `warn`, `info` (default), `verbose`, `de
 
 Specify the output directory. The default option is the current directory.
 
+##### --prettyPrint / -p
+
+Boolean flag to specify if prettyprint the JSON output. The default option is `false`.
+
+
 ## 4. JSON Schemas
 
 The JSON representation of Modelica and CDL models must be compliant with the corresponding JSON Schema. This is applicable for the JSON output, not for the raw-json one.

app.js

@@ -120,8 +120,13 @@ if (args.output === 'json') {
   } else {
     schema = path.join(`${__dirname}`, 'schema-modelica.json')
   }
+<<<<<<< HEAD
+  const jsonDir = (args.directory === 'current') ? process.cwd() : args.directory
+  let jsonFiles = ut.findFilesInDir(path.join(jsonDir, 'json'), '.json')
+=======
   console.log('parsing mode: ', schema)
   // let jsonFiles = ut.findFilesInDir(path.join(args.directory, 'json'), '.json')
+>>>>>>> ae0dee5722f82ce552a298c4e11fb05b1d90f5d9
   // exclude CDL folder and possibly Modelica folder
   // const pathSep = path.sep
   // const cdlPath = path.join(pathSep, 'CDL', pathSep)

lib/util.js

@@ -11,8 +11,9 @@ const Ajv = require('ajv')
  * element. Elements are separated by ':'
  */
 function getMODELICAPATH () {
+  const spe = process.platform.includes('win') ? ';' : ':'
   return (process.env.MODELICAPATH)
-    ? (process.cwd() + ':' + process.env.MODELICAPATH).split(':')
+    ? (process.cwd() + spe + process.env.MODELICAPATH).split(spe)
     : [process.cwd()]
 }