refactor: add recordArrayPair type to allow both exports to work

Author: david-roper

apps/api/src/instrument-records/instrument-records.service.ts

@@ -423,19 +423,17 @@ export class InstrumentRecordsService {
       throw new Error('Record Array is Empty');
     }
     for (const objectEntry of Object.values(listEntry)) {
-      const parseResult = $RecordArrayFieldValue.safeParse(objectEntry);
-      if (!parseResult.success) {
-        validRecordArrayList.push({
-          message: `Error interpreting value of record array entry ${objectEntry}`,
-          success: false
-        });
-      }
-      for (const [dataKey, dataValue] of Object.entries(
-        objectEntry as { [key: string]: boolean | Date | number | string | undefined }
-      )) {
+      for (const [dataKey, dataValue] of Object.entries(objectEntry as { [key: string]: any })) {
+        const parseResult = $RecordArrayFieldValue.safeParse(dataValue);
+        if (!parseResult.success) {
+          validRecordArrayList.push({
+            message: `Error interpreting value ${dataValue} and record array key ${dataKey}`,
+            success: false
+          });
+        }
         validRecordArrayList.push({
           measure: dataKey,
-          measureValue: dataValue,
+          measureValue: parseResult.data,
           success: true
         });
       }

packages/schemas/src/instrument/instrument.base.ts

@@ -92,17 +92,16 @@ const $UnilingualInstrumentDetails = $InstrumentDetails.extend({
 
 const $InstrumentMeasureVisibility: z.ZodType<InstrumentMeasureVisibility> = z.enum(['hidden', 'visible']);
 
-const $RecordArrayFieldValue = z.record(
-  z.string(),
-  z.union([z.string(), z.boolean(), z.number(), z.date(), z.undefined()])
-);
+const $RecordArrayFieldValue = z.union([z.string(), z.boolean(), z.number(), z.date(), z.undefined()]);
+
+const $RecordArrayPair = z.record(z.string(), $RecordArrayFieldValue);
 
 const $InstrumentMeasureValue: z.ZodType<InstrumentMeasureValue> = z.union([
   z.string(),
   z.boolean(),
   z.number(),
   z.date(),
-  z.array($RecordArrayFieldValue),
+  z.array($RecordArrayPair),
   z.undefined()
 ]);