@muze-nl/od-jsontag 0.2.6 → 0.2.8

package/package.json

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

@@ -825,17 +825,10 @@ export default function parse(input, meta, immutable=true)
         },
         handler: {
             get(target, prop, receiver) {
-                firstParse(target, receiver)
                 switch(prop) {
                     case resultSet:
                         return meta.resultArray
                     break;
-                    case source:
-                        if (meta.access && !meta.access(target, prop, 'get')) {
-                            return undefined
-                        }
-                        return target
-                    break
                     case isProxy:
                         return true
                     break
@@ -860,6 +853,15 @@ export default function parse(input, meta, immutable=true)
                     case isChanged:
                         return target[isChanged]
                     break
+                }
+                firstParse(target, receiver)
+                switch(prop) {
+                    case source:
+                        if (meta.access && !meta.access(target, prop, 'get')) {
+                            return undefined
+                        }
+                        return target
+                    break
                     default:
                         if (meta.access && !meta.access(target, prop, 'get')) {
                             return undefined
@@ -876,7 +878,6 @@ export default function parse(input, meta, immutable=true)
                 if (immutable && prop!==resultSet && prop!==source) {
                     throw new Error('dataspace is immutable')
                 }
-                firstParse(target, receiver)
                 switch(prop) {
                     case isChanged:
                         break
@@ -888,18 +889,16 @@ export default function parse(input, meta, immutable=true)
                         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
                 }
+                firstParse(target, receiver)
+                if (meta.access && !meta.access(target, prop, 'set')) {
+                    return undefined
+                }
+                if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                    value = getNewValueProxy(value)
+                }
+                target[prop] = value
                 target[isChanged] = true
                 return true
             },

package/src/serialize.mjs

@@ -6,6 +6,7 @@ import * as odJSONTag from './jsontag.mjs'
 // 
 const encoder = new TextEncoder()
 const decoder = new TextDecoder()
+const realJSON = JSON // in case someone redefines JSON as JSONTag later
 
 function stringToSAB(strData) {
     const buffer = encoder.encode(strData)
@@ -16,7 +17,7 @@ function stringToSAB(strData) {
 }
 
 export default function serialize(value, options={}) {
-	let resultArray = []
+	let resultArray = false
 	let references = new WeakMap()
 
 	if (options.meta) {
@@ -26,6 +27,15 @@ export default function serialize(value, options={}) {
 		if (!options.meta.index.id) {
 			options.meta.index.id = new Map()
 		}
+		if (options.meta.resultArray) {
+			resultArray = options.meta.resultArray
+		}
+	}
+	if (!resultArray) {
+		resultArray = value[resultSet]
+	}
+	if (!resultArray) {
+		resultArray = []
 	}
 
 	function stringifyValue(value, inarray=false, current) {
@@ -52,7 +62,7 @@ export default function serialize(value, options={}) {
 				if (odJSONTag.isNull(value)) {
 					value = 'null'
 				} else {
-					value = JSON.stringify(''+value)
+					value = realJSON.stringify(''+value)
 				}
 				prop = typeString + value
 			break
@@ -75,7 +85,7 @@ export default function serialize(value, options={}) {
 				if (odJSONTag.isNull(value)) {
 					value = 'null'
 				} else {
-					value = JSON.stringify(value)
+					value = realJSON.stringify(value)
 				}
 				prop = typeString + value
 			break
@@ -129,7 +139,7 @@ export default function serialize(value, options={}) {
 			let value = object[key]
 			let prop = stringifyValue(value, false, current)
 			let enumerable = object.propertyIsEnumerable(key) ? '' : '#'
-			props.push(enumerable+'"'+key+'":'+prop)
+			props.push(enumerable+realJSON.stringify(key)+':'+prop) //FIXME: how does key get escaped?
 		}
 		result = odJSONTag.getTypeString(object)+'{'+props.join(',')+'}'
 		return result
@@ -149,9 +159,7 @@ export default function serialize(value, options={}) {
 		return u8arr
 	}
 
-	if (value[resultSet]) {
-		resultArray = value[resultSet].slice()
-	} else {
+	if (!value[resultSet]) {
 		resultArray.push(value)
 	}
 	let currentSource = 0
@@ -185,6 +193,7 @@ export default function serialize(value, options={}) {
 		} else {
 			skipCount++
 		}
+
 		currentSource++
 	}
 	let arr = result.map(encode)