@opentrons/shared-data 0.0.0-alpha.2 → 0.0.1-alpha.17

package/Makefile

@@ -3,9 +3,6 @@
 # using bash instead of /bin/bash in SHELL prevents macOS optimizing away our PATH update
 SHELL := bash
 
-# TODO(mc, 2018-10-25): use dist to match other projects
-BUILD_DIR := build
-
 # These variables can be overriden when make is invoked to customize the
 # behavior of jest
 tests ?=
@@ -28,17 +25,12 @@ clean: clean-js clean-py
 
 # JavaScript targets
 
-.PHONY: setup-js
-setup-js: dist-js
+.PHONY: lib-js
+lib-js: export NODE_ENV := production
+lib-js:
+	yarn webpack
 
-.PHONY: dist-js
-dist-js:
-	@yarn shx mkdir -p $(BUILD_DIR)
-	node js/scripts/build.js $(BUILD_DIR)
 
-.PHONY: clean-js
-clean-js:
-	yarn shx rm -rf $(BUILD_DIR)
 
 # Python targets
 

package/command/schemas/8.json

@@ -469,14 +469,14 @@
           "enum": ["SINGLE"],
           "type": "string"
         },
-        "primary_nozzle": {
-          "title": "Primary Nozzle",
+        "primaryNozzle": {
+          "title": "Primarynozzle",
           "description": "The primary nozzle to use in the layout configuration. This nozzle will update the critical point of the current pipette. For now, this is also the back left corner of your rectangle.",
           "enum": ["A1", "H1", "A12", "H12"],
           "type": "string"
         }
       },
-      "required": ["primary_nozzle"]
+      "required": ["primaryNozzle"]
     },
     "RowNozzleLayoutConfiguration": {
       "title": "RowNozzleLayoutConfiguration",
@@ -489,14 +489,14 @@
           "enum": ["ROW"],
           "type": "string"
         },
-        "primary_nozzle": {
-          "title": "Primary Nozzle",
+        "primaryNozzle": {
+          "title": "Primarynozzle",
           "description": "The primary nozzle to use in the layout configuration. This nozzle will update the critical point of the current pipette. For now, this is also the back left corner of your rectangle.",
           "enum": ["A1", "H1", "A12", "H12"],
           "type": "string"
         }
       },
-      "required": ["primary_nozzle"]
+      "required": ["primaryNozzle"]
     },
     "ColumnNozzleLayoutConfiguration": {
       "title": "ColumnNozzleLayoutConfiguration",
@@ -509,14 +509,14 @@
           "enum": ["COLUMN"],
           "type": "string"
         },
-        "primary_nozzle": {
-          "title": "Primary Nozzle",
+        "primaryNozzle": {
+          "title": "Primarynozzle",
           "description": "The primary nozzle to use in the layout configuration. This nozzle will update the critical point of the current pipette. For now, this is also the back left corner of your rectangle.",
           "enum": ["A1", "H1", "A12", "H12"],
           "type": "string"
         }
       },
-      "required": ["primary_nozzle"]
+      "required": ["primaryNozzle"]
     },
     "QuadrantNozzleLayoutConfiguration": {
       "title": "QuadrantNozzleLayoutConfiguration",
@@ -529,20 +529,20 @@
           "enum": ["QUADRANT"],
           "type": "string"
         },
-        "primary_nozzle": {
-          "title": "Primary Nozzle",
+        "primaryNozzle": {
+          "title": "Primarynozzle",
           "description": "The primary nozzle to use in the layout configuration. This nozzle will update the critical point of the current pipette. For now, this is also the back left corner of your rectangle.",
           "enum": ["A1", "H1", "A12", "H12"],
           "type": "string"
         },
-        "front_right_nozzle": {
-          "title": "Front Right Nozzle",
+        "frontRightNozzle": {
+          "title": "Frontrightnozzle",
           "description": "The front right nozzle in your configuration.",
           "pattern": "[A-Z][0-100]",
           "type": "string"
         }
       },
-      "required": ["primary_nozzle", "front_right_nozzle"]
+      "required": ["primaryNozzle", "frontRightNozzle"]
     },
     "ConfigureNozzleLayoutParams": {
       "title": "ConfigureNozzleLayoutParams",
@@ -554,8 +554,8 @@
           "description": "Identifier of pipette to use for liquid handling.",
           "type": "string"
         },
