@muze-nl/od-jsontag 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/od-jsontag",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"description": "On Demand JSONTag: parse/serialize large datastructures on demand, useful for sharing data between threads",
 	"type": "module",
 	"author": "Auke van Slooten <auke@muze.nl>",

package/src/jsontag.mjs

@@ -45,3 +45,6 @@ export function removeAttribute(obj, attr) {
     return JSONTag.removeAttribute(obj?.[source] ?? obj, attr)
 }
 
+export function clone(obj) {
+    return JSONTag.clone(obj?.[source] ?? obj)
+}

package/src/parse.mjs

@@ -14,6 +14,15 @@ function stringToSAB(strData) {
     return uint8sab
 }
 
+function JSONTagProxy(target, handler) {
+    let p = new Proxy(target, handler)
+    let a = JSONTag.getAttributes(target)
+    JSONTag.setAttributes(target, a)
+    let t = JSONTag.getType(target)
+    JSONTag.setType(target, t)
+    return p
+}
+
 export default function parse(input, meta, immutable=true)
 {
     if (!meta) {
@@ -25,9 +34,6 @@ export default function parse(input, meta, immutable=true)
     if (!meta.baseURL) {
         meta.baseURL = 'http://localhost/'
     }
-    if (!meta.access) {
-        meta.access = () => true
-    }
     let at, ch, value, result;
     let escapee = {
         '"': '"',
@@ -690,17 +696,17 @@ export default function parse(input, meta, immutable=true)
                 } else if (prop===isChanged) {
                     return true
                 } else {
-                    if (!meta.access(target, prop)) {
+                    if (meta.access && !meta.access(target, prop)) {
                         return undefined
                     }
                     if (Array.isArray(target[prop])) {
-                        return new Proxy(target[prop], handlers.newArrayHandler)
+                        return JSONTagProxy(target[prop], handlers.newArrayHandler)
                     }
                     return target[prop]
                 }
             },
             set(target, prop, value) {
-                if (!meta.access(target, prop)) {
+                if (meta.access && !meta.access(target, prop)) {
                     return undefined
                 }
                 if (JSONTag.getType(value)==='object' && !value[isProxy]) {
@@ -735,18 +741,18 @@ export default function parse(input, meta, immutable=true)
                         return true
                     break
                     default:
-                        if (!meta.access(target, prop, 'get')) {
+                        if (meta.access && !meta.access(target, prop, 'get')) {
                             return undefined
                         }
                         if (Array.isArray(target[prop])) {
-                            return new Proxy(target[prop], handlers.newArrayHandler)
+                            return JSONTagProxy(target[prop], handlers.newArrayHandler)
                         }
                         return target[prop]
                     break
                 } 
             },
             set(target, prop, value) {
-                if (!meta.access(target, prop, 'set')) {
+                if (meta.access && !meta.access(target, prop, 'set')) {
                     return undefined
                 }
                 if (JSONTag.getType(value)==='object' && !value[isProxy]) {
@@ -778,12 +784,12 @@ export default function parse(input, meta, immutable=true)
                 } else if (prop===isChanged) {
                     return target[parent][isChanged]
                 } else {
-                    if (!meta.access(target, prop, 'get')) {
+                    if (meta.access && !meta.access(target, prop, 'get')) {
                         return undefined
                     }
                     if (Array.isArray(target[prop])) {
                         target[prop][parent] = target[parent]
-                        return new Proxy(target[prop], handlers.arrayHandler)
+                        return JSONTagProxy(target[prop], handlers.arrayHandler)
                     }
                     return target[prop]
                 }
@@ -792,7 +798,7 @@ export default function parse(input, meta, immutable=true)
                 if (immutable) {
                     throw new Error('dataspace is immutable')
                 }
-                if (!meta.access(target, prop, 'set')) {
+                if (meta.access && !meta.access(target, prop, 'set')) {
                     return undefined
                 }
                 if (JSONTag.getType(value)==='object' && !value[isProxy]) {
@@ -806,7 +812,7 @@ export default function parse(input, meta, immutable=true)
                 if (immutable) {
                     throw new Error('dataspace is immutable')
                 }
-                if (!meta.access(target, prop, 'deleteProperty')) {
+                if (meta.access && !meta.access(target, prop, 'deleteProperty')) {
                     return undefined
                 }
                 //FIXME: if target[prop] was the last reference to an object
@@ -822,7 +828,7 @@ export default function parse(input, meta, immutable=true)
                 firstParse(target)
                 switch(prop) {
                     case source:
-                        if (!meta.access(target, prop, 'get')) {
+                        if (meta.access && !meta.access(target, prop, 'get')) {
                             return undefined
                         }
                         return target
@@ -849,12 +855,12 @@ export default function parse(input, meta, immutable=true)
                         return target[isChanged]
                     break
                     default:
-                        if (!meta.access(target, prop, 'get')) {
+                        if (meta.access && !meta.access(target, prop, 'get')) {
                             return undefined
                         }
                         if (Array.isArray(target[prop])) {
                             target[prop][parent] = target
-                            return new Proxy(target[prop], handlers.arrayHandler)
+                            return JSONTagProxy(target[prop], handlers.arrayHandler)
                         }
                         return target[prop]
                     break
@@ -866,7 +872,7 @@ export default function parse(input, meta, immutable=true)
                 }
                 firstParse(target)
                 if (prop!==isChanged) {
-                    if (prop!=resultSet && !meta.access(target, prop, 'set')) {
+                    if (prop!=resultSet && meta.access && !meta.access(target, prop, 'set')) {
                         return undefined
                     }
                     if (JSONTag.getType(value)==='object' && !value[isProxy]) {
@@ -881,7 +887,7 @@ export default function parse(input, meta, immutable=true)
                 if (immutable) {
                     throw new Error('dataspace is immutable')
                 }
-                if (!meta.access(target, prop, 'deleteProperty')) {
+                if (meta.access && !meta.access(target, prop, 'deleteProperty')) {
                     return undefined
                 }
                 firstParse(target)
@@ -901,14 +907,14 @@ export default function parse(input, meta, immutable=true)
                 if (immutable) {
                     throw new Error('dataspace is immutable')
                 }
-                if (!meta.access(target, prop, 'defineProperty')) {
+                if (meta.access && !meta.access(target, prop, 'defineProperty')) {
                     return undefined
                 }
                 firstParse(target)
                 Object.defineProperty(target, prop, descriptor)
             },
             has(target, prop) {
-                if (!meta.access(target, prop, 'has')) {
+                if (meta.access && !meta.access(target, prop, 'has')) {
                     return false
                 }
                 firstParse()
@@ -932,7 +938,7 @@ export default function parse(input, meta, immutable=true)
         resultArray.push('')
         value[getIndex] = index
         makeChildProxies(value)
-        let result = new Proxy(value, handlers.newValueHandler)
+        let result = JSONTagProxy(value, handlers.newValueHandler)
         resultArray[index] = result
         return result
     }
@@ -952,7 +958,7 @@ export default function parse(input, meta, immutable=true)
         next()
         // newValueHandler makes sure that value[getBuffer] runs stringify
         // arrayHandler makes sure that changes in the array set targetIsChanged to true
-        return new Proxy(cache, handlers.handler)
+        return JSONTagProxy(cache, handlers.handler)
     }
 
     value = function(ob={})