@muze-nl/simplystore 0.6.22 → 0.6.24

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.6.22",
+	"version": "0.6.24",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -20,7 +20,7 @@
 		"@muze-nl/od-jsontag": "^0.2.9",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
-		"@muze-nl/jaqt": "^0.9.6",
+		"@muze-nl/jaqt": "^0.9.7",
 		"json-pointer": "^0.6.2",
 		"jsonpath-plus": "^7.2.0",
 		"vm2": "^3.9.13",

package/src/query-worker-module.mjs

@@ -160,6 +160,11 @@ export function runQuery(pointer, request, query) {
     if (!response.code) {
         if (response.jsontag) {
             try {
+                // JSONTag.stringify doesn't handle tagName/attributes well
+                // with od-jsontag, since some entries in result haven't been parsed yet
+                // only after parsing will these be available
+                // so force parsing of all result - od-jsontag should have its own stringify
+                parseAllObjects(result)
                 response.body = JSONTag.stringify(result)
             } catch(err) {
                 console.log(err)
@@ -174,6 +179,33 @@ export function runQuery(pointer, request, query) {
     return response
 }
 
+let seen = new WeakMap()
+function parseAllObjects(o, reset=true) {
+    if (reset) {
+        seen = new WeakMap()
+    }
+    if (seen.has(o)) {
+        return
+    }
+    if (o && typeof o == 'object') {
+        let temp = o[source]
+        seen.set(o, true)
+        if (Array.isArray(o)) {
+            for (let v of o) {
+                if (v && typeof v == 'object') {
+                    parseAllObjects(v, false)
+                }
+            }
+        } else if (o && typeof o == 'object') {
+            for (let k of Object.keys(o)) {
+                if (o[k] && typeof o[k]=='object') {
+                    parseAllObjects(o[k], false)
+                }
+            }
+        }
+    }
+}
+
 export function getDataSpace(path, dataspace) {
     if (path.substring(path.length-1)==='/') {
         //jsonpointer doesn't allow a trailing '/'