-        "configuration_params": {
-          "title": "Configuration Params",
+        "configurationParams": {
+          "title": "Configurationparams",
           "anyOf": [
             {
               "$ref": "#/definitions/AllNozzleLayoutConfiguration"
@@ -575,7 +575,7 @@
           ]
         }
       },
-      "required": ["pipetteId", "configuration_params"]
+      "required": ["pipetteId", "configurationParams"]
     },
     "ConfigureNozzleLayoutCreate": {
       "title": "ConfigureNozzleLayoutCreate",

package/command/types/gantry.ts

@@ -167,9 +167,15 @@ interface RetractAxisParams {
   axis: MotorAxis
 }
 
+interface AddressableOffsetVector {
+  x: number
+  y: number
+  z: number
+}
 export interface MoveToAddressableAreaParams {
   pipetteId: string
   addressableAreaName: string
+  offset: AddressableOffsetVector
   speed?: number
   minimumZHeight?: number
   forceDirect?: boolean

package/command/types/setup.ts

@@ -179,21 +179,21 @@ const COLUMN = 'COLUMN'
 const SINGLE = 'SINGLE'
 const ROW = 'ROW'
 const QUADRANT = 'QUADRANT'
-const EMPTY = 'EMPTY'
+const ALL = 'ALL'
 
 export type NozzleConfigurationStyle =
   | typeof COLUMN
   | typeof SINGLE
   | typeof ROW
   | typeof QUADRANT
-  | typeof EMPTY
+  | typeof ALL
 
 interface NozzleConfigurationParams {
-  primary_nozzle: string
+  primaryNozzle: string
   style: NozzleConfigurationStyle
 }
 
 interface ConfigureNozzleLayoutParams {
   pipetteId: string
-  configuration_params: NozzleConfigurationParams
+  configurationParams: NozzleConfigurationParams
 }

package/js/constants.ts

@@ -334,3 +334,5 @@ export const WASTE_CHUTE_STAGING_AREA_FIXTURES: CutoutFixtureId[] = [
   STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_COVERED_FIXTURE,
   STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
 ]
+
+export const LOW_VOLUME_PIPETTES = ['p50_single_flex', 'p50_multi_flex']

package/js/getLabware.ts

@@ -1,7 +1,4 @@
-import assert from 'assert'
 import mapValues from 'lodash/mapValues'
-// TODO: Ian 2019-06-04 remove the shared-data build process for labware v1
-import definitions from '../build/labware.json'
 
 import {
   FIXED_TRASH_RENDER_HEIGHT,
@@ -15,11 +12,6 @@ import type {
   WellDefinition,
 } from './types'
 
-assert(
-  definitions && Object.keys(definitions).length > 0,
-  'Expected v1 labware defs. Something went wrong with shared-data/build/labware.json'
-)
-
 // do not list in any "available labware" UI.
 // TODO(mc, 2019-12-3): how should this correspond to RETIRED_LABWARE?
 // see shared-data/js/helpers/index.js

package/js/helpers/getAddressableAreasInProtocol.ts

@@ -0,0 +1,59 @@
+import type { AddressableAreaName } from '../../deck'
+import type { RunTimeCommand } from '../../protocol'
+
+export function getAddressableAreasInProtocol(
+  commands: RunTimeCommand[]
+): AddressableAreaName[] {
+  return commands.reduce<AddressableAreaName[]>((acc, command) => {
+    if (
+      command.commandType === 'moveLabware' &&
+      command.params.newLocation !== 'offDeck' &&
+      'slotName' in command.params.newLocation &&
+      !acc.includes(command.params.newLocation.slotName as AddressableAreaName)
+    ) {
+      return [
+        ...acc,
+        command.params.newLocation.slotName as AddressableAreaName,
+      ]
+    } else if (
+      command.commandType === 'moveLabware' &&
+      command.params.newLocation !== 'offDeck' &&
+      'addressableAreaName' in command.params.newLocation &&
+      !acc.includes(
+        command.params.newLocation.addressableAreaName as AddressableAreaName
+      )
+    ) {
+      return [
+        ...acc,
+        command.params.newLocation.addressableAreaName as AddressableAreaName,
+      ]
+    } else if (
+      (command.commandType === 'loadLabware' ||
+        command.commandType === 'loadModule') &&
+      command.params.location !== 'offDeck' &&
+      'slotName' in command.params.location &&
+      !acc.includes(command.params.location.slotName as AddressableAreaName)
+    ) {
+      return [...acc, command.params.location.slotName as AddressableAreaName]
+    } else if (
+      command.commandType === 'loadLabware' &&
+      command.params.location !== 'offDeck' &&
+      'addressableAreaName' in command.params.location &&
+      !acc.includes(
+        command.params.location.addressableAreaName as AddressableAreaName
+      )
+    ) {
+      return [
+        ...acc,
+        command.params.location.addressableAreaName as AddressableAreaName,
+      ]
+    } else if (
+      command.commandType === 'moveToAddressableArea' &&
+      !acc.includes(command.params.addressableAreaName as AddressableAreaName)
+    ) {
+      return [...acc, command.params.addressableAreaName as AddressableAreaName]
+    } else {
+      return acc
+    }
+  }, [])
+}

package/js/helpers/index.ts

@@ -27,6 +27,7 @@ export * from './getVectorSum'
 export * from './getLoadedLabwareDefinitionsByUri'
 export * from './getOccludedSlotCountForModule'
 export * from './labwareInference'
+export * from './getAddressableAreasInProtocol'
 
 export const getLabwareDefIsStandard = (def: LabwareDefinition2): boolean =>
   def?.namespace === OPENTRONS_LABWARE_NAMESPACE

package/js/helpers/wellSets.ts

@@ -52,7 +52,8 @@ export interface WellSetHelpers {
 
   canPipetteUseLabware: (
     pipetteSpec: PipetteNameSpecs,
-    labwareDef: LabwareDefinition2
+    labwareDef?: LabwareDefinition2,
+    trashName?: string
   ) => boolean
 }
 
@@ -123,24 +124,28 @@ export const makeWellSetHelpers = (): WellSetHelpers => {
 
   const canPipetteUseLabware = (
     pipetteSpec: PipetteNameSpecs,
-    labwareDef: LabwareDefinition2
+    labwareDef?: LabwareDefinition2,
+    trashName?: string
   ): boolean => {
-    if (pipetteSpec.channels === 1) {
+    if (pipetteSpec.channels === 1 || trashName != null) {
       // assume all labware can be used by single-channel
       return true
     }
-
-    const allWellSets = getAllWellSetsForLabware(labwareDef)
-    return allWellSets.some(wellSet => {
-      const uniqueWells = uniq(wellSet)
-      // if all wells are non-null, and there are either 1 (reservoir-like)
-      // or 8 (well plate-like) unique wells in the set,
-      // then assume both 8 and 96 channel pipettes will work
-      return (
-        uniqueWells.every(well => well != null) &&
-        [1, 8].includes(uniqueWells.length)
-      )
-    })
+    if (labwareDef != null) {
+      const allWellSets = getAllWellSetsForLabware(labwareDef)
+      return allWellSets.some(wellSet => {
+        const uniqueWells = uniq(wellSet)
+        // if all wells are non-null, and there are either 1 (reservoir-like)
+        // or 8 (well plate-like) unique wells in the set,
+        // then assume both 8 and 96 channel pipettes will work
+        return (
+          uniqueWells.every(well => well != null) &&
+          [1, 8].includes(uniqueWells.length)
+        )
+      })
+    } else {
+      return false
+    }
   }
   return {
     getAllWellSetsForLabware,