Version 1.0.59 (#1472)

* Optimize Memory Create

* Fix TS-Next Range Test

* Use Consistent Property Configuration | Coverage

* ChangeLog

* Version

Author: sinclairzx81

changelog/1.0.0.md

@@ -3,6 +3,8 @@
 ---
 
 ### Version Updates
+- [Revision 1.0.59](https://github.com/sinclairzx81/typebox/pull/1472)
+  - Optimize Schema Creation
 - [Revision 1.0.58](https://github.com/sinclairzx81/typebox/pull/1468)
   - Update Initial URI used for Json Schema Resolution
 - [Revision 1.0.57](https://github.com/sinclairzx81/typebox/pull/1467)

deno.lock

@@ -34,13 +34,20 @@ import { Metrics } from './metrics.ts'
 // deno-lint-ignore no-explicit-any
 type ObjectLike = Record<PropertyKey, any>
 
-function Merge(left: ObjectLike, right: ObjectLike, configuration: PropertyDescriptor = {}): ObjectLike {
-  const descriptor: PropertyDescriptor = { configurable: true, writable: true, enumerable: true, ...configuration }
+function MergeHidden(left: ObjectLike, right: ObjectLike, configuration: PropertyDescriptor = {}): ObjectLike {
   for(const key of Object.keys(right)) {
-    Object.defineProperty(left, key,  { ...descriptor, value: right[key] })
+    Object.defineProperty(left, key, { 
+      configurable: true,
+      writable: true,
+      enumerable: false, 
+      value: right[key] 
+    })
   }
   return left
 }
+function Merge(left: ObjectLike, right: ObjectLike): ObjectLike {
+  return { ...left, ...right }
+}
 /**  
  * Creates an object with hidden, enumerable, and optional property sets. This function 
  * ensures types are instantiated according to configuration rules for enumerable and 
@@ -49,8 +56,7 @@ function Merge(left: ObjectLike, right: ObjectLike, configuration: PropertyDescr
 export function Create(hidden: ObjectLike, enumerable: ObjectLike, options: ObjectLike = {}): ObjectLike {
   Metrics.create += 1
   const settings = Settings.Get()
-  const withHidden = Merge({}, hidden , { enumerable: settings.enumerableKind }) 
-  const withEnumerable = Merge(withHidden, enumerable)
-  const withOptions = Merge(withEnumerable, options)
-  return settings.immutableTypes ? Object.freeze(withOptions) : withOptions
+  const withOptions = Merge(enumerable, options)
+  const withHidden = settings.enumerableKind ? Merge(withOptions, hidden) : MergeHidden(withOptions, hidden) 
+  return settings.immutableTypes ? Object.freeze(withHidden) : withHidden
 }

src/system/memory/create.ts

@@ -28,10 +28,15 @@ THE SOFTWARE.
 
 import { Task } from 'tasksmith'
 
-export async function Range(versions: string[]) {
-  for(const version of versions) {
+export async function Range(legacy: string[], modern: string[]) {
+  for(const version of legacy) {
     console.log('checking ...', version)
     await Task.tsc(version)
       .run('src/index.ts --target ES2020 --strict --noEmit --allowImportingTsExtensions')
   }
+  for(const version of modern) {
+    console.log('checking ...', version)
+    await Task.tsc(version)
+      .run('src/index.ts --target ES2020 --strict --noEmit --allowImportingTsExtensions --ignoreConfig')
+  }
 }

task/range/range.ts

@@ -8,7 +8,7 @@ import { Range } from './task/range/index.ts'
 import { Metrics } from './task/metrics/index.ts'
 import { Task } from 'tasksmith'
 
-const Version = '1.0.58'
+const Version = '1.0.59'
 
 // ------------------------------------------------------------------
 // Build
@@ -100,5 +100,7 @@ Task.run('metrics', () => Metrics())
 Task.run('range', () => Range([
   '5.0.4', '5.1.3', '5.1.6', '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.9.2', 'next', 'latest'
+  '5.6.3', '5.7.2', '5.7.3', '5.9.2', 'latest'
+], [
+  'next'
 ]))

tasks.ts

@@ -45,7 +45,23 @@ Test('Should Create 1', () => {
   Assert.IsEqual(A.y, 2)
   Assert.IsEqual(A.z, 3)
 })
-Test('Should Create 2', () => {
+// ------------------------------------------------------------------
+// EnumerableKind
+// ------------------------------------------------------------------
+Test('Should Create 3', () => {
+  Settings.Set({ enumerableKind: true })
+  const A: any = Memory.Create({ x: 1 }, { y: 2 }, { z: 3 })
+  Assert.IsEqual(A.x, 1)
+  Assert.IsEqual(A.y, 2)
+  Assert.IsEqual(A.z, 3)
+  A.x = 123
+  Assert.IsEqual(A.x, 123)
+  Settings.Reset()
+})
+// ------------------------------------------------------------------
+// ImmutableTypes
+// ------------------------------------------------------------------
+Test('Should Create 4', () => {
   Settings.Set({ immutableTypes: true })
   const A: any = Memory.Create({ x: 1 }, { y: 2 }, { z: 3 })
   Assert.IsEqual(A.x, 1)