nodalis-compiler 1.0.28 → 1.0.30

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.0.30] 2026-03-30
+- Fixed issue with boolean assignments in C++
+
+## [1.0.29] 2026-03-24
+- Fixed issues with bunding ST folder and reporting errors.
+- Improved support for loop structures.
+
 ## [1.0.28] 2026-03-23
 - Improved support for Arduino, fully tested Arduino compile -> program stack.
 - Added a command line interface for nodalis on Arduino to use in setting IP, read/write of bits, and map info.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodalis-compiler",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "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/ArduinoCompiler.js

@@ -92,6 +92,7 @@ export class ArduinoCompiler extends Compiler {
         const sourceIsDirectory = sourcePathStat.isDirectory();
         const isStructuredTextLanguage = String(language || '').toUpperCase() === IECLanguage.STRUCTURED_TEXT;
         const directoryBundleMode = sourceIsDirectory && isStructuredTextLanguage && typeof resourceName === 'string' && resourceName.trim().length > 0;
+        let bundleFileLineMappings = [];
         let compilerConfig = {};
 
         const sourceDir = sourceIsDirectory ? sourcePath : path.dirname(sourcePath);
@@ -114,15 +115,20 @@ export class ArduinoCompiler extends Compiler {
         let bundleEntryProgram = '';
         if (directoryBundleMode) {
             this.cleanupStructuredTextBundleArtifacts(sourcePath);
-            const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
+            const { combinedSource, entryProgramName, fileLineMappings } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
+            bundleFileLineMappings = fileLineMappings;
         } else {
             sourceCode = fs.readFileSync(sourcePath, 'utf-8');
         }
         const sketchName = path.basename(path.resolve(outputPath));
         const inoFile = path.join(outputPath, `${sketchName}.ino`);
         const stFile = path.join(outputPath, directoryBundleMode ? 'nodalisplc.st' : `${filename}.st`);
+        if (directoryBundleMode) {
+            fs.mkdirSync(outputPath, { recursive: true });
+            fs.writeFileSync(stFile, sourceCode);
+        }
         if (sourcePath.toLowerCase().endsWith('.iec') || sourcePath.toLowerCase().endsWith('.xml')) {
             if (typeof resourceName === 'undefined' || resourceName === null || resourceName.length === 0) {
                 throw new Error('You must provide the resourceName option for an IEC project file.');
@@ -152,8 +158,8 @@ export class ArduinoCompiler extends Compiler {
             }
         }
 
-        const parsed = parseStructuredText(sourceCode);
-        const transpiledCode = transpile(parsed);
+        const parsed = this.parseStructuredTextWithBundleContext(parseStructuredText, sourceCode, bundleFileLineMappings);
+        const transpiledCode = this.transpileStructuredTextWithBundleContext(transpile, parsed, bundleFileLineMappings);
 
         let tasks = [];
         let programs = [];
@@ -285,7 +291,7 @@ void loop() {
 
         fs.mkdirSync(outputPath, { recursive: true });
         fs.writeFileSync(inoFile, inoCode);
-        if (sourcePath.toLowerCase().endsWith('.iec') || sourcePath.toLowerCase().endsWith('.xml') || directoryBundleMode) {
+        if (sourcePath.toLowerCase().endsWith('.iec') || sourcePath.toLowerCase().endsWith('.xml')) {
             fs.writeFileSync(stFile, sourceCode);
         }
 
@@ -333,50 +339,6 @@ void loop() {
         }
     }
 
-    loadStructuredTextBundle(sourcePath, resourceName) {
-        const stFiles = this.listStructuredTextBundleFiles(sourcePath);
-
-        if (stFiles.length === 0) {
-            throw new Error(`No .st files found in source directory "${sourcePath}".`);
-        }
-
-        const normalizedResource = String(resourceName || '').trim();
-        const candidateNames = new Set([
-            normalizedResource,
-            normalizedResource.toLowerCase(),
-            normalizedResource.toLowerCase().endsWith('.st') ? normalizedResource.toLowerCase() : `${normalizedResource.toLowerCase()}.st`
-        ]);
-
-        const entryFile = stFiles.find((file) => {
-            const lower = file.toLowerCase();
-            return candidateNames.has(file) || candidateNames.has(lower);
-        });
-
-        if (!entryFile) {
-            throw new Error(`resourceName "${resourceName}" is not an .st file in "${sourcePath}".`);
-        }
-
-        const orderedFiles = [
-            ...stFiles.filter((file) => file !== entryFile).sort((a, b) => a.localeCompare(b)),
-            entryFile
-        ];
-
-        const combinedSource = orderedFiles
-            .map((file) => fs.readFileSync(path.join(sourcePath, file), 'utf-8').trim())
-            .filter((text) => text.length > 0)
-            .join('\n\n');
-
-        const entrySource = fs.readFileSync(path.join(sourcePath, entryFile), 'utf-8');
-        const entryProgramName = this.extractFirstProgramName(entrySource) || path.basename(entryFile, path.extname(entryFile));
-
-        return { combinedSource, entryProgramName };
-    }
-
-    extractFirstProgramName(sourceCode) {
-        const match = String(sourceCode || '').match(/^\s*PROGRAM\s+([A-Za-z_]\w*)/im);
-        return match ? match[1] : null;
-    }
-
     resolveArduinoFqbn(target, compilerConfig = {}) {
         const explicit = compilerConfig.arduino_fqbn || compilerConfig.arduinoFqbn;
         if (explicit && typeof explicit === 'string' && explicit.includes(':')) {

package/src/compilers/CPPCompiler.js

@@ -71,6 +71,7 @@ export class CPPCompiler extends Compiler {
         const sourceIsDirectory = sourcePathStat.isDirectory();
         const isStructuredTextLanguage = String(language || '').toUpperCase() === IECLanguage.STRUCTURED_TEXT;
         const directoryBundleMode = sourceIsDirectory && isStructuredTextLanguage && typeof resourceName === 'string' && resourceName.trim().length > 0;
+        let bundleFileLineMappings = [];
 
         ToolChain = { ...getDefaultToolchain() };
         const sourceDir = sourceIsDirectory ? sourcePath : path.dirname(sourcePath);
@@ -97,15 +98,20 @@ export class CPPCompiler extends Compiler {
 
         if (directoryBundleMode) {
             this.cleanupStructuredTextBundleArtifacts(sourcePath);
-            const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
+            const { combinedSource, entryProgramName, fileLineMappings } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
+            bundleFileLineMappings = fileLineMappings;
         } else {
             sourceCode = fs.readFileSync(sourcePath, 'utf-8');
         }
 
         const cppFile = path.join(outputPath, `${filename}.cpp`);
         const stFile = path.join(outputPath, directoryBundleMode ? 'nodalisplc.st' : `${filename}.st`);
+        if (directoryBundleMode) {
+            fs.mkdirSync(outputPath, { recursive: true });
+            fs.writeFileSync(stFile, sourceCode);
+        }
         if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml")){
             if(typeof resourceName === "undefined" || resourceName === null || resourceName.length === 0){
                 throw new Error("You must provide the resourceName option for an IEC project file.");
@@ -134,8 +140,8 @@ export class CPPCompiler extends Compiler {
                 throw new Error("No resource was found by the name " + resourceName + " or the resource could not be parsed.");
             }
         }
-        const parsed = parseStructuredText(sourceCode);
-        const transpiledCode = transpile(parsed);
+        const parsed = this.parseStructuredTextWithBundleContext(parseStructuredText, sourceCode, bundleFileLineMappings);
+        const transpiledCode = this.transpileStructuredTextWithBundleContext(transpile, parsed, bundleFileLineMappings);
 
         let tasks = [];
         let programs = [];
@@ -247,7 +253,7 @@ int main() {
 
         fs.mkdirSync(outputPath, { recursive: true });
         fs.writeFileSync(cppFile, cppCode);
-        if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml") || directoryBundleMode){
+        if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml")){
             fs.writeFileSync(stFile, sourceCode);
         }
         const coreDir = path.resolve(__dirname + '/support/generic');
@@ -400,50 +406,6 @@ int main() {
         return null;
     }
 
-    loadStructuredTextBundle(sourcePath, resourceName) {
-        const stFiles = this.listStructuredTextBundleFiles(sourcePath);
-
-        if (stFiles.length === 0) {
-            throw new Error(`No .st files found in source directory "${sourcePath}".`);
-        }
-
-        const normalizedResource = String(resourceName || '').trim();
-        const candidateNames = new Set([
-            normalizedResource,
-            normalizedResource.toLowerCase(),
-            normalizedResource.toLowerCase().endsWith('.st') ? normalizedResource.toLowerCase() : `${normalizedResource.toLowerCase()}.st`
-        ]);
-
-        const entryFile = stFiles.find((file) => {
-            const lower = file.toLowerCase();
-            return candidateNames.has(file) || candidateNames.has(lower);
-        });
-
-        if (!entryFile) {
-            throw new Error(`resourceName "${resourceName}" is not an .st file in "${sourcePath}".`);
-        }
-
-        const orderedFiles = [
-            ...stFiles.filter((file) => file !== entryFile).sort((a, b) => a.localeCompare(b)),
-            entryFile
-        ];
-
-        const combinedSource = orderedFiles
-            .map((file) => fs.readFileSync(path.join(sourcePath, file), 'utf-8').trim())
-            .filter((text) => text.length > 0)
-            .join('\n\n');
-
-        const entrySource = fs.readFileSync(path.join(sourcePath, entryFile), 'utf-8');
-        const entryProgramName = this.extractFirstProgramName(entrySource) || path.basename(entryFile, path.extname(entryFile));
-
-        return { combinedSource, entryProgramName };
-    }
-
-    extractFirstProgramName(sourceCode) {
-        const match = String(sourceCode || '').match(/^\s*PROGRAM\s+([A-Za-z_]\w*)/im);
-        return match ? match[1] : null;
-    }
-
     resolveTarget(target) {
         if (!target || typeof target !== 'string') {
             throw new Error('You must provide a valid target (e.g., linux-x64, macos-arm64).');

package/src/compilers/Compiler.js

@@ -91,6 +91,115 @@ export class Compiler {
       .map((entry) => entry.name);
   }
 
+  loadStructuredTextBundle(sourcePath, resourceName) {
+    const stFiles = this.listStructuredTextBundleFiles(sourcePath);
+
+    if (stFiles.length === 0) {
+      throw new Error(`No .st files found in source directory "${sourcePath}".`);
+    }
+
+    const normalizedResource = String(resourceName || '').trim();
+    const candidateNames = new Set([
+      normalizedResource,
+      normalizedResource.toLowerCase(),
+      normalizedResource.toLowerCase().endsWith('.st') ? normalizedResource.toLowerCase() : `${normalizedResource.toLowerCase()}.st`
+    ]);
+
+    const entryFile = stFiles.find((file) => {
+      const lower = file.toLowerCase();
+      return candidateNames.has(file) || candidateNames.has(lower);
+    });
+
+    if (!entryFile) {
+      throw new Error(`resourceName "${resourceName}" is not an .st file in "${sourcePath}".`);
+    }
+
+    const orderedFiles = [
+      ...stFiles.filter((file) => file !== entryFile).sort((a, b) => a.localeCompare(b)),
+      entryFile
+    ];
+
+    let combinedSource = '';
+    let currentLine = 1;
+    const fileLineMappings = [];
+
+    for (const file of orderedFiles) {
+      const fileSource = fs.readFileSync(path.join(sourcePath, file), 'utf-8').trim();
+      if (fileSource.length === 0) continue;
+
+      if (combinedSource.length > 0) {
+        combinedSource += '\n\n';
+        currentLine += 1;
+      }
+
+      const lineCount = fileSource.split('\n').length;
+      fileLineMappings.push({
+        file,
+        startLine: currentLine,
+        endLine: currentLine + lineCount - 1
+      });
+      combinedSource += fileSource;
+      currentLine += lineCount;
+    }
+
+    const entrySource = fs.readFileSync(path.join(sourcePath, entryFile), 'utf-8');
+    const entryProgramName = this.extractFirstProgramName(entrySource) || path.basename(entryFile, path.extname(entryFile));
+
+    return { combinedSource, entryProgramName, fileLineMappings };
+  }
+
+  extractFirstProgramName(sourceCode) {
+    const match = String(sourceCode || '').match(/^\s*PROGRAM\s+([A-Za-z_]\w*)/im);
+    return match ? match[1] : null;
+  }
+
+  annotateStructuredTextBundleError(error, fileLineMappings = []) {
+    if (!error?.line || !Array.isArray(fileLineMappings) || fileLineMappings.length === 0) {
+      return error;
+    }
+
+    const mapping = fileLineMappings.find(({ startLine, endLine }) => error.line >= startLine && error.line <= endLine);
+    if (!mapping) {
+      return error;
+    }
+
+    const localLine = error.line - mapping.startLine + 1;
+    const column = error.column ?? error.sourceLocation?.column ?? 1;
+    const baseMessage = String(error.message || 'Structured Text error').replace(
+      /\s+at line \d+, column \d+$/,
+      ''
+    );
+
+    error.bundleLine = error.line;
+    error.file = mapping.file;
+    error.line = localLine;
+    error.column = column;
+    error.sourceLocation = {
+      file: mapping.file,
+      line: localLine,
+      column,
+      bundleLine: error.bundleLine
+    };
+    error.message = `${baseMessage} in ${mapping.file} at line ${localLine}, column ${column} (bundle line ${error.bundleLine})`;
+    return error;
+  }
+
+  parseStructuredTextWithBundleContext(parseFn, sourceCode, fileLineMappings) {
+    try {
+      return parseFn(sourceCode);
+    } catch (error) {
+      throw this.annotateStructuredTextBundleError(error, fileLineMappings);
+    }
+  }
+
+  transpileStructuredTextWithBundleContext(transpileFn, parsed, fileLineMappings) {
+    try {
+      return transpileFn(parsed);
+    } catch (error) {
+      throw this.annotateStructuredTextBundleError(error, fileLineMappings);
+    }
+  }
+
   /** @returns {string[]} */
   get supportedLanguages() {
     throw new Error('supportedLanguages must be implemented by subclass.');

package/src/compilers/JSCompiler.js

@@ -60,20 +60,26 @@ export class JSCompiler extends Compiler {
         const sourceIsDirectory = sourcePathStat.isDirectory();
         const isStructuredTextLanguage = String(language || '').toUpperCase() === IECLanguage.STRUCTURED_TEXT;
         const directoryBundleMode = sourceIsDirectory && isStructuredTextLanguage && typeof resourceName === 'string' && resourceName.trim().length > 0;
+        let bundleFileLineMappings = [];
         const sourceName = directoryBundleMode ? resourceName : sourcePath;
         const filename = path.basename(sourceName, path.extname(sourceName));
         let sourceCode = '';
         let bundleEntryProgram = '';
         if (directoryBundleMode) {
             this.cleanupStructuredTextBundleArtifacts(sourcePath);
-            const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
+            const { combinedSource, entryProgramName, fileLineMappings } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
+            bundleFileLineMappings = fileLineMappings;
         } else {
             sourceCode = fs.readFileSync(sourcePath, 'utf-8');
         }
         const jsFile = path.join(outputPath, `nodalisplc.js`);
         const stFile = path.join(outputPath, directoryBundleMode ? 'nodalisplc.st' : `${filename}.st`);
+        if (directoryBundleMode) {
+            fs.mkdirSync(outputPath, { recursive: true });
+            fs.writeFileSync(stFile, sourceCode);
+        }
         if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml")){
             if(typeof resourceName === "undefined" || resourceName === null || resourceName.length === 0){
                 throw new Error("You must provide the resourceName option for an IEC project file.");
@@ -102,8 +108,8 @@ export class JSCompiler extends Compiler {
                 throw new Error("No resource was found by the name " + resourceName + " or the resource could not be parsed.");
             }
         }
-        const parsed = parseStructuredText(sourceCode);
-        const transpiledCode = transpile(parsed);
+        const parsed = this.parseStructuredTextWithBundleContext(parseStructuredText, sourceCode, bundleFileLineMappings);
+        const transpiledCode = this.transpileStructuredTextWithBundleContext(transpile, parsed, bundleFileLineMappings);
 
         let tasks = [];
         let programs = [];
@@ -231,7 +237,7 @@ export function run(){
         if (this.isExecutableOutput()) {
             fs.mkdirSync(binDir, { recursive: true });
         }
-        if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml") || directoryBundleMode){
+        if(sourcePath.toLowerCase().endsWith(".iec") || sourcePath.toLowerCase().endsWith(".xml")){
             fs.writeFileSync(stFile, sourceCode);
         }
         if(target === "nodejs"){
@@ -316,50 +322,6 @@ export function run(){
 
 }
 
-JSCompiler.prototype.loadStructuredTextBundle = function (sourcePath, resourceName) {
-    const stFiles = this.listStructuredTextBundleFiles(sourcePath);
-
-    if (stFiles.length === 0) {
-        throw new Error(`No .st files found in source directory "${sourcePath}".`);
-    }
-
-    const normalizedResource = String(resourceName || '').trim();
-    const candidateNames = new Set([
-        normalizedResource,
-        normalizedResource.toLowerCase(),
-        normalizedResource.toLowerCase().endsWith('.st') ? normalizedResource.toLowerCase() : `${normalizedResource.toLowerCase()}.st`
-    ]);
-
-    const entryFile = stFiles.find((file) => {
-        const lower = file.toLowerCase();
-        return candidateNames.has(file) || candidateNames.has(lower);
-    });
-
-    if (!entryFile) {
-        throw new Error(`resourceName "${resourceName}" is not an .st file in "${sourcePath}".`);
-    }
-
-    const orderedFiles = [
-        ...stFiles.filter((file) => file !== entryFile).sort((a, b) => a.localeCompare(b)),
-        entryFile
-    ];
-
-    const combinedSource = orderedFiles
-        .map((file) => fs.readFileSync(path.join(sourcePath, file), 'utf-8').trim())
-        .filter((text) => text.length > 0)
-        .join('\n\n');
-
-    const entrySource = fs.readFileSync(path.join(sourcePath, entryFile), 'utf-8');
-    const entryProgramName = this.extractFirstProgramName(entrySource) || path.basename(entryFile, path.extname(entryFile));
-
-    return { combinedSource, entryProgramName };
-};
-
-JSCompiler.prototype.extractFirstProgramName = function (sourceCode) {
-    const match = String(sourceCode || '').match(/^\s*PROGRAM\s+([A-Za-z_]\w*)/im);
-    return match ? match[1] : null;
-};
-
 function writePackageJson(outputDir,plcname) {
   const pkg = {
       name: "nodalisplc",

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

@@ -144,6 +144,41 @@ function mapStatement(stmt){
             ...transpileStatements(stmt.body)?.map(s => `  ${s}`),
             `}`
           ];
+        case 'EXIT':
+          return ['break;'];
+        case 'REPEAT': {
+          const cond = convertExpression(Array.isArray(stmt.condition) ? stmt.condition.join(' ') : stmt.condition);
+          return [
+            'do {',
+            ...transpileStatements(stmt.body)?.map(s => `  ${s}`),
+            `} while (!(${cond}));`
+          ];
+        }
+        case 'CASE': {
+          const expr = convertExpression(Array.isArray(stmt.expression) ? stmt.expression.join(' ') : stmt.expression);
+          const lines = [];
+
+          stmt.branches.forEach((branch, index) => {
+            const labels = String(branch.label || '')
+              .split(',')
+              .map((label) => label.trim())
+              .filter(Boolean);
+            const branchCondition = labels
+              .map((label) => `${expr} == ${convertExpression(label)}`)
+              .join(' || ');
+            lines.push(`${index === 0 ? 'if' : 'else if'} (${branchCondition}) {`);
+            lines.push(...transpileStatements(branch.body)?.map((s) => `  ${s}`));
+            lines.push('}');
+          });
+
+          if (stmt.elseBlock?.length) {
+            lines.push('else {');
+            lines.push(...transpileStatements(stmt.elseBlock)?.map((s) => `  ${s}`));
+            lines.push('}');
+          }
+
+          return lines;
+        }
       case "CALL": {
         const isFunctionBlockCall = isFunctionBlockInstance(stmt.name);
         const argParts = parseCallArguments(stmt.args || []);
@@ -234,6 +269,9 @@ function declareVars(varSections, inFunctionBlock = false) {
     else if (v.initialValue !== undefined && v.initialValue !== null) {
       init = ` = ${normalizeCppLiteral(v.initialValue)}`;
     }
+    else if (!isFunctionBlockType) {
+      init = '{}';
+    }
     if (isFunctionBlockType) {
       const functionBlockType = resolveFunctionBlockTypeName(rawType);
       const storagePrefix = (!inFunctionBlock && v.sectionType === 'VAR') ? 'static ' : '';

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

@@ -151,6 +151,9 @@ function mapStatement(stmt, infb = false) {
           `}`
         ];
 
+      case 'EXIT':
+        return ['break;'];
+
       case 'REPEAT': {
         const cond = convertExpression(stmt.condition, infb, fbVars,true);
         return [
@@ -160,6 +163,32 @@ function mapStatement(stmt, infb = false) {
         ];
       }
 
+      case 'CASE': {
+        const expr = convertExpression(stmt.expression, infb, fbVars, true);
+        const lines = [];
+
+        stmt.branches.forEach((branch, index) => {
+          const labels = String(branch.label || '')
+            .split(',')
+            .map((label) => label.trim())
+            .filter(Boolean);
+          const branchCondition = labels
+            .map((label) => `${expr} == ${convertExpression(label, infb, fbVars, true)}`)
+            .join(' || ');
+          lines.push(`${index === 0 ? 'if' : 'else if'} (${branchCondition}) {`);
+          lines.push(...transpileStatements(branch.body, infb).map(s => `  ${s}`));
+          lines.push('}');
+        });
+
+        if (stmt.elseBlock?.length) {
+          lines.push('else {');
+          lines.push(...transpileStatements(stmt.elseBlock, infb).map(s => `  ${s}`));
+          lines.push('}');
+        }
+
+        return lines;
+      }
+
       case 'CALL': {
         const targetName = resolveCallTarget(stmt.name, infb);
         const isFunctionBlockCall = isFunctionBlockInstance(stmt.name);

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

@@ -264,6 +264,11 @@ function parseStatement() {
   if (token.value.toUpperCase() === 'FOR') return parseFor();
   if (token.value.toUpperCase() === 'REPEAT') return parseRepeat();
   if (token.value.toUpperCase() === 'CASE') return parseCase();
+  if (token.value.toUpperCase() === 'EXIT') {
+    consume();
+    if (peek()?.value === ';') consume();
+    return withLoc({ type: 'EXIT' }, token);
+  }
 
   // Call statement like: Foo(...);
   if (token.type === 'IDENTIFIER' && peek(1)?.value === '(') {