refactor(app): add more namespacing for command text utils

Opentrons · Oct 25, 2024 · 297f366 · 297f366
1 parent 819d98d
commit 297f366
Show file tree

Hide file tree

Showing 29 changed files with 67 additions and 65 deletions.
diff --git a/...ands/hooks/useCommandTextString/index.tsx → ...mands/hooks/useCommandTextString/index.ts b/...ands/hooks/useCommandTextString/index.tsx → ...mands/hooks/useCommandTextString/index.ts
@@ -7,11 +7,11 @@ import type {
   RobotType,
   LabwareDefinition2,
 } from '@opentrons/shared-data'
-import type { GetDirectTranslationCommandText } from './utils/getDirectTranslationCommandText'
 import type {
   TCProfileStepText,
   TCProfileCycleText,
-} from './utils/getTCRunExtendedProfileCommandText'
+  GetDirectTranslationCommandText,
+} from './utils'
 import type { CommandTextData } from '/app/local-resources/commands/types'
 
 export interface UseCommandTextStringParams {

diff --git a/...g/utils/getAbsorbanceReaderCommandText.ts → ...andText/getAbsorbanceReaderCommandText.ts b/...g/utils/getAbsorbanceReaderCommandText.ts → ...andText/getAbsorbanceReaderCommandText.ts
@@ -5,7 +5,7 @@ import type {
   AbsorbanceReaderReadRunTimeCommand,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export type AbsorbanceCreateCommand =
   | AbsorbanceReaderOpenLidRunTimeCommand

diff --git a/...TextString/utils/getCommentCommandText.ts → ...tils/commandText/getCommentCommandText.ts b/...TextString/utils/getCommentCommandText.ts → ...tils/commandText/getCommentCommandText.ts
@@ -1,5 +1,5 @@
 import type { CommentRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getCommentCommandText({
   command,

diff --git a/...utils/getConfigureForVolumeCommandText.ts → ...dText/getConfigureForVolumeCommandText.ts b/...utils/getConfigureForVolumeCommandText.ts → ...dText/getConfigureForVolumeCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { ConfigureForVolumeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getConfigureForVolumeCommandText({
   command,

diff --git a/...ls/getConfigureNozzleLayoutCommandText.ts → ...xt/getConfigureNozzleLayoutCommandText.ts b/...ls/getConfigureNozzleLayoutCommandText.ts → ...xt/getConfigureNozzleLayoutCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { ConfigureNozzleLayoutRunTimeCommand } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getConfigureNozzleLayoutCommandText({
   command,

diff --git a/...dTextString/utils/getCustomCommandText.ts → ...utils/commandText/getCustomCommandText.ts b/...dTextString/utils/getCustomCommandText.ts → ...utils/commandText/getCustomCommandText.ts
@@ -1,5 +1,5 @@
 import type { CustomRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getCustomCommandText({
   command,

diff --git a/...ndTextString/utils/getDelayCommandText.ts → .../utils/commandText/getDelayCommandText.ts b/...ndTextString/utils/getDelayCommandText.ts → .../utils/commandText/getDelayCommandText.ts
@@ -1,5 +1,5 @@
 import type { DeprecatedDelayRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getDelayCommandText({
   command,

diff --git a/.../utils/getDirectTranslationCommandText.ts → ...ndText/getDirectTranslationCommandText.ts b/.../utils/getDirectTranslationCommandText.ts → ...ndText/getDirectTranslationCommandText.ts
@@ -1,5 +1,5 @@
 import type { RunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 const SIMPLE_TRANSLATION_KEY_BY_COMMAND_TYPE: {
   [commandType in RunTimeCommand['commandType']]?: string

diff --git a/...tring/utils/getHSShakeSpeedCommandText.ts → ...commandText/getHSShakeSpeedCommandText.ts b/...tring/utils/getHSShakeSpeedCommandText.ts → ...commandText/getHSShakeSpeedCommandText.ts
@@ -1,5 +1,5 @@
 import type { HeaterShakerSetAndWaitForShakeSpeedRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getHSShakeSpeedCommandText({
   command,

diff --git a/...String/utils/getLiquidProbeCommandText.ts → .../commandText/getLiquidProbeCommandText.ts b/...String/utils/getLiquidProbeCommandText.ts → .../commandText/getLiquidProbeCommandText.ts
@@ -2,14 +2,14 @@ import {
   getLabwareName,
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 
 import type {
   LiquidProbeRunTimeCommand,
   RunTimeCommand,
   TryLiquidProbeRunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 type LiquidProbeRunTimeCommands =
   | LiquidProbeRunTimeCommand

diff --git a/...andTextString/utils/getLoadCommandText.ts → ...g/utils/commandText/getLoadCommandText.ts b/...andTextString/utils/getLoadCommandText.ts → ...g/utils/commandText/getLoadCommandText.ts
@@ -5,8 +5,8 @@ import {
   getPipetteSpecsV2,
 } from '@opentrons/shared-data'
 
-import { getPipetteNameOnMount } from './getPipetteNameOnMount'
-import { getLiquidDisplayName } from './getLiquidDisplayName'
+import { getPipetteNameOnMount } from '../getPipetteNameOnMount'
+import { getLiquidDisplayName } from '../getLiquidDisplayName'
 
 import { getLabwareName } from '/app/local-resources/labware'
 import {
@@ -15,7 +15,7 @@ import {
 } from '/app/local-resources/modules'
 
 import type { LoadLabwareRunTimeCommand } from '@opentrons/shared-data'
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
 
 export const getLoadCommandText = ({
   command,

diff --git a/...String/utils/getMoveLabwareCommandText.ts → .../commandText/getMoveLabwareCommandText.ts b/...String/utils/getMoveLabwareCommandText.ts → .../commandText/getMoveLabwareCommandText.ts
@@ -1,13 +1,13 @@
 import { GRIPPER_WASTE_CHUTE_ADDRESSABLE_AREA } from '@opentrons/shared-data'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 import {
   getLabwareName,
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
 
 import type { MoveLabwareRunTimeCommand } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveLabwareCommandText({
   command,

diff --git a/...tring/utils/getMoveRelativeCommandText.ts → ...commandText/getMoveRelativeCommandText.ts b/...tring/utils/getMoveRelativeCommandText.ts → ...commandText/getMoveRelativeCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveRelativeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveRelativeCommandText({
   command,

diff --git a/...ls/getMoveToAddressableAreaCommandText.ts → ...xt/getMoveToAddressableAreaCommandText.ts b/...ls/getMoveToAddressableAreaCommandText.ts → ...xt/getMoveToAddressableAreaCommandText.ts
@@ -1,7 +1,7 @@
-import { getAddressableAreaDisplayName } from './getAddressableAreaDisplayName'
+import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
 
 import type { MoveToAddressableAreaRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToAddressableAreaCommandText({
   command,

diff --git a/...ToAddressabelAreaForDropTipCommandText.ts → ...ToAddressableAreaForDropTipCommandText.ts b/...ToAddressabelAreaForDropTipCommandText.ts → ...ToAddressableAreaForDropTipCommandText.ts
@@ -1,7 +1,7 @@
-import { getAddressableAreaDisplayName } from './getAddressableAreaDisplayName'
+import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
 
 import type { MoveToAddressableAreaForDropTipRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToAddressableAreaForDropTipCommandText({
   command,

diff --git a/.../utils/getMoveToCoordinatesCommandText.ts → ...ndText/getMoveToCoordinatesCommandText.ts b/.../utils/getMoveToCoordinatesCommandText.ts → ...ndText/getMoveToCoordinatesCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveToCoordinatesRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToCoordinatesCommandText({
   command,

diff --git a/...tString/utils/getMoveToSlotCommandText.ts → ...s/commandText/getMoveToSlotCommandText.ts b/...tString/utils/getMoveToSlotCommandText.ts → ...s/commandText/getMoveToSlotCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveToSlotRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToSlotCommandText({
   command,

diff --git a/...tString/utils/getMoveToWellCommandText.ts → ...s/commandText/getMoveToWellCommandText.ts b/...tString/utils/getMoveToWellCommandText.ts → ...s/commandText/getMoveToWellCommandText.ts
@@ -3,10 +3,10 @@ import {
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 
 import type { MoveToWellRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToWellCommandText({
   command,

diff --git a/...xtString/utils/getPipettingCommandText.ts → ...ls/commandText/getPipettingCommandText.ts b/...xtString/utils/getPipettingCommandText.ts → ...ls/commandText/getPipettingCommandText.ts
@@ -1,7 +1,7 @@
 import { getLabwareDefURI } from '@opentrons/shared-data'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
-import { getWellRange } from './getWellRange'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
+import { getWellRange } from '../getWellRange'
 
 import {
   getLabwareDefinitionsFromCommands,
@@ -11,7 +11,7 @@ import {
 } from '/app/local-resources/labware'
 
 import type { PipetteName, RunTimeCommand } from '@opentrons/shared-data'
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
 
 export const getPipettingCommandText = ({
   command,

diff --git a/.../utils/getPrepareToAspirateCommandText.ts → ...ndText/getPrepareToAspirateCommandText.ts b/.../utils/getPrepareToAspirateCommandText.ts → ...ndText/getPrepareToAspirateCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { PrepareToAspirateRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getPrepareToAspirateCommandText({
   command,

diff --git a/...tString/utils/getRailLightsCommandText.ts → ...s/commandText/getRailLightsCommandText.ts b/...tString/utils/getRailLightsCommandText.ts → ...s/commandText/getRailLightsCommandText.ts
@@ -1,5 +1,5 @@
 import type { RunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 type HandledCommands = Extract<RunTimeCommand, { commandType: 'setRailLights' }>
 

diff --git a/...ils/getTCRunExtendedProfileCommandText.ts → ...ext/getTCRunExtendedProfileCommandText.ts b/...ils/getTCRunExtendedProfileCommandText.ts → ...ext/getTCRunExtendedProfileCommandText.ts
@@ -4,8 +4,8 @@ import type {
   TCProfileCycle,
   AtomicProfileStep,
 } from '@opentrons/shared-data/command'
-import type { GetTCRunExtendedProfileCommandTextResult } from '..'
-import type { HandlesCommands } from './types'
+import type { GetTCRunExtendedProfileCommandTextResult } from '../..'
+import type { HandlesCommands } from '../types'
 
 export interface TCProfileStepText {
   kind: 'step'

diff --git a/...tring/utils/getTCRunProfileCommandText.ts → ...commandText/getTCRunProfileCommandText.ts b/...tring/utils/getTCRunProfileCommandText.ts → ...commandText/getTCRunProfileCommandText.ts
@@ -1,7 +1,7 @@
 import { formatDurationLabeled } from '/app/transformations/commands'
 import type { TCRunProfileRunTimeCommand } from '@opentrons/shared-data/command'
-import type { GetTCRunProfileCommandTextResult } from '..'
-import type { HandlesCommands } from './types'
+import type { GetTCRunProfileCommandTextResult } from '../..'
+import type { HandlesCommands } from '../types'
 
 export function getTCRunProfileCommandText({
   command,

diff --git a/...String/utils/getTemperatureCommandText.ts → .../commandText/getTemperatureCommandText.ts b/...String/utils/getTemperatureCommandText.ts → .../commandText/getTemperatureCommandText.ts
@@ -6,7 +6,7 @@ import type {
   HeaterShakerSetTargetTemperatureCreateCommand,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export type TemperatureCreateCommand =
   | TemperatureModuleSetTargetTemperatureCreateCommand

diff --git a/...TextString/utils/getUnknownCommandText.ts → ...tils/commandText/getUnknownCommandText.ts b/...TextString/utils/getUnknownCommandText.ts → ...tils/commandText/getUnknownCommandText.ts
@@ -1,4 +1,4 @@
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
 
 export function getUnknownCommandText({ command }: GetCommandText): string {
   return JSON.stringify(command)

diff --git a/...ng/utils/getWaitForDurationCommandText.ts → ...mandText/getWaitForDurationCommandText.ts b/...ng/utils/getWaitForDurationCommandText.ts → ...mandText/getWaitForDurationCommandText.ts
@@ -1,5 +1,5 @@
 import type { WaitForDurationRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getWaitForDurationCommandText({
   command,

diff --git a/...ring/utils/getWaitForResumeCommandText.ts → ...ommandText/getWaitForResumeCommandText.ts b/...ring/utils/getWaitForResumeCommandText.ts → ...ommandText/getWaitForResumeCommandText.ts
@@ -1,5 +1,5 @@
 import type { WaitForResumeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getWaitForResumeCommandText({
   command,

diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/index.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/index.ts
@@ -0,0 +1,26 @@
+export * from './getLoadCommandText'
+export * from './getTemperatureCommandText'
+export * from './getTCRunProfileCommandText'
+export * from './getTCRunExtendedProfileCommandText'
+export * from './getHSShakeSpeedCommandText'
+export * from './getMoveToSlotCommandText'
+export * from './getMoveRelativeCommandText'
+export * from './getMoveToCoordinatesCommandText'
+export * from './getMoveToWellCommandText'
+export * from './getMoveLabwareCommandText'
+export * from './getConfigureForVolumeCommandText'
+export * from './getConfigureNozzleLayoutCommandText'
+export * from './getPrepareToAspirateCommandText'
+export * from './getMoveToAddressableAreaCommandText'
+export * from './getMoveToAddressableAreaForDropTipCommandText'
+export * from './getDirectTranslationCommandText'
+export * from './getWaitForDurationCommandText'
+export * from './getWaitForResumeCommandText'
+export * from './getDelayCommandText'
+export * from './getCommentCommandText'
+export * from './getCustomCommandText'
+export * from './getUnknownCommandText'
+export * from './getPipettingCommandText'
+export * from './getLiquidProbeCommandText'
+export * from './getRailLightsCommandText'
+export * from './getAbsorbanceReaderCommandText'
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts
@@ -1,26 +1,2 @@
-export { getLoadCommandText } from './getLoadCommandText'
-export { getTemperatureCommandText } from './getTemperatureCommandText'
-export { getTCRunProfileCommandText } from './getTCRunProfileCommandText'
-export { getTCRunExtendedProfileCommandText } from './getTCRunExtendedProfileCommandText'
-export { getHSShakeSpeedCommandText } from './getHSShakeSpeedCommandText'
-export { getMoveToSlotCommandText } from './getMoveToSlotCommandText'
-export { getMoveRelativeCommandText } from './getMoveRelativeCommandText'
-export { getMoveToCoordinatesCommandText } from './getMoveToCoordinatesCommandText'
-export { getMoveToWellCommandText } from './getMoveToWellCommandText'
-export { getMoveLabwareCommandText } from './getMoveLabwareCommandText'
-export { getConfigureForVolumeCommandText } from './getConfigureForVolumeCommandText'
-export { getConfigureNozzleLayoutCommandText } from './getConfigureNozzleLayoutCommandText'
-export { getPrepareToAspirateCommandText } from './getPrepareToAspirateCommandText'
-export { getMoveToAddressableAreaCommandText } from './getMoveToAddressableAreaCommandText'
-export { getMoveToAddressableAreaForDropTipCommandText } from './getMoveToAddressabelAreaForDropTipCommandText'
-export { getDirectTranslationCommandText } from './getDirectTranslationCommandText'
-export { getWaitForDurationCommandText } from './getWaitForDurationCommandText'
-export { getWaitForResumeCommandText } from './getWaitForResumeCommandText'
-export { getDelayCommandText } from './getDelayCommandText'
-export { getCommentCommandText } from './getCommentCommandText'
-export { getCustomCommandText } from './getCustomCommandText'
-export { getUnknownCommandText } from './getUnknownCommandText'
-export { getPipettingCommandText } from './getPipettingCommandText'
-export { getLiquidProbeCommandText } from './getLiquidProbeCommandText'
-export { getRailLightsCommandText } from './getRailLightsCommandText'
-export { getAbsorbanceReaderCommandText } from './getAbsorbanceReaderCommandText'
+export * from './commandText'
+export * from './types'