@muze-nl/simplystore 0.7.3 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.7.3",
+	"version": "0.8.1",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -16,9 +16,9 @@
 	"bugs": "https://github.com/simplyedit/simplystore/issues",
 	"homepage": "https://github.com/simplyedit/simplystore#readme",
 	"dependencies": {
-		"@muze-nl/jaqt": "^0.10.1",
-		"@muze-nl/jsontag": "^0.9.11",
-		"@muze-nl/od-jsontag": "^0.3.4",
+		"@muze-nl/jaqt": "^0.10.2",
+		"@muze-nl/jsontag": "^0.10.2",
+		"@muze-nl/od-jsontag": "^0.4.1",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
 		"json-pointer": "^0.6.2",

package/src/command-worker-module.mjs

@@ -1,6 +1,6 @@
 import JSONTag from '@muze-nl/jsontag'
 import {getIndex, resultSet} from '@muze-nl/od-jsontag/src/symbols.mjs'
-import parse from '@muze-nl/od-jsontag/src/parse.mjs'
+import Parser from '@muze-nl/od-jsontag/src/parse.mjs'
 import serialize from '@muze-nl/od-jsontag/src/serialize.mjs'
 import writeFileAtomic from 'write-file-atomic'
 
@@ -13,10 +13,12 @@ let metaProxy = {
     index: {
     }
 }
+const parser = new Parser()
+parser.immutable = false
 
 export const metaIdProxy = {
     forEach: (callback) => {
-        meta.index.id.forEach((ref,id) => {
+        parser.meta.index.id.forEach((ref,id) => {
             callback({
                 deref: () => {
                     return resultArr[ref]
@@ -25,19 +27,19 @@ export const metaIdProxy = {
         })
     },
     set: (id,ref) => {
-        if (!meta.index.id.has(id)) {
+        if (!parser.meta.index.id.has(id)) {
             if (ref[getIndex]) {
-                meta.index.id.set(id, ref[getIndex])
+                parser.meta.index.id.set(id, ref[getIndex])
             } else {
                 throw new Error('cannot set index.id for non-proxy')
             }
         } else {
-            let line = meta.index.id.get(id)
+            let line = parser.meta.index.id.get(id)
             resultArr[line] = ref
         }
     },
     get: (id) => {
-        let index = meta.index.id.get(id)
+        let index = parser.meta.index.id.get(id)
         if (index || index===0) {
             return {
                 deref: () => {
@@ -47,7 +49,7 @@ export const metaIdProxy = {
         }
     },
     has: (id) => {
-        return meta.index.id.has(id)
+        return parser.meta.index.id.has(id)
     }
 }
 
@@ -59,8 +61,11 @@ const metaReadProxy = {
 }
 
 export async function initialize(task) {
+    if (task.meta) {
+        parser.meta = task.meta
+    }
     for(let jsontag of task.data) {
-        dataspace = parse(jsontag, task.meta, false) // false means mutable
+        dataspace = parser.parse(jsontag)
     }
     resultArr = dataspace[resultSet]
     meta = task.meta
@@ -88,7 +93,6 @@ export default async function runCommand(commandStr, request) {
             let time = Date.now()
             commands[task.name](dataspace, task, request, metaProxy)
             //TODO: if command/task makes no changes, skip updating data.jsontag and writing it, skip response.data
-            JSONTag.setAttribute(dataspace, 'command', task.id)
         
             const uint8sab = serialize(dataspace, {meta, changes: true}) // serialize only changes
             response.data = uint8sab

package/src/load-worker.mjs

@@ -1,9 +1,10 @@
 import { parentPort } from 'node:worker_threads'
 import JSONTag from '@muze-nl/jsontag'
-import parse from '@muze-nl/od-jsontag/src/parse.mjs'
+import Parser from '@muze-nl/od-jsontag/src/parse.mjs'
 import fs from 'fs'
 import serialize from '@muze-nl/od-jsontag/src/serialize.mjs'
 
+const parser = new Parser()
 parentPort.on('message', (files) => {
 	let meta = {
 		index: {
@@ -17,22 +18,20 @@ parentPort.on('message', (files) => {
 	let count = 0
 	let data
 	let jsontag
-	let tempMeta = {}
 	let datafile = files.dataFile
 	let commands = files.commands
 	commands.push('done')
 	do {
 		if (fs.existsSync(datafile)) {
 			jsontag = fs.readFileSync(datafile)
-			data = parse(jsontag, tempMeta) // tempMeta is needed to combine the resultArray, using meta conflicts with meta.index.id
+			data = parser.parse(jsontag)
 			count++
 		}
 		datafile = basefile + '.' + commands.shift() + '.' + extension
 	} while(commands.length)
-	meta.parts = count
 	if (files.schemaFile) {
 		jsontag = fs.readFileSync(files.schemaFile, 'utf-8')
-		meta.schema = JSONTag.parse(jsontag, null, tempMeta)
+		meta.schema = JSONTag.parse(jsontag)
 	}
 
 	const sab = serialize(data, {meta})

package/src/query-worker-module.mjs

@@ -2,66 +2,28 @@ import pointer from 'json-pointer'
 import {VM} from 'vm2'
 import { memoryUsage } from 'node:process'
 import JSONTag from '@muze-nl/jsontag'
-import * as odJSONTag from '@muze-nl/od-jsontag/src/jsontag.mjs'
 import {source} from '@muze-nl/od-jsontag/src/symbols.mjs'
-import parse from '@muze-nl/od-jsontag/src/parse.mjs'
+import Parser from '@muze-nl/od-jsontag/src/parse.mjs'
 import {_,from,not,anyOf,allOf,asc,desc,sum,count,avg,max,min,many,one,distinct} from '@muze-nl/jaqt'
 import process from 'node:process'
 
 let dataspace
-let meta = {}
 let metaProxy = {
     index: {
     }
 }
 
-function protect(target) {
-    if (target[source]) {
-        throw new Error('Data is immutable')
-    }
-}
-
-const myJSONTag = {
-    getAttribute: odJSONTag.getAttribute,
-    getAttributes: odJSONTag.getAttributes,
-    getType: odJSONTag.getType,
-    getTypeString: odJSONTag.getTypeString,
-    setAttribute: (target, name, value) => {
-        protect(target)
-        return odJSONTag.setAttribute(target, name, value)
-    },
-    setType: (target, type) => {
-        protect(target)
-        return odJSONTag.setType(target, type)
-    },
-    setAttributes: (target, attributes) => {
-        protect(target)
-        return odJSONTag.setAttributes(target, attributes)
-    },
-    addAttribute: (target, name, value) => {
-        protect(target)
-        return odJSONTag.addAttribute(target, name, value)
-    },
-    removeAttribute: (target, name) => {
-        protect(target)
-        return odJSONTag.removeAttribute(target, name)
-    },
-    getAttributesString: odJSONTag.getAttributesString,
-    isNull: odJSONTag.isNull,
-    clone: JSONTag.clone,
-    Link: JSONTag.Link,
-    Null: JSONTag.Null
-}
+const parser = new Parser()
 
 const metaIdProxy = {
     get: (id) => {
-        let index = meta.index.id.get(id)
+        let index = parser.meta.index.id.get(id)
         if (index || index===0) {
-            return meta.resultArray[index]
+            return parser.meta.resultArray[index]
         }
     },
     has: (id) => {
-        return meta.index.id.has(id)
+        return parser.meta.index.id.has(id)
     }
 }
 
@@ -70,27 +32,27 @@ const tasks = {
         if (task.req.access) {
             task.req.access = await import(task.req.access)
             task.req.access = task.req.access.default
-            meta.access = task.req.access
+            parser.meta.access = task.req.access
         }
         if (task.req.meta.index) {
-            meta.index = task.req.meta.index
+            parser.meta.index = task.req.meta.index
         }
         if (task.req.meta.schema) {
-            meta.schema = task.req.meta.schema
+            parser.meta.schema = task.req.meta.schema
         }
         for (let sab of task.req.body) { //body contains an array of sharedArrayBuffers with initial data and changes
-            dataspace = parse(sab, meta)
+            dataspace = parser.parse(sab)
         }
         metaProxy.index.id = metaIdProxy
-        metaProxy.schema = meta.schema
+        metaProxy.schema = parser.meta.schema
         //@TODO: add meta.index.references? and baseURL
         return true
     },
     update: async (task) => {
         if (task.req.meta.index) {
-            meta.index = task.req.meta.index
+            parser.meta.index = task.req.meta.index
         }
-        dataspace = parse(task.req.body, meta) //update only has a single changeset
+        dataspace = parser.parse(task.req.body) //update only has a single changeset
         return true
     },
     query: async (task) => {
@@ -139,7 +101,7 @@ export function runQuery(pointer, request, query) {
                 one,
                 distinct,
 //                    console: connectConsole(res),
-                JSONTag: myJSONTag,
+                JSONTag,
                 request
             },
             wasm: false