@mitre/inspec-objects 0.0.4 → 0.0.5

package/lib/utilities/diff.js

@@ -49,10 +49,8 @@ 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/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/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mitre/inspec-objects",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@mitre/inspec-objects",
-      "version": "0.0.1",
+      "version": "0.0.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/flat": "^5.0.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mitre/inspec-objects",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Typescript objects for normalizing between InSpec profiles and XCCDF benchmarks",
   "main": "lib/index.js",
   "publishConfig": {