@mitre/inspec-objects 2.0.4 → 2.1.0

package/lib/utilities/{diffMarkdown.js → diff-markdown.js}

@@ -29,20 +29,19 @@ function createDiffMarkdown(diff) {
         updatedTitles: [],
         updatedDescriptions: [],
     };
-    Object.entries(diff.ignoreFormattingDiff.renamedControlIDs).forEach(([oldId, newId]) => {
+    for (const [oldId, newId] of Object.entries(diff.ignoreFormattingDiff.renamedControlIDs)) {
         renderableDiffData.hasRenamedControls = true;
         renderableDiffData.renamedControls.push({
             oldId: oldId,
             newId: newId,
         });
-    });
-    Object.entries(diff.rawDiff.changedControls).forEach(([id, controlDiff]) => {
-        var _a, _b;
-        if ((_a = controlDiff.descs) === null || _a === void 0 ? void 0 : _a.check) {
+    }
+    for (const [id, controlDiff] of Object.entries(diff.rawDiff.changedControls)) {
+        if (controlDiff.descs?.check) {
             const oldCheck = lodash_1.default.get(controlDiff.descs.check, '__old', 'undefined');
             const newCheck = lodash_1.default.get(controlDiff.descs.check, '__new', 'undefined');
-            if (oldCheck.replace(/\n/g, '').replace(/\W/g, '') !==
-                newCheck.replace(/\n/g, '').replace(/\W/g, '')) {
+            if (oldCheck.replaceAll('\n', '').replaceAll(/\W/g, '')
+                !== newCheck.replaceAll('\n', '').replaceAll(/\W/g, '')) {
                 renderableDiffData.updatedChecks.push({
                     id: id,
                     old: oldCheck,
@@ -50,11 +49,11 @@ function createDiffMarkdown(diff) {
                 });
             }
         }
-        if ((_b = controlDiff.descs) === null || _b === void 0 ? void 0 : _b.fix) {
+        if (controlDiff.descs?.fix) {
             const oldFix = lodash_1.default.get(controlDiff.descs.fix, '__old', 'undefined');
             const newFix = lodash_1.default.get(controlDiff.descs.fix, '__new', 'undefined');
-            if (oldFix.replace(/\n/g, '').replace(/\W/g, '') !==
-                newFix.replace(/\n/g, '').replace(/\W/g, '')) {
+            if (oldFix.replaceAll('\n', '').replaceAll(/\W/g, '')
+                !== newFix.replaceAll('\n', '').replaceAll(/\W/g, '')) {
                 renderableDiffData.updatedFixes.push({
                     id: id,
                     old: oldFix,
@@ -95,7 +94,7 @@ function createDiffMarkdown(diff) {
                 });
             }
         }
-    });
+    }
     // Render output
     return mustache_1.default.render(automatticUpdateTemplate_json_1.default.data, renderableDiffData);
 }

package/lib/utilities/diff.js

@@ -25,7 +25,7 @@ function removeNewlines(control) {
     }
     return lodash_1.default.mapValues(control, (value) => {
         if (typeof value === 'string') {
-            return value.replace(/\n/g, '{{{{newlineHERE}}}}').trim();
+            return value.replaceAll('\n', '{{{{newlineHERE}}}}').trim();
         }
         else if (typeof value === 'object' && value !== null) {
             return removeNewlines(value);
@@ -57,10 +57,10 @@ function ignoreFormattingDiff(diffData) {
     return lodash_1.default.transform(diffData, (result, diffValue, key) => {
         if (lodash_1.default.has(diffValue, '__new')) {
             // Remove any trailing space
-            if (typeof lodash_1.default.get(diffValue, '__new') === 'string' &&
-                typeof lodash_1.default.get(diffValue, '__old') === 'string') {
-                if ((0, global_1.removeWhitespace)(lodash_1.default.get(diffValue, '__new', 'undefined')) !==
-                    (0, global_1.removeWhitespace)(lodash_1.default.get(diffValue, '__old', 'undefined'))) {
+            if (typeof lodash_1.default.get(diffValue, '__new') === 'string'
+                && typeof lodash_1.default.get(diffValue, '__old') === 'string') {
+                if ((0, global_1.removeWhitespace)(lodash_1.default.get(diffValue, '__new', 'undefined'))
+                    !== (0, global_1.removeWhitespace)(lodash_1.default.get(diffValue, '__old', 'undefined'))) {
                     lodash_1.default.set(result, key, lodash_1.default.get(diffValue, '__new'));
                 }
             }
@@ -70,14 +70,14 @@ function ignoreFormattingDiff(diffData) {
         }
         else if (Array.isArray(diffValue)) {
             result[key] = diffValue
-                .map((value) => value[0] === '+' && value[1])
-                .filter((value) => value);
+                .map(value => value[0] === '+' && value[1])
+                .filter(Boolean);
         }
         else if (typeof diffValue === 'object') {
             result[key] = ignoreFormattingDiff(diffValue);
         }
         else if (key.endsWith('__deleted')) {
-            return undefined;
+            return;
         }
         else {
             result[key] = diffValue;
@@ -96,7 +96,6 @@ function ignoreFormattingDiff(diffData) {
  *  - `rawDiff`: The raw profile differences.
  */
 function diffProfile(fromProfile, toProfile, logger) {
-    var _a;
     logger.info(`Processing diff between: ${fromProfile.name}(v:${fromProfile.version}) and: ${toProfile.name}(v:${toProfile.version})`);
     const profileDiff = {
         addedControlIDs: [],
@@ -114,72 +113,71 @@ function diffProfile(fromProfile, toProfile, logger) {
         addedControls: {},
         changedControls: {},
     };
-    const fromControlIDs = fromProfile.controls.map((control) => control.id).sort();
-    const toControlIDs = toProfile.controls.map((control) => control.id).sort();
+    const fromControlIDs = fromProfile.controls.map(control => control.id).toSorted();
+    const toControlIDs = toProfile.controls.map(control => control.id).toSorted();
     // Find new controls
-    const controlIDDiff = (_a = (0, json_diff_1.diff)(fromControlIDs, toControlIDs)) === null || _a === void 0 ? void 0 : _a.filter((item) => !(item.length === 1 && item[0] === ' '));
+    const controlIDDiff = (0, json_diff_1.diff)(fromControlIDs, toControlIDs)?.filter((item) => !(item.length === 1 && item[0] === ' '));
     // Contains the new IDs
     const changedControlIds = [];
     // a diffValue has an entry for both what was subtracted ("-")
     // and what was added ("+") -- need to handle both
-    controlIDDiff === null || controlIDDiff === void 0 ? void 0 : controlIDDiff.forEach((diffValue) => {
-        if (diffValue[0] === '-') {
-            const existingControl = fromProfile.controls.find((control) => control.id === diffValue[1]);
-            // Check if the control has been given a new ID
-            if (existingControl) {
-                const newControl = (0, update_1.findUpdatedControlByAllIdentifiers)(existingControl, toProfile.controls);
-                if (newControl && newControl.id !== existingControl.id) {
-                    profileDiff.renamedControlIDs[existingControl.id] = newControl.id;
-                    originalDiff.renamedControlIDs[existingControl.id] = newControl.id;
-                    changedControlIds.push(newControl.id.toLowerCase());
-                    const controlDiff = lodash_1.default.omit((0, json_diff_1.diff)(existingControl, newControl), 'code__deleted');
-                    // logger.info("CONTROL DIFF:" + JSON.stringify(controlDiff, null, 2))
-                    const renamedControlIgnoredFormatting = ignoreFormattingDiff(controlDiff);
-                    profileDiff.changedControls[newControl.id] = renamedControlIgnoredFormatting;
-                    profileDiff.changedControlIDs.push(newControl.id);
-                    originalDiff.changedControls[newControl.id] = controlDiff;
-                    originalDiff.changedControlIDs.push(newControl.id);
-                    logger.verbose(`Control ${existingControl.id} has been updated to ${newControl.id}`);
-                    logger.debug(`Updated control content: ${JSON.stringify(renamedControlIgnoredFormatting)}`);
+    if (controlIDDiff)
+        for (const diffValue of controlIDDiff) {
+            if (diffValue[0] === '-') {
+                const existingControl = fromProfile.controls.find(control => control.id === diffValue[1]);
+                // Check if the control has been given a new ID
+                if (existingControl) {
+                    const newControl = (0, update_1.findUpdatedControlByAllIdentifiers)(existingControl, toProfile.controls);
+                    if (newControl && newControl.id !== existingControl.id) {
+                        profileDiff.renamedControlIDs[existingControl.id] = newControl.id;
+                        originalDiff.renamedControlIDs[existingControl.id] = newControl.id;
+                        changedControlIds.push(newControl.id.toLowerCase());
+                        const controlDiff = lodash_1.default.omit((0, json_diff_1.diff)(existingControl, newControl), 'code__deleted');
+                        // logger.info("CONTROL DIFF:" + JSON.stringify(controlDiff, null, 2))
+                        const renamedControlIgnoredFormatting = ignoreFormattingDiff(controlDiff);
+                        profileDiff.changedControls[newControl.id] = renamedControlIgnoredFormatting;
+                        profileDiff.changedControlIDs.push(newControl.id);
+                        originalDiff.changedControls[newControl.id] = controlDiff;
+                        originalDiff.changedControlIDs.push(newControl.id);
+                        logger.verbose(`Control ${existingControl.id} has been updated to ${newControl.id}`);
+                        logger.debug(`Updated control content: ${JSON.stringify(renamedControlIgnoredFormatting)}`);
+                    }
+                    else {
+                        profileDiff.removedControlIDs.push(diffValue[1]);
+                        originalDiff.removedControlIDs.push(diffValue[1]);
+                    }
                 }
                 else {
-                    profileDiff.removedControlIDs.push(diffValue[1]);
-                    originalDiff.removedControlIDs.push(diffValue[1]);
+                    logger.error(`Unable to find existing control ${diffValue[1]}`);
                 }
             }
-            else {
-                logger.error(`Unable to find existing control ${diffValue[1]}`);
+            else if (diffValue[0] === '+' && !changedControlIds.includes(diffValue[1].toLowerCase()) && diffValue[1]) {
+                logger.info(JSON.stringify(diffValue));
+                logger.info(JSON.stringify(changedControlIds));
+                profileDiff.addedControlIDs.push(diffValue[1]);
+                originalDiff.addedControlIDs.push(diffValue[1]);
             }
         }
-        else if (diffValue[0] === '+' && !changedControlIds.includes(diffValue[1].toLowerCase()) && diffValue[1]) {
-            logger.info(JSON.stringify(diffValue));
-            logger.info(JSON.stringify(changedControlIds));
-            profileDiff.addedControlIDs.push(diffValue[1]);
-            originalDiff.addedControlIDs.push(diffValue[1]);
-        }
-    });
     // take the list of renamed controls out of the list of added controls
     // (a control is not "new" if it was renamed)
     profileDiff.addedControlIDs = profileDiff.addedControlIDs.filter((item) => !Object.values(profileDiff.renamedControlIDs).includes(item));
     originalDiff.addedControlIDs = originalDiff.addedControlIDs.filter((item) => !Object.values(originalDiff.renamedControlIDs).includes(item));
     // Add new controls to addedControls
-    profileDiff.addedControlIDs.forEach((addedControl) => {
-        const newControl = toProfile.controls.find((control) => addedControl === control.id);
+    for (const addedControl of profileDiff.addedControlIDs) {
+        const newControl = toProfile.controls.find(control => addedControl === control.id);
         if (newControl && !profileDiff.changedControls[newControl.id]) {
             profileDiff.addedControls[addedControl] = newControl;
             originalDiff.addedControls[addedControl] = newControl;
         }
-    });
+    }
     // Find changed controls
     for (const fromControl of fromProfile.controls) {
-        const toControl = toProfile.controls.find((control) => control.id === fromControl.id);
+        const toControl = toProfile.controls.find(control => control.id === fromControl.id);
         if (toControl) {
             const controlDiff = lodash_1.default.omit((0, json_diff_1.diff)(fromControl, toControl), 'code__deleted');
             if (controlDiff) {
-                // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
                 profileDiff.changedControls[toControl.id] = ignoreFormattingDiff(controlDiff);
                 profileDiff.changedControlIDs.push(toControl.id);
-                // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
                 originalDiff.changedControls[toControl.id] = controlDiff;
                 originalDiff.changedControlIDs.push(toControl.id);
             }

package/lib/utilities/global.js

@@ -56,7 +56,7 @@ function wrap(s, lineLength = 80) {
  * @returns The unformatted string with newline characters and excessive whitespace removed.
  */
 function unformatText(s) {
-    return s.replace(/\n/g, ' ').replace(/\\n/g, ' ').replace(/( +|\t)/g, ' ');
+    return s.replaceAll('\n', ' ').replaceAll(String.raw `\n`, ' ').replaceAll(/( +|\t)/g, ' ');
 }
 /**
  * Removes all whitespace characters from the given input string.
@@ -65,7 +65,7 @@ function unformatText(s) {
  * @returns A new string with all whitespace characters removed.
  */
 function removeWhitespace(input) {
-    return input.replace(/\s/gi, '');
+    return input.replaceAll(/\s/gi, '');
 }
 /**
  * Escapes backslashes that precede closing parentheses in a given string.
@@ -79,7 +79,7 @@ function removeWhitespace(input) {
  * @returns A new string with the specified backslashes escaped.
  */
 const escapeSpecialCaseBackslashes = (s) => {
-    return s.replace(/\\\)/g, '\\\\)');
+    return s.replaceAll(String.raw `\)`, String.raw `\\)`);
 };
 /**
  * Escapes single quotes and backslashes in a given string.
@@ -91,7 +91,7 @@ const escapeSpecialCaseBackslashes = (s) => {
  * @returns The escaped string with single quotes and backslashes properly escaped.
  */
 const escapeSingleQuotes = (s) => {
-    return s.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+    return s.replaceAll('\\', '\\\\').replaceAll('\'', String.raw `\'`);
 };
 /**
  * Escapes backslashes and double quotes in a given string.
@@ -103,7 +103,7 @@ const escapeSingleQuotes = (s) => {
  * @returns The escaped string with backslashes and double quotes properly escaped.
  */
 const escapeDoubleQuotes = (s) => {
-    return s.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    return s.replaceAll('\\', '\\\\').replaceAll('"', String.raw `\"`);
 };
 /**
  * Escapes quotes in a given string based on the presence of single and double quotes.
@@ -133,7 +133,7 @@ function escapeQuotes(s) {
  * @returns The modified string with placeholders replaced by newline characters.
  */
 function removeNewlinePlaceholders(s) {
-    return s.replace(/\{\{\{\{newlineHERE\}\}\}\}/g, '\n');
+    return s.replaceAll('{{{{newlineHERE}}}}', '\n');
 }
 /**
  * Retrieves the value from the first path in the provided paths array that exists in the given object.
@@ -144,7 +144,7 @@ function removeNewlinePlaceholders(s) {
  * @throws Will throw an error if none of the paths exist in the object.
  */
 function getFirstPath(object, paths) {
-    const index = lodash_1.default.findIndex(paths, (p) => hasPath(object, p));
+    const index = lodash_1.default.findIndex(paths, p => hasPath(object, p));
     if (index === -1) {
         throw new Error(`Attestation is missing one of these paths: ${paths.join(', ')}`);
     }
@@ -160,12 +160,6 @@ function getFirstPath(object, paths) {
  * @returns `true` if any of the specified paths exist in the object, otherwise `false`.
  */
 function hasPath(file, path) {
-    let pathArray;
-    if (typeof path === 'string') {
-        pathArray = [path];
-    }
-    else {
-        pathArray = path;
-    }
-    return lodash_1.default.some(pathArray, (p) => lodash_1.default.has(file, p));
+    const pathArray = lodash_1.default.isString(path) ? [path] : path;
+    return lodash_1.default.some(pathArray, p => lodash_1.default.has(file, p));
 }

package/lib/utilities/logging.js

@@ -13,6 +13,6 @@ function createWinstonLogger(mapperName, level = 'debug') {
         // Using the ANSI escape code sequence initiator (\xb[) to change output colors
         // Colors used are: 33m (yellow) and 34m (blue)
         // \x1b[0m : Resets the color settings to the default
-        info => `\x1b[33m[${[info.timestamp]} -> ${mapperName}]:\x1b[0m \x1b[34m${info.message}\x1b[0m`)),
+        info => `\u001B[33m[${[info.timestamp]} -> ${mapperName}]:\u001B[0m \u001B[34m${info.message}\u001B[0m`)),
     });
 }

package/lib/utilities/update.js

@@ -14,7 +14,7 @@ const diff_1 = require("./diff");
 const control_1 = tslib_1.__importDefault(require("../objects/control"));
 const profile_1 = tslib_1.__importDefault(require("../objects/profile"));
 const xccdf_1 = require("../parsers/xccdf");
-const diffMarkdown_1 = require("./diffMarkdown");
+const diff_markdown_1 = require("./diff-markdown");
 /**
  * Projects values from the source object onto the destination object,
  * updating the destination object in place.
@@ -50,7 +50,7 @@ function projectValuesOntoExistingObj(dst, src, currentPath = '') {
                 lodash_1.default.set(dst, updatedValue, src[updatedValue]);
             }
             else if (Array.isArray(src[updatedValue])) {
-                const uniqueArrayValues = [...new Set(lodash_1.default.get(dst, updatedValue, []).concat(src[updatedValue]))];
+                const uniqueArrayValues = lodash_1.default.uniq([...lodash_1.default.get(dst, updatedValue, []), ...src[updatedValue]]);
                 lodash_1.default.set(dst, updatedValue, uniqueArrayValues);
             }
         }
@@ -98,12 +98,11 @@ function getRangesForLines(text) {
     const rangeStack = [];
     const ranges = [];
     const lines = text.split('\n');
-    for (let i = 0; i < lines.length; i++) {
+    for (const [i, line] of lines.entries()) {
         let j = 0;
-        while (j < lines[i].length) {
-            const line = lines[i];
+        while (j < line.length) {
             let char = line[j];
-            const isEmptyStack = (stack.length == 0);
+            const isEmptyStack = (stack.length === 0);
             const isNotEmptyStack = (stack.length > 0);
             const isQuoteChar = quotes.includes(char);
             const isNotEscapeChar = ((j == 0) || (j > 0 && line[j - 1] != '\\'));
@@ -141,20 +140,20 @@ function getRangesForLines(text) {
             }
             char = line[j];
             baseCondition = (isNotEmptyStack && isNotEscapeChar);
-            const delimiterCondition = (baseCondition && Object.keys(stringDelimiters).includes(stack[stack.length - 1]));
-            const delimiterPushCondition = (delimiterCondition && (stack[stack.length - 1] == char));
-            const delimiterPopCondition = (delimiterCondition && (stringDelimiters[stack[stack.length - 1]] == char));
-            const basePopCondition = (baseCondition && (stack[stack.length - 1] == char) && !Object.keys(stringDelimiters).includes(char));
+            const delimiterCondition = (baseCondition && Object.keys(stringDelimiters).includes(stack.at(-1)));
+            const delimiterPushCondition = (delimiterCondition && (stack.at(-1) == char));
+            const delimiterPopCondition = (delimiterCondition && (stringDelimiters[stack.at(-1)] == char));
+            const basePopCondition = (baseCondition && (stack.at(-1) == char) && !Object.keys(stringDelimiters).includes(char));
             const isCommentEndChar = ((j == 0) && (line.length >= 4) && (line.slice(0, 4) == '=end'));
-            const commentEndCondition = (baseCondition && isCommentEndChar && (stack[stack.length - 1] == '=begin'));
+            const commentEndCondition = (baseCondition && isCommentEndChar && (stack.at(-1) == '=begin'));
             const popCondition = (basePopCondition || delimiterPopCondition || commentEndCondition);
-            const pushCondition = (quotePushCondition || variablePushCondition || stringPushCondition ||
-                percentStringPushCondition || delimiterPushCondition || commentBeginCondition || inlineInterpolationCondition);
+            const pushCondition = (quotePushCondition || variablePushCondition || stringPushCondition
+                || percentStringPushCondition || delimiterPushCondition || commentBeginCondition || inlineInterpolationCondition);
             if (popCondition) {
                 stack.pop();
-                rangeStack[rangeStack.length - 1].push(i);
+                rangeStack.at(-1).push(i);
                 const range_ = rangeStack.pop();
-                if (rangeStack.length == 0) {
+                if (rangeStack.length === 0) {
                     ranges.push(range_);
                 }
             }
@@ -242,8 +241,8 @@ function getExistingDescribeFromControl(control) {
         // Array of lines representing the full InSpec control, with multi-line strings collapsed
         const lines = joinMultiLineStringsFromRanges(control.code, multiLineRanges);
         // Define RegExp for lines to skip.
-        const skip = ['control\\W', '  title\\W', '  desc\\W', '  impact\\W', '  tag\\W', '  ref\\W'];
-        const skipRegExp = RegExp(skip.map(x => `(^${x})`).join('|'));
+        const skip = [String.raw `control\W`, String.raw `  title\W`, String.raw `  desc\W`, String.raw `  impact\W`, String.raw `  tag\W`, String.raw `  ref\W`];
+        const skipRegExp = new RegExp(skip.map(x => `(^${x})`).join('|'));
         // Extract describe block from InSpec control with collapsed multiline strings.
         const describeBlock = [];
         let ignoreNewLine = true;
@@ -260,9 +259,9 @@ function getExistingDescribeFromControl(control) {
             }
         }
         // Return synthesized logic as describe block
-        const lastIndex = (describeBlock.lastIndexOf('end') === -1)
-            ? describeBlock.lastIndexOf('end\r')
-            : describeBlock.lastIndexOf('end');
+        const lastIndex = (describeBlock.includes('end'))
+            ? describeBlock.lastIndexOf('end')
+            : describeBlock.lastIndexOf('end\r');
         // Drop trailing ['end', '\n'] from Control block.
         return describeBlock.slice(0, lastIndex).join('\n');
     }
@@ -292,10 +291,8 @@ function findUpdatedControlByAllIdentifiers(existingControl, updatedControls) {
     }
     // Try to match based on legacy identifiers
     updatedControl = updatedControls.find((updatedControl) => {
-        var _a;
-        return (_a = updatedControl.tags.legacy) === null || _a === void 0 ? void 0 : _a.some((legacyTag) => {
-            var _a;
-            return legacyTag.toLowerCase() === ((_a = existingControl.id) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+        return updatedControl.tags.legacy?.some((legacyTag) => {
+            return legacyTag.toLowerCase() === existingControl.id?.toLowerCase();
         });
     });
     if (updatedControl) {
@@ -349,7 +346,7 @@ function updateProfile(from, using, logger) {
     // Find the diff
     const diff = (0, diff_1.diffProfile)(from, using, logger);
     // Add the new controls
-    diff.ignoreFormattingDiff.addedControlIDs.forEach(id => {
+    for (const id of diff.ignoreFormattingDiff.addedControlIDs) {
         const addedControl = diff.ignoreFormattingDiff.addedControls[id];
         if (addedControl) {
             logger.debug(`New Control: ${addedControl.id} - ${addedControl.title}`);
@@ -358,7 +355,7 @@ function updateProfile(from, using, logger) {
         else {
             throw new Error(`New control ${id} added but don't have the control data`);
         }
-    });
+    }
     // Update the existing controls
     for (const existingControl of from.controls) {
         const updatedControl = findUpdatedControlByAllIdentifiers(existingControl, using.controls);
@@ -398,11 +395,11 @@ function updateProfileUsingXCCDF(from, using, id, logger, ovalDefinitions) {
     const updatedProfile = updateProfile(from, xccdfProfile, logger);
     logger.debug('Creating diff markdown');
     // Create the markdown
-    const markdown = (0, diffMarkdown_1.createDiffMarkdown)(updatedProfile.diff);
+    const markdown = (0, diff_markdown_1.createDiffMarkdown)(updatedProfile.diff);
     logger.debug('Profile update complete');
     return {
         profile: updatedProfile.profile,
         diff: updatedProfile.diff,
-        markdown: markdown
+        markdown: markdown,
     };
 }

package/lib/utilities/xccdf.js

@@ -90,9 +90,9 @@ function convertEncodedXmlIntoJson(encodedXml, xmlParserOption = 'withArrayOptio
     };
     const parser = new fast_xml_parser_1.XMLParser(xmlParserOption === 'withArrayOption'
         ? withArrayOption
-        : xmlParserOption === 'withArrayNoEntitiesOption'
+        : (xmlParserOption === 'withArrayNoEntitiesOption'
             ? withArrayNoEntitiesOption
-            : noArrayOption);
+            : noArrayOption));
     return parser.parse(encodedXml);
 }
 /**
@@ -141,7 +141,7 @@ function removeHtmlTags(input) {
     //   $ matches the end of the string. This ensures the regex can handle
     //     cases where the tag is incomplete or unclosed (e.g., <div)
     // g: Global flag to find all matches in the input string
-    return input.replace(/<\/?[^>]+(>|$)/g, '');
+    return input.replaceAll(/<\/?[^>]+(>|$)/g, '');
 }
 /**
  * Converts a severity string to a numerical impact value.
@@ -160,21 +160,20 @@ function removeHtmlTags(input) {
  * @returns The numerical impact value corresponding to the severity string.
  */
 function severityStringToImpact(string) {
-    var _a, _b, _c, _d, _e;
-    if ((_a = RegExp(/none|na|n\/a|not[\s()*_|]?applicable/i).exec(string)) === null || _a === void 0 ? void 0 : _a.length) {
-        return 0.0;
+    if (new RegExp(/none|na|n\/a|not[\s()*_|]?applicable/i).exec(string)?.length) {
+        return 0;
     }
-    if ((_b = RegExp(/low|cat(egory)?\s*(iii|3)/i).exec(string)) === null || _b === void 0 ? void 0 : _b.length) {
+    if (new RegExp(/low|cat(egory)?\s*(iii|3)/i).exec(string)?.length) {
         return 0.3;
     }
-    if ((_c = RegExp(/med(ium)?|cat(egory)?\s*(ii|2)/).exec(string)) === null || _c === void 0 ? void 0 : _c.length) {
+    if (new RegExp(/med(ium)?|cat(egory)?\s*(ii|2)/).exec(string)?.length) {
         return 0.5;
     }
-    if ((_d = RegExp(/high|cat(egory)?\s*(i|1)/).exec(string)) === null || _d === void 0 ? void 0 : _d.length) {
+    if (new RegExp(/high|cat(egory)?\s*(i|1)/).exec(string)?.length) {
         return 0.7;
     }
-    if ((_e = RegExp(/crit(ical)?|severe/).exec(string)) === null || _e === void 0 ? void 0 : _e.length) {
-        return 1.0;
+    if (new RegExp(/crit(ical)?|severe/).exec(string)?.length) {
+        return 1;
     }
     return 0.5;
 }
@@ -192,7 +191,7 @@ function severityStringToImpact(string) {
  */
 function impactNumberToSeverityString(impact) {
     // Impact must be 0.0 - 1.0
-    if (impact < 0.0 || impact > 1.0) {
+    if (impact < 0 || impact > 1) {
         throw new Error('Impact cannot be less than 0.0 or greater than 1.0');
     }
     else {
@@ -234,7 +233,7 @@ function impactNumberToSeverityString(impact) {
 function convertEncodedHTMLIntoJson(encodedHTML) {
     if (encodedHTML) {
         // Some STIGs regarding XSS put the < character inside of the description which breaks parsing
-        const patchedHTML = encodedHTML.replace(/"&lt;"/g, '[[[REPLACE_LESS_THAN]]]');
+        const patchedHTML = encodedHTML.replaceAll('"&lt;"', '[[[REPLACE_LESS_THAN]]]');
         const xmlChunks = [];
         const htmlParser = new htmlparser.Parser({
             ontext(text) {
@@ -252,32 +251,22 @@ function convertEncodedHTMLIntoJson(encodedHTML) {
             const remainingFields = lodash_1.default.omit(converted.VulnDiscussion, [
                 'FalsePositives', 'FalseNegatives', 'Documentable', 'Mitigations',
                 'SeverityOverrideGuidance', 'PotentialImpacts', 'ThirdPartyTools',
-                'MitigationControl', 'Responsibility', 'IAControls'
+                'MitigationControl', 'Responsibility', 'IAControls',
             ]);
-            Object.entries(remainingFields).forEach(([field, value]) => {
+            for (const [field, value] of Object.entries(remainingFields)) {
                 extractedVulnDescription += `<${field}> ${value}`;
-            });
+            }
             cleaned = {
                 VulnDiscussion: extractedVulnDescription.replace(/\[\[\[REPLACE_LESS_THAN]]]/, '"<"'),
             };
-            Object.entries(converted.VulnDiscussion).forEach(([key, value]) => {
-                if (typeof value === 'string') {
-                    cleaned[key] = value.replace(/\[\[\[REPLACE_LESS_THAN]]]/, '"<"');
-                }
-                else {
-                    cleaned[key] = value;
-                }
-            });
+            for (const [key, value] of Object.entries(converted.VulnDiscussion)) {
+                cleaned[key] = typeof value === 'string' ? value.replace(/\[\[\[REPLACE_LESS_THAN]]]/, '"<"') : value;
+            }
         }
         else {
-            Object.entries(converted).forEach(([key, value]) => {
-                if (typeof value === 'string') {
-                    cleaned[key] = value.replace(/\[\[\[REPLACE_LESS_THAN]]]/, '"<"');
-                }
-                else {
-                    cleaned[key] = value;
-                }
-            });
+            for (const [key, value] of Object.entries(converted)) {
+                cleaned[key] = typeof value === 'string' ? value.replace(/\[\[\[REPLACE_LESS_THAN]]]/, '"<"') : value;
+            }
         }
         return cleaned;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mitre/inspec-objects",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Typescript objects for normalizing between InSpec profiles and XCCDF benchmarks",
   "main": "lib/index.js",
   "publishConfig": {
@@ -10,8 +10,9 @@
     "build": "tsc -p ./tsconfig.build.json",
     "dev": "npx -y ts-node test.ts",
     "test": "vitest",
-    "lint": "eslint \"**/*.ts\" --fix",
-    "lint:ci": "eslint \"**/*.ts\" --max-warnings 0"
+    "test:ci": "vitest run",
+    "lint": "eslint --fix",
+    "lint:ci": "eslint --max-warnings 0"
   },
   "repository": {
     "type": "git",
@@ -24,33 +25,33 @@
   },
   "homepage": "https://github.com/mitre/ts-inspec-objects#readme",
   "dependencies": {
-    "@types/flat": "5.0.5",
     "@types/he": "^1.1.2",
     "@types/json-diff": "^1.0.0",
     "@types/jstoxml": "^2.0.2",
     "@types/lodash": "^4.14.178",
     "@types/mustache": "^4.2.0",
-    "@types/pretty": "^2.0.1",
     "fast-xml-parser": "^5.0.7",
-    "flat": "6.0.1",
     "he": "^1.2.0",
+    "htmlfy": "^1.0.1",
     "htmlparser2": "^10.0.0",
     "inspecjs": "^2.6.6",
     "json-diff": "^1.0.6",
     "jstoxml": "^7.0.1",
     "lodash": "^4.17.21",
     "mustache": "^4.2.0",
-    "pretty": "^2.0.0",
     "tslib": "^2.8.1",
     "winston": "^3.8.1",
     "yaml": "^2.3.1"
   },
   "devDependencies": {
-    "@types/node": "^24.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.35.1",
-    "@typescript-eslint/parser": "^8.35.1",
-    "eslint": "^8.30.0",
-    "typescript": "^5.2.2",
-    "vitest": "^3.2.4"
+    "@eslint/js": "^10.0.1",
+    "@stylistic/eslint-plugin": "^5.9.0",
+    "@types/node": "^25.3.0",
+    "eslint": "^10.0.2",
+    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-unicorn": "^63.0.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.56.1",
+    "vitest": "^4.0.1"
   }
 }

package/tsconfig.build.json

@@ -2,4 +2,4 @@
 {
     "extends": "./tsconfig.json",
     "exclude": ["**/*.spec.ts", "lib", "test"]
-  }
+}

package/tsconfig.json

@@ -10,12 +10,12 @@
     "outDir": "lib",
     "rootDir": "src",
     "strict": true,
-    "target": "es2019",
+    "target": "ES2024",
     "types": ["node"]
   },
   "include": [
     "index.ts",
     "src/**/*",
     "types/*"
-  ],
+  ]
 }

package/vitest.config.ts

@@ -1,7 +1,7 @@
-import {defineConfig} from 'vitest/config';
+import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
-    testTimeout: 60000
-  }
+    testTimeout: 60_000,
+  },
 });