53222fd83c
This commit fixes compiler bug where it fails when optional values are compiled into absent values in nested calls. - Throw exception with more context for easier future debugging. - Add better validation of argument values for nested calls. - Refactor `FunctionCallCompiler` for better clarity and modularize it to make it more maintainable and testable. - Refactor related interface to not have `I` prefix, and function/variable names for better clarity. Context: Discovered this issue while attempting to call `RunInlineCodeAsTrustedInstaller` which in turn invokes `RunPowerShell` for issue #246. This led to the realization that despite parameters flagged as optional, the nested argument compilation didn't support them.
43 lines
1.5 KiB
TypeScript
43 lines
1.5 KiB
TypeScript
import type { FunctionCallData, FunctionCallsData, FunctionCallParametersData } from '@/application/collections/';
|
|
import { FunctionCall } from './FunctionCall';
|
|
import { FunctionCallArgumentCollection } from './Argument/FunctionCallArgumentCollection';
|
|
import { FunctionCallArgument } from './Argument/FunctionCallArgument';
|
|
import { ParsedFunctionCall } from './ParsedFunctionCall';
|
|
|
|
export function parseFunctionCalls(calls: FunctionCallsData): FunctionCall[] {
|
|
if (calls === undefined) {
|
|
throw new Error('missing call data');
|
|
}
|
|
const sequence = getCallSequence(calls);
|
|
return sequence.map((call) => parseFunctionCall(call));
|
|
}
|
|
|
|
function getCallSequence(calls: FunctionCallsData): FunctionCallData[] {
|
|
if (typeof calls !== 'object') {
|
|
throw new Error('called function(s) must be an object');
|
|
}
|
|
if (calls instanceof Array) {
|
|
return calls as FunctionCallData[];
|
|
}
|
|
return [calls as FunctionCallData];
|
|
}
|
|
|
|
function parseFunctionCall(call: FunctionCallData): FunctionCall {
|
|
if (!call) {
|
|
throw new Error('missing call data');
|
|
}
|
|
const callArgs = parseArgs(call.parameters);
|
|
return new ParsedFunctionCall(call.function, callArgs);
|
|
}
|
|
|
|
function parseArgs(
|
|
parameters: FunctionCallParametersData,
|
|
): FunctionCallArgumentCollection {
|
|
return Object.keys(parameters || {})
|
|
.map((parameterName) => new FunctionCallArgument(parameterName, parameters[parameterName]))
|
|
.reduce((args, arg) => {
|
|
args.addArgument(arg);
|
|
return args;
|
|
}, new FunctionCallArgumentCollection());
|
|
}
|