@mitre/inspec-objects 0.0.24 → 0.0.25

package/lib/utilities/update.d.ts

@@ -1,4 +1,4 @@
-import winston from 'winston';
+import winston from "winston";
 import Control from '../objects/control';
 import Profile from '../objects/profile';
 import { ProfileDiff } from '../types/diff';

package/lib/utilities/update.js

@@ -9,15 +9,13 @@ const profile_1 = tslib_1.__importDefault(require("../objects/profile"));
 const xccdf_1 = require("../parsers/xccdf");
 const diff_1 = require("./diff");
 const diffMarkdown_1 = require("./diffMarkdown");
-const knownInSpecKeywords = ['title', 'desc', 'impact', 'ref', 'tag', '"'];
+const knownInSpecKeywords = ['title', 'desc', 'impact', 'ref', 'tag', "\""];
 function projectValuesOntoExistingObj(dst, src, currentPath = '') {
     for (const updatedValue in src) {
         const existingValue = lodash_1.default.get(dst, updatedValue);
         // We have a new value for something that already exists in dst
         if (existingValue !== undefined) {
-            if (typeof existingValue === 'object' &&
-                existingValue !== null &&
-                !Array.isArray(existingValue)) {
+            if (typeof existingValue === 'object' && existingValue !== null && !Array.isArray(existingValue)) {
                 dst[updatedValue] = projectValuesOntoExistingObj(existingValue, src[updatedValue], currentPath + updatedValue + '.');
             }
             else if (typeof src[updatedValue] === 'string') {
@@ -27,9 +25,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 = [...new Set(lodash_1.default.get(dst, updatedValue, []).concat(src[updatedValue]))];
                 lodash_1.default.set(dst, updatedValue, uniqueArrayValues);
             }
         }
@@ -44,24 +40,23 @@ function getExistingDescribeFromControl(control) {
         let currentQuoteEscape = '';
         let inQuoteBlock = false;
         let inMetadataValueOverride = false;
-        const splitLines = control.code.split('\n');
-        splitLines.forEach((line, lineIndex) => {
-            // Special case - Multi-line arrayed metadata value
-            if (typeof splitLines[lineIndex - 1] === 'string') {
-                if (knownInSpecKeywords.indexOf(splitLines[lineIndex - 1].trim().split(' ')[0]) !== -1 &&
-                    splitLines[lineIndex - 1].trim().split(' ')[1].startsWith('[')) {
-                    inMetadataValueOverride = true;
-                }
-            }
+        let indentedMetadataOverride = false;
+        let mostSpacesSeen = 0;
+        control.code.split('\n').forEach((line) => {
             const wordSplit = line.trim().split(' ');
-            if (!inQuoteBlock && !inMetadataValueOverride) {
+            const spaces = line.substring(0, line.indexOf(wordSplit[0])).length;
+            if (spaces - mostSpacesSeen > 10) {
+                indentedMetadataOverride = true;
+            }
+            else {
+                mostSpacesSeen = spaces;
+                indentedMetadataOverride = false;
+            }
+            if (!inQuoteBlock && !inMetadataValueOverride && !indentedMetadataOverride) {
                 // Get the number of spaces at the beggining of the current line
-                const spaces = line.substring(0, line.indexOf(wordSplit[0])).length;
                 if (spaces >= 2) {
                     const firstWord = wordSplit[0];
-                    if (knownInSpecKeywords.indexOf(firstWord.toLowerCase()) === -1 ||
-                        (knownInSpecKeywords.indexOf(firstWord.toLowerCase()) !== -1 &&
-                            spaces > 2)) {
+                    if (knownInSpecKeywords.indexOf(firstWord.toLowerCase()) === -1 || (knownInSpecKeywords.indexOf(firstWord.toLowerCase()) !== -1 && spaces > 2)) {
                         existingDescribeBlock += line + '\n';
                     }
                 }
@@ -130,7 +125,7 @@ function updateProfile(from, using, logger) {
     // Find the diff
     const diff = (0, diff_1.diffProfile)(from, using, logger);
     // Add the new controls
-    diff.simplified.addedControlIDs.forEach((id) => {
+    diff.simplified.addedControlIDs.forEach(id => {
         const addedControl = diff.simplified.addedControls[id];
         if (addedControl) {
             logger.debug(`New Control: ${addedControl.id} - ${addedControl.title}`);
@@ -155,7 +150,7 @@ function updateProfile(from, using, logger) {
     }
     return {
         profile: to,
-        diff
+        diff,
     };
 }
 exports.updateProfile = updateProfile;

package/package-lock.json

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

package/package.json

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