Skip to content

refactor: use parameter objects for all Function constructors #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jogibear9988 merged 3 commits into from
Mar 21, 2026
Merged

refactor: use parameter objects for all Function constructors #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58a40dd
Initial plan
Copilot Mar 21, 2026
2489ae4
refactor: change all Functions constructors to use parameter objects
Copilot Mar 21, 2026
0f79a4e
address code review: break up long destructuring, extract helper for …
Copilot Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TiaCodegen-ts/src/Commands/Comparisons/InRangeCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class InRangeCall extends SystemFunctionCall {
out: IOperationOrSignal,
eno: IOperationOrSignal | null = null,
) {
super('InRange', eno);
super({ functionName: 'InRange', eno });
this.disableEno = false;
this.iface['min'] = new IOperationOrSignalDirectionWrapper(min, Direction.Input);
this.iface['in'] = new IOperationOrSignalDirectionWrapper(inParam, Direction.Input);
Expand Down
2 changes: 1 addition & 1 deletion TiaCodegen-ts/src/Commands/Comparisons/OutRangeCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class OutRangeCall extends SystemFunctionCall {
out: IOperationOrSignal,
eno: IOperationOrSignal | null = null,
) {
super('OutRange', eno);
super({ functionName: 'OutRange', eno });
this.disableEno = false;
this.iface['min'] = new IOperationOrSignalDirectionWrapper(min, Direction.Input);
this.iface['in'] = new IOperationOrSignalDirectionWrapper(inParam, Direction.Input);
Expand Down
15 changes: 9 additions & 6 deletions TiaCodegen-ts/src/Commands/Functions/AckGlCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import { IOperationOrSignalDirectionWrapper } from '../../Interfaces/IOperationO
import { Direction } from '../../Enums/Direction.js';
import { SystemFunctionBlockCall } from './Base/SystemFunctionBlockCall.js';

export interface AckGlCallOptions {
instanceName: string;
ackGlob?: IOperationOrSignal | null;
eno?: IOperationOrSignal | null;
}

export class AckGlCall extends SystemFunctionBlockCall {
constructor(
instanceName: string,
ackGlob: IOperationOrSignal | null = null,
eno: IOperationOrSignal | null = null,
) {
super('ACK_GL', instanceName, eno);
constructor(options: AckGlCallOptions) {
const { instanceName, ackGlob = null, eno = null } = options;
super({ functionName: 'ACK_GL', instanceName, eno });
this.iface['ACK_GLOB'] = new IOperationOrSignalDirectionWrapper(ackGlob, Direction.Input);

this.additionalSafetyTemplateValues = `
Expand Down
164 changes: 60 additions & 104 deletions TiaCodegen-ts/src/Commands/Functions/Arithmetic/AddCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,115 +3,71 @@ import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperati
import { Direction } from '../../../Enums/Direction.js';
import { VariableArithmeticCall } from './VariableArithmeticCall.js';

export interface AddCallOptions {
type: string;
in1: IOperationOrSignal;
in2: IOperationOrSignal;
in3?: IOperationOrSignal | null;
in4?: IOperationOrSignal | null;
in5?: IOperationOrSignal | null;
in6?: IOperationOrSignal | null;
in7?: IOperationOrSignal | null;
in8?: IOperationOrSignal | null;
in9?: IOperationOrSignal | null;
in10?: IOperationOrSignal | null;
in11?: IOperationOrSignal | null;
in12?: IOperationOrSignal | null;
in13?: IOperationOrSignal | null;
in14?: IOperationOrSignal | null;
in15?: IOperationOrSignal | null;
in16?: IOperationOrSignal | null;
in17?: IOperationOrSignal | null;
in18?: IOperationOrSignal | null;
in19?: IOperationOrSignal | null;
in20?: IOperationOrSignal | null;
in21?: IOperationOrSignal | null;
in22?: IOperationOrSignal | null;
in23?: IOperationOrSignal | null;
in24?: IOperationOrSignal | null;
in25?: IOperationOrSignal | null;
in26?: IOperationOrSignal | null;
in27?: IOperationOrSignal | null;
in28?: IOperationOrSignal | null;
in29?: IOperationOrSignal | null;
in30?: IOperationOrSignal | null;
in31?: IOperationOrSignal | null;
in32?: IOperationOrSignal | null;
in33?: IOperationOrSignal | null;
in34?: IOperationOrSignal | null;
in35?: IOperationOrSignal | null;
in36?: IOperationOrSignal | null;
in37?: IOperationOrSignal | null;
in38?: IOperationOrSignal | null;
in39?: IOperationOrSignal | null;
in40?: IOperationOrSignal | null;
in41?: IOperationOrSignal | null;
in42?: IOperationOrSignal | null;
in43?: IOperationOrSignal | null;
in44?: IOperationOrSignal | null;
in45?: IOperationOrSignal | null;
in46?: IOperationOrSignal | null;
in47?: IOperationOrSignal | null;
in48?: IOperationOrSignal | null;
in49?: IOperationOrSignal | null;
in50?: IOperationOrSignal | null;
out1?: IOperationOrSignal | null;
eno?: IOperationOrSignal | null;
}

export class AddCall extends VariableArithmeticCall {
constructor(
type: string,
in1: IOperationOrSignal,
in2: IOperationOrSignal,
in3: IOperationOrSignal | null = null,
in4: IOperationOrSignal | null = null,
in5: IOperationOrSignal | null = null,
in6: IOperationOrSignal | null = null,
in7: IOperationOrSignal | null = null,
in8: IOperationOrSignal | null = null,
in9: IOperationOrSignal | null = null,
in10: IOperationOrSignal | null = null,
in11: IOperationOrSignal | null = null,
in12: IOperationOrSignal | null = null,
in13: IOperationOrSignal | null = null,
in14: IOperationOrSignal | null = null,
in15: IOperationOrSignal | null = null,
in16: IOperationOrSignal | null = null,
in17: IOperationOrSignal | null = null,
in18: IOperationOrSignal | null = null,
in19: IOperationOrSignal | null = null,
in20: IOperationOrSignal | null = null,
in21: IOperationOrSignal | null = null,
in22: IOperationOrSignal | null = null,
in23: IOperationOrSignal | null = null,
in24: IOperationOrSignal | null = null,
in25: IOperationOrSignal | null = null,
in26: IOperationOrSignal | null = null,
in27: IOperationOrSignal | null = null,
in28: IOperationOrSignal | null = null,
in29: IOperationOrSignal | null = null,
in30: IOperationOrSignal | null = null,
in31: IOperationOrSignal | null = null,
in32: IOperationOrSignal | null = null,
in33: IOperationOrSignal | null = null,
in34: IOperationOrSignal | null = null,
in35: IOperationOrSignal | null = null,
in36: IOperationOrSignal | null = null,
in37: IOperationOrSignal | null = null,
in38: IOperationOrSignal | null = null,
in39: IOperationOrSignal | null = null,
in40: IOperationOrSignal | null = null,
in41: IOperationOrSignal | null = null,
in42: IOperationOrSignal | null = null,
in43: IOperationOrSignal | null = null,
in44: IOperationOrSignal | null = null,
in45: IOperationOrSignal | null = null,
in46: IOperationOrSignal | null = null,
in47: IOperationOrSignal | null = null,
in48: IOperationOrSignal | null = null,
in49: IOperationOrSignal | null = null,
in50: IOperationOrSignal | null = null,
out1: IOperationOrSignal | null = null,
eno: IOperationOrSignal | null = null,
) {
super('Add', eno);
constructor(options: AddCallOptions) {
const { type, in1, in2, out1 = null, eno = null } = options;
super({ functionName: 'Add', eno });
this.disableEno = true;
this.type = type;
this.iface['IN1'] = new IOperationOrSignalDirectionWrapper(in1, Direction.Input);
this.iface['IN2'] = new IOperationOrSignalDirectionWrapper(in2, Direction.Input);
this.iface['IN3'] = new IOperationOrSignalDirectionWrapper(in3, Direction.Input);
this.iface['IN4'] = new IOperationOrSignalDirectionWrapper(in4, Direction.Input);
this.iface['IN5'] = new IOperationOrSignalDirectionWrapper(in5, Direction.Input);
this.iface['IN6'] = new IOperationOrSignalDirectionWrapper(in6, Direction.Input);
this.iface['IN7'] = new IOperationOrSignalDirectionWrapper(in7, Direction.Input);
this.iface['IN8'] = new IOperationOrSignalDirectionWrapper(in8, Direction.Input);
this.iface['IN9'] = new IOperationOrSignalDirectionWrapper(in9, Direction.Input);
this.iface['IN10'] = new IOperationOrSignalDirectionWrapper(in10, Direction.Input);
this.iface['IN11'] = new IOperationOrSignalDirectionWrapper(in11, Direction.Input);
this.iface['IN12'] = new IOperationOrSignalDirectionWrapper(in12, Direction.Input);
this.iface['IN13'] = new IOperationOrSignalDirectionWrapper(in13, Direction.Input);
this.iface['IN14'] = new IOperationOrSignalDirectionWrapper(in14, Direction.Input);
this.iface['IN15'] = new IOperationOrSignalDirectionWrapper(in15, Direction.Input);
this.iface['IN16'] = new IOperationOrSignalDirectionWrapper(in16, Direction.Input);
this.iface['IN17'] = new IOperationOrSignalDirectionWrapper(in17, Direction.Input);
this.iface['IN18'] = new IOperationOrSignalDirectionWrapper(in18, Direction.Input);
this.iface['IN19'] = new IOperationOrSignalDirectionWrapper(in19, Direction.Input);
this.iface['IN20'] = new IOperationOrSignalDirectionWrapper(in20, Direction.Input);
this.iface['IN21'] = new IOperationOrSignalDirectionWrapper(in21, Direction.Input);
this.iface['IN22'] = new IOperationOrSignalDirectionWrapper(in22, Direction.Input);
this.iface['IN23'] = new IOperationOrSignalDirectionWrapper(in23, Direction.Input);
this.iface['IN24'] = new IOperationOrSignalDirectionWrapper(in24, Direction.Input);
this.iface['IN25'] = new IOperationOrSignalDirectionWrapper(in25, Direction.Input);
this.iface['IN26'] = new IOperationOrSignalDirectionWrapper(in26, Direction.Input);
this.iface['IN27'] = new IOperationOrSignalDirectionWrapper(in27, Direction.Input);
this.iface['IN28'] = new IOperationOrSignalDirectionWrapper(in28, Direction.Input);
this.iface['IN29'] = new IOperationOrSignalDirectionWrapper(in29, Direction.Input);
this.iface['IN30'] = new IOperationOrSignalDirectionWrapper(in30, Direction.Input);
this.iface['IN31'] = new IOperationOrSignalDirectionWrapper(in31, Direction.Input);
this.iface['IN32'] = new IOperationOrSignalDirectionWrapper(in32, Direction.Input);
this.iface['IN33'] = new IOperationOrSignalDirectionWrapper(in33, Direction.Input);
this.iface['IN34'] = new IOperationOrSignalDirectionWrapper(in34, Direction.Input);
this.iface['IN35'] = new IOperationOrSignalDirectionWrapper(in35, Direction.Input);
this.iface['IN36'] = new IOperationOrSignalDirectionWrapper(in36, Direction.Input);
this.iface['IN37'] = new IOperationOrSignalDirectionWrapper(in37, Direction.Input);
this.iface['IN38'] = new IOperationOrSignalDirectionWrapper(in38, Direction.Input);
this.iface['IN39'] = new IOperationOrSignalDirectionWrapper(in39, Direction.Input);
this.iface['IN40'] = new IOperationOrSignalDirectionWrapper(in40, Direction.Input);
this.iface['IN41'] = new IOperationOrSignalDirectionWrapper(in41, Direction.Input);
this.iface['IN42'] = new IOperationOrSignalDirectionWrapper(in42, Direction.Input);
this.iface['IN43'] = new IOperationOrSignalDirectionWrapper(in43, Direction.Input);
this.iface['IN44'] = new IOperationOrSignalDirectionWrapper(in44, Direction.Input);
this.iface['IN45'] = new IOperationOrSignalDirectionWrapper(in45, Direction.Input);
this.iface['IN46'] = new IOperationOrSignalDirectionWrapper(in46, Direction.Input);
this.iface['IN47'] = new IOperationOrSignalDirectionWrapper(in47, Direction.Input);
this.iface['IN48'] = new IOperationOrSignalDirectionWrapper(in48, Direction.Input);
this.iface['IN49'] = new IOperationOrSignalDirectionWrapper(in49, Direction.Input);
this.iface['IN50'] = new IOperationOrSignalDirectionWrapper(in50, Direction.Input);
this.addVariableInputs(options, 3, 50);
this.iface['OUT'] = new IOperationOrSignalDirectionWrapper(out1, Direction.Output);

for (const w of Object.values(this.iface)) {
Expand Down
9 changes: 5 additions & 4 deletions TiaCodegen-ts/src/Commands/Functions/Arithmetic/ArithmeticCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { IOperationOrSignal } from '../../../Interfaces/IOperationOrSignal.js';
import { SystemFunctionCall } from '../Base/SystemFunctionCall.js';
import { SystemFunctionCall, SystemFunctionCallOptions } from '../Base/SystemFunctionCall.js';

export interface ArithmeticCallOptions extends SystemFunctionCallOptions {}

export abstract class ArithmeticCall extends SystemFunctionCall {
type: string = '';

constructor(functionName: string, eno: IOperationOrSignal | null = null) {
super(functionName, eno);
constructor(options: ArithmeticCallOptions) {
super(options);
}
}
19 changes: 11 additions & 8 deletions TiaCodegen-ts/src/Commands/Functions/Arithmetic/DivCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperati
import { Direction } from '../../../Enums/Direction.js';
import { ArithmeticCall } from './ArithmeticCall.js';

export interface DivCallOptions {
type: string;
in1: IOperationOrSignal;
in2: IOperationOrSignal;
out1?: IOperationOrSignal | null;
eno?: IOperationOrSignal | null;
}

export class DivCall extends ArithmeticCall {
constructor(
type: string,
in1: IOperationOrSignal,
in2: IOperationOrSignal,
out1: IOperationOrSignal | null = null,
eno: IOperationOrSignal | null = null,
) {
super('Div', eno);
constructor(options: DivCallOptions) {
const { type, in1, in2, out1 = null, eno = null } = options;
super({ functionName: 'Div', eno });
this.disableEno = true;
this.type = type;
this.iface['IN1'] = new IOperationOrSignalDirectionWrapper(in1, Direction.Input);
Expand Down
19 changes: 11 additions & 8 deletions TiaCodegen-ts/src/Commands/Functions/Arithmetic/ModCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ import { IOperationOrSignalDirectionWrapper } from '../../../Interfaces/IOperati
import { Direction } from '../../../Enums/Direction.js';
import { ArithmeticCall } from './ArithmeticCall.js';

export interface ModCallOptions {
type: string;
in1: IOperationOrSignal;
in2: IOperationOrSignal;
out1?: IOperationOrSignal | null;
eno?: IOperationOrSignal | null;
}

export class ModCall extends ArithmeticCall {
constructor(
type: string,
in1: IOperationOrSignal,
in2: IOperationOrSignal,
out1: IOperationOrSignal | null = null,
eno: IOperationOrSignal | null = null,
) {
super('Mod', eno);
constructor(options: ModCallOptions) {
const { type, in1, in2, out1 = null, eno = null } = options;
super({ functionName: 'Mod', eno });
this.disableEno = true;
this.type = type;
this.iface['IN1'] = new IOperationOrSignalDirectionWrapper(in1, Direction.Input);
Expand Down
Loading
Loading