@muze-nl/simplystore 0.6.18 → 0.6.20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/simplystore",
-	"version": "0.6.18",
+	"version": "0.6.20",
 	"main": "src/server.mjs",
 	"type": "module",
 	"scripts": {
@@ -17,10 +17,10 @@
 	"homepage": "https://github.com/simplyedit/simplystore#readme",
 	"dependencies": {
 		"@muze-nl/jsontag": "^0.9.1",
-		"@muze-nl/od-jsontag": "^0.2.7",
+		"@muze-nl/od-jsontag": "^0.2.9",
 		"codemirror": "^6.0.1",
 		"express": "^4.18.1",
-		"jaqt": "^0.9.0",
+		"@muze-nl/jaqt": "^0.9.5",
 		"json-pointer": "^0.6.2",
 		"jsonpath-plus": "^7.2.0",
 		"vm2": "^3.9.13",

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 fs from 'fs'
 import serialize from '@muze-nl/od-jsontag/src/serialize.mjs'
 
-parentPort.on('message', datafile => {
+parentPort.on('message', (files) => {
 	let meta = {
 		index: {
 			id: new Map()
@@ -11,11 +12,11 @@ parentPort.on('message', datafile => {
 	}
 
 	let count = 0
-	let basefile = datafile
-	let data 
+	let basefile = files.dataFile
+	let data
 	let jsontag
 	let tempMeta = {}
-
+	let datafile = files.dataFile
 	do {
 		jsontag = fs.readFileSync(datafile)
 		data = parse(jsontag, tempMeta) // tempMeta is needed to combine the resultArray, using meta conflicts with meta.index.id
@@ -23,6 +24,10 @@ parentPort.on('message', datafile => {
 		datafile = basefile + '.' + count
 	} while(fs.existsSync(datafile))
 	meta.parts = count
+	if (files.schemaFile) {
+		jsontag = fs.readFileSync(files.schemaFile, 'utf-8')
+		meta.schema = JSONTag.parse(jsontag, null, tempMeta)
+	}
 
 	const sab = serialize(data, {meta})
 

package/src/query-worker-module.mjs

@@ -5,7 +5,7 @@ import JSONTag from '@muze-nl/jsontag'
 import * as odJSONTag from '@muze-nl/od-jsontag/src/jsontag.mjs'
 import {source, isProxy, resultSet} from '@muze-nl/od-jsontag/src/symbols.mjs'
 import parse from '@muze-nl/od-jsontag/src/parse.mjs'
-import {_,from,not,anyOf,allOf,asc,desc,sum,count,avg,max,min} from 'jaqt'
+import {_,from,not,anyOf,allOf,asc,desc,sum,count,avg,max,min,distinct} from '@muze-nl/jaqt'
 
 let dataspace
 let meta = {}
@@ -74,10 +74,14 @@ const tasks = {
         if (task.req.meta.index) {
             meta.index = task.req.meta.index
         }
+        if (task.req.meta.schema) {
+            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)
         }
         metaProxy.index.id = metaIdProxy
+        metaProxy.schema = meta.schema
         //@TODO: add meta.index.references? and baseURL
         return true
     },
@@ -129,7 +133,8 @@ export function runQuery(pointer, request, query) {
                 count,
                 avg,
                 max,
-                min,    
+                min,
+                distinct,
 //                    console: connectConsole(res),
                 JSONTag: myJSONTag,
                 request

package/src/server.mjs

@@ -20,6 +20,7 @@ async function main(options) {
     }  
     const port          = options.port          || 3000
     const datafile      = options.datafile      || './data.od-jsontag'
+    const schemaFile    = options.schemaFile    || null 
     const wwwroot       = options.wwwroot       || __dirname+'/www'
     const maxWorkers    = options.maxWorkers    || 8
     const queryWorker   = options.queryWorker   || __dirname+'/src/query-worker.mjs'
@@ -49,7 +50,7 @@ async function main(options) {
                 reject(error)
                 worker.terminate()
             })
-            worker.postMessage(datafile)
+            worker.postMessage({dataFile:datafile,schemaFile})
         })
     }
     try {