nodalis-compiler 1.0.23 → 1.0.24

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.24] 2026-03-04
+- Added support for CONFIGURATION, RESOURCE, TASK, and PROGRAM (instance) keywords in ST.
+- Added "required" arrays to programmers for communicating required parameters beyond the base params when calling program.
+
 ## [1.0.23] 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.

package/package.json

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

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
 import { Compiler, IECLanguage, OutputType, CommunicationProtocol } from './Compiler.js';
 import * as iec from './iec-parser/parser.js';
-import { parseStructuredText } from './st-parser/parser.js';
+import { parseStructuredText, buildCompilerMetadataDirectives } from './st-parser/parser.js';
 import { transpile } from './st-parser/gcctranspiler.js';
 import { DEFAULT_ARDUINO_FQBN } from './arduinoDefaults.js';
 import { getManagedArduinoCliPath, getManagedArduinoCliExecOptions } from '../toolchains.js';
@@ -161,7 +161,9 @@ export class ArduinoCompiler extends Compiler {
         let taskCode = '';
         let mapCode = '';
 
-        const lines = sourceCode.split('\n');
+        const metadataDirectives = buildCompilerMetadataDirectives(parsed);
+        const metadataAwareSource = metadataDirectives.length > 0 ? `${metadataDirectives}${sourceCode}` : sourceCode;
+        const lines = metadataAwareSource.split('\n');
         lines.forEach((line) => {
             if (line.trim().startsWith('//Task=')) {
                 const task = JSON.parse(line.substring(line.indexOf('=') + 1).trim());

package/src/compilers/CPPCompiler.js

@@ -20,7 +20,7 @@ import fs from 'fs';
 import path from "path";
 import { Compiler, IECLanguage, OutputType, CommunicationProtocol } from './Compiler.js';
 import * as iec from "./iec-parser/parser.js";
-import { parseStructuredText } from './st-parser/parser.js';
+import { parseStructuredText, buildCompilerMetadataDirectives } from './st-parser/parser.js';
 import { transpile } from './st-parser/gcctranspiler.js';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
@@ -146,7 +146,9 @@ export class CPPCompiler extends Compiler {
         if(typeof resourceName !== "undefined" && resourceName !== null){
             plcname = resourceName;
         }
-        const lines = sourceCode.split("\n");
+        const metadataDirectives = buildCompilerMetadataDirectives(parsed);
+        const metadataAwareSource = metadataDirectives.length > 0 ? `${metadataDirectives}${sourceCode}` : sourceCode;
+        const lines = metadataAwareSource.split("\n");
         lines.forEach((line) => {
             if(line.trim().startsWith("//Task=")){
                 var task = JSON.parse(line.substring(line.indexOf("=") + 1).trim());

package/src/compilers/JSCompiler.js

@@ -19,7 +19,7 @@ import os from "os";
 import path from "path";
 import { Compiler, IECLanguage, OutputType, CommunicationProtocol } from './Compiler.js';
 import * as iec from "./iec-parser/parser.js";
-import { parseStructuredText } from './st-parser/parser.js';
+import { parseStructuredText, buildCompilerMetadataDirectives } from './st-parser/parser.js';
 import { transpile } from './st-parser/jstranspiler.js';
 import which from "which";
 import { fileURLToPath } from "url";
@@ -114,7 +114,9 @@ export class JSCompiler extends Compiler {
         if(typeof resourceName !== "undefined" && resourceName !== null){
             plcname = resourceName;
         }
-        const lines = sourceCode.split("\n");
+        const metadataDirectives = buildCompilerMetadataDirectives(parsed);
+        const metadataAwareSource = metadataDirectives.length > 0 ? `${metadataDirectives}${sourceCode}` : sourceCode;
+        const lines = metadataAwareSource.split("\n");
         lines.forEach((line) => {
             if(line.trim().startsWith("//Task=")){
                 var task = JSON.parse(line.substring(line.indexOf("=") + 1).trim());

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

@@ -32,6 +32,15 @@ import { tokenize } from './tokenizer.js';
 export function parseStructuredText(code) {
   const tokens = tokenize(code);
   let position = 0;
+  const TOP_LEVEL_STARTERS = new Set([
+    'PROGRAM',
+    'FUNCTION',
+    'FUNCTION_BLOCK',
+    'VAR_GLOBAL',
+    'CONFIGURATION',
+    'RESOURCE',
+    'TASK'
+  ]);
 
   function peek(offset = 0) {
     return tokens[position + offset];
@@ -55,19 +64,101 @@ export function parseStructuredText(code) {
 
     switch (token.value.toUpperCase()) {
       case 'PROGRAM':
-        return parseProgram();
+        return parseProgramOrInstance();
       case 'FUNCTION':
         return parseFunction();
       case 'FUNCTION_BLOCK':
         return parseFunctionBlock();
       case 'VAR_GLOBAL':
         return parseGlobalVarSection();
+      case 'TASK':
+        return parseTask();
+      case 'CONFIGURATION':
+        return parseContainer('CONFIGURATION', 'END_CONFIGURATION');
+      case 'RESOURCE':
+        return parseContainer('RESOURCE', 'END_RESOURCE');
       default:
         consume();
         return null;
     }
   }
 
+  function parseContainer(startKeyword, endKeyword) {
+    expect(startKeyword);
+    const blocks = [];
+
+    while (peek() && peek().value.toUpperCase() !== endKeyword) {
+      const upper = peek().value.toUpperCase();
+      if (TOP_LEVEL_STARTERS.has(upper)) {
+        const block = parseBlock();
+        if (Array.isArray(block)) blocks.push(...block);
+        else if (block) blocks.push(block);
+      } else {
+        consume();
+      }
+    }
+
+    expect(endKeyword);
+    return blocks;
+  }
+
+  function parseTask() {
+    expect('TASK');
+    const name = consume().value;
+    let interval = '1000';
+    let priority = '1';
+
+    if (peek()?.value === '(') {
+      consume();
+      while (peek() && peek().value !== ')') {
+        const key = consume().value.toUpperCase();
+        if (peek()?.value === ':=') consume();
+
+        const valueTokens = [];
+        while (peek() && peek().value !== ',' && peek().value !== ')') {
+          valueTokens.push(consume().value);
+        }
+        const value = valueTokens.join('');
+
+        if (key === 'INTERVAL') interval = normalizeTaskInterval(value);
+        else if (key === 'PRIORITY') priority = normalizeNumericString(value, '1');
+
+        if (peek()?.value === ',') consume();
+      }
+      expect(')');
+    }
+
+    if (peek()?.value === ';') consume();
+    return { type: 'TaskDeclaration', name, interval, priority };
+  }
+
+  function normalizeNumericString(value, fallback) {
+    const match = String(value || '').match(/-?\d+/);
+    return match ? match[0] : fallback;
+  }
+
+  function normalizeTaskInterval(value) {
+    const text = String(value || '').trim();
+    if (!text) return '1000';
+
+    if (/^-?\d+$/.test(text)) return text;
+
+    const duration = text.match(/^T#?([+-]?\d+(?:\.\d+)?)(MS|S|M|H|D)?$/i);
+    if (!duration) return normalizeNumericString(text, '1000');
+
+    const amount = Number(duration[1]);
+    const unit = (duration[2] || 'MS').toUpperCase();
+    const multipliers = {
+      MS: 1,
+      S: 1000,
+      M: 60000,
+      H: 3600000,
+      D: 86400000
+    };
+    const ms = Math.round(amount * (multipliers[unit] || 1));
+    return String(ms);
+  }
+
   function parseGlobalVarSection() {
     expect('VAR_GLOBAL');
     const variables = [];
@@ -342,9 +433,22 @@ function parseStatementsUntil(endTokens) {
     return peek(1)?.value === ':' || peek(1)?.value === ',';
   }
 
-  function parseProgram() {
+  function parseProgramOrInstance() {
     expect('PROGRAM');
     const name = consume().value;
+
+    if (peek()?.value?.toUpperCase() === 'WITH' || peek()?.value === ':') {
+      let associatedTaskName = '';
+      if (peek()?.value?.toUpperCase() === 'WITH') {
+        consume();
+        associatedTaskName = consume().value;
+      }
+      expect(':');
+      const typeName = consume().value;
+      if (peek()?.value === ';') consume();
+      return { type: 'ProgramInstanceDeclaration', name, typeName, associatedTaskName };
+    }
+
     const vars = [];
     const stmts = [];
 
@@ -395,8 +499,21 @@ function parseStatementsUntil(endTokens) {
   const body = [];
   while (position < tokens.length) {
     const block = parseBlock();
-    if (block) body.push(block);
+    if (Array.isArray(block)) body.push(...block);
+    else if (block) body.push(block);
   }
 
   return { type: 'Program', body };
 }
+
+export function buildCompilerMetadataDirectives(ast) {
+  const lines = [];
+  for (const block of ast?.body || []) {
+    if (block?.type === 'TaskDeclaration') {
+      lines.push(`//Task={"Name":"${block.name}", "Interval":"${block.interval}", "Priority":"${block.priority}"}`);
+    } else if (block?.type === 'ProgramInstanceDeclaration') {
+      lines.push(`//Instance={"TypeName":"${block.typeName}", "Name":"${block.name}", "AssociatedTaskName":"${block.associatedTaskName || ''}"}`);
+    }
+  }
+  return lines.join('\n') + (lines.length > 0 ? '\n' : '');
+}

package/src/nodalis.js

@@ -104,7 +104,8 @@ export class Nodalis {
   listProgrammers() {
     return this.programmers.map(p => ({
       name: p.name,
-      target: p.target
+      target: p.target,
+      required: p.required
     }));
   }
 

package/src/programmers/ArduinoProgrammer.js

@@ -23,6 +23,7 @@ export class ArduinoProgrammer extends Programmer {
     super(options);
     this.name = 'ArduinoProgrammer';
     this.target = 'arduino';
+    this.required = ["fqbn"];
   }
 
   async program() {

package/src/programmers/FileProgrammer.js

@@ -32,6 +32,7 @@ export class FileProgrammer extends Programmer {
     super(options);
     this.name = 'FileProgrammer';
     this.target = 'FILE';
+    this.required = [];
   }
 
   async program() {

package/src/programmers/MTIProgrammer.js

@@ -26,6 +26,7 @@ export class MTIProgrammer extends Programmer {
         super(options);
         this.name = "MTIProgrammer";
         this.target = "MTI";
+        this.required = [];
     }
 
     async program() {

package/src/programmers/SSHProgrammer.js

@@ -37,6 +37,7 @@ export class SSHProgrammer extends Programmer {
     super(options);
     this.name = 'SSHProgrammer';
     this.target = 'SSH';
+    this.required = ["username", "password"];
   }
 
   async program() {