Naming changes, Function is now Rpc

Author: Josema

src/api/createNodeFactory.js

@@ -1,7 +1,7 @@
 import { isFunction, isInteger, isArray } from '../util/is'
 import createRequest from '../util/createRequest'
 import localProcedureCall from '../util/localProcedureCall'
-import { FUNCTION_CREATOR } from '../const'
+import { RPC_CREATOR } from '../const'
 
 export default function createNodeFactory({ encode, decode }) {
     return function createNode({
@@ -89,7 +89,7 @@ export default function createNodeFactory({ encode, decode }) {
             node.send = (msg) => send(serialize(msg))
             return createRemoteFunction({
                 function_id,
-                function_creator: FUNCTION_CREATOR.ENTRY,
+                function_creator: RPC_CREATOR.ENTRY,
             })
         }
 
@@ -107,8 +107,8 @@ export default function createNodeFactory({ encode, decode }) {
                 createRemoteFunction,
                 caller: fn,
                 function_creator: is_request
-                    ? FUNCTION_CREATOR.REQUEST
-                    : FUNCTION_CREATOR.RESPONSE,
+                    ? RPC_CREATOR.REQUEST
+                    : RPC_CREATOR.RESPONSE,
             })
 
             let args = msg[2]

src/const.js

@@ -1,12 +1,12 @@
 export const ESCAPE_KEY = '$escape'
-export const FUNCTION_KEY = '$f'
+export const RPC_KEY = '$f'
 export const DELETE_KEY = '$d'
 export const REPLACE_KEY = '$r'
 export const SPLICE_KEY = '$s'
 export const SWAP_KEY = '$w'
 export const MULTI_KEY = '$m'
 
-export const FUNCTION_CREATOR = {
+export const RPC_CREATOR = {
     ENTRY: 'ENTRY',
     REQUEST: 'REQUEST',
     RESPONSE: 'RESPONSE',

src/types/Function.js

@@ -1,4 +1,4 @@
-import { ESCAPE_KEY, FUNCTION_KEY } from '../const'
+import { ESCAPE_KEY, RPC_KEY } from '../const'
 import { isValidToEscape, isValidToDecode } from '../util/isValid'
 import { getUniqueKey } from '../util/get'
 import { isInteger, isFunction } from '../util/is'
@@ -10,8 +10,8 @@ Rpc.encode = function ({ value, local_rpcs, registerLocalRpcFromEncode }) {
         const function_id = local_rpcs.has(value)
             ? local_rpcs.get(value)
             : registerLocalRpcFromEncode(value)
-        return { [FUNCTION_KEY]: function_id }
-    } else if (isValidToDecode({ value, key: FUNCTION_KEY })) {
+        return { [RPC_KEY]: function_id }
+    } else if (isValidToDecode({ value, key: RPC_KEY })) {
         return { [ESCAPE_KEY]: value }
     }
     return value
@@ -24,19 +24,16 @@ Rpc.decode = function ({
     caller,
     function_creator,
 }) {
-    if (
-        getUniqueKey(value) === FUNCTION_KEY &&
-        isInteger(value[FUNCTION_KEY])
-    ) {
+    if (getUniqueKey(value) === RPC_KEY && isInteger(value[RPC_KEY])) {
         return createRemoteFunction({
-            function_id: value[FUNCTION_KEY],
+            function_id: value[RPC_KEY],
             function_creator,
             caller,
             path: path.slice(2),
         })
     } else if (
         isValidToEscape({ value }) &&
-        isValidToDecode({ value: value[ESCAPE_KEY], key: FUNCTION_KEY })
+        isValidToDecode({ value: value[ESCAPE_KEY], key: RPC_KEY })
     ) {
         return value[ESCAPE_KEY]
     }

src/types/Rpc.js

@@ -1,4 +1,4 @@
-import { ESCAPE_KEY, FUNCTION_KEY } from '../const'
+import { ESCAPE_KEY, RPC_KEY } from '../const'
 import { isValidToEscape, isValidToDecode } from '../util/isValid'
 import { getUniqueKey } from '../util/get'
 import { isInteger, isFunction } from '../util/is'
@@ -10,8 +10,8 @@ Rpc.encode = function ({ value, local_rpcs, registerLocalRpcFromEncode }) {
         const function_id = local_rpcs.has(value)
             ? local_rpcs.get(value)
             : registerLocalRpcFromEncode(value)
-        return { [FUNCTION_KEY]: function_id }
-    } else if (isValidToDecode({ value, key: FUNCTION_KEY })) {
+        return { [RPC_KEY]: function_id }
+    } else if (isValidToDecode({ value, key: RPC_KEY })) {
         return { [ESCAPE_KEY]: value }
     }
     return value
@@ -24,19 +24,16 @@ Rpc.decode = function ({
     caller,
     function_creator,
 }) {
-    if (
-        getUniqueKey(value) === FUNCTION_KEY &&
-        isInteger(value[FUNCTION_KEY])
-    ) {
+    if (getUniqueKey(value) === RPC_KEY && isInteger(value[RPC_KEY])) {
         return createRemoteFunction({
-            function_id: value[FUNCTION_KEY],
+            function_id: value[RPC_KEY],
             function_creator,
             caller,
             path: path.slice(2),
         })
     } else if (
         isValidToEscape({ value }) &&
-        isValidToDecode({ value: value[ESCAPE_KEY], key: FUNCTION_KEY })
+        isValidToDecode({ value: value[ESCAPE_KEY], key: RPC_KEY })
     ) {
         return value[ESCAPE_KEY]
     }

test/createNode.js

@@ -1,6 +1,6 @@
 import test from 'ava'
 import { createNode } from '../'
-import { FUNCTION_CREATOR } from '../src/const'
+import { RPC_CREATOR } from '../src/const'
 
 test('Api', async (t) => {
     const server = createNode()
@@ -276,22 +276,22 @@ test('rpcFilter API', async (t) => {
         // console.log({ function_id, function_creator, caller, path })
         t.is(node, server)
         if (function_id === 0) {
-            t.is(function_creator, FUNCTION_CREATOR.ENTRY)
+            t.is(function_creator, RPC_CREATOR.ENTRY)
             t.is(caller, undefined)
             t.is(path, undefined)
         }
         if (function_id === 1) {
-            t.is(function_creator, FUNCTION_CREATOR.REQUEST)
+            t.is(function_creator, RPC_CREATOR.REQUEST)
             t.is(caller, entryFunction)
             t.deepEqual(path, [0])
         }
         if (function_id === 2) {
-            t.is(function_creator, FUNCTION_CREATOR.RESPONSE)
+            t.is(function_creator, RPC_CREATOR.RESPONSE)
             t.is(caller, undefined)
             t.deepEqual(path, [])
         }
         if (function_id === 3) {
-            t.is(function_creator, FUNCTION_CREATOR.REQUEST)
+            t.is(function_creator, RPC_CREATOR.REQUEST)
             t.is(caller, login)
             t.deepEqual(path, [0, 'fn'])
         }