@muze-nl/od-jsontag 0.3.0 → 0.3.2

package/package.json

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

@@ -15,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) {
@@ -69,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
@@ -566,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(']')
@@ -651,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)
     }
 
@@ -665,7 +698,7 @@ export default function parse(input, meta, immutable=true)
         Object.entries(parent).forEach(([key,entry]) => {
             if (Array.isArray(entry)) {
                 makeChildProxies(entry)
-            } else if (JSONTag.getType(entry)==='object') {
+            } else if (entry && JSONTag.getType(entry)==='object') {
                 if (entry[isProxy]) {
                     // do nothing
                 } else {
@@ -919,7 +952,7 @@ export default function parse(input, meta, immutable=true)
                 if (meta.access && !meta.access(target, prop, 'set')) {
                     return undefined
                 }
-                if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                if (value && JSONTag.getType(value)==='object' && !value[isProxy]) {
                     value = getNewValueProxy(value)
                 }
                 target[prop] = value
@@ -954,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')) {
@@ -993,6 +1026,9 @@ export default function parse(input, meta, immutable=true)
     }
 
     const getNewValueProxy = function(value) {
+        if (value === null) {
+            return null
+        }
         let index = meta.resultArray.length
         meta.resultArray.push('')
         value[getIndex] = index
@@ -1027,6 +1063,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

@@ -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':