@teamplay/backend 0.2.4 → 0.2.5

package/features/serverAggregate.js

@@ -1,8 +1,8 @@
 import _serverAggregate from '@teamplay/server-aggregate'
 import { isAggregationFunction } from '@teamplay/utils/aggregation'
 
-export default function serverAggregate (backend, { customCheck, models = {} } = {}) {
-  _serverAggregate(backend, { customCheck })
+export default function serverAggregate (backend, { models = {}, ...options } = {}) {
+  _serverAggregate(backend, options)
 
   for (const modelPattern in models) {
     for (const aggregationName in models[modelPattern]) {

package/features/validateSchema.js

@@ -1,8 +1,13 @@
 import sharedbSchema from '@teamplay/sharedb-schema'
 import { transformSchema } from '@teamplay/schema'
 
-export default function validateSchema (backend, { models = {} } = {}) {
-  const schemaPerCollection = { schemas: {}, formats: {}, validators: {} }
+export default function validateSchema (backend, { models = {}, ...options } = {}) {
+  options = {
+    schemas: {},
+    formats: {},
+    validators: {},
+    ...options
+  }
 
   for (const modelPattern in models) {
     let { schema, factory } = models[modelPattern]
@@ -16,18 +21,18 @@ export default function validateSchema (backend, { models = {} } = {}) {
       if (/\./.test(collectionName)) throw Error(ERRORS.onlyTopLevelCollections(modelPattern))
       // transform schema from simplified format to full format
       schema = transformSchema(schema, { collectionName })
-      schemaPerCollection.schemas[collectionName] = schema
+      options.schemas[collectionName] = schema
     }
 
     // allow any 'service' collection structure
     // since 'service' collection is used in our startupjs libraries
     // and we don't have a tool to collect scheme from all packages right now
-    schemaPerCollection.schemas.service = transformSchema({
+    options.schemas.service = transformSchema({
       type: 'object', properties: {}, additionalProperties: true
     })
   }
 
-  sharedbSchema(backend, schemaPerCollection)
+  sharedbSchema(backend, options)
   console.log('✓ Security: JSON-schema validation of DB collections on backend is enabled')
 }
 

package/index.js

@@ -44,15 +44,15 @@ export default function createBackend ({
   if (hooks) hooks(backend)
 
   if (accessControl) {
-    initAccessControl(backend, { models })
+    initAccessControl(backend, { models, ...(typeof accessControl === 'object' ? accessControl : {}) })
   }
 
   if (serverAggregate) {
-    initServerAggregate(backend, { customCheck: serverAggregate?.customCheck, models })
+    initServerAggregate(backend, { models, ...(typeof serverAggregate === 'object' ? serverAggregate : {}) })
   }
 
   if (validateSchema && process.env.NODE_ENV !== 'production') {
-    initValidateSchema(backend, { models })
+    initValidateSchema(backend, { models, ...(typeof validateSchema === 'object' ? validateSchema : {}) })
   }
 
   backend.on('client', (client, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamplay/backend",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Create new ShareDB backend instance",
   "type": "module",
   "main": "index.js",
@@ -12,11 +12,11 @@
     ".": "./index.js"
   },
   "dependencies": {
-    "@teamplay/schema": "^0.2.4",
-    "@teamplay/server-aggregate": "^0.2.4",
-    "@teamplay/sharedb-access": "^0.2.4",
-    "@teamplay/sharedb-schema": "^0.2.4",
-    "@teamplay/utils": "^0.2.4",
+    "@teamplay/schema": "^0.2.5",
+    "@teamplay/server-aggregate": "^0.2.5",
+    "@teamplay/sharedb-access": "^0.2.5",
+    "@teamplay/sharedb-schema": "^0.2.5",
+    "@teamplay/utils": "^0.2.5",
     "@types/ioredis-mock": "^8.2.5",
     "ioredis": "^5.3.2",
     "ioredis-mock": "^8.9.0",
@@ -29,5 +29,5 @@
     "sharedb-redis-pubsub": "^2.0.1",
     "sqlite3": "^5.1.6"
   },
-  "gitHead": "9d78732c718f86a12cfa74d0a2b23b31d8ba8daa"
+  "gitHead": "e4ea7de3c12214a24928af14b882651b3aeb5599"
 }