Fix sketchOnFace point&click for booleans

src/hooks/useEngineConnectionSubscriptions.ts

@@ -34,6 +34,7 @@ import type {
   ExtrudeFacePlane,
 } from '@src/machines/modelingMachine'
 import toast from 'react-hot-toast'
+import { findAllChildrenAndOrderByPlaceInCode } from '@src/lang/modifyAst/boolean'
 
 export function useEngineConnectionSubscriptions() {
   const { send, context, state } = useModelingContext()
@@ -146,7 +147,7 @@ export function useEngineConnectionSubscriptions() {
                 }
 
                 sceneInfra.modelingSend({
-                  type: 'Select default plane',
+                  type: 'Select sketch plane',
                   data: {
                     type: 'defaultPlane',
                     planeId: planeId,
@@ -163,7 +164,7 @@ export function useEngineConnectionSubscriptions() {
                 const planeInfo =
                   await sceneEntitiesManager.getFaceDetails(planeOrFaceId)
                 sceneInfra.modelingSend({
-                  type: 'Select default plane',
+                  type: 'Select sketch plane',
                   data: {
                     type: 'offsetPlane',
                     zAxis: [
@@ -192,7 +193,7 @@ export function useEngineConnectionSubscriptions() {
                 return
               }
 
-              // Artifact is likely an extrusion face
+              // Artifact is likely an sweep face
               const faceId = planeOrFaceId
               const extrusion = getSweepFromSuspectedSweepSurface(
                 faceId,
@@ -316,15 +317,30 @@ export function useEngineConnectionSubscriptions() {
                     }
                   : { type: 'wall' }
 
+              if (err(extrusion)) {
+                return Promise.reject(
+                  new Error(`Extrusion is not a valid artifact: ${extrusion}`)
+                )
+              }
+
+              const lastChild = findAllChildrenAndOrderByPlaceInCode(
+                { type: 'sweep', ...extrusion },
+                kclManager.artifactGraph
+              )[0]
+              const lastChildCodeRef =
+                lastChild.type === 'compositeSolid'
+                  ? lastChild.codeRef.range
+                  : null
+
               const extrudePathToNode = !err(extrusion)
                 ? getNodePathFromSourceRange(
                     kclManager.ast,
-                    extrusion.codeRef.range
+                    lastChildCodeRef || extrusion.codeRef.range
                   )
                 : []
 
               sceneInfra.modelingSend({
-                type: 'Select default plane',
+                type: 'Select sketch plane',
                 data: {
                   type: 'extrudeFace',
                   zAxis: [z_axis.x, z_axis.y, z_axis.z],

src/lang/modifyAst.ts

@@ -637,7 +637,8 @@ export function sketchOnExtrudedFace(
 
   const expressionIndex = Math.max(
     sketchPathToNode[1][0] as number,
-    extrudePathToNode[1][0] as number
+    extrudePathToNode[1][0] as number,
+    node.body.length - 1
   )
   _node.body.splice(expressionIndex + 1, 0, newSketch)
   const newpathToNode: PathToNode = [

src/lang/modifyAst/boolean.ts

@@ -167,6 +167,26 @@ export function findAllChildrenAndOrderByPlaceInCode(
   artifact: Artifact,
   artifactGraph: ArtifactGraph
 ): Artifact[] {
+  const pathToCompositeSolidMap: { [key: string]: string[] } = {}
+  for (const [id, artifact] of artifactGraph) {
+    if (artifact.type === 'compositeSolid') {
+      for (const pathId of artifact.solidIds) {
+        if (pathToCompositeSolidMap[pathId]) {
+          pathToCompositeSolidMap[pathId].push(id)
+        } else {
+          pathToCompositeSolidMap[pathId] = [id]
+        }
+      }
+      for (const pathId of artifact.toolIds) {
+        if (pathToCompositeSolidMap[pathId]) {
+          pathToCompositeSolidMap[pathId].push(id)
+        } else {
+          pathToCompositeSolidMap[pathId] = [id]
+        }
+      }
+    }
+  }
+
   const result: string[] = []
   const stack: string[] = [artifact.id]
 
@@ -211,6 +231,13 @@ export function findAllChildrenAndOrderByPlaceInCode(
       pushToSomething(currentId, current?.segIds)
     } else if (current?.type === 'sweep') {
       pushToSomething(currentId, current?.surfaceIds)
+      const path = artifactGraph.get(current.pathId)
+      if (path && path.type === 'path') {
+        const compositeSolidIds = pathToCompositeSolidMap[current.pathId]
+        if (compositeSolidIds) {
+          result.push(...compositeSolidIds)
+        }
+      }
     } else if (current?.type === 'wall' || current?.type === 'cap') {
       pushToSomething(currentId, current?.pathIds)
     } else if (current?.type === 'segment') {

src/machines/modelingMachine.ts

@@ -306,7 +306,7 @@ export type ModelingMachineEvent =
     }
   | { type: 'Sketch On Face' }
   | {
-      type: 'Select default plane'
+      type: 'Select sketch plane'
       data: DefaultPlane | ExtrudeFacePlane | OffsetPlane
     }
   | {
@@ -4421,7 +4421,7 @@ export const modelingMachine = setup({
 
       exit: ['hide default planes', 'set selection filter to defaults'],
       on: {
-        'Select default plane': {
+        'Select sketch plane': {
           target: 'animating to plane',
           actions: ['reset sketch metadata'],
         },
@@ -4434,7 +4434,7 @@ export const modelingMachine = setup({
         id: 'animate-to-face',
 
         input: ({ event }) => {
-          if (event.type !== 'Select default plane') return undefined
+          if (event.type !== 'Select sketch plane') return undefined
           return event.data
         },