Convert TiaCodegen-ts to ESM: add .js extensions to all imports/exports

TiaCodegen-ts/package.json

@@ -2,11 +2,18 @@
   "name": "tia-codegen-ts",
   "version": "1.0.0",
   "description": "TypeScript port of TiaCodeGen C# library",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "scripts": {
     "build": "tsc",
-    "test": "jest --testPathPattern=tests",
+    "test": "node --experimental-vm-modules node_modules/jest-cli/bin/jest.js --testPathPattern=tests",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
@@ -17,8 +24,14 @@
     "typescript": "^5.4.5"
   },
   "jest": {
-    "preset": "ts-jest",
+    "preset": "ts-jest/presets/default-esm",
     "testEnvironment": "node",
-    "testMatch": ["**/tests/**/*.test.ts"]
+    "testMatch": ["**/tests/**/*.test.ts"],
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "transform": {
+      "^.+\\.tsx?$": ["ts-jest", {"useESM": true}]
+    }
   }
 }

TiaCodegen-ts/src/Blocks/Block.ts

@@ -1,5 +1,5 @@
-import { CodeBlock } from './CodeBlock';
-import { KopCodeHelper } from '../CodeGen/KopCodeHelper';
+import { CodeBlock } from './CodeBlock.js';
+import { KopCodeHelper } from '../CodeGen/KopCodeHelper.js';
 
 export class Block {
     name: string;

TiaCodegen-ts/src/Blocks/CodeBlock.ts

@@ -1,4 +1,4 @@
-import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal';
+import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal.js';
 
 export class CodeBlock extends BaseOperationOrSignal {
     name: string;

TiaCodegen-ts/src/Blocks/Network.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
-import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
+import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal.js';
 
 export class Network extends BaseOperationOrSignal {
     networkTitle: string | undefined;

TiaCodegen-ts/src/CodeGen/KopCodeHelper.ts

@@ -1,39 +1,39 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
-import { ICoil } from '../Interfaces/ICoil';
-import { IFunctionOperation } from '../Interfaces/IFunctionOperation';
-import { IPartName } from '../Interfaces/IPartName';
-import { StringBuilder } from '../utils/StringBuilder';
-import { flatten } from '../Internal/IEnumerableExtensions';
-import { NaturalComparer } from '../Extensions/NaturalComparer';
-import { CodeBlock } from '../Blocks/CodeBlock';
-import { Network } from '../Blocks/Network';
-import { And } from '../Commands/And';
-import { Or } from '../Commands/Or';
-import { Not } from '../Commands/Not';
-import { Distributor } from '../Commands/Distributor';
-import { Move } from '../Commands/Move';
-import { Convert } from '../Commands/Convert';
-import { S_Move } from '../Commands/S_Move';
-import { Signal } from '../Commands/Signals/Signal';
-import { BaseCoil } from '../Commands/Coils/BaseCoil';
-import { BaseNPCoil } from '../Commands/Coils/BaseNPCoil';
-import { Coil } from '../Commands/Coils/Coil';
-import { SCoil } from '../Commands/Coils/SCoil';
-import { RCoil } from '../Commands/Coils/RCoil';
-import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal';
-import { CompareOperator } from '../Commands/Comparisons/CompareOperator';
-import { InRangeCall } from '../Commands/Comparisons/InRangeCall';
-import { OutRangeCall } from '../Commands/Comparisons/OutRangeCall';
-import { FunctionCall } from '../Commands/Functions/Base/FunctionCall';
-import { FunctionBlockCall } from '../Commands/Functions/Base/FunctionBlockCall';
-import { SystemFunctionCall } from '../Commands/Functions/Base/SystemFunctionCall';
-import { SystemFunctionBlockCall } from '../Commands/Functions/Base/SystemFunctionBlockCall';
-import { ArithmeticCall } from '../Commands/Functions/Arithmetic/ArithmeticCall';
-import { VariableArithmeticCall } from '../Commands/Functions/Arithmetic/VariableArithmeticCall';
-import { AckGlCall } from '../Commands/Functions/AckGlCall';
-import { CTUCall } from '../Commands/Functions/CTUCall';
-import { CTUDCall } from '../Commands/Functions/CTUDCall';
-import { tryGetParent } from '../Extensions/OperationOrSignalExtensions';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
+import { ICoil } from '../Interfaces/ICoil.js';
+import { IFunctionOperation } from '../Interfaces/IFunctionOperation.js';
+import { IPartName } from '../Interfaces/IPartName.js';
+import { StringBuilder } from '../utils/StringBuilder.js';
+import { flatten } from '../Internal/IEnumerableExtensions.js';
+import { NaturalComparer } from '../Extensions/NaturalComparer.js';
+import { CodeBlock } from '../Blocks/CodeBlock.js';
+import { Network } from '../Blocks/Network.js';
+import { And } from '../Commands/And.js';
+import { Or } from '../Commands/Or.js';
+import { Not } from '../Commands/Not.js';
+import { Distributor } from '../Commands/Distributor.js';
+import { Move } from '../Commands/Move.js';
+import { Convert } from '../Commands/Convert.js';
+import { S_Move } from '../Commands/S_Move.js';
+import { Signal } from '../Commands/Signals/Signal.js';
+import { BaseCoil } from '../Commands/Coils/BaseCoil.js';
+import { BaseNPCoil } from '../Commands/Coils/BaseNPCoil.js';
+import { Coil } from '../Commands/Coils/Coil.js';
+import { SCoil } from '../Commands/Coils/SCoil.js';
+import { RCoil } from '../Commands/Coils/RCoil.js';
+import { BaseOperationOrSignal } from '../Commands/BaseOperationOrSignal.js';
+import { CompareOperator } from '../Commands/Comparisons/CompareOperator.js';
+import { InRangeCall } from '../Commands/Comparisons/InRangeCall.js';
+import { OutRangeCall } from '../Commands/Comparisons/OutRangeCall.js';
+import { FunctionCall } from '../Commands/Functions/Base/FunctionCall.js';
+import { FunctionBlockCall } from '../Commands/Functions/Base/FunctionBlockCall.js';
+import { SystemFunctionCall } from '../Commands/Functions/Base/SystemFunctionCall.js';
+import { SystemFunctionBlockCall } from '../Commands/Functions/Base/SystemFunctionBlockCall.js';
+import { ArithmeticCall } from '../Commands/Functions/Arithmetic/ArithmeticCall.js';
+import { VariableArithmeticCall } from '../Commands/Functions/Arithmetic/VariableArithmeticCall.js';
+import { AckGlCall } from '../Commands/Functions/AckGlCall.js';
+import { CTUCall } from '../Commands/Functions/CTUCall.js';
+import { CTUDCall } from '../Commands/Functions/CTUDCall.js';
+import { tryGetParent } from '../Extensions/OperationOrSignalExtensions.js';
 
 export class KopCodeHelper {
     static flattenOrdered<T>(e: T[], f: (t: T) => T[]): T[] {

TiaCodegen-ts/src/Commands/And.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
-import { BaseOperationOrSignal } from './BaseOperationOrSignal';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
+import { BaseOperationOrSignal } from './BaseOperationOrSignal.js';
 
 export class And extends BaseOperationOrSignal {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/BaseOperationOrSignal.ts

@@ -1,4 +1,4 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
 
 export abstract class BaseOperationOrSignal implements IOperationOrSignal {
     debugInfo: string | null = null;
@@ -23,9 +23,10 @@ export abstract class BaseOperationOrSignal implements IOperationOrSignal {
 
     createContactAndFillCardinality(parent: IOperationOrSignal): number {
         this.cardinality = 1;
-        if (this.children.length > 0 && this.children[this.children.length - 1] instanceof Or) {
-            this.cardinality = this.children[this.children.length - 1].createContactAndFillCardinality(parent);
-            this.children[this.children.length - 1].doNotCreateContact = true;
+        const lastChild = this.children[this.children.length - 1];
+        if (this.children.length > 0 && lastChild.constructor.name === 'Or') {
+            this.cardinality = lastChild.createContactAndFillCardinality(parent);
+            lastChild.doNotCreateContact = true;
         }
         return this.cardinality;
     }
@@ -35,14 +36,15 @@ export abstract class BaseOperationOrSignal implements IOperationOrSignal {
     }
 
     toString(): string {
-        if (this instanceof And || this instanceof Or) {
-            return `${this.constructor.name} (${this.children.map(x => x.toString()).join(',')})`;
+        const name = this.constructor.name;
+        if (name === 'And' || name === 'Or') {
+            return `${name} (${this.children.map(x => x.toString()).join(',')})`;
         }
-        return this.constructor.name;
+        return name;
     }
 
     getFirstChildNotAnd(): IOperationOrSignal {
-        if (this instanceof And) {
+        if (this.constructor.name === 'And') {
             const ch1 = this.children[0];
             if (ch1 instanceof BaseOperationOrSignal) {
                 return ch1.getFirstChildNotAnd();
@@ -63,7 +65,3 @@ export abstract class BaseOperationOrSignal implements IOperationOrSignal {
         return inst;
     }
 }
-
-// Forward declarations to avoid circular imports - these are resolved at runtime
-import { And } from './And';
-import { Or } from './Or';

TiaCodegen-ts/src/Commands/Coils/BaseCoil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { ICoil } from '../../Interfaces/ICoil';
-import { Signal } from '../Signals/Signal';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { ICoil } from '../../Interfaces/ICoil.js';
+import { Signal } from '../Signals/Signal.js';
 
 export class BaseCoil implements IOperationOrSignal, ICoil {
     debugInfo: string | null = null;

TiaCodegen-ts/src/Commands/Coils/BaseNPCoil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { Signal } from '../Signals/Signal';
-import { BaseCoil } from './BaseCoil';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { Signal } from '../Signals/Signal.js';
+import { BaseCoil } from './BaseCoil.js';
 
 export class BaseNPCoil extends BaseCoil {
     helpSignal: Signal | null;

TiaCodegen-ts/src/Commands/Coils/Coil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { Signal } from '../Signals/Signal';
-import { BaseCoil } from './BaseCoil';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { Signal } from '../Signals/Signal.js';
+import { BaseCoil } from './BaseCoil.js';
 
 export class Coil extends BaseCoil {
     constructor(signal: Signal, op: IOperationOrSignal | null = null) {

TiaCodegen-ts/src/Commands/Coils/PCoil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { Signal } from '../Signals/Signal';
-import { BaseNPCoil } from './BaseNPCoil';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { Signal } from '../Signals/Signal.js';
+import { BaseNPCoil } from './BaseNPCoil.js';
 
 export class PCoil extends BaseNPCoil {
     constructor(signal: Signal, helpSignal: Signal, op: IOperationOrSignal | null = null) {

TiaCodegen-ts/src/Commands/Coils/RCoil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { Signal } from '../Signals/Signal';
-import { BaseCoil } from './BaseCoil';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { Signal } from '../Signals/Signal.js';
+import { BaseCoil } from './BaseCoil.js';
 
 export class RCoil extends BaseCoil {
     constructor(signal: Signal, op: IOperationOrSignal | null = null) {

TiaCodegen-ts/src/Commands/Coils/SCoil.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { Signal } from '../Signals/Signal';
-import { BaseCoil } from './BaseCoil';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { Signal } from '../Signals/Signal.js';
+import { BaseCoil } from './BaseCoil.js';
 
 export class SCoil extends BaseCoil {
     constructor(signal: Signal, op: IOperationOrSignal | null = null) {

TiaCodegen-ts/src/Commands/Comparisons/CompareOperator.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { BaseOperationOrSignal } from '../BaseOperationOrSignal';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { BaseOperationOrSignal } from '../BaseOperationOrSignal.js';
 
 export abstract class CompareOperator extends BaseOperationOrSignal {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/Eq.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Eq extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/Ge.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Ge extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/Gt.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Gt extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/InRangeCall.ts

@@ -1,7 +1,7 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper';
-import { Direction } from '../../Enums/Direction';
-import { SystemFunctionCall } from '../Functions/Base/SystemFunctionCall';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper.js';
+import { Direction } from '../../Enums/Direction.js';
+import { SystemFunctionCall } from '../Functions/Base/SystemFunctionCall.js';
 
 export class InRangeCall extends SystemFunctionCall {
     constructor(

TiaCodegen-ts/src/Commands/Comparisons/Le.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Le extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/Lt.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Lt extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/Ne.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { CompareOperator } from './CompareOperator';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { CompareOperator } from './CompareOperator.js';
 
 export class Ne extends CompareOperator {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Comparisons/OutRangeCall.ts

@@ -1,7 +1,7 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper';
-import { Direction } from '../../Enums/Direction';
-import { SystemFunctionCall } from '../Functions/Base/SystemFunctionCall';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper.js';
+import { Direction } from '../../Enums/Direction.js';
+import { SystemFunctionCall } from '../Functions/Base/SystemFunctionCall.js';
 
 export class OutRangeCall extends SystemFunctionCall {
     constructor(

TiaCodegen-ts/src/Commands/Convert.ts

@@ -1,6 +1,6 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
-import { IFunctionOperation } from '../Interfaces/IFunctionOperation';
-import { BaseOperationOrSignal } from './BaseOperationOrSignal';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
+import { IFunctionOperation } from '../Interfaces/IFunctionOperation.js';
+import { BaseOperationOrSignal } from './BaseOperationOrSignal.js';
 
 export class Convert extends BaseOperationOrSignal implements IFunctionOperation {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Distributor.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal';
-import { BaseOperationOrSignal } from './BaseOperationOrSignal';
+import { IOperationOrSignal } from '../Interfaces/IOperationOrSignal.js';
+import { BaseOperationOrSignal } from './BaseOperationOrSignal.js';
 
 export class Distributor extends BaseOperationOrSignal {
     constructor(...operationOrSignals: IOperationOrSignal[]) {

TiaCodegen-ts/src/Commands/Functions/AckGlCall.ts

@@ -1,7 +1,7 @@
-import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal';
-import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper';
-import { Direction } from '../../Enums/Direction';
-import { SystemFunctionBlockCall } from './Base/SystemFunctionBlockCall';
+import { IOperationOrSignal } from '../../Interfaces/IOperationOrSignal.js';
+import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationOrSignalDirectionWrapper.js';
+import { Direction } from '../../Enums/Direction.js';
+import { SystemFunctionBlockCall } from './Base/SystemFunctionBlockCall.js';
 
 export class AckGlCall extends SystemFunctionBlockCall {
     constructor(

TiaCodegen-ts/src/Commands/Functions/Arithmetic/AddCall.ts

@@ -1,7 +1,7 @@
-import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal';
-import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper';
-import { Direction } from '../../../Enums/Direction';
-import { VariableArithmeticCall } from './VariableArithmeticCall';
+import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
+import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
+import { Direction } from '../../../Enums/Direction.js';
+import { VariableArithmeticCall } from './VariableArithmeticCall.js';
 
 export class AddCall extends VariableArithmeticCall {
     constructor(

TiaCodegen-ts/src/Commands/Functions/Arithmetic/ArithmeticCall.ts

@@ -1,5 +1,5 @@
-import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal';
-import { SystemFunctionCall } from '../Base/SystemFunctionCall';
+import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
+import { SystemFunctionCall } from '../Base/SystemFunctionCall.js';
 
 export abstract class ArithmeticCall extends SystemFunctionCall {
     type: string = '';

TiaCodegen-ts/src/Commands/Functions/Arithmetic/DivCall.ts

@@ -1,7 +1,7 @@
-import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal';
-import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper';
-import { Direction } from '../../../Enums/Direction';
-import { ArithmeticCall } from './ArithmeticCall';
+import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
+import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
+import { Direction } from '../../../Enums/Direction.js';
+import { ArithmeticCall } from './ArithmeticCall.js';
 
 export class DivCall extends ArithmeticCall {
     constructor(