nodalis-compiler 1.0.20 → 1.0.22

package/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## [1.0.20] 2026-03-03
+## [1.0.22] 2026-03-03
 - Changed IEC parser to interpret Function Blocks that are actually standard functions to a formal function call.
 - Fixed nodejs/jint compiles to put executables in a bin folder.
+- Fixed syntax errors with repeat.
+- Prevent stale files in ST bundle compile.
 
 ## [1.0.17] 2026-02-25
 - Added support for compilation of multiple ST files as a single project.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodalis-compiler",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "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

@@ -115,6 +115,7 @@ export class ArduinoCompiler extends Compiler {
         let sourceCode = '';
         let bundleEntryProgram = '';
         if (directoryBundleMode) {
+            this.cleanupStructuredTextBundleArtifacts(sourcePath);
             const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
@@ -285,9 +286,7 @@ void loop() {
     }
 
     loadStructuredTextBundle(sourcePath, resourceName) {
-        const stFiles = fs.readdirSync(sourcePath, { withFileTypes: true })
-            .filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith('.st'))
-            .map((entry) => entry.name);
+        const stFiles = this.listStructuredTextBundleFiles(sourcePath);
 
         if (stFiles.length === 0) {
             throw new Error(`No .st files found in source directory "${sourcePath}".`);

package/src/compilers/CPPCompiler.js

@@ -103,6 +103,7 @@ export class CPPCompiler extends Compiler {
         let bundleEntryProgram = '';
 
         if (directoryBundleMode) {
+            this.cleanupStructuredTextBundleArtifacts(sourcePath);
             const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
@@ -400,9 +401,7 @@ int main() {
     }
 
     loadStructuredTextBundle(sourcePath, resourceName) {
-        const stFiles = fs.readdirSync(sourcePath, { withFileTypes: true })
-            .filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith('.st'))
-            .map((entry) => entry.name);
+        const stFiles = this.listStructuredTextBundleFiles(sourcePath);
 
         if (stFiles.length === 0) {
             throw new Error(`No .st files found in source directory "${sourcePath}".`);

package/src/compilers/Compiler.js

@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import fs from 'fs';
 import path from 'path';
 
 export const IECLanguage = Object.freeze({
@@ -70,6 +71,26 @@ export class Compiler {
     return path.join(this.options.outputPath, 'bin');
   }
 
+  getStructuredTextBundleArtifactName() {
+    return 'nodalisplc.st';
+  }
+
+  cleanupStructuredTextBundleArtifacts(sourcePath) {
+    const artifactPath = path.join(sourcePath, this.getStructuredTextBundleArtifactName());
+    if (fs.existsSync(artifactPath) && fs.lstatSync(artifactPath).isFile()) {
+      fs.rmSync(artifactPath, { force: true });
+    }
+  }
+
+  listStructuredTextBundleFiles(sourcePath) {
+    const bundleArtifactName = this.getStructuredTextBundleArtifactName().toLowerCase();
+    return fs.readdirSync(sourcePath, { withFileTypes: true })
+      .filter((entry) => entry.isFile()
+        && entry.name.toLowerCase().endsWith('.st')
+        && entry.name.toLowerCase() !== bundleArtifactName)
+      .map((entry) => entry.name);
+  }
+
   /** @returns {string[]} */
   get supportedLanguages() {
     throw new Error('supportedLanguages must be implemented by subclass.');

package/src/compilers/JSCompiler.js

@@ -65,6 +65,7 @@ export class JSCompiler extends Compiler {
         let sourceCode = '';
         let bundleEntryProgram = '';
         if (directoryBundleMode) {
+            this.cleanupStructuredTextBundleArtifacts(sourcePath);
             const { combinedSource, entryProgramName } = this.loadStructuredTextBundle(sourcePath, resourceName);
             sourceCode = combinedSource;
             bundleEntryProgram = entryProgramName;
@@ -314,9 +315,7 @@ export function run(){
 }
 
 JSCompiler.prototype.loadStructuredTextBundle = function (sourcePath, resourceName) {
-    const stFiles = fs.readdirSync(sourcePath, { withFileTypes: true })
-        .filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith('.st'))
-        .map((entry) => entry.name);
+    const stFiles = this.listStructuredTextBundleFiles(sourcePath);
 
     if (stFiles.length === 0) {
         throw new Error(`No .st files found in source directory "${sourcePath}".`);

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

@@ -127,7 +127,7 @@ export function convertExpression(expr, isjsfb = false, jsfbVars = [], isjs=fals
     if (/^%[IQM][XBWDL]?\d+(\.\d+)?$/i.test(e)) return getReadAddressExpression(e);
 
     // Don't wrap literals or operators
-    if (/^(true|false|null|[+-]?\d+|[+-]?(?:(?:\d+\.\d*|\d*\.\d+)(?:[eE][+-]?\d+)?|\d+[eE][+-]?\d+)|0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-f]+|!|&&|\|\||==|!=|[<>=+\-*/(),&|^])$/i.test(e)) return e;
+    if (/^(true|false|null|[+-]?\d+|[+-]?(?:(?:\d+\.\d*|\d*\.\d+)(?:[eE][+-]?\d+)?|\d+[eE][+-]?\d+)|0[bB][01]+|0[oO][0-7]+|0[xX][0-9a-f]+|!|&&|\|\||==|!=|>=|<=|>|<|=|\+|-|\*|\/|%|\(|\)|,|&|\||\^)$/i.test(e)) return e;
 
     // Don't wrap known function expressions (e.g., getBit)
     if (/^getBit\(/.test(e)) return e;

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

@@ -292,9 +292,10 @@ function parseStatementsUntil(endTokens) {
     const body = parseStatements('UNTIL');
     expect('UNTIL');
     const condition = [];
-    while (peek() && peek().value !== ';') {
+    while (peek() && peek().value.toUpperCase() !== 'END_REPEAT') {
       condition.push(consume().value);
     }
+    expect('END_REPEAT');
     if (peek()?.value === ';') consume();
     return { type: 'REPEAT', condition, body };
   }

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

@@ -72,20 +72,25 @@ while ((match = regex.exec(code)) !== null) {
 }
 
 function normalizeNumericLiteral(value) {
-  const boolMatch = String(value).match(new RegExp(`^${BOOL_TYPE_PATTERN}#(TRUE|FALSE|1|0)$`, 'i'));
+  const literal = String(value);
+  const boolMatch = literal.match(new RegExp(`^${BOOL_TYPE_PATTERN}#(TRUE|FALSE|1|0)$`, 'i'));
   if (boolMatch) {
     const boolLiteral = boolMatch[1].toUpperCase();
     if (boolLiteral === 'TRUE' || boolLiteral === '1') return 'TRUE';
     return 'FALSE';
   }
 
-  const typedValue = String(value).replace(
+  const typedValue = literal.replace(
     new RegExp(`^(?:${INTEGER_TYPE_PATTERN}|${REAL_TYPE_PATTERN}|${BOOL_TYPE_PATTERN})#`, 'i'),
     ''
   );
 
   const match = typedValue.match(/^(2|8|16)#([0-9a-f_]+)$/i);
-  if (!match) return typedValue.replace(/_/g, '');
+  if (!match) {
+    const normalized = typedValue.replace(/_/g, '');
+    if (/^[+-]?\d+$/.test(normalized)) return normalizeDecimalIntegerLiteral(normalized);
+    return normalized;
+  }
   const radix = match[1];
   const digits = match[2].replace(/_/g, '');
   if (radix === '2') return `0b${digits}`;
@@ -93,6 +98,12 @@ function normalizeNumericLiteral(value) {
   return `0x${digits}`;
 }
 
+function normalizeDecimalIntegerLiteral(value) {
+  const sign = value.startsWith('-') ? '-' : '';
+  const digits = value.replace(/^[+-]?/, '').replace(/^0+(?=\d)/, '');
+  return `${sign}${digits || '0'}`;
+}
+
 function getTokenType(value) {
   const keywords = new Set([
     'PROGRAM', 'FUNCTION_BLOCK', 'FUNCTION', 'VAR_INPUT', 'VAR_OUTPUT', 'VAR', 'END_VAR',