@oscarpalmer/atoms 0.19.0 → 0.20.0

package/dist/js/index.js

@@ -290,9 +290,9 @@ var _getDiffs = function(first, second, prefix) {
       continue;
     }
     const keys = Object.keys(value);
-    const size = keys.length;
+    const { length } = keys;
     let inner = 0;
-    for (;inner < size; inner += 1) {
+    for (;inner < length; inner += 1) {
       const key = keys[inner];
       if (checked.has(key)) {
         continue;
@@ -417,11 +417,12 @@ function merge(...values) {
 function set(data, key, value) {
   const parts = getString(key).split(".");
   const { length } = parts;
+  const lastIndex = length - 1;
   let index = 0;
   let target = typeof data === "object" ? data ?? {} : {};
   for (;index < length; index += 1) {
     const part = parts[index];
-    if (parts.indexOf(part) === parts.length - 1) {
+    if (parts.indexOf(part) === lastIndex) {
       _setValue(target, part, value);
       break;
     }
@@ -436,27 +437,34 @@ function set(data, key, value) {
 }
 
 // src/js/proxy.ts
-var _createProxy = function(blob, value2) {
-  if (!isArrayOrObject(value2) || _isProxy(value2)) {
+var _createProxy = function(existing, value2) {
+  if (!isArrayOrObject(value2) || _isProxy(value2) && value2.$ === existing) {
     return value2;
   }
   const isArray = Array.isArray(value2);
-  const proxyBlob = blob ?? new ProxyBlob;
-  const proxyValue = new Proxy(isArray ? [] : {}, {});
-  Object.defineProperty(proxyValue, "$", {
-    value: proxyBlob
+  const proxy = new Proxy(isArray ? [] : {}, {
+    get(target, property) {
+      return property === "$" ? manager : Reflect.get(target, property);
+    },
+    set(target, property, value3) {
+      return property === "$" || Reflect.set(target, property, _createProxy(manager, value3));
+    }
+  });
+  const manager = existing ?? new Manager(proxy);
+  Object.defineProperty(proxy, "$", {
+    value: manager
   });
   const keys = Object.keys(value2);
-  const size = keys.length ?? 0;
+  const { length } = keys;
   let index = 0;
-  for (;index < size; index += 1) {
+  for (;index < length; index += 1) {
     const key = keys[index];
-    proxyValue[key] = _createProxy(proxyBlob, value2[key]);
+    proxy[key] = value2[key];
   }
-  return proxyValue;
+  return proxy;
 };
 var _isProxy = function(value2) {
-  return value2?.$ instanceof ProxyBlob;
+  return value2?.$ instanceof Manager;
 };
 function proxy(value2) {
   if (!isArrayOrObject(value2)) {
@@ -465,7 +473,14 @@ function proxy(value2) {
   return _createProxy(undefined, value2);
 }
 
-class ProxyBlob {
+class Manager {
+  owner;
+  constructor(owner) {
+    this.owner = owner;
+  }
+  clone() {
+    return clone(merge(this.owner));
+  }
 }
 // src/js/timer.ts
 function repeat(callback, options) {

package/dist/js/proxy.js

@@ -1,30 +1,66 @@
 // src/js/value.ts
+function clone(value) {
+  return structuredClone(value);
+}
 function isArrayOrObject(value) {
   return /^(array|object)$/i.test(value?.constructor?.name);
 }
+function merge(...values) {
+  if (values.length === 0) {
+    return {};
+  }
+  const actual = values.filter(isArrayOrObject);
+  const result = actual.every(Array.isArray) ? [] : {};
+  const { length } = actual;
+  let itemIndex = 0;
+  for (;itemIndex < length; itemIndex += 1) {
+    const item = actual[itemIndex];
+    const keys = Object.keys(item);
+    const size = keys.length;
+    let keyIndex = 0;
+    for (;keyIndex < size; keyIndex += 1) {
+      const key = keys[keyIndex];
+      const next = item[key];
+      const previous = result[key];
+      if (isArrayOrObject(next)) {
+        result[key] = isArrayOrObject(previous) ? merge(previous, next) : merge(next);
+      } else {
+        result[key] = next;
+      }
+    }
+  }
+  return result;
+}
 
 // src/js/proxy.ts
-var _createProxy = function(blob, value2) {
-  if (!isArrayOrObject(value2) || _isProxy(value2)) {
+var _createProxy = function(existing, value2) {
+  if (!isArrayOrObject(value2) || _isProxy(value2) && value2.$ === existing) {
     return value2;
   }
   const isArray = Array.isArray(value2);
-  const proxyBlob = blob ?? new ProxyBlob;
-  const proxyValue = new Proxy(isArray ? [] : {}, {});
-  Object.defineProperty(proxyValue, "$", {
-    value: proxyBlob
+  const proxy = new Proxy(isArray ? [] : {}, {
+    get(target, property) {
+      return property === "$" ? manager : Reflect.get(target, property);
+    },
+    set(target, property, value3) {
+      return property === "$" || Reflect.set(target, property, _createProxy(manager, value3));
+    }
+  });
+  const manager = existing ?? new Manager(proxy);
+  Object.defineProperty(proxy, "$", {
+    value: manager
   });
   const keys = Object.keys(value2);
-  const size = keys.length ?? 0;
+  const { length } = keys;
   let index = 0;
-  for (;index < size; index += 1) {
+  for (;index < length; index += 1) {
     const key = keys[index];
-    proxyValue[key] = _createProxy(proxyBlob, value2[key]);
+    proxy[key] = value2[key];
   }
-  return proxyValue;
+  return proxy;
 };
 var _isProxy = function(value2) {
-  return value2?.$ instanceof ProxyBlob;
+  return value2?.$ instanceof Manager;
 };
 function proxy(value2) {
   if (!isArrayOrObject(value2)) {
@@ -33,7 +69,14 @@ function proxy(value2) {
   return _createProxy(undefined, value2);
 }
 
-class ProxyBlob {
+class Manager {
+  owner;
+  constructor(owner) {
+    this.owner = owner;
+  }
+  clone() {
+    return clone(merge(this.owner));
+  }
 }
 export {
   proxy

package/dist/js/proxy.mjs

@@ -1,26 +1,37 @@
 // src/js/proxy.ts
-import {isArrayOrObject} from "./value";
-var _createProxy = function(blob, value2) {
-  if (!isArrayOrObject(value2) || _isProxy(value2)) {
+import {
+clone,
+isArrayOrObject,
+merge
+} from "./value";
+var _createProxy = function(existing, value2) {
+  if (!isArrayOrObject(value2) || _isProxy(value2) && value2.$ === existing) {
     return value2;
   }
   const isArray = Array.isArray(value2);
-  const proxyBlob = blob ?? new ProxyBlob;
-  const proxyValue = new Proxy(isArray ? [] : {}, {});
-  Object.defineProperty(proxyValue, "$", {
-    value: proxyBlob
+  const proxy = new Proxy(isArray ? [] : {}, {
+    get(target, property) {
+      return property === "$" ? manager : Reflect.get(target, property);
+    },
+    set(target, property, value3) {
+      return property === "$" || Reflect.set(target, property, _createProxy(manager, value3));
+    }
+  });
+  const manager = existing ?? new Manager(proxy);
+  Object.defineProperty(proxy, "$", {
+    value: manager
   });
   const keys = Object.keys(value2);
-  const size = keys.length ?? 0;
+  const { length } = keys;
   let index = 0;
-  for (;index < size; index += 1) {
+  for (;index < length; index += 1) {
     const key = keys[index];
-    proxyValue[key] = _createProxy(proxyBlob, value2[key]);
+    proxy[key] = value2[key];
   }
-  return proxyValue;
+  return proxy;
 };
 var _isProxy = function(value2) {
-  return value2?.$ instanceof ProxyBlob;
+  return value2?.$ instanceof Manager;
 };
 function proxy(value2) {
   if (!isArrayOrObject(value2)) {
@@ -29,7 +40,14 @@ function proxy(value2) {
   return _createProxy(undefined, value2);
 }
 
-class ProxyBlob {
+class Manager {
+  owner;
+  constructor(owner) {
+    this.owner = owner;
+  }
+  clone() {
+    return clone(merge(this.owner));
+  }
 }
 export {
   proxy

package/dist/js/value.js

@@ -18,9 +18,9 @@ var _getDiffs = function(first, second, prefix) {
       continue;
     }
     const keys = Object.keys(value);
-    const size = keys.length;
+    const { length } = keys;
     let inner = 0;
-    for (;inner < size; inner += 1) {
+    for (;inner < length; inner += 1) {
       const key = keys[inner];
       if (checked.has(key)) {
         continue;
@@ -145,11 +145,12 @@ function merge(...values) {
 function set(data, key, value) {
   const parts = getString(key).split(".");
   const { length } = parts;
+  const lastIndex = length - 1;
   let index = 0;
   let target = typeof data === "object" ? data ?? {} : {};
   for (;index < length; index += 1) {
     const part = parts[index];
-    if (parts.indexOf(part) === parts.length - 1) {
+    if (parts.indexOf(part) === lastIndex) {
       _setValue(target, part, value);
       break;
     }

package/dist/js/value.mjs

@@ -10,9 +10,9 @@ var _getDiffs = function(first, second, prefix) {
       continue;
     }
     const keys = Object.keys(value);
-    const size = keys.length;
+    const { length } = keys;
     let inner = 0;
-    for (;inner < size; inner += 1) {
+    for (;inner < length; inner += 1) {
       const key = keys[inner];
       if (checked.has(key)) {
         continue;
@@ -137,11 +137,12 @@ function merge(...values) {
 function set(data, key, value) {
   const parts = getString(key).split(".");
   const { length } = parts;
+  const lastIndex = length - 1;
   let index = 0;
   let target = typeof data === "object" ? data ?? {} : {};
   for (;index < length; index += 1) {
     const part = parts[index];
-    if (parts.indexOf(part) === parts.length - 1) {
+    if (parts.indexOf(part) === lastIndex) {
       _setValue(target, part, value);
       break;
     }

package/package.json

@@ -99,5 +99,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.19.0"
+	"version": "0.20.0"
 }

package/src/js/proxy.ts

@@ -1,49 +1,73 @@
-import {ArrayOrObject, GenericObject, isArrayOrObject} from './value';
+import {
+	ArrayOrObject,
+	GenericObject,
+	clone,
+	isArrayOrObject,
+	merge,
+} from './value';
 
-class ProxyBlob {}
+class Manager<T extends ArrayOrObject = GenericObject> {
+	constructor(readonly owner: Proxied<T>) {}
 
-type ProxyValue = {
-	$: ProxyBlob;
-};
+	clone(): Proxied<T> {
+		return clone(merge(this.owner)) as Proxied<T>;
+	}
+}
+
+export type Proxied<T extends ArrayOrObject = GenericObject> = {
+	$: Manager<T>;
+} & T;
 
 function _createProxy<T extends ArrayOrObject>(
-	blob: ProxyBlob | undefined,
+	existing: Manager | undefined,
 	value: T,
-): T {
-	if (!isArrayOrObject(value) || _isProxy(value)) {
+): unknown {
+	if (!isArrayOrObject(value) || (_isProxy(value) && value.$ === existing)) {
 		return value;
 	}
 
 	const isArray = Array.isArray(value);
-	const proxyBlob = blob ?? new ProxyBlob();
-	const proxyValue = new Proxy(isArray ? [] : {}, {});
 
-	Object.defineProperty(proxyValue, '$', {
-		value: proxyBlob,
+	const proxy = new Proxy(isArray ? [] : {}, {
+		get(target, property) {
+			return property === '$' ? manager : Reflect.get(target, property);
+		},
+		set(target, property, value) {
+			return (
+				property === '$' ||
+				Reflect.set(target, property, _createProxy(manager, value))
+			);
+		},
+	}) as Proxied;
+
+	const manager = existing ?? new Manager(proxy);
+
+	Object.defineProperty(proxy, '$', {
+		value: manager,
 	});
 
-	const keys =  Object.keys(value);
-	const size = keys.length ?? 0;
+	const keys = Object.keys(value);
+	const {length} = keys;
 
 	let index = 0;
 
-	for (; index < size; index += 1) {
+	for (; index < length; index += 1) {
 		const key = keys[index];
 
-		proxyValue[key as never] = _createProxy(proxyBlob, value[key as never]);
+		proxy[key as never] = value[key as never];
 	}
 
-	return proxyValue as T;
+	return proxy;
 }
 
-function _isProxy(value: unknown): value is ProxyValue {
-	return (value as GenericObject)?.$ instanceof ProxyBlob;
+function _isProxy(value: unknown): value is Proxied {
+	return (value as Proxied)?.$ instanceof Manager;
 }
 
-export function proxy<T extends ArrayOrObject>(value: T): T {
+export function proxy<T extends ArrayOrObject>(value: T): Proxied<T> {
 	if (!isArrayOrObject(value)) {
 		throw new Error('Proxy value must be an array or object');
 	}
 
-	return _createProxy(undefined, value);
+	return _createProxy(undefined, value) as Proxied<T>;
 }

package/src/js/value.ts

@@ -43,11 +43,11 @@ function _getDiffs(
 		}
 
 		const keys = Object.keys(value);
-		const size = keys.length;
+		const {length} = keys;
 
 		let inner = 0;
 
-		for (; inner < size; inner += 1) {
+		for (; inner < length; inner += 1) {
 			const key = keys[inner];
 
 			if (checked.has(key)) {
@@ -264,6 +264,7 @@ export function set<T extends ValueObject>(
 ): T {
 	const parts = getString(key).split('.');
 	const {length} = parts;
+	const lastIndex = length - 1;
 
 	let index = 0;
 	let target: ValueObject = typeof data === 'object' ? data ?? {} : {};
@@ -271,7 +272,7 @@ export function set<T extends ValueObject>(
 	for (; index < length; index += 1) {
 		const part = parts[index];
 
-		if (parts.indexOf(part) === parts.length - 1) {
+		if (parts.indexOf(part) === lastIndex) {
 			_setValue(target, part, value);
 
 			break;

package/types/proxy.d.ts

@@ -1,2 +1,11 @@
-import { ArrayOrObject } from './value';
-export declare function proxy<T extends ArrayOrObject>(value: T): T;
+import { ArrayOrObject, GenericObject } from './value';
+declare class Manager<T extends ArrayOrObject = GenericObject> {
+    readonly owner: Proxied<T>;
+    constructor(owner: Proxied<T>);
+    clone(): Proxied<T>;
+}
+export type Proxied<T extends ArrayOrObject = GenericObject> = {
+    $: Manager<T>;
+} & T;
+export declare function proxy<T extends ArrayOrObject>(value: T): Proxied<T>;
+export {};