@mitre/inspec-objects 2.0.2 → 2.0.5

package/.github/dependabot.yml

@@ -6,6 +6,8 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-      time: "20:00"
-      timezone: America/New_York
-    open-pull-requests-limit: 99
+    groups:
+      typescript-eslint:
+        applies-to: version-updates
+        patterns:
+          - "@typescript-eslint/*"

package/.github/workflows/auto-approve-and-merge.yml

@@ -4,6 +4,7 @@ on:
     types: [labeled]
 permissions:
   pull-requests: write
+  contents: write
 
 jobs:
   approve:

package/.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build and Pack TS-InSpec-Objects
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  build:
+    name: Build and Pack TS-InSpec-Objects
+    runs-on: ubuntu-24.04
+
+    steps:
+     - uses: actions/checkout@v4
+
+     - name: Setup Node.js
+       uses: actions/setup-node@v4
+       with:
+        node-version: 22
+        cache: 'npm'
+
+     - name: Prep
+       run: |
+         npm ci
+         rm -rf test
+
+     - name: Build
+       run: npm run build
+
+     - name: Pack
+       run: npm pack

package/.github/workflows/push-to-gpr.yml

@@ -17,16 +17,18 @@ jobs:
           registry-url: 'https://npm.pkg.github.com'
           scope: '@mitre'
 
-      - name: Build the NPM Package
-        run: |
-          npm install
-          rm -rf test
-          npm run build
+      - name: Install project dependencies
+        run: npm ci
 
-      - name: Pack all items that are published
+      - name: Remove testing resources
+        run: rm -rf test
+
+      - name: Build
+        run: npm run build
+
+      - name: Pack all items that are published as packages
         run: npm pack
 
-      # Publish inspec-objects to GitHub Package Registry
       - name: Publish inspec-objects to GPR
         run: npm publish mitre-inspec-objects-*.tgz
         env:

package/lib/objects/control.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectifyDescriptions = objectifyDescriptions;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const flat_1 = require("flat");
-const flat_2 = require("flat");
 const global_1 = require("../utilities/global");
 const logging_1 = require("../utilities/logging");
 /**
@@ -60,7 +58,7 @@ class Control {
         this.refs = [];
         this.tags = {};
         if (data) {
-            Object.entries(data).forEach(([key, value]) => {
+            Object.entries(lodash_1.default.cloneDeep(data)).forEach(([key, value]) => {
                 lodash_1.default.set(this, key, value);
             });
         }
@@ -73,13 +71,7 @@ class Control {
      * @returns {Control} A new Control object created from the unformatted data.
      */
     toUnformattedObject() {
-        const flattened = (0, flat_1.flatten)(this);
-        Object.entries(flattened).forEach(([key, value]) => {
-            if (typeof value === 'string') {
-                lodash_1.default.set(flattened, key, value);
-            }
-        });
-        return new Control((0, flat_2.unflatten)(flattened));
+        return new Control(this);
     }
     /**
      * Converts the control object to a string representation in a specific format.

package/lib/parsers/oval.js

@@ -109,7 +109,6 @@ function processOVAL(oval) {
                 extractedDefinitions[definition['@_id']].resolvedValues = (_a = extractedDefinitions[definition['@_id']].criteriaRefs) === null || _a === void 0 ? void 0 : _a.map((criteriaRef) => {
                     // Extract the original criteria from the oval file
                     const foundCriteriaRefererence = searchTree(parsed.oval_definitions[0].tests, (oNode) => oNode['@_id'] === criteriaRef, false)[0];
-                    // eslint-disable-next-line @typescript-eslint/ban-types
                     const foundObjects = [];
                     const foundStates = [];
                     if (foundCriteriaRefererence) {

package/lib/parsers/xccdf.js

@@ -174,9 +174,7 @@ function processXCCDF(xml, removeNewlines, useRuleId, ovalDefinitions) {
                 break;
             case 'version':
                 if (rule.version !== undefined) {
-                    (lodash_1.default.isArray(rule.version))
-                        ? control.id = rule.version[0]
-                        : control.id = rule.version;
+                    control.id = (lodash_1.default.isArray(rule.version)) ? rule.version[0] : rule.version;
                 }
                 else {
                     throw new Error('The rule type "version" did not provide an identification (Id) value');
@@ -344,8 +342,8 @@ function processXCCDF(xml, removeNewlines, useRuleId, ovalDefinitions) {
         }
         // Update the control tags base on corresponding rule tags.
         control.tags.severity = (0, xccdf_1.impactNumberToSeverityString)((0, xccdf_1.severityStringToImpact)(rule['@_severity'] || 'medium'));
-        control.tags.gid = rule.group['@_id'],
-            control.tags.rid = rule['@_id'];
+        control.tags.gid = rule.group['@_id'];
+        control.tags.rid = rule['@_id'];
         control.tags.stig_id = rule['version'];
         if (typeof rule.group.title === 'string') {
             control.tags.gtitle = (0, xccdf_1.removeXMLSpecialCharacters)(rule.group.title);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mitre/inspec-objects",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "Typescript objects for normalizing between InSpec profiles and XCCDF benchmarks",
   "main": "lib/index.js",
   "publishConfig": {
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "tsc -p ./tsconfig.build.json",
     "dev": "npx -y ts-node test.ts",
-    "test": "jest",
+    "test": "vitest",
     "lint": "eslint \"**/*.ts\" --fix",
     "lint:ci": "eslint \"**/*.ts\" --max-warnings 0"
   },
@@ -24,7 +24,6 @@
   },
   "homepage": "https://github.com/mitre/ts-inspec-objects#readme",
   "dependencies": {
-    "@types/flat": "5.0.2",
     "@types/he": "^1.1.2",
     "@types/json-diff": "^1.0.0",
     "@types/jstoxml": "^2.0.2",
@@ -32,34 +31,24 @@
     "@types/mustache": "^4.2.0",
     "@types/pretty": "^2.0.1",
     "fast-xml-parser": "^5.0.7",
-    "flat": "5.0.2",
     "he": "^1.2.0",
     "htmlparser2": "^10.0.0",
     "inspecjs": "^2.6.6",
     "json-diff": "^1.0.6",
-    "jstoxml": "^6.0.1",
+    "jstoxml": "^7.0.1",
     "lodash": "^4.17.21",
     "mustache": "^4.2.0",
     "pretty": "^2.0.0",
+    "tslib": "^2.8.1",
     "winston": "^3.8.1",
     "yaml": "^2.3.1"
   },
   "devDependencies": {
-    "@types/jest": "^30.0.0",
     "@types/node": "^24.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.35.1",
+    "@typescript-eslint/parser": "^8.35.1",
     "eslint": "^8.30.0",
-    "jest": "^30.0.0",
-    "ts-jest": "^29.1.1",
-    "tslib": "^2.4.0",
-    "typescript": "^5.2.2"
-  },
-  "jest": {
-    "rootDir": ".",
-    "testTimeout": 10000000,
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
-    }
+    "typescript": "^5.2.2",
+    "vitest": "^3.2.4"
   }
 }

package/tsconfig.json

@@ -11,11 +11,11 @@
     "rootDir": "src",
     "strict": true,
     "target": "es2019",
-    "types": ["node", "jest"]
+    "types": ["node"]
   },
   "include": [
     "index.ts",
     "src/**/*",
     "types/*"
   ],
-}
+}

package/vitest.config.ts

@@ -0,0 +1,7 @@
+import {defineConfig} from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    testTimeout: 60000
+  }
+});