@rapid-io/protocol - npm Package Compare versions

Comparing version 0.0.61 to 0.0.62

lib/index.js

@@ -6,3 +6,3 @@ 'use strict'
 const err = require('./events/err')
-const filter = require('./schema/filter')
+const filter = require('./shared/filter')
 
@@ -9,0 +9,0 @@ module.exports = {

lib/schema/ack.js

 'use strict'
 
 module.exports = {
-  id: '/ack',
+  id: '/schema/ack',
   title: 'Acknowledge',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/auth.js

 'use strict'
 
 module.exports = {
-  id: '/auth',
+  id: '/schema/auth',
   title: 'Authorize',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/ca.js

 'use strict'
 
 module.exports = {
-  id: '/ca',
+  id: '/schema/ca',
   title: 'Cancel',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/con.js

 'use strict'
 
 module.exports = {
-  id: '/con',
+  id: '/schema/con',
   title: 'Connection',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/deauth.js

 'use strict'
 
 module.exports = {
-  id: '/deauth',
+  id: '/schema/deauth',
   title: 'Deauthorize',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/del.js

 'use strict'
 
 module.exports = {
-  id: '/del',
+  id: '/schema/del',
   title: 'Delete',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/dis.js

 'use strict'
 
 module.exports = {
-  id: '/dis',
+  id: '/schema/dis',
   title: 'Disconnect',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/err.js

 'use strict'
 
 module.exports = {
-  id: '/err',
+  id: '/schema/err',
   title: 'Error',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/ftc.js

 'use strict'
 
-const filter = require('./filter')
+const filter = require('../shared/filter')
+const order = require('../shared/order')
+const limit = require('../shared/limit')
+const skip = require('../shared/skip')
 
 module.exports = {
-  id: '/ftc',
+  id: '/schema/ftc',
   title: 'Fetch',
@@ -26,21 +29,5 @@ type: 'object',
         filter: { $ref: filter.id },
-        order: {
-          type: 'array',
-          items: {
-            type: 'object',
-            additionalProperties: {
-              type: 'string',
-              enum: ['asc', 'desc'],
-            },
-          },
-        },
-        limit: {
-          type: 'integer',
-          minimum: 1,
-          maximum: 250,
-        },
-        skip: {
-          type: 'integer',
-          minimum: 0,
-        },
+        order: { $ref: order.id },
+        limit: { $ref: limit.id },
+        skip: { $ref: skip.id },
       },
@@ -47,0 +34,0 @@ required: ['evt-id', 'col-id', 'ftc-id'],

lib/schema/mer.js

 'use strict'
 
 module.exports = {
-  id: '/mer',
+  id: '/schema/mer',
   title: 'Merge',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/mut.js

 'use strict'
 
 module.exports = {
-  id: '/mut',
+  id: '/schema/mut',
   title: 'Mutate',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/nop.js

 'use strict'
 
 module.exports = {
-  id: '/nop',
+  id: '/schema/nop',
   title: 'Acknowledge',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/query.js

 'use strict'
 
-const filter = require('./filter')
+const filter = require('../shared/filter')
+const order = require('../shared/order')
+const limit = require('../shared/limit')
+const skip = require('../shared/skip')
 
-const schemaId = '/obj/query'
+const schemaId = '/schema/query'
 
@@ -13,19 +16,7 @@ module.exports = {
     filter: { $ref: filter.id },
-    order: {
-      type: 'array',
-      minItems: 1,
-      items: {
-        type: 'object',
-        additionalProperties: {
-          type: 'string',
-          enum: ['asc', 'desc'],
-        },
-        maxProperties: 1,
-        minProperties: 1,
-      },
-    },
-    limit: { type: 'integer' },
-    skip: { type: 'integer' },
+    order: { $ref: order.id },
+    limit: { $ref: limit.id },
+    skip: { $ref: skip.id },
   },
   additionalProperties: false,
 }

lib/schema/rec.js

 'use strict'
 
 module.exports = {
-  id: '/rec',
+  id: '/schema/rec',
   title: 'Reconnection',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/res.js

 'use strict'
 
 module.exports = {
-  id: '/res',
+  id: '/schema/res',
   title: 'Results',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/rm.js

 'use strict'
 
 module.exports = {
-  id: '/rm',
+  id: '/schema/rm',
   title: 'Remove',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/sub.js

 'use strict'
 
-const filter = require('./filter')
+const filter = require('../shared/filter')
+const order = require('../shared/order')
+const limit = require('../shared/limit')
+const skip = require('../shared/skip')
 
 module.exports = {
-  id: '/sub',
+  id: '/schema/sub',
   title: 'Subscribe',
@@ -26,21 +29,5 @@ type: 'object',
         filter: { $ref: filter.id },
-        order: {
-          type: 'array',
-          items: {
-            type: 'object',
-            additionalProperties: {
-              type: 'string',
-              enum: ['asc', 'desc'],
-            },
-          },
-        },
-        limit: {
-          type: 'integer',
-          minimum: 1,
-          maximum: 250,
-        },
-        skip: {
-          type: 'integer',
-          minimum: 0,
-        },
+        order: { $ref: order.id },
+        limit: { $ref: limit.id },
+        skip: { $ref: skip.id },
       },
@@ -47,0 +34,0 @@ required: ['evt-id', 'col-id', 'sub-id'],

lib/schema/uns.js

 'use strict'
 
 module.exports = {
-  id: '/uns',
+  id: '/schema/uns',
   title: 'Unsubscribe',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/upd.js

 'use strict'
 
 module.exports = {
-  id: '/upd',
+  id: '/schema/upd',
   title: 'Update',
@@ -6,0 +6,0 @@ type: 'object',

lib/schema/val.js

 'use strict'
 
 module.exports = {
-  id: '/val',
+  id: '/schema/val',
   title: 'Value',
@@ -6,0 +6,0 @@ type: 'object',

lib/validation/validator.js

@@ -5,5 +5,8 @@ 'use strict'
 
-const filter = require('../schema/filter')
+const filter = require('../shared/filter')
+const order = require('../shared/order')
+const limit = require('../shared/limit')
+const skip = require('../shared/skip')
+
 const query = require('../schema/query')
-
 const ack = require('../schema/ack')
@@ -83,2 +86,5 @@ const err = require('../schema/err')
     filter,
+    order,
+    limit,
+    skip,
     query,
@@ -85,0 +91,0 @@ event,

package.json

 {
   "name": "@rapid-io/protocol",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "description": "Protocol and validation for Rapid.io",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

56791

increased by0.5%

Number of package files

33

increased by10%

Worsened metrics

Lines of code

865

decreased by-0.12%

No dependency changes