tungsten 0.1.44 → 0.1.46

package/dist/__deproxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"__deproxy.d.ts","sourceRoot":"","sources":["../src/__deproxy.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CAAC,aAAa,EAAE,OAAO,WAS/C;AAED,eAAO,MAAM,IAAI,kBAAY,CAAA"}
+{"version":3,"file":"__deproxy.d.ts","sourceRoot":"","sources":["../src/__deproxy.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,aAAa,EAAE,OAAO,WAW/C;AAED,eAAO,MAAM,IAAI,kBAAY,CAAA"}

package/dist/__deproxy.js

@@ -1,10 +1,14 @@
+import { $original } from "./componentProxyHandlers.js";
 import { NoDeproxy } from "./NoDeproxy.js";
+// doesn't this need to be deep?
 export function __deproxy(possibleProxy) {
+  console.log('__deproxy called, this function may not be adequate');
   if (possibleProxy instanceof NoDeproxy) {
     return possibleProxy.value;
   } else if (typeof possibleProxy === 'object' && possibleProxy !== null) {
-    if ('__original' in possibleProxy) {
-      return possibleProxy.__original;
+    //if ('__original' in possibleProxy) {
+    if ($original in possibleProxy) {
+      return possibleProxy[$original];
     }
   }
   return possibleProxy;

package/dist/componentProxyHandlers.d.ts

@@ -1,6 +1,8 @@
 import { TungstenStatefulComponent, TungstenComponent } from './Components.jsx';
 type StatefulComponentWithState<State extends object> = TungstenStatefulComponent<any, State, any> | TungstenComponent<any, State, any>;
 type StatefulComponentAny = TungstenStatefulComponent<any, any, any> | TungstenComponent<any, any, any>;
+export declare const $original: unique symbol;
+export declare const $ownerName: unique symbol;
 export declare const getStateProxyHandler: <State extends object>(element: StatefulComponentWithState<State>) => {
     get: (obj: State, key: string | symbol) => unknown;
     set: (obj: State, key: string | symbol, value: unknown) => boolean;

package/dist/componentProxyHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentProxyHandlers.d.ts","sourceRoot":"","sources":["../src/componentProxyHandlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAO/E,KAAK,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAC9C,yBAAyB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAC1C,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;AAExC,KAAK,oBAAoB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvG,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,WAAW,0BAA0B,CAAC,KAAK,CAAC;eACtF,KAAK,OAAO,MAAM,GAAG,MAAM;eAK3B,KAAK,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAyBhC,KAAK,OAAO,MAAM,GAAG,MAAM;CAOnD,CAAA;AAGF,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,MAAM,WAAW,oBAAoB;eAC3E,CAAC,OAAO,MAAM,GAAG,MAAM;eAKvB,CAAC,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAwB5B,CAAC,OAAO,MAAM,GAAG,MAAM;CAO/C,CAAA;AAGF,eAAO,MAAM,yBAAyB,YAAa,oBAAoB;eACxD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;eAqB/B,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;CAyB5D,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CA0CxD,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAsC/C,CAAA;AAgCF,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CA4BnG;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CA4BpG"}
+{"version":3,"file":"componentProxyHandlers.d.ts","sourceRoot":"","sources":["../src/componentProxyHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAS/E,KAAK,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAC9C,yBAAyB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAC1C,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;AAExC,KAAK,oBAAoB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvG,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,eAAO,MAAM,UAAU,eAAsB,CAAA;AAE7C,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,WAC/C,0BAA0B,CAAC,KAAK,CAAC;eAC5B,KAAK,OAAO,MAAM,GAAG,MAAM;eAQ3B,KAAK,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAkChC,KAAK,OAAO,MAAM,GAAG,MAAM;CAOnD,CAAA;AAGF,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,MAAM,WAAW,oBAAoB;eAC3E,CAAC,OAAO,MAAM,GAAG,MAAM;eAKvB,CAAC,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAgC5B,CAAC,OAAO,MAAM,GAAG,MAAM;CAO/C,CAAA;AAGF,eAAO,MAAM,yBAAyB,YAAa,oBAAoB;eACxD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;eAwB/B,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;CA6B5D,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CA8CxD,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAyC/C,CAAA;AAgCF,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAiCnG;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAgCpG"}

package/dist/componentProxyHandlers.js

@@ -1,9 +1,14 @@
 import { KeyIsArrayMutatingFunction, KeyIsMapMutatingFunction, KeyIsSetMutatingFunction } from "./mutatingFunctions.js";
 import { objectTypesToProxy } from "./objectTypesToProxy.js";
-import { warn } from "./output.js";
+import { throwError } from "./throwError.js";
+export const $original = Symbol('original');
+export const $ownerName = Symbol('ownerName');
 export const getStateProxyHandler = element => ({
   get: (obj, key) => {
     if (key === '__original') return obj; // return the internal object if requested
+    if (key === $original) return obj; // return the internal object if requested
+    // owner?
+    if (key === $ownerName) return element.constructor.name;
     return obj[key]; // Proxy typing allowed accessing keys outside of the type.
     // So act on that obj as an object that accept all string | symbol keys
   },
@@ -12,19 +17,28 @@ export const getStateProxyHandler = element => ({
     //const isObject = (typeof value === 'object' && value !== null)
     if (Array.isArray(value)) {
       // arrays
-      obj[key] = new Proxy(value, getStateArrayProxyHandler(element)); // if an array was set, proxy it too
+      obj[key]
+      //= new Proxy<unknown[]>(value, getStateArrayProxyHandler(element)) // if an array was set, proxy it too
+      = proxyArray(value, element);
     } else if (typeof value === 'object' && value !== null && objectTypesToProxy.includes(value.constructor.name) // ensure that it is an object literal or otherwise an approved object type
     ) {
       // plain objects
-      obj[key] = new Proxy(value, getStateObjectProxyHandler(element)); // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      // if an plian object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      obj[key]
+      //= new Proxy(value, getStateObjectProxyHandler(element))
+      = proxyObject(value, element);
     } else if (value instanceof Map) {
       // Maps
       //console.log('found a Map in state');
-      obj[key] = new Proxy(value, getStateMapProxyHandler(element));
+      obj[key];
+      //= new Proxy(value, getStateMapProxyHandler(element))
+      proxyMap(value, element);
     } else if (value instanceof Set) {
       // Sets
       //console.log('found a Set in state');
-      obj[key] = new Proxy(value, getStateSetProxyHandler(element));
+      obj[key]
+      //= new Proxy(value, getStateSetProxyHandler(element))
+      = proxySet(value, element);
     } else {
       obj[key] = value;
     }
@@ -52,20 +66,28 @@ export const getStateObjectProxyHandler = element => ({
     //console.log('proxied object set')
     if (Array.isArray(value)) {
       // arrays
-      obj[key] = new Proxy(value, getStateArrayProxyHandler(element)); // if an array was set, proxy it too
+      obj[key]
+      //= new Proxy(value, getStateArrayProxyHandler(element)) // if an array was set, proxy it too
+      = proxyArray(value, element);
     } else if (typeof value === 'object' && value !== null
     // && value.constructor.name === 'Object'
     && objectTypesToProxy.includes(value.constructor.name) // ensure that it is an object literal or otherwise an approve object type
     ) {
       // plain objects
-      obj[key] = new Proxy(value, getStateObjectProxyHandler(element)); // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      obj[key]
+      //= new Proxy(value, getStateObjectProxyHandler(element)) // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      = proxyObject(value, element);
     } else if (value instanceof Map) {
       // Maps
       //console.log('applying a map proxy is state');
-      obj[key] = new Proxy(value, getStateMapProxyHandler(element));
+      obj[key]
+      //= new Proxy(value, getStateMapProxyHandler(element))
+      = proxyMap(value, element);
     } else if (value instanceof Set) {
       // Sets
-      obj[key] = new Proxy(value, getStateSetProxyHandler(element));
+      obj[key]
+      //= new Proxy(value, getStateSetProxyHandler(element))
+      = proxySet(value, element);
     } else {
       obj[key] = value;
     }
@@ -86,6 +108,9 @@ export const getStateObjectProxyHandler = element => ({
 export const getStateArrayProxyHandler = element => ({
   get: (arr, key) => {
     //console.log('arr key', typeof key)
+    if (key === $original) return arr; // return the internal object if requested
+    // owner?
+    if (key === $ownerName) return element.constructor.name;
     if (typeof key === 'string') {
       if (key === '__original') return arr; // return the internal object if requested
       if (KeyIsArrayMutatingFunction(key)) {
@@ -110,21 +135,25 @@ export const getStateArrayProxyHandler = element => ({
     if (Array.isArray(value)) {
       // arrays
       // @ts-ignore // TS doesn't like us accessing array by string key
-      arr[key] = new Proxy(value, getStateArrayProxyHandler); // if an array was set, proxy it too
+      arr[key]
+      //= new Proxy(value, getStateArrayProxyHandler as ProxyHandler<unknown[]>) // if an array was set, proxy it too
+      = proxyArray(value, element);
     } else if (typeof value === 'object' && value !== null
     // && value.constructor.name === 'Object'
     && objectTypesToProxy.includes(value.constructor.name) // ensure that it is an object literal or otherwise an approve object type
     ) {
       // plain objects
       // @ts-ignore // TS doesn't like us accessing array by string key
-      arr[key] = new Proxy(value, getStateObjectProxyHandler); // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      arr[key]
+      //= new Proxy(value, getStateObjectProxyHandler) // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+      = proxyObject(value, element);
     } else {
       // @ts-ignore // TS doesn't like us accessing array by string key
       arr[key] = value;
     }
     // reactivity
-    const varKey = key;
-    warn('__stateArrayProxyHandler set __reactiveUpdate key may overlap between strings and numbers');
+    //const varKey = key
+    //warn('__stateArrayProxyHandler set __reactiveUpdate key may overlap between strings and numbers')
     //this.__reactiveUpdate(String(varKey))
     if (element.__initialized) element.__queueUpdate();
     return true;
@@ -134,6 +163,9 @@ export const getStateArrayProxyHandler = element => ({
 export const getStateMapProxyHandler = element => ({
   get: (map, key) => {
     //console.log('map get', key)
+    if (key === $original) return map; // return the internal object if requested
+    // owner?
+    if (key === $ownerName) return element.constructor.name;
     if (typeof key === 'string') {
       if (key === '__original') return map; // return the internal object if requested
       if (KeyIsMapMutatingFunction(key)) {
@@ -176,6 +208,9 @@ export const getStateMapProxyHandler = element => ({
 export const getStateSetProxyHandler = element => ({
   get: (set, key) => {
     //console.log('arr key', typeof key)
+    if (key === $original) return set; // return the internal object if requested
+    // owner?
+    if (key === $ownerName) return element.constructor.name;
     if (typeof key === 'string') {
       if (key === '__original') return set; // return the internal object if requested
       if (KeyIsSetMutatingFunction(key)) {
@@ -245,26 +280,30 @@ export function proxyObjectContent(element, object) {
       // objects, including array
       if (Array.isArray(value)) {
         proxyArrayContent(element, value);
-        object[key] = new Proxy(value, getStateObjectProxyHandler(element));
-        //(object[key as keyof O] as unknown[]) = proxyArrayContent(element, value)
-        //;(object[key as keyof O] as unknown[]) = new Proxy<unknown[]>(value, getStateArrayProxyHandler(element)) // if an array was set, proxy it too
+        object[key]
+        //= new Proxy(value, getStateObjectProxyHandler(element))
+        = proxyArray(value, element);
       } else if (typeof value === 'object' && value !== null
       // && value.constructor.name === 'Object'
       && objectTypesToProxy.includes(value.constructor.name) // ensure that it is an object literal or otherwise an approve object type
       ) {
         // plain objects
         proxyObjectContent(element, value);
-        object[key] = new Proxy(value, getStateObjectProxyHandler(element));
-        //object[key] = new Proxy(value, getStateObjectProxyHandler(element))
-        //(object[key as keyof O] as EverythingObject)[key] = new Proxy(value, getStateObjectProxyHandler(element)) // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+        object[key]
+        //= new Proxy(value, getStateObjectProxyHandler(element))
+        = proxyObject(value, element);
       } else if (value instanceof Map) {
         // Maps
         //console.log('proxying a Map in state');
-        object[key] = new Proxy(value, getStateMapProxyHandler(element));
+        object[key]
+        //= new Proxy(value, getStateMapProxyHandler(element))
+        = proxyMap(value, element);
       } else if (value instanceof Set) {
         // Sets
         //console.log('proxying a Set in state');
-        object[key] = new Proxy(value, getStateSetProxyHandler(element));
+        object[key]
+        //= new Proxy(value, getStateSetProxyHandler(element))
+        = proxySet(value, element);
       }
     }
   }
@@ -276,27 +315,55 @@ export function proxyArrayContent(element, array) {
       // objects, including array
       if (Array.isArray(value)) {
         proxyArrayContent(element, value);
-        array[key] = new Proxy(value, getStateObjectProxyHandler(element));
-        //(object[key as keyof O] as unknown[]) = proxyArrayContent(element, value)
-        //;(object[key as keyof O] as unknown[]) = new Proxy<unknown[]>(value, getStateArrayProxyHandler(element)) // if an array was set, proxy it too
+        array[key]
+        //= new Proxy(value, getStateObjectProxyHandler(element))
+        = proxyArray(value, element);
       } else if (typeof value === 'object' && value !== null
       // && value.constructor.name === 'Object'
       && objectTypesToProxy.includes(value.constructor.name) // ensure that it is an object literal or otherwise an approve object type
       ) {
         // plain objects
         proxyObjectContent(element, value);
-        array[key] = new Proxy(value, getStateObjectProxyHandler(element));
-        //object[key] = new Proxy(value, getStateObjectProxyHandler(element))
-        //(object[key as keyof O] as EverythingObject)[key] = new Proxy(value, getStateObjectProxyHandler(element)) // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+        array[key]
+        //= new Proxy(value, getStateObjectProxyHandler(element))
+        = proxyObject(value, element);
       } else if (value instanceof Map) {
         // Maps
         //console.log('proxying a Map in state');
-        array[key] = new Proxy(value, getStateMapProxyHandler(element));
+        array[key]
+        //= new Proxy(value, getStateMapProxyHandler(element))
+        = proxyMap(value, element);
       } else if (value instanceof Set) {
         // Sets
         //console.log('proxying a Set in state');
-        array[key] = new Proxy(value, getStateSetProxyHandler(element));
+        array[key]
+        //= new Proxy(value, getStateSetProxyHandler(element))
+        = proxySet(value, element);
       }
     }
   }
+}
+function proxyObject(obj, element) {
+  if ($original in obj && $ownerName in obj) {
+    throwError('proxyObject', `object in ${element.constructor.name} state is already in the state of a ${obj[$ownerName]}`);
+  }
+  return new Proxy(obj, getStateObjectProxyHandler(element)); // if an plan object was set, proxy it too. If an object has a class other than Object, we'll leave it alone
+}
+function proxyArray(arr, element) {
+  if ($original in arr && $ownerName in arr) {
+    throwError('proxyObject', `array in ${element.constructor.name} state is already in the state of a ${arr[$ownerName]}`);
+  }
+  return new Proxy(arr, getStateArrayProxyHandler(element));
+}
+function proxySet(set, element) {
+  if ($original in set && $ownerName in set) {
+    throwError('proxyObject', `Set in ${element.constructor.name} state is already in the state of a ${set[$ownerName]}`);
+  }
+  return new Proxy(set, getStateSetProxyHandler(element));
+}
+function proxyMap(map, element) {
+  if ($original in map && $ownerName in map) {
+    throwError('proxyObject', `Map in ${element.constructor.name} state is already in the state of a ${map[$ownerName]}`);
+  }
+  return new Proxy(map, getStateMapProxyHandler(element));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "",
   "type": "module",
   "bin": {