style: simplify record types (#456)

Author: jkowalleck

src/resources.node.ts

@@ -27,27 +27,27 @@ export const ROOT = path.resolve(__dirname, '..', 'res')
 /** @internal */
 export const FILES = Object.freeze({
   CDX: Object.freeze({
-    XML_SCHEMA: Object.freeze(Object.fromEntries([
-      [Version.v1dot0, path.resolve(ROOT, 'bom-1.0.SNAPSHOT.xsd')],
-      [Version.v1dot1, path.resolve(ROOT, 'bom-1.1.SNAPSHOT.xsd')],
-      [Version.v1dot2, path.resolve(ROOT, 'bom-1.2.SNAPSHOT.xsd')],
-      [Version.v1dot3, path.resolve(ROOT, 'bom-1.3.SNAPSHOT.xsd')],
-      [Version.v1dot4, path.resolve(ROOT, 'bom-1.4.SNAPSHOT.xsd')]
-    ]) as { [key in Version]?: string }),
-    JSON_SCHEMA: Object.freeze(Object.fromEntries([
+    XML_SCHEMA: Object.freeze({
+      [Version.v1dot0]: path.resolve(ROOT, 'bom-1.0.SNAPSHOT.xsd'),
+      [Version.v1dot1]: path.resolve(ROOT, 'bom-1.1.SNAPSHOT.xsd'),
+      [Version.v1dot2]: path.resolve(ROOT, 'bom-1.2.SNAPSHOT.xsd'),
+      [Version.v1dot3]: path.resolve(ROOT, 'bom-1.3.SNAPSHOT.xsd'),
+      [Version.v1dot4]: path.resolve(ROOT, 'bom-1.4.SNAPSHOT.xsd')
+    }),
+    JSON_SCHEMA: Object.freeze({
       // v1.0 is not defined in JSON
       // v1.1 is not defined in JSON
-      [Version.v1dot2, path.resolve(ROOT, 'bom-1.2.SNAPSHOT.schema.json')],
-      [Version.v1dot3, path.resolve(ROOT, 'bom-1.3.SNAPSHOT.schema.json')],
-      [Version.v1dot4, path.resolve(ROOT, 'bom-1.4.SNAPSHOT.schema.json')]
-    ]) as { [key in Version]?: string }),
-    JSON_STRICT_SCHEMA: Object.freeze(Object.fromEntries([
+      [Version.v1dot2]: path.resolve(ROOT, 'bom-1.2.SNAPSHOT.schema.json'),
+      [Version.v1dot3]: path.resolve(ROOT, 'bom-1.3.SNAPSHOT.schema.json'),
+      [Version.v1dot4]: path.resolve(ROOT, 'bom-1.4.SNAPSHOT.schema.json')
+    }),
+    JSON_STRICT_SCHEMA: Object.freeze({
       // v1.0 is not defined in JSON
       // v1.1 is not defined in JSON
-      [Version.v1dot2, path.resolve(ROOT, 'bom-1.2-strict.SNAPSHOT.schema.json')],
-      [Version.v1dot3, path.resolve(ROOT, 'bom-1.3-strict.SNAPSHOT.schema.json')]
+      [Version.v1dot2]: path.resolve(ROOT, 'bom-1.2-strict.SNAPSHOT.schema.json'),
+      [Version.v1dot3]: path.resolve(ROOT, 'bom-1.3-strict.SNAPSHOT.schema.json')
       // v1.4 is already strict - no special file here
-    ]) as { [key in Version]?: string })
+    })
   }),
   SPDX: Object.freeze({
     XML_SCHEMA: path.resolve(ROOT, 'spdx.SNAPSHOT.xsd'),

src/spec.ts

@@ -298,7 +298,7 @@ export const Spec1dot4: Readonly<Protocol> = Object.freeze(new Spec(
   true
 ))
 
-export const SpecVersionDict: { readonly [key in Version]?: Readonly<Protocol> } = Object.freeze({
+export const SpecVersionDict: Readonly<Partial<Record<Version, Readonly<Protocol>>>> = Object.freeze({
   [Version.v1dot2]: Spec1dot2,
   [Version.v1dot3]: Spec1dot3,
   [Version.v1dot4]: Spec1dot4

tests/functional/Resources.node.spec.js

@@ -27,7 +27,7 @@ const {
 } = require('../../')
 
 suite('Resources', () => {
-  suite('expected dir', () => {
+  suite('expected dirs', () => {
     [
       Resources.ROOT
     ].forEach(expectedDir =>