@mitre/inspec-objects 0.0.2 → 0.0.5

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: [],

package/lib/utilities/global.d.ts

@@ -4,5 +4,6 @@ declare const escapeQuotes: (s: string) => string;
 declare const escapeDoubleQuotes: (s: string) => string;
 declare const wrapAndEscapeQuotes: (s: string, lineLength?: number) => string;
 export { escapeQuotes, escapeDoubleQuotes, wrapAndEscapeQuotes };
+export declare function removeNewlinePlaceholders(s: string): string;
 export declare function getFirstPath(object: Record<string, unknown>, paths: string[]): string;
 export declare function hasPath(file: Record<string, unknown>, path: string | string[]): boolean;

package/lib/utilities/global.js

@@ -1,11 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasPath = exports.getFirstPath = exports.wrapAndEscapeQuotes = exports.escapeDoubleQuotes = exports.escapeQuotes = exports.unformatText = exports.wrap = void 0;
+exports.hasPath = exports.getFirstPath = exports.removeNewlinePlaceholders = exports.wrapAndEscapeQuotes = exports.escapeDoubleQuotes = exports.escapeQuotes = exports.unformatText = exports.wrap = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 // Breaks lines down to lineLength number of characters
 function wrap(s, lineLength = 80) {
-    return s.replace(new RegExp(`(?![^\n]{1,${lineLength}}$)([^\n]{1,${lineLength}})`, "g"), "$1\n");
+    let newString = "";
+    let currentLine = "";
+    let currentLength = 0;
+    let shouldBreakLine = false;
+    for (var i = 0; i < s.length; i++) {
+        if (shouldBreakLine) {
+            newString += `\n`;
+            currentLength = 0;
+            shouldBreakLine = false;
+        }
+        let currentChar = s.charAt(i);
+        let nextChar = s.charAt(i + 1);
+        if (nextChar === " ") {
+            if (currentLength >= lineLength) {
+                shouldBreakLine = true;
+                newString += currentChar;
+                currentLength++;
+            }
+            else {
+                newString += currentChar;
+                currentLength++;
+            }
+        }
+        else {
+            newString += currentChar;
+            currentLength++;
+        }
+    }
+    return newString;
 }
 exports.wrap = wrap;
 function unformatText(s) {
@@ -18,6 +46,10 @@ const escapeDoubleQuotes = (s) => s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 exports.escapeDoubleQuotes = escapeDoubleQuotes;
 const wrapAndEscapeQuotes = (s, lineLength) => escapeDoubleQuotes(wrap(s, lineLength)); // Escape backslashes and quotes, and wrap long lines
 exports.wrapAndEscapeQuotes = wrapAndEscapeQuotes;
+function removeNewlinePlaceholders(s) {
+    return s.replace(/\{\{\{\{newlineHERE\}\}\}\}/g, '\n');
+}
+exports.removeNewlinePlaceholders = removeNewlinePlaceholders;
 function getFirstPath(object, paths) {
     const index = lodash_1.default.findIndex(paths, (p) => hasPath(object, p));
     if (index === -1) {

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) {