Share JSON-object validation helper

src/cloud-hypervisor/artifact-manifest.ts

@@ -3,6 +3,7 @@ import {
   type CloudHypervisorArtifactDigests,
 } from '../types/runtime-options';
 import { version as AWF_VERSION } from '../../package.json';
+import { requireObject } from '../json-validation';
 
 const VIRTIOFSD_RELEASE_VERSION = '1.13.3';
 export const CLOUD_HYPERVISOR_ARTIFACT_RELEASE_TAG = `v${AWF_VERSION}`;
@@ -37,13 +38,6 @@ export interface CloudHypervisorArtifactManifest {
   }>;
 }
 
-function requireObject(value: unknown, label: string): Record<string, unknown> {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) {
-    throw new Error(`${label} must be a JSON object`);
-  }
-  return value as Record<string, unknown>;
-}
-
 function requireString(value: unknown, label: string): string {
   if (typeof value !== 'string' || value.length === 0) {
     throw new Error(`${label} must be a non-empty string`);

src/cloud-hypervisor/enclave-artifact-manifest.ts

@@ -4,6 +4,7 @@ import {
   CLOUD_HYPERVISOR_ARTIFACT_REPOSITORY,
   CLOUD_HYPERVISOR_ARTIFACT_SIGNER_WORKFLOW,
 } from './artifact-manifest';
+import { requireObject } from '../json-validation';
 
 export type CloudHypervisorEnclaveRole = 'script' | 'agent';
 export const CLOUD_HYPERVISOR_ENCLAVE_KERNEL_VERSION = '6.1.141';
@@ -59,13 +60,6 @@ export interface CloudHypervisorEnclaveArtifactManifest {
   >>;
 }
 
-function requireObject(value: unknown, label: string): Record<string, unknown> {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) {
-    throw new Error(`${label} must be a JSON object`);
-  }
-  return value as Record<string, unknown>;
-}
-
 function requireClosedKeys(
   value: Record<string, unknown>,
   expected: readonly string[],

src/json-validation.test.ts

@@ -0,0 +1,18 @@
+import { requireObject } from './json-validation';
+
+describe('requireObject', () => {
+  it('returns plain JSON objects', () => {
+    const value = { key: 'value' };
+
+    expect(requireObject(value, 'value')).toBe(value);
+  });
+
+  it.each([null, undefined, false, 0, '', [], ['value']])(
+    'rejects non-object JSON values: %p',
+    (value) => {
+      expect(() => requireObject(value, 'value')).toThrow(
+        'value must be a JSON object',
+      );
+    },
+  );
+});

src/json-validation.ts

@@ -0,0 +1,9 @@
+export function requireObject(
+  value: unknown,
+  label: string,
+): Record<string, unknown> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    throw new Error(`${label} must be a JSON object`);
+  }
+  return value as Record<string, unknown>;
+}

src/nvx/outcome.ts

@@ -1,3 +1,5 @@
+import { requireObject } from '../json-validation';
+
 export const NVX_OUTCOME_SCHEMA_VERSION = 1;
 export const NVX_TEARDOWN_STAGES = [
   'control_channels_closed',
@@ -137,13 +139,6 @@ export function parseNvxOneShotOutcome(contents: string): NvxOneShotOutcome {
   };
 }
 
-function requireObject(value: unknown, label: string): Record<string, unknown> {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) {
-    throw new Error(`${label} must be a JSON object`);
-  }
-  return value as Record<string, unknown>;
-}
-
 function requireString(value: unknown, label: string): string {
   if (typeof value !== 'string' || value.length === 0) {
     throw new Error(`${label} must be a non-empty string`);