Merge fff1399 into 4c110da

Author: toomuchdesign

.changeset/itchy-pumas-build.md

@@ -0,0 +1,5 @@
+---
+'@toomuchdesign/json-schema-fns': minor
+---
+
+Remove unnecessary `Readonly` invocations

.changeset/three-masks-read.md

@@ -0,0 +1,5 @@
+---
+'@toomuchdesign/json-schema-fns': minor
+---
+
+Remove unnecessary `Simplify` invocations

src/mergeProps.ts

@@ -5,6 +5,7 @@ import type {
   MergeOptionalRecords,
   MergeOptionalTuples,
   MergeRecords,
+  Simplify,
 } from './utils/types';
 
 type MergeProps<
@@ -13,11 +14,19 @@ type MergeProps<
 > = MergeRecords<
   MergeRecords<Schema1, Schema2>,
   {
-    required: MergeOptionalTuples<Schema1['required'], Schema2['required']>;
-    properties: MergeRecords<Schema1['properties'], Schema2['properties']>;
-    patternProperties: MergeOptionalRecords<
-      Schema1['patternProperties'],
-      Schema2['patternProperties']
+    readonly required: Readonly<
+      MergeOptionalTuples<Schema1['required'], Schema2['required']>
+    >;
+    readonly properties: Simplify<
+      Readonly<MergeRecords<Schema1['properties'], Schema2['properties']>>
+    >;
+    readonly patternProperties: Simplify<
+      Readonly<
+        MergeOptionalRecords<
+          Schema1['patternProperties'],
+          Schema2['patternProperties']
+        >
+      >
     >;
   }
 >;

src/sealSchemaDeep.ts

@@ -17,9 +17,9 @@ type DisableAdditionalPropertiesDeep<Value> = Value extends object
         >
       >
     : // Any other object/array
-      Readonly<{
+      {
         [Key in keyof Value]: DisableAdditionalPropertiesDeep<Value[Key]>;
-      }>
+      }
   : // Any other primitive
     Value;
 

src/unsealSchemaDeep.ts

@@ -4,16 +4,16 @@ import type { JSONSchema, JSONSchemaObjectOutput } from './utils/types';
 type OmitAdditionalPropertiesDeep<Value> = Value extends object
   ? Value extends { type: 'object' }
     ? // JSON schema object type
-      Readonly<{
+      {
         [Key in keyof Omit<
           Value,
           'additionalProperties'
         >]: OmitAdditionalPropertiesDeep<Value[Key]>;
-      }>
+      }
     : // Any other object/array
-      Readonly<{
+      {
         [Key in keyof Value]: OmitAdditionalPropertiesDeep<Value[Key]>;
-      }>
+      }
   : // Any other primitive
     Value;
 

src/utils/types/definitions.ts

@@ -1,4 +1,4 @@
-import type { MergeRecords, OmitByValue, Simplify } from './records';
+import type { MergeRecords, OmitByValue } from './records';
 
 // https://github.com/ThomasAribart/json-schema-to-ts/blob/12767c1eab895159c01f5e6898d8e5e711ff9d1c/src/definitions/jsonSchema.ts
 export type JSONSchema = Readonly<{
@@ -17,6 +17,6 @@ export type JSONSchemaObject = MergeRecords<
   }
 >;
 
-export type JSONSchemaObjectOutput<Schema extends JSONSchema> =
+export type JSONSchemaObjectOutput<Schema extends Record<string, unknown>> =
   // Remove undefined props and empty arrays
   OmitByValue<Schema, readonly [] | undefined>;

src/utils/types/records.ts

@@ -11,7 +11,7 @@ export type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {};
 export type MergeRecords<
   Destination extends UnknownRecord,
   Source extends UnknownRecord,
-> = Simplify<Omit<Destination, keyof Source> & Source>;
+> = Omit<Destination, keyof Source> & Source;
 
 /**
  * Merge two optional records, keeping `undefined` if both are undefined

src/utils/types/tuples.ts

@@ -32,11 +32,9 @@ export type PickFromTuple<
 export type MergeTuples<
   T1 extends StringTuple,
   T2 extends StringTuple,
-> = Readonly<
-  UnionToTuple<
-    // Transform tuples to union to remove duplicates
-    T1[number] | T2[number]
-  >
+> = UnionToTuple<
+  // Transform tuples to union to remove duplicates
+  T1[number] | T2[number]
 >;
 
 /**
@@ -51,4 +49,4 @@ export type MergeOptionalTuples<
     : T1
   : T2 extends StringTuple
     ? T2
-    : [];
+    : readonly [];