Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-21 13:45:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Post-PR changes to NetscriptHelpers.runOptions() (#442)

Browse Source
This commit is contained in:
David Walker 2023-03-23 09:01:20 -07:00 committed by GitHub
parent 2b54c6c9b9
commit 07b18edb5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Netscript/NetscriptHelpers.ts
View File

@ -183,22 +183,33 @@ function scriptArgs(ctx: NetscriptContext, args: unknown) {
} }
function runOptions(ctx: NetscriptContext, threadOrOption: unknown): CompleteRunOptions { function runOptions(ctx: NetscriptContext, threadOrOption: unknown): CompleteRunOptions {
const result: CompleteRunOptions = {
threads: 1 as PositiveInteger,
temporary: false,
};
function checkThreads(threads: unknown, argName: string) {
if (threads !== null && threads !== undefined) {
result.threads = positiveInteger(ctx, argName, threads);
}
}
if (typeof threadOrOption !== "object" || threadOrOption === null) { if (typeof threadOrOption !== "object" || threadOrOption === null) {
return { threads: positiveInteger(ctx, "threads", threadOrOption ?? 1), temporary: false }; checkThreads(threadOrOption, "threads");
return result;
} }
// Safe assertion since threadOrOption type has been narrowed to a non-null object // Safe assertion since threadOrOption type has been narrowed to a non-null object
const options = threadOrOption as Unknownify<CompleteRunOptions>; const options = threadOrOption as Unknownify<CompleteRunOptions>;
const threads = positiveInteger(ctx, "RunOptions.threads", options.threads ?? 1); checkThreads(options.threads, "RunOptions.threads");
const temporary = !!options.temporary; result.temporary = !!options.temporary;
if (options.ramOverride === undefined || options.ramOverride === null) return { threads, temporary }; if (options.ramOverride !== undefined && options.ramOverride !== null) {
const ramOverride = number(ctx, "RunOptions.ramOverride", options.ramOverride); result.ramOverride = number(ctx, "RunOptions.ramOverride", options.ramOverride);
if (ramOverride < RamCostConstants.Base) { if (result.ramOverride < RamCostConstants.Base) {
throw makeRuntimeErrorMsg( throw makeRuntimeErrorMsg(
ctx, ctx,
`RunOptions.ramOverride must be >= baseCost (${RamCostConstants.Base}), was ${ramOverride}`, `RunOptions.ramOverride must be >= baseCost (${RamCostConstants.Base}), was ${result.ramOverride}`,
); );
} }
return { threads, temporary, ramOverride }; }
return result;
} }
/** Convert multiple arguments for tprint or print into a single string. */ /** Convert multiple arguments for tprint or print into a single string. */