@mitre/inspec-objects 0.0.2 → 0.0.3

package/lib/utilities/diff.d.ts

@@ -1,5 +1,4 @@
 import Profile from '../objects/profile';
 import { ProfileDiff } from '../types/diff';
-import Control from '../objects/control';
-export declare function updateControl(originalControlString: string, originalControl: Control, updatedControl: Control): void;
+export declare function removeNewlines(control?: Record<string, unknown>): Record<string, unknown>;
 export declare function diffProfile(fromProfile: Profile, toProfile: Profile): ProfileDiff;

package/lib/utilities/diff.js

@@ -1,13 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diffProfile = exports.updateControl = void 0;
+exports.diffProfile = exports.removeNewlines = void 0;
 const tslib_1 = require("tslib");
 const json_diff_1 = require("json-diff");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-function updateControl(originalControlString, originalControl, updatedControl) {
-    console.log('Here is the original control:');
+function removeNewlines(control) {
+    if (!control) {
+        return {};
+    }
+    return lodash_1.default.mapValues(control, (value) => {
+        if (typeof value === 'string') {
+            return value.replace(/\n/g, '{{{{newlineHERE}}}}').trim();
+        }
+        else if (typeof value === 'object' && value !== null) {
+            return removeNewlines(value);
+        }
+        return value;
+    });
 }
-exports.updateControl = updateControl;
+exports.removeNewlines = removeNewlines;
 function diffProfile(fromProfile, toProfile) {
     const profileDiff = {
         addedControlIDs: [],
@@ -38,8 +49,10 @@ function diffProfile(fromProfile, toProfile) {
         const toControl = toProfile.controls.find((control) => control.id === fromControl.id);
         if (toControl) {
             const controlDiff = (0, json_diff_1.diff)(fromControl, toControl);
+            console.log(controlDiff);
             if (controlDiff) {
                 Object.entries(controlDiff).forEach(([key, value]) => {
+                    console.log(value);
                     if (lodash_1.default.has(value, '__new')) {
                         lodash_1.default.set(profileDiff, 'changedControls.' + fromControl.id + '.' + key.replace('.', '\\.'), lodash_1.default.get(controlDiff, key + '.__new'));
                     }

package/lib/utilities/xccdf.d.ts

@@ -1,5 +1,6 @@
 import { DecodedDescription } from '../types/xccdf';
 export declare function convertEncodedXmlIntoJson(encodedXml: string): any;
+export declare function removeXMLSpecialCharacters(input: string): string;
 export declare function severityStringToImpact(string: string, id: string): number;
 export declare function impactNumberToSeverityString(impact: number): string;
 export declare function convertEncodedHTMLIntoJson(encodedHTML?: string): DecodedDescription;

package/lib/utilities/xccdf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertEncodedHTMLIntoJson = exports.impactNumberToSeverityString = exports.severityStringToImpact = exports.convertEncodedXmlIntoJson = void 0;
+exports.convertEncodedHTMLIntoJson = exports.impactNumberToSeverityString = exports.severityStringToImpact = exports.removeXMLSpecialCharacters = exports.convertEncodedXmlIntoJson = void 0;
 const tslib_1 = require("tslib");
 const fast_xml_parser_1 = tslib_1.__importDefault(require("fast-xml-parser"));
 const htmlparser = tslib_1.__importStar(require("htmlparser2"));
@@ -14,6 +14,10 @@ function convertEncodedXmlIntoJson(encodedXml) {
     });
 }
 exports.convertEncodedXmlIntoJson = convertEncodedXmlIntoJson;
+function removeXMLSpecialCharacters(input) {
+    return input.replace(/&amp;/gm, '&').replace(/&lt;/gm, '<').replace(/&gt;/gm, '>');
+}
+exports.removeXMLSpecialCharacters = removeXMLSpecialCharacters;
 function severityStringToImpact(string, id) {
     var _a, _b, _c, _d, _e;
     if ((_a = string.match(/none|na|n\/a|not[\s()*_|]?applicable/i)) === null || _a === void 0 ? void 0 : _a.length) {