@muze-nl/od-jsontag 0.1.7 → 0.2.1

package/package.json

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

@@ -46,7 +46,9 @@ export default function parse(input, meta, immutable=true)
         t: "\t"
     }
     let offsetArray = []
-    let resultArray = []
+    if (!meta.resultArray) {
+        meta.resultArray = []
+    }
 
     at = 0
     ch = " "
@@ -661,6 +663,7 @@ export default function parse(input, meta, immutable=true)
     }
 
     let parseValue = function(position, ob={}) {
+        input = position.input
         at = position.start
         next()
         return value(ob)
@@ -719,6 +722,9 @@ export default function parse(input, meta, immutable=true)
         newValueHandler: {
             get(target, prop, receiver) {
                 switch(prop) {
+                    case resultSet:
+                        return meta.resultArray
+                    break;
                     case source:
                         return target
                     break
@@ -827,6 +833,9 @@ export default function parse(input, meta, immutable=true)
             get(target, prop, receiver) {
                 firstParse(target)
                 switch(prop) {
+                    case resultSet:
+                        return meta.resultArray
+                    break;
                     case source:
                         if (meta.access && !meta.access(target, prop, 'get')) {
                             return undefined
@@ -845,7 +854,7 @@ export default function parse(input, meta, immutable=true)
                             if (target[isChanged]) {
                                 return serialize(target, null, true)
                             }
-                            return input.slice(target[position].start,target[position].end)
+                            return target[position].input.slice(target[position].start,target[position].end)
                         }
                     break
                     case getIndex:
@@ -867,18 +876,31 @@ export default function parse(input, meta, immutable=true)
                 }
             },
             set(target, prop, value) {
-                if (immutable && prop!==resultSet) {
+                if (immutable && prop!==resultSet && prop!==source) {
                     throw new Error('dataspace is immutable')
                 }
                 firstParse(target)
-                if (prop!==isChanged) {
-                    if (prop!=resultSet && meta.access && !meta.access(target, prop, 'set')) {
-                        return undefined
-                    }
-                    if (JSONTag.getType(value)==='object' && !value[isProxy]) {
-                        value = getNewValueProxy(value)
-                    }
-                    target[prop] = value
+                switch(prop) {
+                    case isChanged:
+                        break
+                    case source:
+                        resetObject(target)
+                        target[position] = value[position]
+                        target[isParsed] = false
+                        return true
+                        break
+                    case resultSet:
+                        break
+                    default:
+                        if (meta.access && !meta.access(target, prop, 'set')) {
+                            return undefined
+                        }
+                        if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                            value = getNewValueProxy(value)
+                        }
+                        target[prop] = value
+           
+                        break
                 }
                 target[isChanged] = true
                 return true
@@ -933,13 +955,19 @@ export default function parse(input, meta, immutable=true)
         }
     }
 
+    function resetObject(ob) {
+        for (let prop of Object.getOwnPropertyNames(ob)) {
+            delete ob[prop]
+        }
+    }
+
     const getNewValueProxy = function(value) {
-        let index = resultArray.length
-        resultArray.push('')
+        let index = meta.resultArray.length
+        meta.resultArray.push('')
         value[getIndex] = index
         makeChildProxies(value)
         let result = JSONTagProxy(value, handlers.newValueHandler)
-        resultArray[index] = result
+        meta.resultArray[index] = result
         return result
     }
 
@@ -951,6 +979,7 @@ export default function parse(input, meta, immutable=true)
         cache[isParsed] = false
         // current offset + length contains jsontag of this value
         cache[position] = {
+            input,
             start: at-1,
             end: at-1+length
         }
@@ -967,7 +996,7 @@ export default function parse(input, meta, immutable=true)
         whitespace()
         if (ch==='~') {
             let vOffset = offset()
-            return resultArray[vOffset]
+            return meta.resultArray[vOffset]
         }
         if (ch==='<') {
             tagOb = tag()
@@ -1028,18 +1057,40 @@ export default function parse(input, meta, immutable=true)
         return result
     }
 
+    function jump() {
+        next('+')
+        return number()
+    }
+
     function lengthValue(i) {
-        let l = length()
-        let v = valueProxy(l,i)
-        return [l, v]
+        whitespace()
+        if (!ch) {
+            next()
+        }
+        let l, v
+        if (ch=='+') {
+            i += jump()
+        } else {
+            l = length()
+            v = valueProxy(l,i)
+        }
+        return [l, v, i]
     }
 
+    let line = 0
     while(ch && at<input.length) {
-        result = lengthValue(resultArray.length)
+        result = lengthValue(line) // needs to return current line nr
         whitespace()
         offsetArray.push(at)
-        resultArray.push(result[1])
+        line = result[2]
+        if (result[1]) {
+            if (!meta.resultArray[line]) {
+                meta.resultArray[line] = result[1]
+            } else {
+                meta.resultArray[line][source] = result[1]
+            }
+            line++
+        }
     }
-    resultArray[0][resultSet] = resultArray  
-    return resultArray[0]
+    return meta.resultArray[0]
 }

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