* selection stuff
* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)
* trigger CI
* fix bugs
* some edge cut stuff
* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores)
* trigger CI
* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores)
* fix sketch mode issues
* fix more tests, selection in sketch related
* more test fixing
* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores)
* Trigger ci
* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores)
* Trigger ci
* more sketch mode selection fixes
* fix unit tests
* rename function
* remove .only
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* lint
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* fix bad pathToNode issue
* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores)
* fix sketch on face
* migrate a more selections types
* migrate a more selections types
* fix code selection of fillets
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* migrate a more selections types
* fix bad path to node, looks like a race
* migrate a more selections types
* migrate a more selections types
* fix cmd bar selections
* fix cmd bar selections
* fix display issues
* feat: implementing axis selection for point and click revolve
* feat: enforcing selection of 2 options for axis rotation
* feat: added negative rotations for the revolve
* fix: fmt, tsc fixes
* migrate a more selections types
* Revert "migrate a more selections types"
This reverts commit 0d0e453bbb
.
* migrate a more selections types
* clean up1
* clean up 2
* chore: improving the copy after discussing with Frank
* fix: merge main fixes
* chore: was able to add a seg to a line. Does not check if one exists already
* saving off some code
* chore: moving revolveSketch into own file for readability, improving variable names instead of node1
* chore: renaming more variables for readability
* chore: more renaming
* fix: allows creating a custom rotation on axis
* fix: added opposite edge logic and adj, need to error handle still
* fix: use other import
* feat: point and click on edges, crude implementation
* feat: implemented toast message and returned error message from validation
* fix: auto linter
* fix: addressing tsc errors
* fix: fighting typescript
* fix: cleaning up PR
* fix: trying to resolve more typescript issues
* fix: save off tsc fixes
* fix: adding comments
* fix: resolving tsc errors
* fix: tsc errors
* fix: auto linter fixes and tsc fixes
* fix:??
* fix: revolve ast works with declaration
* fix: retry logic to make sure the disable dry run actually runs
* fix: codespell typo
---------
Co-authored-by: Kurt Hutten Irev-Dev <k.hutten@protonmail.ch>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
312 lines
9.1 KiB
TypeScript
312 lines
9.1 KiB
TypeScript
import { CustomIconName } from 'components/CustomIcon'
|
|
import { AllMachines } from 'hooks/useStateMachineCommands'
|
|
import { Actor, AnyStateMachine, ContextFrom, EventFrom } from 'xstate'
|
|
import { Identifier, Expr, VariableDeclaration } from 'lang/wasm'
|
|
import { commandBarMachine } from 'machines/commandBarMachine'
|
|
import { ReactNode } from 'react'
|
|
import { MachineManager } from 'components/MachineManagerProvider'
|
|
import { Node } from 'wasm-lib/kcl/bindings/Node'
|
|
import { Artifact } from 'lang/std/artifactGraph'
|
|
import { CommandBarContext } from 'machines/commandBarMachine'
|
|
type Icon = CustomIconName
|
|
const PLATFORMS = ['both', 'web', 'desktop'] as const
|
|
const INPUT_TYPES = [
|
|
'options',
|
|
'string',
|
|
'text',
|
|
'kcl',
|
|
'selection',
|
|
'boolean',
|
|
] as const
|
|
export interface KclExpression {
|
|
valueAst: Expr
|
|
valueText: string
|
|
valueCalculated: string
|
|
}
|
|
export interface KclExpressionWithVariable extends KclExpression {
|
|
variableName: string
|
|
variableDeclarationAst: Node<VariableDeclaration>
|
|
variableIdentifierAst: Node<Identifier>
|
|
insertIndex: number
|
|
}
|
|
export type KclCommandValue = KclExpression | KclExpressionWithVariable
|
|
export type CommandInputType = (typeof INPUT_TYPES)[number]
|
|
|
|
export type StateMachineCommandSetSchema<T extends AnyStateMachine> = Partial<{
|
|
[EventType in EventFrom<T>['type']]: Record<string, any>
|
|
}>
|
|
|
|
export type StateMachineCommandSet<
|
|
T extends AllMachines,
|
|
Schema extends StateMachineCommandSetSchema<T>
|
|
> = Partial<{
|
|
[EventType in EventFrom<T>['type']]: Command<
|
|
T,
|
|
EventFrom<T>['type'],
|
|
Schema[EventType]
|
|
>
|
|
}>
|
|
|
|
/**
|
|
* A configuration object for a set of commands tied to a state machine.
|
|
* Each event type can have one or more commands associated with it.
|
|
* @param T The state machine type.
|
|
* @param Schema The schema for the command set, defined by the developer.
|
|
*/
|
|
export type StateMachineCommandSetConfig<
|
|
T extends AllMachines,
|
|
Schema extends StateMachineCommandSetSchema<T>
|
|
> = Partial<{
|
|
[EventType in EventFrom<T>['type']]:
|
|
| CommandConfig<T, EventFrom<T>['type'], Schema[EventType]>
|
|
| CommandConfig<T, EventFrom<T>['type'], Schema[EventType]>[]
|
|
}>
|
|
|
|
export type Command<
|
|
T extends AnyStateMachine = AnyStateMachine,
|
|
CommandName extends EventFrom<T>['type'] = EventFrom<T>['type'],
|
|
CommandSchema extends StateMachineCommandSetSchema<T>[CommandName] = StateMachineCommandSetSchema<T>[CommandName]
|
|
> = {
|
|
name: CommandName
|
|
groupId: T['id']
|
|
needsReview: boolean
|
|
reviewMessage?:
|
|
| string
|
|
| ReactNode
|
|
| ((
|
|
commandBarContext: { argumentsToSubmit: Record<string, unknown> } // Should be the commandbarMachine's context, but it creates a circular dependency
|
|
) => string | ReactNode)
|
|
onSubmit: (data?: CommandSchema) => void
|
|
onCancel?: () => void
|
|
args?: {
|
|
[ArgName in keyof CommandSchema]: CommandArgument<CommandSchema[ArgName], T>
|
|
}
|
|
displayName?: string
|
|
description?: string
|
|
icon?: Icon
|
|
hide?: (typeof PLATFORMS)[number]
|
|
}
|
|
|
|
export type CommandConfig<
|
|
T extends AnyStateMachine = AnyStateMachine,
|
|
CommandName extends EventFrom<T>['type'] = EventFrom<T>['type'],
|
|
CommandSchema extends StateMachineCommandSetSchema<T>[CommandName] = StateMachineCommandSetSchema<T>[CommandName]
|
|
> = Omit<
|
|
Command<T, CommandName, CommandSchema>,
|
|
'name' | 'groupId' | 'onSubmit' | 'onCancel' | 'args' | 'needsReview'
|
|
> & {
|
|
needsReview?: true
|
|
status?: 'active' | 'development' | 'inactive'
|
|
args?: {
|
|
[ArgName in keyof CommandSchema]: CommandArgumentConfig<
|
|
CommandSchema[ArgName],
|
|
ContextFrom<T>
|
|
>
|
|
}
|
|
}
|
|
|
|
export type CommandArgumentConfig<
|
|
OutputType,
|
|
C = ContextFrom<AnyStateMachine>
|
|
> = {
|
|
description?: string
|
|
required:
|
|
| boolean
|
|
| ((
|
|
commandBarContext: { argumentsToSubmit: Record<string, unknown> }, // Should be the commandbarMachine's context, but it creates a circular dependency
|
|
machineContext?: C
|
|
) => boolean)
|
|
warningMessage?: string
|
|
skip?: boolean
|
|
/** For showing a summary display of the current value, such as in
|
|
* the command bar's header
|
|
*/
|
|
valueSummary?: (value: OutputType) => string
|
|
} & (
|
|
| {
|
|
inputType: 'options'
|
|
options:
|
|
| CommandArgumentOption<OutputType>[]
|
|
| ((
|
|
commandBarContext: {
|
|
argumentsToSubmit: Record<string, unknown>
|
|
machineManager?: MachineManager
|
|
}, // Should be the commandbarMachine's context, but it creates a circular dependency
|
|
machineContext?: C
|
|
) => CommandArgumentOption<OutputType>[])
|
|
optionsFromContext?: (context: C) => CommandArgumentOption<OutputType>[]
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => OutputType)
|
|
defaultValueFromContext?: (context: C) => OutputType
|
|
}
|
|
| {
|
|
inputType: 'selection'
|
|
selectionTypes: Artifact['type'][]
|
|
multiple: boolean
|
|
validation?: ({
|
|
data,
|
|
context,
|
|
}: {
|
|
data: any
|
|
context: CommandBarContext
|
|
}) => Promise<boolean | string>
|
|
}
|
|
| {
|
|
inputType: 'kcl'
|
|
createVariableByDefault?: boolean
|
|
variableName?:
|
|
| string
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => string)
|
|
defaultValue?:
|
|
| string
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => string)
|
|
}
|
|
| {
|
|
inputType: 'string'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => OutputType)
|
|
defaultValueFromContext?: (context: C) => OutputType
|
|
}
|
|
| {
|
|
inputType: 'text'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => OutputType)
|
|
defaultValueFromContext?: (context: C) => OutputType
|
|
}
|
|
| {
|
|
inputType: 'boolean'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: C
|
|
) => OutputType)
|
|
defaultValueFromContext?: (context: C) => OutputType
|
|
}
|
|
)
|
|
|
|
export type CommandArgument<
|
|
OutputType,
|
|
T extends AnyStateMachine = AnyStateMachine
|
|
> = {
|
|
description?: string
|
|
required:
|
|
| boolean
|
|
| ((
|
|
commandBarContext: { argumentsToSubmit: Record<string, unknown> }, // Should be the commandbarMachine's context, but it creates a circular dependency
|
|
machineContext?: ContextFrom<T>
|
|
) => boolean)
|
|
skip?: boolean
|
|
machineActor?: Actor<T>
|
|
warningMessage?: string
|
|
/** For showing a summary display of the current value, such as in
|
|
* the command bar's header
|
|
*/
|
|
valueSummary?: (value: OutputType) => string
|
|
} & (
|
|
| {
|
|
inputType: Extract<CommandInputType, 'options'>
|
|
options:
|
|
| CommandArgumentOption<OutputType>[]
|
|
| ((
|
|
commandBarContext: {
|
|
argumentsToSubmit: Record<string, unknown>
|
|
}, // Should be the commandbarMachine's context, but it creates a circular dependency
|
|
machineContext?: ContextFrom<T>
|
|
) => CommandArgumentOption<OutputType>[])
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => OutputType)
|
|
}
|
|
| {
|
|
inputType: 'selection'
|
|
selectionTypes: Artifact['type'][]
|
|
multiple: boolean
|
|
validation?: ({
|
|
data,
|
|
context,
|
|
}: {
|
|
data: any
|
|
context: CommandBarContext
|
|
}) => Promise<boolean | string>
|
|
}
|
|
| {
|
|
inputType: 'kcl'
|
|
createVariableByDefault?: boolean
|
|
variableName?:
|
|
| string
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => string)
|
|
defaultValue?:
|
|
| string
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => string)
|
|
}
|
|
| {
|
|
inputType: 'string'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => OutputType)
|
|
}
|
|
| {
|
|
inputType: 'text'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => OutputType)
|
|
}
|
|
| {
|
|
inputType: 'boolean'
|
|
defaultValue?:
|
|
| OutputType
|
|
| ((
|
|
commandBarContext: ContextFrom<typeof commandBarMachine>,
|
|
machineContext?: ContextFrom<T>
|
|
) => OutputType)
|
|
}
|
|
)
|
|
|
|
export type CommandArgumentWithName<
|
|
OutputType,
|
|
T extends AnyStateMachine = AnyStateMachine
|
|
> = CommandArgument<OutputType, T> & {
|
|
name: string
|
|
}
|
|
|
|
export type CommandArgumentOption<A> = {
|
|
name: string
|
|
isCurrent?: boolean
|
|
disabled?: boolean
|
|
value: A
|
|
}
|