nodalis-compiler 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),  
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.6]
+
+- Fixed issue with JS compile where program was not compiling exactly right.
+- Integrated latest version of mticp-npm.
+
+## [1.0.5]
+
+- Changed JSCompiler to avoid including the setup and run functions if we are just compiling generic ST.
+
 ## [1.0.4]
 
 - Added support for TypeScript types.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodalis-compiler",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Compiles IEC-61131-3/10 languages into code that can be used as a PLC on multiple platforms.",
   "icon": "nodalis.png",
   "main": "src/nodalis.js",

package/src/compilers/Compiler.js

@@ -39,9 +39,10 @@ export const CommunicationProtocol = Object.freeze({
 
 /**
  * @typedef {Object} CompilerOptions
- * @property {string} source - Source file or folder path
- * @property {string} destination - Output destination folder path
- * @property {string} language - One of IECLanguage values
+ * @property {string} sourcePath - Source file or folder path
+ * @property {string} outputPath - Output destination folder path
+ * @property {string} target - The target type for the compiler.
+ * @property {string} resourceName - The name of the resource to compile, if IEC.
  * @property {string} outputType - One of OutputType values
  */
 

package/src/compilers/JSCompiler.js

@@ -174,7 +174,7 @@ export class JSCompiler extends Compiler {
 `${includes}
 ${transpiledCode}
 ${target === "nodejs" ? `let opcServer = new OPCServer();`: ""}
-export async function setup(){
+${taskCode !== "" ? `export async function setup(){
     ${mapCode}
 
     ${target === "nodejs" ? "opcServer.setReadWriteHandlers(readAddress, writeAddress);\n" + `await opcServer.start();\n` + globals.join("\n") : ""}
@@ -186,7 +186,7 @@ export function run(){
     ${taskCode}
     
 }
-`;
+` : ""}`;
         if(target === "nodejs"){
             jsCode += "\nsetup();\nrun();";
         }

package/src/compilers/SkipCompiler.js

@@ -59,15 +59,22 @@ export class SkipCompiler extends Compiler {
             throw new Error("Invalid target. Must be IEC, ST, or XML target.");
         }
         else {
-            const action = "to" + target;
+            let action = "to" + target;
             if (!fs.existsSync(outputPath)) {
                 fs.mkdirSync(outputPath);
             }
+            let tojint = false;
+            if (action === "tojint") {
+                action = "tost";
+                tojint = true;
+            }
             runMticp([
                 `action=${action}`,
                 `src=${sourcePath}`,
                     `dst=${outputPath}`
-            ]).then(output => console.log(output))
+            ]).then(output => {
+                console.log(output);
+            })
                 .catch(err => console.error(err));
         }
     }

package/src/compilers/st-parser/expressionConverter.js

@@ -15,6 +15,7 @@
 // limitations under the License.
 
 
+
 /**
  * @description Expression Converter
  * @author Nathan Skipper, MTI
@@ -72,7 +73,7 @@ export function convertExpression(expr, isjsfb = false, jsfbVars = [], isjs=fals
   results = tokens.join(' ');
   // Replace %I/Q/M references
   const parts = results.split(/\s+/);
-  results = parts.map(e => {
+  results = parts.map((e, index, tks) => {
     // Don't touch raw address reads
     if (/^%[IQM][XBWDL]?\d+(\.\d+)?$/i.test(e)) return getReadAddressExpression(e);
 
@@ -84,7 +85,8 @@ export function convertExpression(expr, isjsfb = false, jsfbVars = [], isjs=fals
 
     // Don't wrap dot-bit references already processed
     if (/^&?[A-Za-z_]\w*\.\d+$/.test(e)) return e;
-
+    // token is a function call
+    if (tks.length > index && tks[index + 1] === "(") return e;
     // Otherwise, wrap in resolve()
     if(isjs)
       return `resolve(${e})`;

package/src/compilers/st-parser/jstranspiler.js

@@ -42,7 +42,7 @@ export function transpile(ast) {
 
       case 'ProgramDeclaration':
         lines.push(`export function ${block.name}() { // PROGRAM:${block.name}`);
-        lines.push(...declareVars(block.varSections),false, block.name);
+        lines.push(...declareVars(block.varSections, false, block.name));
         lines.push(...transpileStatements(block.statements));
         lines.push('}');
         break;

package/src/compilers/st-parser/parser.js

@@ -304,12 +304,13 @@ function parseStatementsUntil(endTokens) {
     while (peek() && peek().value.toUpperCase().startsWith('VAR')) {
       vars.push(...parseVarSection());
     }
+
+    stmts.push(...parseStatements('END_PROGRAM'));
     vars.forEach((v) => {
-      if(mapType(v.type) === "auto"){
-        stmts.push({type: "CALL", name: v.name});
+      if (mapType(v.type) === "auto") {
+        stmts.push({ type: "CALL", name: v.name });
       }
     });
-    stmts.push(...parseStatements('END_PROGRAM'));
     expect('END_PROGRAM');
 
     return { type: 'ProgramDeclaration', name, varSections: vars, statements: stmts };
@@ -326,12 +327,13 @@ function parseStatementsUntil(endTokens) {
     while (peek() && peek().value.toUpperCase().startsWith('VAR')) {
       vars.push(...parseVarSection());
     }
+
+    stmts.push(...parseStatements('END_FUNCTION'));
     vars.forEach((v) => {
-      if(mapType(v.type) === "auto"){
-        stmts.push({type: "CALL", name: v.name});
+      if (mapType(v.type) === "auto") {
+        stmts.push({ type: "CALL", name: v.name });
       }
     });
-    stmts.push(...parseStatements('END_FUNCTION'));
     expect('END_FUNCTION');
 
     return { type: 'FunctionDeclaration', name, returnType, varSections: vars, statements: stmts };
@@ -346,12 +348,13 @@ function parseStatementsUntil(endTokens) {
     while (peek() && peek().value.toUpperCase().startsWith('VAR')) {
       vars.push(...parseVarSection());
     }
+
+    stmts.push(...parseStatements('END_FUNCTION_BLOCK'));
     vars.forEach((v) => {
-      if(mapType(v.type) === "auto"){
-        stmts.push({type: "CALL", name: v.name});
+      if (mapType(v.type) === "auto") {
+        stmts.push({ type: "CALL", name: v.name });
       }
     });
-    stmts.push(...parseStatements('END_FUNCTION_BLOCK'));
     expect('END_FUNCTION_BLOCK');
 
     return { type: 'FunctionBlockDeclaration', name, varSections: vars, statements: stmts };