@muze-nl/od-jsontag 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/od-jsontag",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"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/parse.mjs

@@ -14,15 +14,6 @@ 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) {
@@ -703,7 +694,7 @@ export default function parse(input, meta, immutable=true)
                         return undefined
                     }
                     if (Array.isArray(target[prop])) {
-                        return JSONTagProxy(target[prop], handlers.newArrayHandler)
+                        return new Proxy(target[prop], handlers.newArrayHandler)
                     }
                     return target[prop]
                 }
@@ -740,7 +731,7 @@ export default function parse(input, meta, immutable=true)
                             if (i != index) {
                                 return encoder.encode('~'+index)
                             }
-                            return serialize(target, meta, true, i)
+                            return serialize(target, {meta, skipLength:true})
                         }
                     break
                     case getIndex:
@@ -754,7 +745,7 @@ export default function parse(input, meta, immutable=true)
                             return undefined
                         }
                         if (Array.isArray(target[prop])) {
-                            return JSONTagProxy(target[prop], handlers.newArrayHandler)
+                            return new Proxy(target[prop], handlers.newArrayHandler)
                         }
                         return target[prop]
                     break
@@ -798,7 +789,7 @@ export default function parse(input, meta, immutable=true)
                     }
                     if (Array.isArray(target[prop])) {
                         target[prop][parent] = target[parent]
-                        return JSONTagProxy(target[prop], handlers.arrayHandler)
+                        return new Proxy(target[prop], handlers.arrayHandler)
                     }
                     return target[prop]
                 }
@@ -834,7 +825,7 @@ export default function parse(input, meta, immutable=true)
         },
         handler: {
             get(target, prop, receiver) {
-                firstParse(target)
+                firstParse(target, receiver)
                 switch(prop) {
                     case resultSet:
                         return meta.resultArray
@@ -858,7 +849,7 @@ export default function parse(input, meta, immutable=true)
                                 return encoder.encode('~'+index)
                             }
                             if (target[isChanged]) {
-                                return serialize(target, null, true)
+                                return serialize(target, {skipLength: true})
                             }
                             return target[position].input.slice(target[position].start,target[position].end)
                         }
@@ -875,17 +866,17 @@ export default function parse(input, meta, immutable=true)
                         }
                         if (Array.isArray(target[prop])) {
                             target[prop][parent] = target
-                            return JSONTagProxy(target[prop], handlers.arrayHandler)
+                            return new Proxy(target[prop], handlers.arrayHandler)
                         }
                         return target[prop]
                     break
                 }
             },
-            set(target, prop, value) {
+            set(target, prop, value, receiver) {
                 if (immutable && prop!==resultSet && prop!==source) {
                     throw new Error('dataspace is immutable')
                 }
-                firstParse(target)
+                firstParse(target, receiver)
                 switch(prop) {
                     case isChanged:
                         break
@@ -955,10 +946,20 @@ export default function parse(input, meta, immutable=true)
         }
     }
 
-    const firstParse = function(target) {
+    const firstParse = function(target, receiver) {
         if (!target[isParsed]) {
             parseValue(target[position], target)
             target[isParsed] = true
+            if (receiver) {
+                let tag = JSONTag.getType(target)
+                if (tag) {
+                    JSONTag.setType(receiver, tag)
+                }
+                let attributes = JSONTag.getAttributes(target)
+                if (attributes) {
+                    JSONTag.setAttributes(receiver, attributes)
+                }
+            }
         }
     }
 
@@ -973,7 +974,7 @@ export default function parse(input, meta, immutable=true)
         meta.resultArray.push('')
         value[getIndex] = index
         makeChildProxies(value)
-        let result = JSONTagProxy(value, handlers.newValueHandler)
+        let result = new Proxy(value, handlers.newValueHandler)
         meta.resultArray[index] = result
         return result
     }
@@ -994,7 +995,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 JSONTagProxy(cache, handlers.handler)
+        return new Proxy(cache, handlers.handler)
     }
 
     value = function(ob={})

package/src/serialize.mjs

@@ -19,6 +19,15 @@ export default function serialize(value, options={}) {
 	let resultArray = []
 	let references = new WeakMap()
 
+	if (options.meta) {
+		if (!options.meta.index) {
+			options.meta.index = {}
+		}
+		if (!options.meta.index.id) {
+			options.meta.index.id = new Map()
+		}
+	}
+
 	function stringifyValue(value, inarray=false) {
 		let prop
 		let typeString = odJSONTag.getTypeString(value)
@@ -160,9 +169,21 @@ export default function serialize(value, options={}) {
 				currentResult++
 			}
 			result[currentResult] = encoder.encode(innerStringify(currentSource))
+			if (options.meta) {
+				const id=odJSONTag.getAttribute(resultArray[currentSource],'id')
+				if (id) {
+					options.meta.index.id.set(id, currentSource)
+				}
+			}
 			currentResult++
 		} else if (!options.changes) {
 			resultArray[currentResult] = resultArray[currentSource][getBuffer](currentSource)
+			if (options.meta) {
+				const id=odJSONTag.getAttribute(resultArray[currentSource],'id')
+				if (id) {
+					options.meta.index.id.set(id, currentSource)
+				}
+			}
 			currentResult++
 		} else {
 			skipCount++