ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update types ready for new selections

Browse Source
This commit is contained in:
Kurt Hutten Irev-Dev
2024-09-09 06:06:13 +10:00
parent 6595fca000
commit 70694d9dd3
31 changed files with 236 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clientSideScene/sceneEntities.ts
View File

@ -77,7 +77,7 @@ import {
createPipeSubstitution,
findUniqueName,
} from 'lang/modifyAst'
import { Selections, getEventForSegmentSelection } from 'lib/selections'
import { Selections__old, getEventForSegmentSelection } from 'lib/selections'
import { createGridHelper, orthoScale, perspScale } from './helpers'
import { Models } from '@kittycad/lib'
import { uuidv4 } from 'lib/utils'
@ -374,7 +374,7 @@ export class SceneEntities {
forward: [number, number, number]
up: [number, number, number]
position?: [number, number, number]
selectionRanges?: Selections
selectionRanges?: Selections__old
}): Promise<{
truncatedAst: Program
programMemoryOverride: ProgramMemory

6
src/components/CommandBar/CommandBarHeader.tsx
View File

@ -2,7 +2,7 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
import { CustomIcon } from '../CustomIcon'
import React, { useState } from 'react'
import { ActionButton } from '../ActionButton'
import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
import { Selections__old, getSelectionTypeDisplayText } from 'lib/selections'
import { useHotkeys } from 'react-hotkeys-hook'
import { KclCommandValue, KclExpressionWithVariable } from 'lib/commandTypes'
import Tooltip from 'components/Tooltip'
@ -125,7 +125,9 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
<span data-testid="header-arg-value">
{argValue ? (
arg.inputType === 'selection' ? (
getSelectionTypeDisplayText(argValue as Selections)
getSelectionTypeDisplayText(
argValue as Selections__old
)
) : arg.inputType === 'kcl' ? (
roundOff(
Number(

8
src/components/CommandBar/CommandBarSelectionInput.tsx
View File

@ -3,7 +3,7 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
import { useKclContext } from 'lang/KclProvider'
import { CommandArgument } from 'lib/commandTypes'
import {
Selection,
Selection__old,
canSubmitSelectionArg,
getSelectionType,
getSelectionTypeDisplayText,
@ -12,13 +12,15 @@ import { modelingMachine } from 'machines/modelingMachine'
import { useEffect, useMemo, useRef, useState } from 'react'
import { StateFrom } from 'xstate'
const semanticEntityNames: { [key: string]: Array<Selection['type']> } = {
const semanticEntityNames: { [key: string]: Array<Selection__old['type']> } = {
face: ['extrude-wall', 'start-cap', 'end-cap'],
edge: ['edge', 'line', 'arc'],
point: ['point', 'line-end', 'line-mid'],
}
function getSemanticSelectionType(selectionType: Array<Selection['type']>) {
function getSemanticSelectionType(
selectionType: Array<Selection__old['type']>
) {
const semanticSelectionType = new Set()
selectionType.forEach((type) => {
Object.entries(semanticEntityNames).forEach(([entity, entityTypes]) => {

6
src/components/EngineCommands.tsx
View File

@ -21,6 +21,7 @@ export const EngineCommands = () => {
const [engineCommands, clearEngineCommands] = useEngineCommands()
const [containsFilter, setContainsFilter] = useState('')
const [customCmd, setCustomCmd] = useState('')
console.log(JSON.stringify(engineCommands, null, 2))
return (
<div>
<input
@ -64,7 +65,10 @@ export const EngineCommands = () => {
)
})}
</div>
<button data-testid="clear-commands" onClick={clearEngineCommands}>
<button
data-testid="clear-commands"
onClick={() => clearEngineCommands()}
>
Clear
</button>
<br />

4
src/components/ModelingMachineProvider.tsx
View File

@ -37,7 +37,7 @@ import {
} from './Toolbar/SetAngleBetween'
import { applyConstraintAngleLength } from './Toolbar/setAngleLength'
import {
Selections,
Selections__old,
canSweepSelection,
handleSelectionBatch,
isSelectionLastLine,
@ -275,7 +275,7 @@ export const ModelingMachineProvider = ({
})
})
}
let selections: Selections = {
let selections: Selections__old = {
codeBasedSelections: [],
otherSelections: [],
}

6
src/components/Toolbar/EqualAngle.tsx
View File

@ -1,5 +1,5 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { Program, Expr, VariableDeclarator } from '../../lang/wasm'
import {
getNodePathFromSourceRange,
@ -18,7 +18,7 @@ import { TransformInfo } from 'lang/std/stdTypes'
export function equalAngleInfo({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
transforms: TransformInfo[]
@ -82,7 +82,7 @@ export function equalAngleInfo({
export function applyConstraintEqualAngle({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
modifiedAst: Program

6
src/components/Toolbar/EqualLength.tsx
View File

@ -1,5 +1,5 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { Program, Expr, VariableDeclarator } from '../../lang/wasm'
import {
getNodePathFromSourceRange,
@ -18,7 +18,7 @@ import { err } from 'lib/trap'
export function setEqualLengthInfo({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
transforms: TransformInfo[]
@ -83,7 +83,7 @@ export function setEqualLengthInfo({
export function applyConstraintEqualLength({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
modifiedAst: Program

6
src/components/Toolbar/HorzVert.tsx
View File

@ -1,5 +1,5 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { Program, ProgramMemory, Expr } from '../../lang/wasm'
import {
getNodePathFromSourceRange,
@ -15,7 +15,7 @@ import { kclManager } from 'lib/singletons'
import { err } from 'lib/trap'
export function horzVertInfo(
selectionRanges: Selections,
selectionRanges: Selections__old,
horOrVert: 'vertical' | 'horizontal'
):
| {
@ -53,7 +53,7 @@ export function horzVertInfo(
}
export function applyConstraintHorzVert(
selectionRanges: Selections,
selectionRanges: Selections__old,
horOrVert: 'vertical' | 'horizontal',
ast: Program,
programMemory: ProgramMemory

8
src/components/Toolbar/Intersect.tsx
View File

@ -1,6 +1,6 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Program, Expr, VariableDeclarator } from '../../lang/wasm'
import { Selections__old } from 'lib/selections'
import {
getNodePathFromSourceRange,
getNodeFromPath,
@ -25,12 +25,12 @@ const getModalInfo = createInfoModal(GetInfoModal)
export function intersectInfo({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
transforms: TransformInfo[]
enabled: boolean
forcedSelectionRanges: Selections
forcedSelectionRanges: Selections__old
}
| Error {
if (selectionRanges.codeBasedSelections.length < 2) {
@ -134,7 +134,7 @@ export function intersectInfo({
export async function applyConstraintIntersect({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}): Promise<{
modifiedAst: Program
pathToNodeMap: PathToNodeMap

10
src/components/Toolbar/RemoveConstrainingValues.tsx
View File

@ -1,5 +1,5 @@
import { toolTips } from 'lang/langHelpers'
import { Selection, Selections } from 'lib/selections'
import { Selection__old, Selections__old } from 'lib/selections'
import { PathToNode, Program, Expr } from '../../lang/wasm'
import {
getNodePathFromSourceRange,
@ -18,13 +18,13 @@ export function removeConstrainingValuesInfo({
selectionRanges,
pathToNodes,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
pathToNodes?: Array<PathToNode>
}):
| {
transforms: TransformInfo[]
enabled: boolean
updatedSelectionRanges: Selections
updatedSelectionRanges: Selections__old
}
| Error {
const paths =
@ -45,7 +45,7 @@ export function removeConstrainingValuesInfo({
? {
otherSelections: [],
codeBasedSelections: nodes.map(
(node): Selection => ({
(node): Selection__old => ({
range: [node.start, node.end],
type: 'default',
})
@ -73,7 +73,7 @@ export function applyRemoveConstrainingValues({
selectionRanges,
pathToNodes,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
pathToNodes?: Array<PathToNode>
}):
| {

8
src/components/Toolbar/SetAbsDistance.tsx
View File

@ -1,6 +1,6 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Program, Expr } from '../../lang/wasm'
import { Selections__old } from 'lib/selections'
import {
getNodePathFromSourceRange,
getNodeFromPath,
@ -32,7 +32,7 @@ export function absDistanceInfo({
selectionRanges,
constraint,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: Constraint
}):
| {
@ -93,7 +93,7 @@ export async function applyConstraintAbsDistance({
selectionRanges,
constraint,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: 'xAbs' | 'yAbs'
}): Promise<{
modifiedAst: Program
@ -157,7 +157,7 @@ export function applyConstraintAxisAlign({
selectionRanges,
constraint,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: 'snapToYAxis' | 'snapToXAxis'
}):
| {

6
src/components/Toolbar/SetAngleBetween.tsx
View File

@ -1,6 +1,6 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Program, Expr, VariableDeclarator } from '../../lang/wasm'
import { Selections__old } from 'lib/selections'
import {
getNodePathFromSourceRange,
getNodeFromPath,
@ -24,7 +24,7 @@ const getModalInfo = createInfoModal(GetInfoModal)
export function angleBetweenInfo({
selectionRanges,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
}):
| {
transforms: TransformInfo[]
@ -90,7 +90,7 @@ export async function applyConstraintAngleBetween({
selectionRanges,
}: // constraint,
{
selectionRanges: Selections
selectionRanges: Selections__old
// constraint: 'setHorzDistance' | 'setVertDistance'
}): Promise<{
modifiedAst: Program

8
src/components/Toolbar/SetHorzVertDistance.tsx
View File

@ -16,7 +16,7 @@ import { GetInfoModal, createInfoModal } from '../SetHorVertDistanceModal'
import { createLiteral, createVariableDeclaration } from '../../lang/modifyAst'
import { removeDoubleNegatives } from '../AvailableVarsHelpers'
import { kclManager } from 'lib/singletons'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { cleanErrs, err } from 'lib/trap'
const getModalInfo = createInfoModal(GetInfoModal)
@ -25,7 +25,7 @@ export function horzVertDistanceInfo({
selectionRanges,
constraint,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: 'setHorzDistance' | 'setVertDistance'
}):
| {
@ -95,7 +95,7 @@ export async function applyConstraintHorzVertDistance({
// TODO align will always be false (covered by synconous applyConstraintHorzVertAlign), remove it
isAlign = false,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: 'setHorzDistance' | 'setVertDistance'
isAlign?: false
}): Promise<{
@ -181,7 +181,7 @@ export function applyConstraintHorzVertAlign({
selectionRanges,
constraint,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
constraint: 'setHorzDistance' | 'setVertDistance'
}):
| {

6
src/components/Toolbar/setAngleLength.tsx
View File

@ -1,6 +1,6 @@
import { toolTips } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Program, Expr } from '../../lang/wasm'
import { Selections__old } from 'lib/selections'
import {
getNodePathFromSourceRange,
getNodeFromPath,
@ -32,7 +32,7 @@ export function angleLengthInfo({
selectionRanges,
angleOrLength = 'setLength',
}: {
selectionRanges: Selections
selectionRanges: Selections__old
angleOrLength?: 'setLength' | 'setAngle'
}):
| {
@ -74,7 +74,7 @@ export async function applyConstraintAngleLength({
selectionRanges,
angleOrLength = 'setLength',
}: {
selectionRanges: Selections
selectionRanges: Selections__old
angleOrLength?: 'setLength' | 'setAngle'
}): Promise<{
modifiedAst: Program

14
src/editor/manager.ts
View File

@ -2,7 +2,11 @@ import { EditorView, ViewUpdate } from '@codemirror/view'
import { EditorSelection, Annotation, Transaction } from '@codemirror/state'
import { engineCommandManager } from 'lib/singletons'
import { modelingMachine, ModelingMachineEvent } from 'machines/modelingMachine'
import { Selections, processCodeMirrorRanges, Selection } from 'lib/selections'
import {
Selections__old,
Selection__old,
processCodeMirrorRanges,
} from 'lib/selections'
import { undo, redo } from '@codemirror/commands'
import { CommandBarMachineEvent } from 'machines/commandBarMachine'
import { addLineHighlight, addLineHighlightEvent } from './highlightextension'
@ -31,7 +35,7 @@ export default class EditorManager {
private _copilotEnabled: boolean = true
private _isShiftDown: boolean = false
private _selectionRanges: Selections = {
private _selectionRanges: Selections__old = {
otherSelections: [],
codeBasedSelections: [],
}
@ -73,7 +77,7 @@ export default class EditorManager {
this._isShiftDown = isShiftDown
}
set selectionRanges(selectionRanges: Selections) {
set selectionRanges(selectionRanges: Selections__old) {
this._selectionRanges = selectionRanges
}
@ -97,7 +101,7 @@ export default class EditorManager {
return this._highlightRange
}
setHighlightRange(selections: Array<Selection['range']>): void {
setHighlightRange(selections: Array<Selection__old['range']>): void {
this._highlightRange = selections
const selectionsWithSafeEnds = selections.map((s): [number, number] => {
@ -203,7 +207,7 @@ export default class EditorManager {
return false
}
selectRange(selections: Selections) {
selectRange(selections: Selections__old) {
if (selections.codeBasedSelections.length === 0) {
return
}

6
src/lang/KclSingleton.ts
View File

@ -1,5 +1,5 @@
import { executeAst, lintAst } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { KCLError, kclErrorsToDiagnostics } from './errors'
import { uuidv4 } from 'lib/utils'
import { EngineCommandManager } from './std/engineConnection'
@ -425,14 +425,14 @@ export class KclManager {
}
): Promise<{
newAst: Program
selections?: Selections
selections?: Selections__old
}> {
const newCode = recast(ast)
if (err(newCode)) return Promise.reject(newCode)
const astWithUpdatedSource = this.safeParse(newCode)
if (!astWithUpdatedSource) return Promise.reject(new Error('bad ast'))
let returnVal: Selections | undefined = undefined
let returnVal: Selections__old | undefined = undefined
if (optionalParams?.focusPath) {
returnVal = {

8
src/lang/modifyAst.ts
View File

@ -1,5 +1,5 @@
import { Selection } from 'lib/selections'
import { err, reportRejection, trap } from 'lib/trap'
import { Selection__old } from 'lib/selections'
import {
Program,
CallExpression,
@ -762,7 +762,7 @@ export function createBinaryExpressionWithUnary([left, right]: [
export function giveSketchFnCallTag(
ast: Program,
range: Selection['range'],
range: Selection__old['range'],
tag?: string
):
| {
@ -836,7 +836,7 @@ export function moveValueIntoNewVariablePath(
export function moveValueIntoNewVariable(
ast: Program,
programMemory: ProgramMemory,
sourceRange: Selection['range'],
sourceRange: Selection__old['range'],
variableName: string
): {
modifiedAst: Program
@ -955,7 +955,7 @@ export function removeSingleConstraintInfo(
export async function deleteFromSelection(
ast: Program,
selection: Selection,
selection: Selection__old,
programMemory: ProgramMemory,
getFaceDetails: (id: string) => Promise<Models['FaceIsPlanar_type']> = () =>
({} as any)

8
src/lang/modifyAst/addFillet.test.ts
View File

@ -19,7 +19,7 @@ import {
import { getNodeFromPath, getNodePathFromSourceRange } from '../queryAst'
import { createLiteral } from 'lang/modifyAst'
import { err } from 'lib/trap'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { engineCommandManager, kclManager } from 'lib/singletons'
import { VITE_KC_DEV_TOKEN } from 'env'
import { KclCommandValue } from 'lib/commandTypes'
@ -106,7 +106,7 @@ const runGetPathToExtrudeForSegmentSelectionTest = async (
code.indexOf(selectedSegmentSnippet),
code.indexOf(selectedSegmentSnippet) + selectedSegmentSnippet.length,
]
const selection: Selections = {
const selection: Selections__old = {
codeBasedSelections: [
{
range: segmentRange,
@ -469,7 +469,7 @@ const runModifyAstWithFilletAndTagTest = async (
code.indexOf(selectionSnippet) + selectionSnippet.length,
]
)
const selection: Selections = {
const selection: Selections__old = {
codeBasedSelections: segmentRanges.map((segmentRange) => ({
range: segmentRange,
type: 'default',
@ -730,7 +730,7 @@ describe('Testing button states', () => {
]
: [ast.end, ast.end] // empty line in the end of the code
const selectionRanges: Selections = {
const selectionRanges: Selections__old = {
codeBasedSelections: [
{
range,

10
src/lang/modifyAst/addFillet.ts
View File

@ -31,7 +31,7 @@ import {
sketchLineHelperMap,
} from '../std/sketch'
import { err, trap } from 'lib/trap'
import { Selections, canFilletSelection } from 'lib/selections'
import { Selections__old, canFilletSelection } from 'lib/selections'
import { KclCommandValue } from 'lib/commandTypes'
import {
ArtifactGraph,
@ -45,7 +45,7 @@ import { kclManager, engineCommandManager, editorManager } from 'lib/singletons'
export function applyFilletToSelection(
ast: Program,
selection: Selections,
selection: Selections__old,
radius: KclCommandValue
): void | Error {
// 1. clone ast
@ -63,7 +63,7 @@ export function applyFilletToSelection(
export function modifyAstWithFilletAndTag(
ast: Program,
selection: Selections,
selection: Selections__old,
radius: KclCommandValue
): { modifiedAst: Program; pathToFilletNode: Array<PathToNode> } | Error {
const astResult = insertRadiusIntoAst(ast, radius)
@ -130,7 +130,7 @@ function insertRadiusIntoAst(
export function getPathToExtrudeForSegmentSelection(
ast: Program,
selection: Selections,
selection: Selections__old,
programMemory: ProgramMemory,
artifactGraph: ArtifactGraph
): { pathToSegmentNode: PathToNode; pathToExtrudeNode: PathToNode } | Error {
@ -447,7 +447,7 @@ export const hasValidFilletSelection = ({
ast,
code,
}: {
selectionRanges: Selections
selectionRanges: Selections__old
ast: Program
code: string
}) => {

23
src/lang/queryAst.ts
View File

@ -1,5 +1,5 @@
import { ToolTip } from 'lang/langHelpers'
import { Selection, Selections } from 'lib/selections'
import { Selection__old, Selections__old } from 'lib/selections'
import {
ArrayExpression,
BinaryExpression,
@ -120,7 +120,7 @@ export function getNodeFromPathCurry(
function moreNodePathFromSourceRange(
node: Expr | ExpressionStatement | VariableDeclaration | ReturnStatement,
sourceRange: Selection['range'],
sourceRange: Selection__old['range'],
previousPath: PathToNode = [['body', '']]
): PathToNode {
const [start, end] = sourceRange
@ -315,7 +315,7 @@ function moreNodePathFromSourceRange(
export function getNodePathFromSourceRange(
node: Program,
sourceRange: Selection['range'],
sourceRange: Selection__old['range'],
previousPath: PathToNode = [['body', '']]
): PathToNode {
const [start, end] = sourceRange || []
@ -493,7 +493,7 @@ export function findAllPreviousVariablesPath(
export function findAllPreviousVariables(
ast: Program,
programMemory: ProgramMemory,
sourceRange: Selection['range'],
sourceRange: Selection__old['range'],
type: 'number' | 'string' = 'number'
): {
variables: PrevVariable<typeof type extends 'number' ? number : string>[]
@ -639,8 +639,8 @@ export function isValueZero(val?: Expr): boolean {
export function isLinesParallelAndConstrained(
ast: Program,
programMemory: ProgramMemory,
primaryLine: Selection,
secondaryLine: Selection
primaryLine: Selection__old,
secondaryLine: Selection__old
):
| {
isParallelAndConstrained: boolean
@ -735,7 +735,7 @@ export function doesPipeHaveCallExp({
}: {
calleeName: string
ast: Program
selection: Selection
selection: Selection__old
}): boolean {
const pathToNode = getNodePathFromSourceRange(ast, selection.range)
const pipeExpressionMeta = getNodeFromPath<PipeExpression>(
@ -762,7 +762,7 @@ export function hasExtrudeSketchGroup({
programMemory,
}: {
ast: Program
selection: Selection
selection: Selection__old
programMemory: ProgramMemory
}): boolean {
const pathToNode = getNodePathFromSourceRange(ast, selection.range)
@ -786,7 +786,7 @@ export function hasExtrudeSketchGroup({
}
export function isSingleCursorInPipe(
selectionRanges: Selections,
selectionRanges: Selections__old,
ast: Program
) {
if (selectionRanges.codeBasedSelections.length !== 1) return false
@ -860,7 +860,10 @@ export function findUsesOfTagInPipe(
return dependentRanges
}
export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
export function hasSketchPipeBeenExtruded(
selection: Selection__old,
ast: Program
) {
const path = getNodePathFromSourceRange(ast, selection.range)
const _node = getNodeFromPath<PipeExpression>(ast, path, 'PipeExpression')
if (err(_node)) return false

86
src/lang/std/artifactGraph.ts
View File

@ -5,86 +5,90 @@ import { err } from 'lib/trap'
export type ArtifactId = string
interface CommonCommandProperties {
interface BaseArtifact {
id: ArtifactId
}
interface CodeRef {
range: SourceRange
pathToNode: PathToNode
}
export interface PlaneArtifact {
export interface PlaneArtifact extends BaseArtifact {
type: 'plane'
pathIds: Array<ArtifactId>
codeRef: CommonCommandProperties
codeRef: CodeRef
}
export interface PlaneArtifactRich {
export interface PlaneArtifactRich extends BaseArtifact {
type: 'plane'
paths: Array<PathArtifact>
codeRef: CommonCommandProperties
codeRef: CodeRef
}
export interface PathArtifact {
export interface PathArtifact extends BaseArtifact {
type: 'path'
planeId: ArtifactId
segIds: Array<ArtifactId>
sweepId: ArtifactId
solid2dId?: ArtifactId
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface solid2D {
interface solid2D extends BaseArtifact {
type: 'solid2D'
pathId: ArtifactId
}
export interface PathArtifactRich {
export interface PathArtifactRich extends BaseArtifact {
type: 'path'
plane: PlaneArtifact | WallArtifact
segments: Array<SegmentArtifact>
sweep: SweepArtifact
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface SegmentArtifact {
interface SegmentArtifact extends BaseArtifact {
type: 'segment'
pathId: ArtifactId
surfaceId: ArtifactId
edgeIds: Array<ArtifactId>
edgeCutId?: ArtifactId
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface SegmentArtifactRich {
interface SegmentArtifactRich extends BaseArtifact {
type: 'segment'
path: PathArtifact
surf: WallArtifact
edges: Array<SweepEdge>
edgeCut?: EdgeCut
codeRef: CommonCommandProperties
codeRef: CodeRef
}
/** A Sweep is a more generic term for extrude, revolve, loft and sweep*/
interface SweepArtifact {
interface SweepArtifact extends BaseArtifact {
type: 'sweep'
subType: 'extrusion' | 'revolve'
pathId: string
surfaceIds: Array<string>
edgeIds: Array<string>
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface SweepArtifactRich {
interface SweepArtifactRich extends BaseArtifact {
type: 'sweep'
subType: 'extrusion' | 'revolve'
path: PathArtifact
surfaces: Array<WallArtifact | CapArtifact>
edges: Array<SweepEdge>
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface WallArtifact {
interface WallArtifact extends BaseArtifact {
type: 'wall'
segId: ArtifactId
edgeCutEdgeIds: Array<ArtifactId>
sweepId: ArtifactId
pathIds: Array<ArtifactId>
}
interface CapArtifact {
interface CapArtifact extends BaseArtifact {
type: 'cap'
subType: 'start' | 'end'
edgeCutEdgeIds: Array<ArtifactId>
@ -92,7 +96,7 @@ interface CapArtifact {
pathIds: Array<ArtifactId>
}
interface SweepEdge {
interface SweepEdge extends BaseArtifact {
type: 'sweepEdge'
segId: ArtifactId
sweepId: ArtifactId
@ -100,16 +104,16 @@ interface SweepEdge {
}
/** A edgeCut is a more generic term for both fillet or chamfer */
interface EdgeCut {
interface EdgeCut extends BaseArtifact {
type: 'edgeCut'
subType: 'fillet' | 'chamfer'
consumedEdgeId: ArtifactId
edgeIds: Array<ArtifactId>
surfaceId: ArtifactId
codeRef: CommonCommandProperties
codeRef: CodeRef
}
interface EdgeCutEdge {
interface EdgeCutEdge extends BaseArtifact {
type: 'edgeCutEdge'
edgeCutId: ArtifactId
surfaceId: ArtifactId
@ -258,6 +262,7 @@ export function getArtifactsToUpdate({
id: currentPlaneId,
artifact: {
type: 'wall',
id,
segId: existingPlane.segId,
edgeCutEdgeIds: existingPlane.edgeCutEdgeIds,
sweepId: existingPlane.sweepId,
@ -267,7 +272,10 @@ export function getArtifactsToUpdate({
]
} else {
return [
{ id: currentPlaneId, artifact: { type: 'plane', pathIds, codeRef } },
{
id: currentPlaneId,
artifact: { type: 'plane', id: currentPlaneId, pathIds, codeRef },
},
]
}
} else if (cmd.type === 'start_path') {
@ -275,6 +283,7 @@ export function getArtifactsToUpdate({
id,
artifact: {
type: 'path',
id,
segIds: [],
planeId: currentPlaneId,
sweepId: '',
@ -287,7 +296,7 @@ export function getArtifactsToUpdate({
if (plane?.type === 'plane') {
returnArr.push({
id: currentPlaneId,
artifact: { type: 'plane', pathIds: [id], codeRef },
artifact: { type: 'plane', id: currentPlaneId, pathIds: [id], codeRef },
})
}
if (plane?.type === 'wall') {
@ -295,6 +304,7 @@ export function getArtifactsToUpdate({
id: currentPlaneId,
artifact: {
type: 'wall',
id,
segId: plane.segId,
edgeCutEdgeIds: plane.edgeCutEdgeIds,
sweepId: plane.sweepId,
@ -309,6 +319,7 @@ export function getArtifactsToUpdate({
id,
artifact: {
type: 'segment',
id,
pathId,
surfaceId: '',
edgeIds: [],
@ -327,7 +338,11 @@ export function getArtifactsToUpdate({
) {
returnArr.push({
id: response.data.modeling_response.data.face_id,
artifact: { type: 'solid2D', pathId },
artifact: {
type: 'solid2D',
id: response.data.modeling_response.data.face_id,
pathId,
},
})
const path = getArtifact(pathId)
if (path?.type === 'path')
@ -347,6 +362,7 @@ export function getArtifactsToUpdate({
artifact: {
type: 'sweep',
subType: subType,
id,
pathId: cmd.target,
surfaceIds: [],
edgeIds: [],
@ -378,6 +394,7 @@ export function getArtifactsToUpdate({
id: face_id,
artifact: {
type: 'wall',
id: face_id,
segId: curve_id,
edgeCutEdgeIds: [],
sweepId: path.sweepId,
@ -410,6 +427,7 @@ export function getArtifactsToUpdate({
id: face_id,
artifact: {
type: 'cap',
id: face_id,
subType: cap === 'bottom' ? 'start' : 'end',
edgeCutEdgeIds: [],
sweepId: path.sweepId,
@ -456,6 +474,7 @@ export function getArtifactsToUpdate({
id: response.data.modeling_response.data.edge,
artifact: {
type: 'sweepEdge',
id: response.data.modeling_response.data.edge,
subType:
cmd.type === 'solid3d_get_prev_adjacent_edge'
? 'adjacent'
@ -484,6 +503,7 @@ export function getArtifactsToUpdate({
id,
artifact: {
type: 'edgeCut',
id,
subType: cmd.cut_type,
consumedEdgeId: cmd.edge_id,
edgeIds: [],
@ -574,6 +594,7 @@ export function expandPlane(
)
return {
type: 'plane',
id: plane.id,
paths: Array.from(paths.values()),
codeRef: plane.codeRef,
}
@ -602,6 +623,7 @@ export function expandPath(
if (err(plane)) return plane
return {
type: 'path',
id: path.id,
segments: Array.from(segs.values()),
sweep,
plane,
@ -629,6 +651,7 @@ export function expandSweep(
return {
type: 'sweep',
subType: 'extrusion',
id: sweep.id,
surfaces: Array.from(surfs.values()),
edges: Array.from(edges.values()),
path,
@ -664,6 +687,7 @@ export function expandSegment(
return {
type: 'segment',
id: segment.id,
path,
surf,
edges: Array.from(edges.values()),
@ -675,7 +699,7 @@ export function expandSegment(
export function getCapCodeRef(
cap: CapArtifact,
artifactGraph: ArtifactGraph
): CommonCommandProperties | Error {
): CodeRef | Error {
const sweep = getArtifactOfTypes(
{ key: cap.sweepId, types: ['sweep'] },
artifactGraph
@ -692,7 +716,7 @@ export function getCapCodeRef(
export function getSolid2dCodeRef(
solid2D: solid2D,
artifactGraph: ArtifactGraph
): CommonCommandProperties | Error {
): CodeRef | Error {
const path = getArtifactOfTypes(
{ key: solid2D.pathId, types: ['path'] },
artifactGraph
@ -704,7 +728,7 @@ export function getSolid2dCodeRef(
export function getWallCodeRef(
wall: WallArtifact,
artifactGraph: ArtifactGraph
): CommonCommandProperties | Error {
): CodeRef | Error {
const seg = getArtifactOfTypes(
{ key: wall.segId, types: ['segment'] },
artifactGraph
@ -716,7 +740,7 @@ export function getWallCodeRef(
export function getSweepEdgeCodeRef(
edge: SweepEdge,
artifactGraph: ArtifactGraph
): CommonCommandProperties | Error {
): CodeRef | Error {
const seg = getArtifactOfTypes(
{ key: edge.segId, types: ['segment'] },
artifactGraph

4
src/lang/std/sketch.ts
View File

@ -1912,11 +1912,13 @@ export function getConstraintInfo(
): ConstrainInfo[] {
const fnName = callExpression?.callee?.name || ''
if (!(fnName in sketchLineHelperMap)) return []
return sketchLineHelperMap[fnName].getConstraintInfo(
const result = sketchLineHelperMap[fnName].getConstraintInfo(
callExpression,
code,
pathToNode
)
console.log('result path', result[0].pathToNode)
return result
}
export function compareVec2Epsilon(

4
src/lang/std/sketchConstraints.test.ts
View File

@ -11,7 +11,7 @@ import {
transformAstSketchLines,
} from './sketchcombos'
import { getSketchSegmentFromSourceRange } from './sketchConstraints'
import { Selection } from 'lib/selections'
import { Selection__old } from 'lib/selections'
import { enginelessExecutor } from '../../lib/testHelpers'
import { err } from 'lib/trap'
@ -33,7 +33,7 @@ async function testingSwapSketchFnCall({
originalRange: [number, number]
}> {
const startIndex = inputCode.indexOf(callToSwap)
const range: Selection = {
const range: Selection__old = {
type: 'default',
range: [startIndex, startIndex + callToSwap.length],
}

16
src/lang/std/sketchcombos.test.ts
View File

@ -9,7 +9,7 @@ import {
getConstraintLevelFromSourceRange,
} from './sketchcombos'
import { ToolTip } from 'lang/langHelpers'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { err } from 'lib/trap'
import { enginelessExecutor } from '../../lib/testHelpers'
@ -87,8 +87,8 @@ function getConstraintTypeFromSourceHelper2(
}
function makeSelections(
codeBaseSelections: Selections['codeBasedSelections']
): Selections {
codeBaseSelections: Selections__old['codeBasedSelections']
): Selections__old {
return {
codeBasedSelections: codeBaseSelections,
otherSelections: [],
@ -208,7 +208,7 @@ const part001 = startSketchOn('XY')
const ast = parse(inputScript)
if (err(ast)) return Promise.reject(ast)
const selectionRanges: Selections['codeBasedSelections'] = inputScript
const selectionRanges: Selections__old['codeBasedSelections'] = inputScript
.split('\n')
.filter((ln) => ln.includes('//'))
.map((ln) => {
@ -299,7 +299,7 @@ const part001 = startSketchOn('XY')
const ast = parse(inputScript)
if (err(ast)) return Promise.reject(ast)
const selectionRanges: Selections['codeBasedSelections'] = inputScript
const selectionRanges: Selections__old['codeBasedSelections'] = inputScript
.split('\n')
.filter((ln) => ln.includes('// select for horizontal constraint'))
.map((ln) => {
@ -361,7 +361,7 @@ const part001 = startSketchOn('XY')
const ast = parse(inputScript)
if (err(ast)) return Promise.reject(ast)
const selectionRanges: Selections['codeBasedSelections'] = inputScript
const selectionRanges: Selections__old['codeBasedSelections'] = inputScript
.split('\n')
.filter((ln) => ln.includes('// select for vertical constraint'))
.map((ln) => {
@ -434,7 +434,7 @@ const part001 = startSketchOn('XY')
segEndY(seg01) + 2.93
], %) // xRelative`)
})
it('testing for yRelative to horizontal distance', async () => {
it.only('testing for yRelative to horizontal distance', async () => {
const expectedCode = await helperThing(
inputScript,
['// base selection', '// yRelative'],
@ -456,7 +456,7 @@ async function helperThing(
const ast = parse(inputScript)
if (err(ast)) return Promise.reject(ast)
const selectionRanges: Selections['codeBasedSelections'] = inputScript
const selectionRanges: Selections__old['codeBasedSelections'] = inputScript
.split('\n')
.filter((ln) =>
linesOfInterest.some((lineOfInterest) => ln.includes(lineOfInterest))

15
src/lang/std/sketchcombos.ts
View File

@ -7,7 +7,7 @@ import {
TransformInfo,
} from './stdTypes'
import { ToolTip, toolTips } from 'lang/langHelpers'
import { Selections, Selection } from 'lib/selections'
import { Selections__old, Selection__old } from 'lib/selections'
import { cleanErrs, err } from 'lib/trap'
import {
CallExpression,
@ -1470,7 +1470,7 @@ export function getConstraintType(
}
export function getTransformInfos(
selectionRanges: Selections,
selectionRanges: Selections__old,
ast: Program,
constraintType: ConstraintType
): TransformInfo[] {
@ -1502,7 +1502,7 @@ export function getTransformInfos(
}
export function getRemoveConstraintsTransforms(
selectionRanges: Selections,
selectionRanges: Selections__old,
ast: Program,
constraintType: ConstraintType
): TransformInfo[] | Error {
@ -1542,7 +1542,7 @@ export function transformSecondarySketchLinesTagFirst({
forceValueUsedInTransform,
}: {
ast: Program
selectionRanges: Selections
selectionRanges: Selections__old
transformInfos: TransformInfo[]
programMemory: ProgramMemory
forceSegName?: string
@ -1613,12 +1613,12 @@ export function transformAstSketchLines({
referencedSegmentRange,
}: {
ast: Program
selectionRanges: Selections | PathToNode[]
selectionRanges: Selections__old | PathToNode[]
transformInfos: TransformInfo[]
programMemory: ProgramMemory
referenceSegName: string
referencedSegmentRange?: Selection__old['range']
forceValueUsedInTransform?: BinaryPart
referencedSegmentRange?: Selection['range']
}):
| {
modifiedAst: Program
@ -1658,6 +1658,7 @@ export function transformAstSketchLines({
''
const inputs: InputArgs = []
console.log('getConstraintInfo', callExp.node, _pathToNode)
getConstraintInfo(callExp.node, '', _pathToNode).forEach((a) => {
if (
a.type === 'tangentialWithPrevious' ||
@ -1822,7 +1823,7 @@ function getArgLiteralVal(arg: Literal): number | Error {
export type ConstraintLevel = 'free' | 'partial' | 'full'
export function getConstraintLevelFromSourceRange(
cursorRange: Selection['range'],
cursorRange: Selection__old['range'],
ast: Program | Error
): Error | { range: [number, number]; level: ConstraintLevel } {
if (err(ast)) return ast

10
src/lang/util.ts
View File

@ -1,4 +1,4 @@
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { Program, PathToNode } from './wasm'
import { getNodeFromPath } from './queryAst'
import { ArtifactGraph, filterArtifacts } from 'lang/std/artifactGraph'
@ -7,10 +7,10 @@ import { err } from 'lib/trap'
export function pathMapToSelections(
ast: Program,
prevSelections: Selections,
prevSelections: Selections__old,
pathToNodeMap: { [key: number]: PathToNode }
): Selections {
const newSelections: Selections = {
): Selections__old {
const newSelections: Selections__old = {
...prevSelections,
codeBasedSelections: [],
}
@ -47,7 +47,7 @@ export function updatePathToNodeFromMap(
export function isCursorInSketchCommandRange(
artifactGraph: ArtifactGraph,
selectionRanges: Selections
selectionRanges: Selections__old
): string | false {
const overlappingEntries = filterArtifacts(
{

8
src/lib/commandBarConfigs/modelingCommandConfig.ts
View File

@ -2,7 +2,7 @@ import { Models } from '@kittycad/lib'
import { StateMachineCommandSetConfig, KclCommandValue } from 'lib/commandTypes'
import { KCL_DEFAULT_LENGTH, KCL_DEFAULT_DEGREE } from 'lib/constants'
import { components } from 'lib/machine-api'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { machineManager } from 'lib/machineManager'
import { modelingMachine, SketchTool } from 'machines/modelingMachine'
@ -28,17 +28,17 @@ export type ModelingCommandSchema = {
machine: components['schemas']['MachineInfoResponse']
}
Extrude: {
selection: Selections // & { type: 'face' } would be cool to lock that down
selection: Selections__old // & { type: 'face' } would be cool to lock that down
// result: (typeof EXTRUSION_RESULTS)[number]
distance: KclCommandValue
}
Revolve: {
selection: Selections
selection: Selections__old
angle: KclCommandValue
}
Fillet: {
// todo
selection: Selections
selection: Selections__old
radius: KclCommandValue
}
'change tool': {

6
src/lib/commandTypes.ts
View File

@ -1,7 +1,7 @@
import { CustomIconName } from 'components/CustomIcon'
import { AllMachines } from 'hooks/useStateMachineCommands'
import { Actor, AnyStateMachine, ContextFrom, EventFrom } from 'xstate'
import { Selection } from './selections'
import { Selection__old } from './selections'
import { Identifier, Expr, VariableDeclaration } from 'lang/wasm'
import { commandBarMachine } from 'machines/commandBarMachine'
import { ReactNode } from 'react'
@ -140,7 +140,7 @@ export type CommandArgumentConfig<
}
| {
inputType: 'selection'
selectionTypes: Selection['type'][]
selectionTypes: Selection__old['type'][]
multiple: boolean
}
| { inputType: 'kcl'; defaultValue?: string } // KCL expression inputs have simple strings as default values
@ -213,7 +213,7 @@ export type CommandArgument<
}
| {
inputType: 'selection'
selectionTypes: Selection['type'][]
selectionTypes: Selection__old['type'][]
multiple: boolean
}
| { inputType: 'kcl'; defaultValue?: string } // KCL expression inputs have simple strings as default value

71
src/lib/selections.ts
View File

@ -28,6 +28,7 @@ import { AXIS_GROUP, X_AXIS } from 'clientSideScene/sceneInfra'
import { PathToNodeMap } from 'lang/std/sketchcombos'
import { err } from 'lib/trap'
import {
Artifact,
getArtifactOfTypes,
getArtifactsOfTypes,
getCapCodeRef,
@ -41,7 +42,8 @@ export const Y_AXIS_UUID = '680fd157-266f-4b8a-984f-cdf46b8bdf01'
export type Axis = 'y-axis' | 'x-axis' | 'z-axis'
export type Selection = {
/** @deprecated Use {@link Artifact} instead. */
export type Selection__old = {
type:
| 'default'
| 'line-end'
@ -58,9 +60,29 @@ export type Selection = {
| 'all'
range: SourceRange
}
/** @deprecated Use {@link Selection} instead. */
export type Selections__old = {
otherSelections: Axis[]
codeBasedSelections: Selection__old[]
}
export type Selections = {
otherSelections: Axis[]
codeBasedSelections: Selection[]
graphSelections: Artifact[]
}
/** @deprecated If you're writing a new function, it should use {@link Selection} and not {@link Selection__old}
* this function should only be used for backwards compatibility with old functions.
*/
export function convertSelectionToOld(selection: Selection__old): Artifact {
return {} as Artifact
// TODO implementation
}
/** @deprecated If you're writing a new function, it should use {@link Selection} and not {@link Selection__old}
* this function should only be used for backwards compatibility with old functions.
*/
export function convertSelectionsToOld(selection: Selections__old): Selections {
// TODO implementation
return { otherSelections: [], graphSelections: [] }
}
export async function getEventForSelectWithPoint({
@ -211,7 +233,7 @@ export function getEventForSegmentSelection(
export function handleSelectionBatch({
selections,
}: {
selections: Selections
selections: Selections__old
}): {
engineEvents: Models['WebSocketRequest_type'][]
codeMirrorSelection: EditorSelection
@ -252,7 +274,7 @@ export function handleSelectionBatch({
}
}
type SelectionToEngine = { type: Selection['type']; id: string }
type SelectionToEngine = { type: Selection__old['type']; id: string }
export function processCodeMirrorRanges({
codeMirrorRanges,
@ -260,7 +282,7 @@ export function processCodeMirrorRanges({
isShiftDown,
}: {
codeMirrorRanges: readonly SelectionRange[]
selectionRanges: Selections
selectionRanges: Selections__old
isShiftDown: boolean
}): null | {
modelingEvent: ModelingMachineEvent
@ -276,7 +298,7 @@ export function processCodeMirrorRanges({
})
if (!isChange) return null
const codeBasedSelections: Selections['codeBasedSelections'] =
const codeBasedSelections: Selections__old['codeBasedSelections'] =
codeMirrorRanges.map(({ from, to }) => {
return {
type: 'default',
@ -303,7 +325,7 @@ export function processCodeMirrorRanges({
}
}
function updateSceneObjectColors(codeBasedSelections: Selection[]) {
function updateSceneObjectColors(codeBasedSelections: Selection__old[]) {
const updated = kclManager.ast
Object.values(sceneEntitiesManager.activeSegments).forEach((segmentGroup) => {
@ -358,7 +380,7 @@ function resetAndSetEngineEntitySelectionCmds(
]
}
export function isSketchPipe(selectionRanges: Selections) {
export function isSketchPipe(selectionRanges: Selections__old) {
if (!isSingleCursorInPipe(selectionRanges, kclManager.ast)) return false
return isCursorInSketchCommandRange(
engineCommandManager.artifactGraph,
@ -367,14 +389,14 @@ export function isSketchPipe(selectionRanges: Selections) {
}
export function isSelectionLastLine(
selectionRanges: Selections,
selectionRanges: Selections__old,
code: string,
i = 0
) {
return selectionRanges.codeBasedSelections[i].range[1] === code.length
}
export function isRangeBetweenCharacters(selectionRanges: Selections) {
export function isRangeBetweenCharacters(selectionRanges: Selections__old) {
return (
selectionRanges.codeBasedSelections.length === 1 &&
selectionRanges.codeBasedSelections[0].range[0] === 0 &&
@ -383,11 +405,14 @@ export function isRangeBetweenCharacters(selectionRanges: Selections) {
}
export type CommonASTNode = {
selection: Selection
selection: Selection__old
ast: Program
}
function buildCommonNodeFromSelection(selectionRanges: Selections, i: number) {
function buildCommonNodeFromSelection(
selectionRanges: Selections__old,
i: number
) {
return {
selection: selectionRanges.codeBasedSelections[i],
ast: kclManager.ast,
@ -420,7 +445,7 @@ function nodeHasCircle(node: CommonASTNode) {
})
}
export function canSweepSelection(selection: Selections) {
export function canSweepSelection(selection: Selections__old) {
const commonNodes = selection.codeBasedSelections.map((_, i) =>
buildCommonNodeFromSelection(selection, i)
)
@ -433,7 +458,7 @@ export function canSweepSelection(selection: Selections) {
)
}
export function canFilletSelection(selection: Selections) {
export function canFilletSelection(selection: Selections__old) {
const commonNodes = selection.codeBasedSelections.map((_, i) =>
buildCommonNodeFromSelection(selection, i)
) // TODO FILLET DUMMY PLACEHOLDER
@ -444,7 +469,7 @@ export function canFilletSelection(selection: Selections) {
)
}
function canExtrudeSelectionItem(selection: Selections, i: number) {
function canExtrudeSelectionItem(selection: Selections__old, i: number) {
const isolatedSelection = {
...selection,
codeBasedSelections: [selection.codeBasedSelections[i]],
@ -459,7 +484,7 @@ function canExtrudeSelectionItem(selection: Selections, i: number) {
}
// This accounts for non-geometry selections under "other"
export type ResolvedSelectionType = [Selection['type'] | 'other', number]
export type ResolvedSelectionType = [Selection__old['type'] | 'other', number]
/**
* In the future, I'd like this function to properly return the type of each selected entity based on
@ -469,7 +494,7 @@ export type ResolvedSelectionType = [Selection['type'] | 'other', number]
* @returns
*/
export function getSelectionType(
selection?: Selections
selection?: Selections__old
): ResolvedSelectionType[] {
if (!selection) return []
const extrudableCount = selection.codeBasedSelections.filter((_, i) => {
@ -486,7 +511,7 @@ export function getSelectionType(
}
export function getSelectionTypeDisplayText(
selection?: Selections
selection?: Selections__old
): string | null {
const selectionsByType = getSelectionType(selection)
@ -518,7 +543,7 @@ export function canSubmitSelectionArg(
}
function codeToIdSelections(
codeBasedSelections: Selection[]
codeBasedSelections: Selection__old[]
): SelectionToEngine[] {
return codeBasedSelections
.flatMap(({ type, range, ...rest }): null | SelectionToEngine[] => {
@ -684,13 +709,13 @@ export async function sendSelectEventToEngine(
export function updateSelections(
pathToNodeMap: PathToNodeMap,
prevSelectionRanges: Selections,
prevSelectionRanges: Selections__old,
ast: Program | Error
): Selections | Error {
): Selections__old | Error {
if (err(ast)) return ast
const newSelections = Object.entries(pathToNodeMap)
.map(([index, pathToNode]): Selection | undefined => {
.map(([index, pathToNode]): Selection__old | undefined => {
const nodeMeta = getNodeFromPath<Expr>(ast, pathToNode)
if (err(nodeMeta)) return undefined
const node = nodeMeta.node
@ -699,7 +724,7 @@ export function updateSelections(
type: prevSelectionRanges.codeBasedSelections[Number(index)]?.type,
}
})
.filter((x?: Selection) => x !== undefined) as Selection[]
.filter((x?: Selection__old) => x !== undefined) as Selection__old[]
return {
codeBasedSelections:

4
src/machines/commandBarMachine.ts
View File

@ -5,14 +5,14 @@ import {
CommandArgumentWithName,
KclCommandValue,
} from 'lib/commandTypes'
import { Selections } from 'lib/selections'
import { Selections__old } from 'lib/selections'
import { getCommandArgumentKclValuesOnly } from 'lib/commandUtils'
export type CommandBarContext = {
commands: Command[]
selectedCommand?: Command
currentArgument?: CommandArgument<unknown> & { name: string }
selectionRanges: Selections
selectionRanges: Selections__old
argumentsToSubmit: { [x: string]: unknown }
}

15
src/machines/modelingMachine.ts
View File

@ -5,7 +5,12 @@ import {
parse,
recast,
} from 'lang/wasm'
import { Axis, Selection, Selections, updateSelections } from 'lib/selections'
import {
Axis,
Selection__old,
Selections__old,
updateSelections,
} from 'lib/selections'
import { assign, fromPromise, setup } from 'xstate'
import { SidebarType } from 'components/ModelingSidebar/ModelingPanes'
import {
@ -70,7 +75,7 @@ export const MODELING_PERSIST_KEY = 'MODELING_PERSIST_KEY'
export type SetSelections =
| {
selectionType: 'singleCodeCursor'
selection?: Selection
selection?: Selection__old
}
| {
selectionType: 'otherSelection'
@ -78,12 +83,12 @@ export type SetSelections =
}
| {
selectionType: 'completeSelection'
selection: Selections
selection: Selections__old
updatedPathToNode?: PathToNode
}
| {
selectionType: 'mirrorCodeMirrorSelections'
selection: Selections
selection: Selections__old
}
export type MouseState =
@ -283,7 +288,7 @@ export interface ModelingMachineContext {
currentMode: ToolbarModeName
currentTool: SketchTool
selection: string[]
selectionRanges: Selections
selectionRanges: Selections__old
sketchDetails: SketchDetails | null
sketchPlaneId: string
sketchEnginePathId: string