@muze-nl/od-jsontag 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/od-jsontag",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"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,6 +731,9 @@ 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]
@@ -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]
@@ -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

@@ -15,17 +15,8 @@ function stringToSAB(strData) {
     return uint8sab
 }
 
-export default function serialize(value, meta, skipLength=false, index=false) {
+export default function serialize(value, options={}) {
 	let resultArray = []
-	if (!meta) {
-		meta = {}
-	}
-	if (!meta.index) {
-		meta.index = {}
-	}
-	if (!meta.index.id) {
-		meta.index.id = new Map()
-	}
 	let references = new WeakMap()
 
 	function stringifyValue(value, inarray=false) {
@@ -139,7 +130,7 @@ export default function serialize(value, meta, skipLength=false, index=false) {
 		if (typeof s == 'string' || s instanceof String) {
 			s = encoder.encode(s)
 		}
-		if (skipLength) {
+		if (s[0]==43 || options.skipLength) {
 			return new Uint8Array(s)
 		}
 		let length = encoder.encode('('+s.length+')')
@@ -154,16 +145,31 @@ export default function serialize(value, meta, skipLength=false, index=false) {
 	} else {
 		resultArray.push(value)
 	}
-	let current = 0
-	while(current<resultArray.length) {
-		if (resultArray[current][isChanged] || !resultArray[current][isProxy]) {
-			resultArray[current] = encoder.encode(innerStringify(current))
+	let currentSource = 0
+	let currentResult = 0
+	let skipCount = 0
+	let result = resultArray
+	if (options.changes) {
+		result = []
+	}
+	while(currentSource<resultArray.length) {
+		if (resultArray[currentSource][isChanged] || !resultArray[currentSource][isProxy]) {
+			if (skipCount) {
+				result[currentResult] = encoder.encode('+'+skipCount)
+				skipCount = 0
+				currentResult++
+			}
+			result[currentResult] = encoder.encode(innerStringify(currentSource))
+			currentResult++
+		} else if (!options.changes) {
+			resultArray[currentResult] = resultArray[currentSource][getBuffer](currentSource)
+			currentResult++
 		} else {
-			resultArray[current] = resultArray[current][getBuffer](current)
+			skipCount++
 		}
-		current++
+		currentSource++
 	}
-	let arr = resultArray.map(encode)
+	let arr = result.map(encode)
 	let length = 0
 	for (let line of arr) {
 		length += line.length+1

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')