Revision 0.34.39 (#1296)

* Guard Array in Object Conversion

* Guard Array in Record Conversion

* Version | Changelog

* TypeScript 5.9.2

Author: sinclairzx81

changelog/0.34.0.md

@@ -3,6 +3,8 @@
 ---
 
 ### Revision Updates
+- [Revision 0.34.39](https://github.com/sinclairzx81/typebox/pull/1296)
+  - Guard for Array in Object and Record conversion
 - [Revision 0.34.38](https://github.com/sinclairzx81/typebox/pull/1282)
   - Preserve exact type matches in Union conversion
 - [Revision 0.34.37](https://github.com/sinclairzx81/typebox/pull/1278)

hammer.mjs

@@ -40,7 +40,7 @@ export async function test_typescript() {
     '5.2.2', '5.3.2', '5.3.3', '5.4.3', 
     '5.4.5', '5.5.2', '5.5.3', '5.5.4', 
     '5.6.2', '5.6.3', '5.7.2', '5.7.3', 
-    '5.8.2', 'next', 'latest'
+    '5.8.2', '5.8.3', 'next', 'latest'
   ]) {
     await shell(`npm install typescript@${version} --no-save`)
     await test_static()

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.34.38",
+  "version": "0.34.39",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",
@@ -38,6 +38,6 @@
     "ajv-formats": "^2.1.1",
     "mocha": "^11.1.0",
     "prettier": "^2.7.1",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   }
 }

package.json

@@ -200,15 +200,15 @@ function FromNumber(schema: TNumber, references: TSchema[], value: any): unknown
 }
 // prettier-ignore
 function FromObject(schema: TObject, references: TSchema[], value: any): unknown {
-  if(!IsObject(value)) return value
+  if(!IsObject(value) || IsArray(value)) return value
   for(const propertyKey of Object.getOwnPropertyNames(schema.properties)) {
     if(!HasPropertyKey(value, propertyKey)) continue
     value[propertyKey] = Visit(schema.properties[propertyKey], references, value[propertyKey])
   }
   return value
 }
 function FromRecord(schema: TRecord, references: TSchema[], value: any): unknown {
-  const isConvertable = IsObject(value)
+  const isConvertable = IsObject(value) && !IsArray(value)
   if (!isConvertable) return value
   const propertyKey = Object.getOwnPropertyNames(schema.patternProperties)[0]
   const property = schema.patternProperties[propertyKey]

src/value/convert/convert.ts

@@ -77,4 +77,26 @@ describe('value/convert/Union', () => {
     Assert.IsEqual((A as any).data[0].key2, 42)
     Assert.IsEqual((B as any).data[0].key2, 42)
   })
+  // ----------------------------------------------------------------
+  // https://github.com/sinclairzx81/typebox/issues/1295
+  // ----------------------------------------------------------------
+  it('Should guard against Array conversion in Object', () => {
+    const T = Type.Union([
+      Type.Object({
+        type: Type.Literal('A'),
+        values: Type.Union([Type.String(), Type.Number()]),
+      }),
+      Type.Object({
+        type: Type.Literal('B'),
+        values: Type.String(),
+      }),
+    ])
+    const converted = Value.Convert(T, [{ type: 'A', values: 1 }])
+    Assert.IsEqual(converted, [{ type: 'A', values: 1 }])
+  })
+  it('Should guard against Array conversion in Record', () => {
+    const T = Type.Union([Type.Record(Type.String({ pattern: '^values$' }), Type.Union([Type.String(), Type.Number()])), Type.Record(Type.String({ pattern: '^type$' }), Type.Union([Type.String(), Type.Number()]))])
+    const converted = Value.Convert(T, [{ type: 'A', values: 1 }])
+    Assert.IsEqual(converted, [{ type: 'A', values: 1 }])
+  })
 })