use objects for constructor parameters

Author: jogibear9988

TiaCodegen-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-projects/tia-codegen-ts",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "TypeScript port of TiaCodeGen C# library",
   "type": "module",
   "main": "dist/index.js",

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

@@ -2,9 +2,10 @@ import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
 import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
 import { Direction } from '../../../Enums/Direction.js';
 import { VariableArithmeticCall } from './VariableArithmeticCall.js';
+import { numericType } from './ArithmeticCall.js';
 
 export interface AddCallOptions {
-    type: string;
+    type: numericType;
     in1: IOperationOrSignal;
     in2: IOperationOrSignal;
     in3?: IOperationOrSignal | null;
@@ -67,6 +68,7 @@ export class AddCall extends VariableArithmeticCall {
         this.type = type;
         this.iface['IN1'] = new IOperationOrSignalDirectionWrapper(in1, Direction.Input);
         this.iface['IN2'] = new IOperationOrSignalDirectionWrapper(in2, Direction.Input);
+        //@ts-ignore
         this.addVariableInputs(options, 3, 50);
         this.iface['OUT'] = new IOperationOrSignalDirectionWrapper(out1, Direction.Output);
 

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

@@ -1,9 +1,11 @@
 import { SystemFunctionCall, SystemFunctionCallOptions } from '../Base/SystemFunctionCall.js';
 
-export interface ArithmeticCallOptions extends SystemFunctionCallOptions {}
+export interface ArithmeticCallOptions extends SystemFunctionCallOptions { }
+
+export type numericType = "Int" | "DInt" | "LInt" | "UInt" | "UDInt" | "ULInt" | "Real";
 
 export abstract class ArithmeticCall extends SystemFunctionCall {
-    type: string = '';
+    type?: numericType = 'Int';
 
     constructor(options: ArithmeticCallOptions) {
         super(options);

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

@@ -1,10 +1,10 @@
 import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
 import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
 import { Direction } from '../../../Enums/Direction.js';
-import { ArithmeticCall } from './ArithmeticCall.js';
+import { ArithmeticCall, numericType } from './ArithmeticCall.js';
 
 export interface DivCallOptions {
-    type: string;
+    type: numericType;
     in1: IOperationOrSignal;
     in2: IOperationOrSignal;
     out1?: IOperationOrSignal | null;

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

@@ -1,10 +1,10 @@
 import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
 import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
 import { Direction } from '../../../Enums/Direction.js';
-import { ArithmeticCall } from './ArithmeticCall.js';
+import { ArithmeticCall, numericType } from './ArithmeticCall.js';
 
 export interface ModCallOptions {
-    type: string;
+    type: numericType;
     in1: IOperationOrSignal;
     in2: IOperationOrSignal;
     out1?: IOperationOrSignal | null;

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

@@ -2,9 +2,10 @@ import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
 import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
 import { Direction } from '../../../Enums/Direction.js';
 import { VariableArithmeticCall } from './VariableArithmeticCall.js';
+import { numericType } from './ArithmeticCall.js';
 
 export interface MulCallOptions {
-    type: string;
+    type: numericType;
     in1: IOperationOrSignal;
     in2: IOperationOrSignal;
     in3?: IOperationOrSignal | null;
@@ -67,6 +68,7 @@ export class MulCall extends VariableArithmeticCall {
         this.type = type;
         this.iface['IN1'] = new IOperationOrSignalDirectionWrapper(in1, Direction.Input);
         this.iface['IN2'] = new IOperationOrSignalDirectionWrapper(in2, Direction.Input);
+        //@ts-ignore
         this.addVariableInputs(options, 3, 50);
         this.iface['OUT'] = new IOperationOrSignalDirectionWrapper(out1, Direction.Output);
 

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

@@ -1,10 +1,10 @@
 import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
 import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperationOrSignalDirectionWrapper.js';
 import { Direction } from '../../../Enums/Direction.js';
-import { ArithmeticCall } from './ArithmeticCall.js';
+import { ArithmeticCall, numericType } from './ArithmeticCall.js';
 
 export interface SubCallOptions {
-    type: string;
+    type: numericType;
     in1: IOperationOrSignal;
     in2: IOperationOrSignal;
     out1?: IOperationOrSignal | null;

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

@@ -3,14 +3,18 @@ import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperati
 import { Direction } from '../../../Enums/Direction.js';
 import { ArithmeticCall, ArithmeticCallOptions } from './ArithmeticCall.js';
 
-export interface VariableArithmeticCallOptions extends ArithmeticCallOptions {}
+export interface VariableArithmeticCallOptions extends ArithmeticCallOptions { }
 
 export abstract class VariableArithmeticCall extends ArithmeticCall {
     constructor(options: VariableArithmeticCallOptions) {
         super(options);
     }
 
-    protected addVariableInputs(options: object, startIndex: number, endIndex: number): void {
+    protected addVariableInputs(
+        options: Record<string, IOperationOrSignal | null | undefined>,
+        startIndex: number,
+        endIndex: number
+    ): void {
         for (let i = startIndex; i <= endIndex; i++) {
             const value = ((options as Record<string, unknown>)[`in${i}`] as IOperationOrSignal | null | undefined) ?? null;
             this.iface[`IN${i}`] = new IOperationOrSignalDirectionWrapper(value, Direction.Input);