* Rename useCalc * Move CommandBar so it has access to settings and kcl * Create codemirror variable mention extension * Make project path a dep of TextEditor useMemo * Add incomplete KCL input for CommandBar to replace current number arg type * Add previous variables autocompletion to kcl input * Fix missed typos from merge * Working AST mods, not working variable additions * Add ability to create a new variable * Add icon and tooltip to command arg tag if a variable is added * Polish variable naming logic, preserve when going back * Allow stepping back from KCL input * Don't prevent keydown of enter, it's used by autocomplete * Round the variable value in cmd bar header * Add Playwright test * Formatting, polish TS types * More type wrangling * Needed to fmt after above type wrangling * Update snapshot tests to account for new variable name autogeneration * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * Merge branch 'main' into cmd-bar-make-variable * Update all test instances of var name with number index after merge with main * Partial revert of "Polish variable naming logic, preserve when going back" This reverts commitdddcb13c36
. * Revert "Update all test instances of var name with number index after merge with main" This reverts commit8c4b63b523
. * Revert "Update snapshot tests to account for new variable name autogeneration" This reverts commit11bfce3832
. * Retry a refactoring of findUniqueName * minor feedback from @jgomez720 - better highlighting of kcl input - consistent hotkeys - disallow invalid var names * Polish stepping back state logic * Fix tests now that keyboard shortcut changed * Remove unused imports * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * Fix tests * Trigger CI * Update src/components/ProjectSidebarMenu.test.tsx * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * re-trigger CI --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>
157 lines
4.4 KiB
TypeScript
157 lines
4.4 KiB
TypeScript
import { CustomIconName } from 'components/CustomIcon'
|
|
import { AllMachines } from 'hooks/useStateMachineCommands'
|
|
import {
|
|
AnyStateMachine,
|
|
ContextFrom,
|
|
EventFrom,
|
|
InterpreterFrom,
|
|
} from 'xstate'
|
|
import { Selection } from './selections'
|
|
import { Identifier, Value, VariableDeclaration } from 'lang/wasm'
|
|
|
|
type Icon = CustomIconName
|
|
const PLATFORMS = ['both', 'web', 'desktop'] as const
|
|
const INPUT_TYPES = ['options', 'string', 'kcl', 'selection'] as const
|
|
export interface KclExpression {
|
|
valueAst: Value
|
|
valueText: string
|
|
valueCalculated: string
|
|
}
|
|
export interface KclExpressionWithVariable extends KclExpression {
|
|
variableName: string
|
|
variableDeclarationAst: VariableDeclaration
|
|
variableIdentifierAst: Identifier
|
|
insertIndex: number
|
|
}
|
|
export type KclCommandValue = KclExpression | KclExpressionWithVariable
|
|
export type CommandInputType = (typeof INPUT_TYPES)[number]
|
|
|
|
export type CommandSetSchema<T extends AnyStateMachine> = Partial<{
|
|
[EventType in EventFrom<T>['type']]: Record<string, any>
|
|
}>
|
|
|
|
export type CommandSet<
|
|
T extends AllMachines,
|
|
Schema extends CommandSetSchema<T>
|
|
> = Partial<{
|
|
[EventType in EventFrom<T>['type']]: Command<
|
|
T,
|
|
EventFrom<T>['type'],
|
|
Schema[EventType]
|
|
>
|
|
}>
|
|
|
|
export type CommandSetConfig<
|
|
T extends AllMachines,
|
|
Schema extends CommandSetSchema<T>
|
|
> = Partial<{
|
|
[EventType in EventFrom<T>['type']]: CommandConfig<
|
|
T,
|
|
EventFrom<T>['type'],
|
|
Schema[EventType]
|
|
>
|
|
}>
|
|
|
|
export type Command<
|
|
T extends AnyStateMachine = AnyStateMachine,
|
|
CommandName extends EventFrom<T>['type'] = EventFrom<T>['type'],
|
|
CommandSchema extends CommandSetSchema<T>[CommandName] = CommandSetSchema<T>[CommandName]
|
|
> = {
|
|
name: CommandName
|
|
ownerMachine: T['id']
|
|
needsReview: boolean
|
|
onSubmit: (data?: CommandSchema) => void
|
|
onCancel?: () => void
|
|
args?: {
|
|
[ArgName in keyof CommandSchema]: CommandArgument<CommandSchema[ArgName], T>
|
|
}
|
|
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 CommandSetSchema<T>[CommandName] = CommandSetSchema<T>[CommandName]
|
|
> = Omit<
|
|
Command<T, CommandName, CommandSchema>,
|
|
'name' | 'ownerMachine' | 'onSubmit' | 'onCancel' | 'args' | 'needsReview'
|
|
> & {
|
|
needsReview?: true
|
|
args?: {
|
|
[ArgName in keyof CommandSchema]: CommandArgumentConfig<
|
|
CommandSchema[ArgName],
|
|
T
|
|
>
|
|
}
|
|
}
|
|
|
|
export type CommandArgumentConfig<
|
|
OutputType,
|
|
T extends AnyStateMachine = AnyStateMachine
|
|
> =
|
|
| {
|
|
description?: string
|
|
required: boolean
|
|
skip?: true
|
|
} & (
|
|
| {
|
|
inputType: Extract<CommandInputType, 'options'>
|
|
options:
|
|
| CommandArgumentOption<OutputType>[]
|
|
| ((context: ContextFrom<T>) => CommandArgumentOption<OutputType>[])
|
|
defaultValue?: OutputType | ((context: ContextFrom<T>) => OutputType)
|
|
}
|
|
| {
|
|
inputType: Extract<CommandInputType, 'selection'>
|
|
selectionTypes: Selection['type'][]
|
|
multiple: boolean
|
|
}
|
|
| { inputType: Extract<CommandInputType, 'kcl'>; defaultValue?: string } // KCL expression inputs have simple strings as default values
|
|
| {
|
|
inputType: Extract<CommandInputType, 'string'>
|
|
defaultValue?: OutputType | ((context: ContextFrom<T>) => OutputType)
|
|
}
|
|
)
|
|
|
|
export type CommandArgument<
|
|
OutputType,
|
|
T extends AnyStateMachine = AnyStateMachine
|
|
> =
|
|
| {
|
|
description?: string
|
|
required: boolean
|
|
skip?: true
|
|
} & (
|
|
| {
|
|
inputType: Extract<CommandInputType, 'options'>
|
|
options: CommandArgumentOption<OutputType>[]
|
|
defaultValue?: OutputType
|
|
}
|
|
| {
|
|
inputType: Extract<CommandInputType, 'selection'>
|
|
selectionTypes: Selection['type'][]
|
|
actor: InterpreterFrom<T>
|
|
multiple: boolean
|
|
}
|
|
| { inputType: Extract<CommandInputType, 'kcl'>; defaultValue?: string } // KCL expression inputs have simple strings as default values
|
|
| {
|
|
inputType: Extract<CommandInputType, 'string'>
|
|
defaultValue?: OutputType
|
|
}
|
|
)
|
|
|
|
export type CommandArgumentWithName<
|
|
OutputType,
|
|
T extends AnyStateMachine = AnyStateMachine
|
|
> = CommandArgument<OutputType, T> & {
|
|
name: string
|
|
}
|
|
|
|
export type CommandArgumentOption<A> = {
|
|
name: string
|
|
isCurrent?: boolean
|
|
value: A
|
|
}
|