@mitre/inspec-objects 0.0.23 → 0.0.26

package/lib/utilities/update.js

@@ -40,16 +40,20 @@ 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 (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)) {

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 convertJsonIntoXML(data: any): string;
 export declare function removeXMLSpecialCharacters(str: string): string;
 export declare function severityStringToImpact(string: string, id: string): number;
 export declare function impactNumberToSeverityString(impact: number): string;

package/lib/utilities/xccdf.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertEncodedHTMLIntoJson = exports.impactNumberToSeverityString = exports.severityStringToImpact = exports.removeXMLSpecialCharacters = exports.convertEncodedXmlIntoJson = void 0;
+exports.convertEncodedHTMLIntoJson = exports.impactNumberToSeverityString = exports.severityStringToImpact = exports.removeXMLSpecialCharacters = exports.convertJsonIntoXML = exports.convertEncodedXmlIntoJson = void 0;
 const tslib_1 = require("tslib");
 const fast_xml_parser_1 = tslib_1.__importDefault(require("fast-xml-parser"));
+const jstoxml_1 = require("jstoxml");
 const htmlparser = tslib_1.__importStar(require("htmlparser2"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const he_1 = tslib_1.__importDefault(require("he"));
@@ -11,10 +12,15 @@ function convertEncodedXmlIntoJson(encodedXml) {
         ignoreAttributes: false,
         ignoreNameSpace: true,
         attributeNamePrefix: '@_',
+        stopNodes: ['div', 'p'],
         arrayMode: true
     });
 }
 exports.convertEncodedXmlIntoJson = convertEncodedXmlIntoJson;
+function convertJsonIntoXML(data) {
+    return (0, jstoxml_1.toXML)(data);
+}
+exports.convertJsonIntoXML = convertJsonIntoXML;
 function removeXMLSpecialCharacters(str) {
     return he_1.default.decode(str);
 }