typebox 1.3.10 → 1.3.11

package/build/system/memory/clone.mjs

@@ -13,24 +13,27 @@ function FromClassInstance(value) {
     return value; // atomic
 }
 // ------------------------------------------------------------------
-// TypeObject
+// SchemaObject
 //
-// Types have non-enumerable properties that MUST be preserved on Clone. 
-// The following is the optimal path for TypeBox types.
+// Schema objects have non-enumerable properties that MUST be preserved 
+// on Clone. The following is the optimal path these objects.
 // ------------------------------------------------------------------
-function IsTypeObject(value) {
+function IsSchemaObject(value) {
     return (Guard.HasPropertyKey(value, '~kind') ||
         Guard.HasPropertyKey(value, '~unsafe'));
 }
-function FromTypeObject(value) {
+function FromSchemaObject(value) {
     const result = {};
-    const descriptors = Object.getOwnPropertyDescriptors(value);
-    for (const key of Object.keys(descriptors)) {
+    for (const key of Object.getOwnPropertyNames(value)) {
         if (Guard.IsUnsafePropertyKey(key))
             continue; // (ignore: prototype-pollution)
-        const descriptor = descriptors[key];
-        if (Guard.HasPropertyKey(descriptor, 'value')) {
-            Object.defineProperty(result, key, { ...descriptor, value: FromValue(descriptor.value) });
+        const descriptor = Object.getOwnPropertyDescriptor(value, key); // safe-name!
+        descriptor.value = FromValue(descriptor.value);
+        if (Guard.IsEqual(descriptor.enumerable, true)) {
+            result[key] = descriptor.value;
+        }
+        else {
+            Object.defineProperty(result, key, descriptor);
         }
     }
     return result;
@@ -55,7 +58,7 @@ function FromPlainObject(value) {
 // ------------------------------------------------------------------
 function FromObject(value) {
     return (Guard.IsClassInstance(value) ? FromClassInstance(value) :
-        IsTypeObject(value) ? FromTypeObject(value) :
+        IsSchemaObject(value) ? FromSchemaObject(value) :
             FromPlainObject(value));
 }
 // ------------------------------------------------------------------

package/build/system/memory/discard.mjs

@@ -6,12 +6,12 @@ import { Clone } from './clone.mjs';
 export function Discard(value, propertyKeys) {
     Metrics.discard += 1;
     const result = {};
-    const descriptors = Object.getOwnPropertyDescriptors(Clone(value));
-    const keysToDiscard = new Set(propertyKeys);
-    for (const key of Object.keys(descriptors)) {
-        if (keysToDiscard.has(key))
+    for (const key of Object.getOwnPropertyNames(value)) {
+        if (propertyKeys.includes(key))
             continue;
-        Object.defineProperty(result, key, descriptors[key]);
+        const descriptor = Object.getOwnPropertyDescriptor(value, key); // safe-name!
+        descriptor.value = Clone(descriptor.value);
+        Object.defineProperty(result, key, descriptor);
     }
     return result;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typebox",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "keywords": [
     "typescript",
     "jsonschema"