autopass 3.4.0 → 3.4.1

package/spec/schema/index.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 4
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
 
-const VERSION = 1
+const VERSION = 4
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -64,24 +64,24 @@ const encoding2 = {
     c.buffer.preencode(state, m.key)
     state.end++ // max flag is 2 so always one byte
 
-    if (m.name) c.string.preencode(state, m.name)
+    if (version >= 4 && m.name) c.string.preencode(state, m.name)
   },
   encode(state, m) {
-    const flags = (m.name ? 1 : 0) | (m.readOnly ? 2 : 0)
+    const flags = ((version >= 4 && m.name) ? 1 : 0) | ((version >= 4 && m.readOnly) ? 2 : 0)
 
     c.buffer.encode(state, m.key)
     c.uint.encode(state, flags)
 
-    if (m.name) c.string.encode(state, m.name)
+    if (version >= 4 && m.name) c.string.encode(state, m.name)
   },
   decode(state) {
     const r0 = c.buffer.decode(state)
-    const flags = c.uint.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       key: r0,
-      name: (flags & 1) !== 0 ? c.string.decode(state) : null,
-      readOnly: (flags & 2) !== 0
+      name: (version >= 4 && (flags & 1) !== 0) ? c.string.decode(state) : null,
+      readOnly: (version >= 4 && (flags & 2) !== 0)
     }
   }
 }
@@ -103,54 +103,68 @@ const encoding3 = {
   }
 }
 
-// @autopass/invitee
+// @autopass/invite
 const encoding4 = {
   preencode(state, m) {
-    c.fixed32.preencode(state, m.key)
-    state.end++ // max flag is 1 so always one byte
+    c.buffer.preencode(state, m.id)
+    c.buffer.preencode(state, m.invite)
+    c.buffer.preencode(state, m.publicKey)
+    c.int.preencode(state, m.expires)
+    state.end++ // max flag is 2 so always one byte
 
-    if (m.name) c.string.preencode(state, m.name)
+    if (version >= 3 && m.additional) encoding4_5.preencode(state, m.additional)
   },
   encode(state, m) {
-    const flags = m.name ? 1 : 0
+    const flags = ((version >= 2 && m.readOnly) ? 1 : 0) | ((version >= 3 && m.additional) ? 2 : 0)
 
-    c.fixed32.encode(state, m.key)
+    c.buffer.encode(state, m.id)
+    c.buffer.encode(state, m.invite)
+    c.buffer.encode(state, m.publicKey)
+    c.int.encode(state, m.expires)
     c.uint.encode(state, flags)
 
-    if (m.name) c.string.encode(state, m.name)
+    if (version >= 3 && m.additional) encoding4_5.encode(state, m.additional)
   },
   decode(state) {
-    const r0 = c.fixed32.decode(state)
-    const flags = c.uint.decode(state)
+    const r0 = c.buffer.decode(state)
+    const r1 = c.buffer.decode(state)
+    const r2 = c.buffer.decode(state)
+    const r3 = c.int.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
-      key: r0,
-      name: (flags & 1) !== 0 ? c.string.decode(state) : null
+      id: r0,
+      invite: r1,
+      publicKey: r2,
+      expires: r3,
+      readOnly: (version >= 2 && (flags & 1) !== 0),
+      additional: (version >= 3 && (flags & 2) !== 0) ? encoding4_5.decode(state) : null
     }
   }
 }
 
-// @autopass/public-invite-metadata
+// @autopass/del-invite
 const encoding5 = {
   preencode(state, m) {
-    state.end++ // max flag is 1 so always one byte
+    c.buffer.preencode(state, m.id)
   },
   encode(state, m) {
-    const flags = m.readOnly ? 1 : 0
-
-    c.uint.encode(state, flags)
+    c.buffer.encode(state, m.id)
   },
   decode(state) {
-    const flags = c.uint.decode(state)
+    const r0 = c.buffer.decode(state)
 
     return {
-      readOnly: (flags & 1) !== 0
+      id: r0
     }
   }
 }
 
+// @autopass/del-mirror
+const encoding6 = encoding1
+
 // @autopass/additional-invite-data
