Ensure component:component payload conforms with FBP protocol schema

noflo · Mar 21, 2018 · dbcd0db · dbcd0db
1 parent b9514d3
commit dbcd0db
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/src/protocol/Component.coffee b/src/protocol/Component.coffee
@@ -99,31 +99,36 @@ class ComponentProtocol
       callback null
     , true
 
+  processPort: (portName, port) ->
+    # Required port properties
+    portDef =
+      id: portName
+      type: if port.getDataType then port.getDataType() else 'all'
+    if port.getSchema?()
+      portDef.schema = port.getSchema()
+    if port.isRequired
+      portDef.required = port.isRequired()
+    if port.isAddressable
+      portDef.addressable = port.isAddressable()
+    if port.getDescription
+      portDef.description = port.getDescription()
+    if port.options?.values
+      portDef.values = port.options.values
+    if port.hasDefault?()
+      portDef.default = port.options.default
+    return portDef
+
   sendComponent: (component, instance, context) ->
     inPorts = []
     outPorts = []
     for portName, port of instance.inPorts
       continue if not port or typeof port is 'function' or not port.canAttach
-      inPorts.push
-        id: portName
-        type: port.getDataType() if port.getDataType
-        schema: port.getSchema() if port.getSchema
-        required: port.isRequired() if port.isRequired
-        addressable: port.isAddressable() if port.isAddressable
-        description: port.getDescription() if port.getDescription
-        values: port.options.values if port.options and port.options.values
-        default: port.options.default if port.options and port.options.default
+      inPorts.push @processPort portName, port
     for portName, port of instance.outPorts
       continue if not port or typeof port is 'function' or not port.canAttach
-      outPorts.push
-        id: portName
-        type: port.getDataType() if port.getDataType
-        schema: port.getSchema() if port.getSchema
-        required: port.isRequired() if port.isRequired
-        addressable: port.isAddressable() if port.isAddressable
-        description: port.getDescription() if port.getDescription
-
-    icon = if instance.getIcon then instance.getIcon() else 'blank'
+      outPorts.push @processPort portName, port
+
+    icon = if instance.getIcon then instance.getIcon() else 'gear'
 
     @send 'component',
       name: component