@muze-nl/od-jsontag 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/od-jsontag",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"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

@@ -1,7 +1,7 @@
 import JSONTag from '@muze-nl/jsontag';
 import Null from '@muze-nl/jsontag/src/lib/Null.mjs'
 import serialize from './serialize.mjs'
-import {source,isProxy,getBuffer,getIndex,isChanged,isParsed,position,parent,resultSet} from './symbols.mjs'
+import {source,isProxy,proxyType,getBuffer,getIndex,isChanged,isParsed,position,parent,resultSet} from './symbols.mjs'
 
 const decoder = new TextDecoder()
 const encoder = new TextEncoder()
@@ -731,13 +731,16 @@ export default function parse(input, meta, immutable=true)
                     case isProxy:
                         return true
                     break
+                    case proxyType:
+                        return 'new'
+                    break
                     case getBuffer:
                         return (i) => {
                             let index = target[getIndex]
                             if (i != index) {
                                 return encoder.encode('~'+index)
                             }
-                            return serialize(target, meta, true, i)
+                            return serialize(target, {meta, skipLength:true})
                         }
                     break
                     case getIndex:
@@ -845,6 +848,9 @@ export default function parse(input, meta, immutable=true)
                     case isProxy:
                         return true
                     break
+                    case proxyType:
+                        return 'parse'
+                    break
                     case getBuffer:
                         return (i) => {
                             let index = target[getIndex]
@@ -852,7 +858,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)
                         }
@@ -887,6 +893,7 @@ export default function parse(input, meta, immutable=true)
                         resetObject(target)
                         target[position] = value[position]
                         target[isParsed] = false
+                        target[isChanged] = false
                         return true
                         break
                     case resultSet:
@@ -1084,7 +1091,7 @@ export default function parse(input, meta, immutable=true)
         offsetArray.push(at)
         line = result[2]
         if (result[1]) {
-            if (!meta.resultArray[line]) {
+            if (!meta.resultArray[line] || meta.resultArray[line][proxyType]=='new') {
                 meta.resultArray[line] = result[1]
             } else {
                 meta.resultArray[line][source] = result[1]

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?.index?.id) {
+				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?.index?.id) {
+				const id=odJSONTag.getAttribute(resultArray[currentSource],'id')
+				if (id) {
+					options.meta.index.id.set(id, currentSource)
+				}
+			}
 			currentResult++
 		} else {
 			skipCount++

package/src/symbols.mjs

@@ -1,5 +1,6 @@
 export const source = Symbol('source')
 export const isProxy = Symbol('isProxy')
+export const proxyType = Symbol('proxyType')
 export const getBuffer = Symbol('getBuffer')
 export const getIndex = Symbol('getIndex')
 export const isChanged = Symbol('isChanged')