diff --git a/apps/frontend/src/store/data_filters.ts b/apps/frontend/src/store/data_filters.ts index c9d510cc89..ef798e90be 100644 --- a/apps/frontend/src/store/data_filters.ts +++ b/apps/frontend/src/store/data_filters.ts @@ -21,10 +21,10 @@ import * as _ from 'lodash'; import {LRUCache} from 'lru-cache'; import { Action, - getModule, Module, Mutation, - VuexModule + VuexModule, + getModule } from 'vuex-module-decorators'; const MAX_CACHE_ENTRIES = 20; diff --git a/apps/frontend/src/store/data_store.ts b/apps/frontend/src/store/data_store.ts index 67fa0941e2..cbf87dce50 100644 --- a/apps/frontend/src/store/data_store.ts +++ b/apps/frontend/src/store/data_store.ts @@ -12,10 +12,10 @@ import { import Store from '@/store/store'; import { Action, - getModule, Module, Mutation, - VuexModule + VuexModule, + getModule } from 'vuex-module-decorators'; import {FilteredDataModule} from './data_filters'; diff --git a/apps/frontend/src/store/evaluations.ts b/apps/frontend/src/store/evaluations.ts index b9528c63d8..b55ddda2c0 100644 --- a/apps/frontend/src/store/evaluations.ts +++ b/apps/frontend/src/store/evaluations.ts @@ -11,10 +11,10 @@ import axios from 'axios'; import * as _ from 'lodash'; import { Action, - getModule, Module, Mutation, - VuexModule + VuexModule, + getModule } from 'vuex-module-decorators'; import {InspecDataModule} from './data_store'; import { diff --git a/apps/frontend/src/store/server.ts b/apps/frontend/src/store/server.ts index 1298414cd3..026d5da65e 100644 --- a/apps/frontend/src/store/server.ts +++ b/apps/frontend/src/store/server.ts @@ -10,10 +10,10 @@ import axios from 'axios'; import Vue from 'vue'; import { Action, - getModule, Module, Mutation, - VuexModule + VuexModule, + getModule } from 'vuex-module-decorators'; import {GroupsModule} from './groups'; diff --git a/apps/frontend/src/store/severity_counts.ts b/apps/frontend/src/store/severity_counts.ts index 2377ceb846..99ed415458 100644 --- a/apps/frontend/src/store/severity_counts.ts +++ b/apps/frontend/src/store/severity_counts.ts @@ -11,7 +11,7 @@ import { import Store from '@/store/store'; import {Severity} from 'inspecjs'; import {LRUCache} from 'lru-cache'; -import {getModule, Module, VuexModule} from 'vuex-module-decorators'; +import {Module, VuexModule, getModule} from 'vuex-module-decorators'; // The hash that we will generally be working with herein type SeverityHash = {[key in Severity]: number}; diff --git a/apps/frontend/src/store/status_counts.ts b/apps/frontend/src/store/status_counts.ts index 18cf9fd08f..c84e0f7ddd 100644 --- a/apps/frontend/src/store/status_counts.ts +++ b/apps/frontend/src/store/status_counts.ts @@ -11,7 +11,7 @@ import { import Store from '@/store/store'; import {ControlStatus} from 'inspecjs'; import {LRUCache} from 'lru-cache'; -import {getModule, Module, VuexModule} from 'vuex-module-decorators'; +import {Module, VuexModule, getModule} from 'vuex-module-decorators'; // The hash that we will generally be working with herein export type ControlStatusHash = { diff --git a/apps/frontend/tests/unit/Results.spec.ts b/apps/frontend/tests/unit/Results.spec.ts index 2789bb6e56..8ab9ebb103 100644 --- a/apps/frontend/tests/unit/Results.spec.ts +++ b/apps/frontend/tests/unit/Results.spec.ts @@ -1,7 +1,7 @@ import ControlTable from '@/components/cards/controltable/ControlTable.vue'; import {Filter, FilteredDataModule} from '@/store/data_filters'; import Results from '@/views/Results.vue'; -import {shallowMount, Wrapper} from '@vue/test-utils'; +import {Wrapper, shallowMount} from '@vue/test-utils'; import {ContextualizedControl} from 'inspecjs'; import 'jest'; import Vue from 'vue'; diff --git a/libs/hdf-converters/src/asff-mapper/case-previously-hdf.ts b/libs/hdf-converters/src/asff-mapper/case-previously-hdf.ts index ccbdce7e2c..900cac24e5 100644 --- a/libs/hdf-converters/src/asff-mapper/case-previously-hdf.ts +++ b/libs/hdf-converters/src/asff-mapper/case-previously-hdf.ts @@ -3,11 +3,11 @@ import {ExecJSON} from 'inspecjs'; import * as _ from 'lodash'; import {ILookupPath, MappedTransform} from '../base-converter'; import { - conditionallyProvideAttribute, DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS, - FROM_ASFF_TYPES_SLASH_REPLACEMENT + FROM_ASFF_TYPES_SLASH_REPLACEMENT, + conditionallyProvideAttribute } from '../utils/global'; -import {ASFFMapper, consolidate, SpecialCasing} from './asff-mapper'; +import {ASFFMapper, SpecialCasing, consolidate} from './asff-mapper'; function replaceTypesSlashes(type: T): T | string { if (!_.isString(type)) { diff --git a/libs/hdf-converters/src/converters-from-hdf/html/reverse-html-mapper.ts b/libs/hdf-converters/src/converters-from-hdf/html/reverse-html-mapper.ts index eec852ba83..9429e4e4e1 100644 --- a/libs/hdf-converters/src/converters-from-hdf/html/reverse-html-mapper.ts +++ b/libs/hdf-converters/src/converters-from-hdf/html/reverse-html-mapper.ts @@ -11,8 +11,8 @@ import axios from 'axios'; import { ContextualizedControl, ContextualizedEvaluation, - convertFileContextual, HDFControlSegment, + convertFileContextual, isContextualizedEvaluation } from 'inspecjs'; import * as _ from 'lodash'; diff --git a/libs/hdf-converters/src/xccdf-results-mapper.ts b/libs/hdf-converters/src/xccdf-results-mapper.ts index fbf652fa20..6ba8133edc 100644 --- a/libs/hdf-converters/src/xccdf-results-mapper.ts +++ b/libs/hdf-converters/src/xccdf-results-mapper.ts @@ -4,15 +4,15 @@ import {version as HeimdallToolsVersion} from '../package.json'; import { BaseConverter, ILookupPath, - impactMapping, MappedTransform, + impactMapping, parseHtml, parseXml } from './base-converter'; import {CciNistMapping} from './mappings/CciNistMapping'; import { - conditionallyProvideAttribute, - DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS + DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS, + conditionallyProvideAttribute } from './utils/global'; const IMPACT_MAPPING: Map = new Map([ diff --git a/libs/hdf-converters/types/splunk-control-types.ts b/libs/hdf-converters/types/splunk-control-types.ts index 3511a42970..0d0a4d822c 100644 --- a/libs/hdf-converters/types/splunk-control-types.ts +++ b/libs/hdf-converters/types/splunk-control-types.ts @@ -9,7 +9,7 @@ export type SplunkControl = { descriptions: Record[] | ILookupPathFH; id: string; impact: number; - refs: any[] | ILookupPathFH; + refs: any[]; results?: HDFControlSegment[] | ILookupPathFH; source_location?: any; tags: Tags; diff --git a/libs/inspecjs/src/compat_impl/compat_inspec_1_0.ts b/libs/inspecjs/src/compat_impl/compat_inspec_1_0.ts index 4b35123c81..1b026d5c57 100644 --- a/libs/inspecjs/src/compat_impl/compat_inspec_1_0.ts +++ b/libs/inspecjs/src/compat_impl/compat_inspec_1_0.ts @@ -16,9 +16,9 @@ import { import {ProfileJSONControl as ProfileControl_1_0} from '../generated_parsers/v_1_0/profile-json'; import { CanonizationConfig, - is_control, NistControl, NistRevision, + is_control, parse_nist } from '../nist'; diff --git a/libs/inspecjs/src/index.ts b/libs/inspecjs/src/index.ts index 8a71763394..d34828ae2f 100644 --- a/libs/inspecjs/src/index.ts +++ b/libs/inspecjs/src/index.ts @@ -5,9 +5,9 @@ export { ControlStatus, HDFControl, HDFControlSegment, - hdfWrapControl, SegmentStatus, - Severity + Severity, + hdfWrapControl } from './compat_wrappers'; // Export Conversion functions export * from './context'; diff --git a/libs/inspecjs/src/versions/v_1_0/exec_json.ts b/libs/inspecjs/src/versions/v_1_0/exec_json.ts index f1055d6f3f..f6691e4182 100644 --- a/libs/inspecjs/src/versions/v_1_0/exec_json.ts +++ b/libs/inspecjs/src/versions/v_1_0/exec_json.ts @@ -1,19 +1,19 @@ export { + ExecJSONControl as Control, ControlDescription, ControlGroup, ControlResult, ControlResultStatus, + WaiverData as ControlWaiverData, Convert, - Dependency as ProfileDependency, ExecJSON as Execution, - ExecJSONControl as Control, - ExecJSONProfile as Profile, Platform, + ExecJSONProfile as Profile, + Dependency as ProfileDependency, Reference, SourceLocation, StatisticBlock, StatisticHash, Statistics, - SupportedPlatform, - WaiverData as ControlWaiverData + SupportedPlatform } from '../../generated_parsers/v_1_0/exec-json'; diff --git a/libs/inspecjs/src/versions/v_1_0/exec_jsonmin.ts b/libs/inspecjs/src/versions/v_1_0/exec_jsonmin.ts index 8c344aef69..45ee74c4e0 100644 --- a/libs/inspecjs/src/versions/v_1_0/exec_jsonmin.ts +++ b/libs/inspecjs/src/versions/v_1_0/exec_jsonmin.ts @@ -1,7 +1,7 @@ export { + ExecJSONMINControl as Control, Convert, ExecJsonmin as Execution, - ExecJSONMINControl as Control, StatisticBlock, StatisticHash, Statistics diff --git a/libs/inspecjs/src/versions/v_1_0/index.ts b/libs/inspecjs/src/versions/v_1_0/index.ts index 4ce278a500..7296ac88ec 100644 --- a/libs/inspecjs/src/versions/v_1_0/index.ts +++ b/libs/inspecjs/src/versions/v_1_0/index.ts @@ -1,4 +1,4 @@ import * as ExecJSON from './exec_json'; import * as ExecJSONMin from './exec_jsonmin'; import * as ProfileJSON from './profile_json'; -export {ExecJSON, ProfileJSON, ExecJSONMin}; +export {ExecJSON, ExecJSONMin, ProfileJSON}; diff --git a/libs/inspecjs/src/versions/v_1_0/profile_json.ts b/libs/inspecjs/src/versions/v_1_0/profile_json.ts index 54fc14d77f..615fabed5a 100644 --- a/libs/inspecjs/src/versions/v_1_0/profile_json.ts +++ b/libs/inspecjs/src/versions/v_1_0/profile_json.ts @@ -1,9 +1,9 @@ export { + ProfileJSONControl as Control, ControlGroup, Convert, - Dependency as ProfileDependency, ProfileJSON as Profile, - ProfileJSONControl as Control, + Dependency as ProfileDependency, Reference, SourceLocation, SupportedPlatform diff --git a/package.json b/package.json index b1a3c36f6a..de89a272c3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lerna": "^8.1.2", "prettier": "^3.2.4", "prettier-plugin-organize-imports": "^3.0.0", - "typescript": "^4.9.3", + "typescript": "^5.3.3", "vue": "^2.7.16", "vue-template-compiler": "^2.7.16" }, diff --git a/yarn.lock b/yarn.lock index 8b764b63bd..6c627f12ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19839,10 +19839,10 @@ typescript@5.3.3: resolved "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== -typescript@^4.9.3: - version "4.9.5" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.3.3: + version "5.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== typescript@~3.2.1: version "3.2.4"