@muze-nl/od-jsontag 0.2.9 → 0.3.1

package/package.json

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

@@ -1,5 +1,5 @@
 import JSONTag from '@muze-nl/jsontag'
-import {source} from './symbols.mjs'
+import {source, isChanged} from './symbols.mjs'
 
 export function getType(obj) {
     return JSONTag.getType(obj?.[source] ?? obj)
@@ -26,22 +26,36 @@ export function isNull(obj) {
 }
 
 export function setAttribute(obj, attr, value) {
+    if (obj?.[source]) {
+        obj[isChanged] = true
+    }
     return JSONTag.setAttribute(obj?.[source] ?? obj, attr, value)
 }
 
 export function setAttributes(obj, attr) {
+    if (obj?.[source]) {
+        obj[isChanged] = true
+    }
     return JSONTag.setAttribute(obj?.[source] ?? obj, attr)
 }
 
 export function setType(obj, type) {
+    if (obj?.[source]) {
+        obj[isChanged] = true
+    }
     return JSONTag.setType(obj?.[source] ?? obj, type)
 }
 
 export function addAttribute(obj, attr, value) {
+    if (obj?.[source]) {
+        obj[isChanged] = true
+    }
     return JSONTag.addAttribute(obj?.[source] ?? obj, attr, value)
 }
 
 export function removeAttribute(obj, attr) {
+    if (obj?.[source]) {
+        obj[isChanged] = true
+    }
     return JSONTag.removeAttribute(obj?.[source] ?? obj, attr)
-}
-
+}

package/src/parse.mjs

@@ -5,6 +5,7 @@ import {source,isProxy,proxyType,getBuffer,getIndex,isChanged,isParsed,position,
 
 const decoder = new TextDecoder()
 const encoder = new TextEncoder()
+const arrayProxies = new WeakMap()
 
 function stringToSAB(strData) {
     const buffer = encoder.encode(strData)
@@ -14,6 +15,25 @@ function stringToSAB(strData) {
     return uint8sab
 }
 
+function SABtoString(arr) {
+    let string = '';
+    for (let c of arr) {
+        string+= String.fromCharCode(c)
+    }
+    return string
+}
+
+class Slice {
+    constructor(start, end) {
+        this.start = start;
+        this.end = end;
+    }
+}
+
+const isSlice = function(r) {
+    return r instanceof Slice
+}
+
 export default function parse(input, meta, immutable=true)
 {
     if (!meta) {
@@ -68,7 +88,8 @@ export default function parse(input, meta, immutable=true)
     let next = function(c)
     {
         if (c && c!==ch) {
-            error("Expected '"+c+"' instead of '"+ch+"': "+at+':'+input)
+            let source = SABtoString(input)
+            error("Expected '"+c+"' instead of '"+ch+"': "+at+':'+source)
         }
         ch = String.fromCharCode(input.at(at))
         at+=1
@@ -565,7 +586,11 @@ export default function parse(input, meta, immutable=true)
         while(ch) {
             item = value()
             checkUnresolved(item, array, array.length)
-            array.push(item)
+            if (isSlice(item)) {
+                array = array.concat(meta.resultArray.slice(item.start, item.end))
+            } else {
+                array.push(item)
+            }
             whitespace()
             if (ch===']') {
                 next(']')
@@ -650,6 +675,15 @@ export default function parse(input, meta, immutable=true)
             numString += ch
             next()
         }
+        if (ch=='-') {
+            next('-')
+            let endString = ''
+            while(ch>='0' && ch<='9') {
+                endString += ch
+                next()
+            }
+            return new Slice(parseInt(numString),parseInt(endString)+1) // +1 because array.slice(start,end) slices upto but not including end
+        }
         return parseInt(numString)
     }
 
@@ -674,6 +708,18 @@ export default function parse(input, meta, immutable=true)
         })
     }
 
+    const getArrayProxy = (arr, par, handler) => {
+        if (!handler) {
+            handler = handlers.arrayHandler
+        }
+        if (!arrayProxies.has(arr)) {
+            arrayProxies.set(arr, new Proxy(arr, handler))
+        }
+        let aProxy = arrayProxies.get(arr)
+        aProxy[parent] = par
+        return aProxy
+    }
+
     const handlers = {
         newArrayHandler: {
             get(target, prop) {
@@ -694,12 +740,17 @@ export default function parse(input, meta, immutable=true)
                         return undefined
                     }
                     if (Array.isArray(target[prop])) {
-                        return new Proxy(target[prop], handlers.newArrayHandler)
+                        return getArrayProxy(target[prop], target, handlers.newArrayHandler)
                     }
                     return target[prop]
                 }
             },
             set(target, prop, value) {
+                if (prop === isChanged || prop === parent) {
+                    // prevent infinite loops, parent is only needed to mark it isChanged
+                    // but this is a new array proxy, parent is already dirty
+                    return true
+                }
                 if (meta.access && !meta.access(target, prop)) {
                     return undefined
                 }
@@ -745,7 +796,7 @@ export default function parse(input, meta, immutable=true)
                             return undefined
                         }
                         if (Array.isArray(target[prop])) {
-                            return new Proxy(target[prop], handlers.newArrayHandler)
+                            return getArrayProxy(target[prop], target, handlers.newArrayHandler)
                         }
                         return target[prop]
                     break
@@ -782,19 +833,24 @@ export default function parse(input, meta, immutable=true)
                         return result
                     }
                 } else if (prop===isChanged) {
-                    return target[parent][isChanged]
+                    return target[isChanged] || target[parent][isChanged]
+                } else if (prop===source) {
+                    return target
                 } else {
                     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 getArrayProxy(target[prop], target)
                     }
                     return target[prop]
                 }
             },
             set(target, prop, value) {
+                if (prop == parent) {
+                    target[parent] = value
+                    return true
+                }
                 if (immutable) {
                     throw new Error('dataspace is immutable')
                 }
@@ -805,6 +861,7 @@ export default function parse(input, meta, immutable=true)
                     value = getNewValueProxy(value)
                 } 
                 target[prop] = value
