diff --git a/src/Augmentations.js b/src/Augmentations.js index 0ba6aa2f6..5a40f61a9 100644 --- a/src/Augmentations.js +++ b/src/Augmentations.js @@ -16,7 +16,7 @@ import {createElement, createAccordionElement, removeChildrenFromElement, clearObject} from "../utils/HelperFunctions"; import {Reviver, Generic_toJSON, Generic_fromJSON} from "../utils/JSONReviver"; -import {isString} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; //Augmentations function Augmentation(params) { diff --git a/src/CinematicText.js b/src/CinematicText.js index 71906bf08..466432af7 100644 --- a/src/CinematicText.js +++ b/src/CinematicText.js @@ -2,7 +2,7 @@ import {Engine} from "./engine"; import {removeChildrenFromElement, createElement, exceptionAlert} from "../utils/HelperFunctions"; -import {isString} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; var cinematicTextFlag = false; diff --git a/src/CompanyManagement.js b/src/CompanyManagement.js index b52bd8097..de82616da 100644 --- a/src/CompanyManagement.js +++ b/src/CompanyManagement.js @@ -14,7 +14,8 @@ import {getRandomInt, removeElementById, import {Reviver, Generic_toJSON, Generic_fromJSON} from "../utils/JSONReviver"; import numeral from "numeral/min/numeral.min"; -import {formatNumber, isString, generateRandomString} from "../utils/StringHelperFunctions"; +import {formatNumber, generateRandomString} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; import {yesNoBoxCreate, yesNoTxtInpBoxCreate, yesNoBoxGetYesButton, yesNoBoxGetNoButton, yesNoTxtInpBoxGetYesButton, yesNoTxtInpBoxGetNoButton, diff --git a/src/Missions.js b/src/Missions.js index 29eac2dc6..8a6c98f5d 100644 --- a/src/Missions.js +++ b/src/Missions.js @@ -6,7 +6,8 @@ import {dialogBoxCreate} from "../utils/DialogBox"; import {addOffset, getRandomInt, clearEventListenersEl, clearEventListeners} from "../utils/HelperFunctions"; -import {formatNumber, isString} from "../utils/StringHelperFunctions"; +import {formatNumber} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; import jsplumb from 'jsplumb' let inMission = false; //Flag to denote whether a mission is running diff --git a/src/NetscriptEvaluator.js b/src/NetscriptEvaluator.js index 08070dd1f..5b35cf154 100644 --- a/src/NetscriptEvaluator.js +++ b/src/NetscriptEvaluator.js @@ -11,7 +11,7 @@ import {Script, findRunningScript, import {parse, Node} from "../utils/acorn"; import {printArray} from "../utils/HelperFunctions"; import {isValidIPAddress} from "../utils/IPAddress"; -import {isString} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; var Promise = require("bluebird"); diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index 46046594b..1c11ed774 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -50,7 +50,8 @@ import Decimal from "decimal.js"; import {dialogBoxCreate} from "../utils/DialogBox"; import {printArray, powerOfTwo} from "../utils/HelperFunctions"; import {createRandomIp} from "../utils/IPAddress"; -import {formatNumber, isString, isHTML} from "../utils/StringHelperFunctions"; +import {formatNumber, isHTML} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; import {yesNoBoxClose, yesNoBoxGetYesButton, yesNoBoxGetNoButton, yesNoBoxCreate, yesNoBoxOpen} from "../utils/YesNoBox"; diff --git a/src/Terminal.js b/src/Terminal.js index ccb2f9d35..f7286c12e 100644 --- a/src/Terminal.js +++ b/src/Terminal.js @@ -34,7 +34,8 @@ import {SpecialServerIps, import {TextFile, getTextFile} from "./TextFile"; import {containsAllStrings, longestCommonStart, - formatNumber, isString} from "../utils/StringHelperFunctions"; + formatNumber} from "../utils/StringHelperFunctions"; +import {isString} from "../utils/helpers/isString"; import {addOffset, printArray} from "../utils/HelperFunctions"; import {logBoxCreate} from "../utils/LogBox"; import {yesNoBoxCreate, diff --git a/utils/HelperFunctions.js b/utils/HelperFunctions.js index 7c1573baf..dcf6c1e45 100644 --- a/utils/HelperFunctions.js +++ b/utils/HelperFunctions.js @@ -1,5 +1,5 @@ //General helper functions -import {isString} from "./StringHelperFunctions"; +import {isString} from "./helpers/isString"; import {dialogBoxCreate} from "./DialogBox"; //Returns the size (number of keys) of an object diff --git a/utils/StringHelperFunctions.ts b/utils/StringHelperFunctions.ts index 7ca429146..c72d296df 100644 --- a/utils/StringHelperFunctions.ts +++ b/utils/StringHelperFunctions.ts @@ -1,5 +1,6 @@ import { EqualityFunc } from "../src/types"; import { dialogBoxCreate } from "./DialogBox"; +import { isString } from "./helpers/isString"; // Netburner String helper functions @@ -63,11 +64,6 @@ function longestCommonStart(strings: string[]): string { return a1.substring(0, i); } -// Returns whether a variable is a string -function isString(str: any): boolean { - return (typeof str === "string" || str instanceof String); -} - // Returns whether an array contains entirely of string objects function containsAllStrings(arr: string[]): boolean { return arr.every(isString); @@ -155,5 +151,5 @@ function generateRandomString(n: number): string { } export {convertTimeMsToTimeElapsedString, longestCommonStart, - isString, containsAllStrings, formatNumber, + containsAllStrings, formatNumber, numOccurrences, numNetscriptOperators, isHTML, generateRandomString, replaceAt}; diff --git a/utils/helpers/isString.ts b/utils/helpers/isString.ts new file mode 100644 index 000000000..5d24bc197 --- /dev/null +++ b/utils/helpers/isString.ts @@ -0,0 +1,7 @@ +/** + * Checks whether the value passed in can be considered a string. + * @param value The value to check if it is a string. + */ +export function isString(value: any): boolean { + return (typeof value === "string" || value instanceof String); +}