-const encoding6 = {
+const encoding7 = {
   preencode(state, m) {
     c.buffer.preencode(state, m.data)
     c.buffer.preencode(state, m.signature)
@@ -170,68 +184,54 @@ const encoding6 = {
   }
 }
 
-// @autopass/invite.additional
-const encoding7_5 = c.frame(encoding6)
-
-// @autopass/invite
-const encoding7 = {
+// @autopass/invitee
+const encoding8 = {
   preencode(state, m) {
-    c.buffer.preencode(state, m.id)
-    c.buffer.preencode(state, m.invite)
-    c.buffer.preencode(state, m.publicKey)
-    c.int.preencode(state, m.expires)
-    state.end++ // max flag is 2 so always one byte
+    c.fixed32.preencode(state, m.key)
+    state.end++ // max flag is 1 so always one byte
 
-    if (m.additional) encoding7_5.preencode(state, m.additional)
+    if (version >= 4 && m.name) c.string.preencode(state, m.name)
   },
   encode(state, m) {
-    const flags = (m.readOnly ? 1 : 0) | (m.additional ? 2 : 0)
+    const flags = (version >= 4 && m.name) ? 1 : 0
 
-    c.buffer.encode(state, m.id)
-    c.buffer.encode(state, m.invite)
-    c.buffer.encode(state, m.publicKey)
-    c.int.encode(state, m.expires)
+    c.fixed32.encode(state, m.key)
     c.uint.encode(state, flags)
 
-    if (m.additional) encoding7_5.encode(state, m.additional)
+    if (version >= 4 && m.name) c.string.encode(state, m.name)
   },
   decode(state) {
-    const r0 = c.buffer.decode(state)
-    const r1 = c.buffer.decode(state)
-    const r2 = c.buffer.decode(state)
-    const r3 = c.int.decode(state)
+    const r0 = c.fixed32.decode(state)
     const flags = c.uint.decode(state)
 
     return {
-      id: r0,
-      invite: r1,
-      publicKey: r2,
-      expires: r3,
-      readOnly: (flags & 1) !== 0,
-      additional: (flags & 2) !== 0 ? encoding7_5.decode(state) : null
+      key: r0,
+      name: (version >= 4 && (flags & 1) !== 0) ? c.string.decode(state) : null
     }
   }
 }
 
-// @autopass/del-invite
-const encoding8 = {
+// @autopass/public-invite-metadata
+const encoding9 = {
   preencode(state, m) {
-    c.buffer.preencode(state, m.id)
+    state.end++ // max flag is 1 so always one byte
   },
   encode(state, m) {
-    c.buffer.encode(state, m.id)
+    const flags = (version >= 4 && m.readOnly) ? 1 : 0
+
+    c.uint.encode(state, flags)
   },
   decode(state) {
-    const r0 = c.buffer.decode(state)
+    const flags = c.uint.decode(state)
 
     return {
-      id: r0
+      readOnly: (version >= 4 && (flags & 1) !== 0)
     }
   }
 }
 
-// @autopass/del-mirror
-const encoding9 = encoding1
+// @autopass/invite.additional, deferred due to recusive use
+const encoding4_5 = c.frame(encoding7)
 
 function setVersion(v) {
   version = v
@@ -264,17 +264,17 @@ function getEncoding(name) {
       return encoding2
     case '@autopass/delete':
       return encoding3
-    case '@autopass/invitee':
+    case '@autopass/invite':
       return encoding4
-    case '@autopass/public-invite-metadata':
+    case '@autopass/del-invite':
       return encoding5
-    case '@autopass/additional-invite-data':
+    case '@autopass/del-mirror':
       return encoding6
-    case '@autopass/invite':
+    case '@autopass/additional-invite-data':
       return encoding7
-    case '@autopass/del-invite':
+    case '@autopass/invitee':
       return encoding8
-    case '@autopass/del-mirror':
+    case '@autopass/public-invite-metadata':
       return encoding9
     default:
       throw new Error('Encoder not found ' + name)

package/spec/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 4,
   "schema": [
     {
       "name": "records",
@@ -56,12 +56,12 @@
         {
           "name": "name",
           "type": "string",
-          "version": 1
+          "version": 4
         },
         {
           "name": "readOnly",
           "type": "bool",
-          "version": 1
+          "version": 4
         }
       ]
     },
@@ -79,58 +79,6 @@
         }
       ]
     },
-    {
-      "name": "invitee",
-      "namespace": "autopass",
-      "compact": false,
-      "flagsPosition": 1,
-      "fields": [
-        {
-          "name": "key",
-          "required": true,
-          "type": "fixed32",
-          "version": 1
-        },
-        {
-          "name": "name",
-          "type": "string",
-          "version": 1
-        }
-      ]
-    },
-    {
-      "name": "public-invite-metadata",
-      "namespace": "autopass",
-      "compact": false,
-      "flagsPosition": 0,
-      "fields": [
-        {
-          "name": "readOnly",
-          "type": "bool",
-          "version": 1
-        }
-      ]
-    },
-    {
-      "name": "additional-invite-data",
-      "namespace": "autopass",
-      "compact": false,
-      "flagsPosition": -1,
-      "fields": [
-        {
-          "name": "data",
-          "required": true,
-          "type": "buffer",
-          "version": 1
-        },
-        {
-          "name": "signature",
-          "required": true,
-          "type": "buffer",
-          "version": 1
-        }
-      ]
-    },
     {
       "name": "invite",
       "namespace": "autopass",
@@ -165,13 +113,13 @@
           "name": "readOnly",
           "required": false,
           "type": "bool",
-          "version": 1
+          "version": 2
         },
         {
           "name": "additional",
           "required": false,
           "type": "@autopass/additional-invite-data",
-          "version": 1
+          "version": 3
         }
       ]
     },
@@ -202,6 +150,58 @@
           "version": 1
         }
       ]
+    },
+    {
+      "name": "additional-invite-data",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "data",
+          "required": true,
+          "type": "buffer",
+          "version": 3
+        },
+        {
+          "name": "signature",
+          "required": true,
+          "type": "buffer",
+          "version": 3
+        }
+      ]
+    },
+    {
+      "name": "invitee",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": 1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 4
+        },
+        {
+          "name": "name",
+          "type": "string",
+          "version": 4
+        }
+      ]
+    },
+    {
+      "name": "public-invite-metadata",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": 0,
+      "fields": [
+        {
+          "name": "readOnly",
+          "type": "bool",
+          "version": 4
+        }
+      ]
     }
   ]
 }