+                target[isChanged] = true
                 target[parent][isChanged] = true
                 return true
             },
@@ -819,6 +876,7 @@ export default function parse(input, meta, immutable=true)
                 //that object should be deleted so that its line will become empty
                 //when stringifying resultArray again
                 delete target[prop]
+                target[isChanged] = true
                 target[parent][isChanged] = true
                 return true
             }
@@ -867,15 +925,14 @@ export default function parse(input, meta, immutable=true)
                             return undefined
                         }
                         if (Array.isArray(target[prop])) {
-                            target[prop][parent] = target
-                            return new Proxy(target[prop], handlers.arrayHandler)
+                            return getArrayProxy(target[prop], target)
                         }
                         return target[prop]
                     break
                 }
             },
             set(target, prop, value, receiver) {
-                if (immutable && prop!==resultSet && prop!==source) {
+                if (immutable && prop!==resultSet && prop!==source && prop!==isChanged) {
                     throw new Error('dataspace is immutable')
                 }
                 switch(prop) {
@@ -930,7 +987,7 @@ export default function parse(input, meta, immutable=true)
                     return undefined
                 }
                 firstParse(target)
-                Object.defineProperty(target, prop, descriptor)
+                return Object.defineProperty(target, prop, descriptor)
             },
             has(target, prop) {
                 if (meta.access && !meta.access(target, prop, 'has')) {
@@ -1003,6 +1060,9 @@ export default function parse(input, meta, immutable=true)
         whitespace()
         if (ch==='~') {
             let vOffset = offset()
+            if (isSlice(vOffset)) {
+                return vOffset
+            }
             return meta.resultArray[vOffset]
         }
         if (ch==='<') {

package/src/serialize.mjs

@@ -32,7 +32,7 @@ export default function serialize(value, options={}) {
 		}
 	}
 	if (!resultArray) {
-		resultArray = value[resultSet]
+		resultArray = value?.[resultSet]
 	}
 	if (!resultArray) {
 		resultArray = []
@@ -90,7 +90,29 @@ export default function serialize(value, options={}) {
 				prop = typeString + value
 			break
 			case 'array': 
-				let entries = value.map(e => stringifyValue(e, true, current)).join(',')
+				let entries = value.map(e => stringifyValue(e, true, current))
+				let mergedEntries = []
+				let previousIndex = null
+				let startSlice = null
+				entries.forEach(e => {
+					if (e[0]=='~') {
+						let currIndex = parseInt(e.substr(1))
+						if (startSlice && currIndex === (previousIndex + 1)) {
+							mergedEntries.pop()
+							mergedEntries.push('~' + startSlice + '-' + currIndex)
+							previousIndex = currIndex
+						} else {
+							mergedEntries.push(e)
+							previousIndex = currIndex
+							startSlice = currIndex
+						}
+					} else {
+						mergedEntries.push(e)
+						previousIndex = null
+						startSlice = null
+					}
+				})
+				entries = mergedEntries.join(',')
 				prop = typeString + '[' + entries + ']'
 			break
 			case 'object':
@@ -159,7 +181,7 @@ export default function serialize(value, options={}) {
 		return u8arr
 	}
 
-	if (!value[resultSet]) {
+	if (!value?.[resultSet]) {
 		resultArray.push(value)
 	}
 	let currentSource = 0
@@ -205,7 +227,9 @@ export default function serialize(value, options={}) {
 	for (let line of arr) {
 		length += line.length+1
 	}
-	length -= 1 // skip last newline
+	if (length) {
+		length -= 1 // skip last newline
+	}
 	let sab = new SharedArrayBuffer(length)
 	let u8arr = new Uint8Array(sab)
 	let offset = 0