@highstate/backend 0.9.35 → 0.9.37

package/src/orchestrator/operation-plan.update.test.ts

@@ -320,7 +320,54 @@ describe("OperationPlan - Update Operations", () => {
               },
               {
                 "id": "component.v1:GhostChild",
-                "message": "included in operation",
+                "message": "ghost cleanup",
+                "parentId": "composite.v1:Parent",
+              },
+            ],
+            "type": "destroy",
+          },
+        ]
+      `)
+    },
+  )
+
+  operationPlanTest(
+    "5a. should skip ghost children in update phase when forcing child updates",
+    async ({ testBuilder, expect }) => {
+      // arrange
+      const { context, operation } = await testBuilder()
+        .composite("Parent")
+        .unit("GhostChild")
+        .children("Parent", "GhostChild")
+        .states({
+          Parent: "upToDate",
+          GhostChild: "ghost",
+        })
+        .options({ forceUpdateChildren: true })
+        .request("update", "Parent")
+        .build()
+
+      // act
+      const plan = createOperationPlan(
+        context,
+        operation.type,
+        operation.requestedInstanceIds,
+        operation.options,
+      )
+
+      // assert
+      expect(plan).toMatchInlineSnapshot(`
+        [
+          {
+            "instances": [
+              {
+                "id": "composite.v1:Parent",
+                "message": "explicitly requested",
+                "parentId": undefined,
+              },
+              {
+                "id": "component.v1:GhostChild",
+                "message": "ghost cleanup",
                 "parentId": "composite.v1:Parent",
               },
             ],
@@ -946,7 +993,7 @@ describe("OperationPlan - Update Operations", () => {
               },
               {
                 "id": "component.v1:GhostChild",
-                "message": "included in operation",
+                "message": "ghost cleanup",
                 "parentId": "composite.v1:Parent",
               },
             ],

package/src/orchestrator/operation.ts

@@ -794,6 +794,14 @@ export class RuntimeOperation {
           }
         : undefined,
     })
+
+    if (
+      update.operationType === "destroy" &&
+      this.workset.isLastPhaseForInstance(instance.id) &&
+      this.context.isGhostInstance(instance.id)
+    ) {
+      this.instanceStateService.publishGhostInstanceDeletion(this.project.id, [instance.id])
+    }
   }
 
   private getInstancePromise(

package/src/project-model/backends/codebase.ts

@@ -108,7 +108,7 @@ export class CodebaseProjectModelBackend implements ProjectModelBackend {
     assertCodebaseSpec(spec)
 
     try {
-      return await this.withInstance(project.name, instanceId, instance => {
+      return await this.withInstance(project.id, project.name, instanceId, instance => {
         applyInstancePatch(instance, patch)
         return instance
       })
@@ -312,6 +312,7 @@ export class CodebaseProjectModelBackend implements ProjectModelBackend {
   }
 
   private async withInstance<T>(
+    projectId: string,
     projectName: string,
     instanceId: string,
     callback: (instance: InstanceModel) => T,
@@ -319,7 +320,7 @@ export class CodebaseProjectModelBackend implements ProjectModelBackend {
     return await this.withProject(projectName, projectData => {
       const instance = projectData.instances[instanceId]
       if (!instance) {
-        throw new Error(`Instance ${instanceId} not found`)
+        throw new ProjectModelInstanceNotFoundError(projectId, instanceId)
       }
 
       return callback(instance)

package/src/project-model/index.ts

@@ -2,3 +2,4 @@ export type { ProjectModelBackend } from "./abstractions"
 export * from "../business/evaluation"
 export * from "./errors"
 export { createProjectModelBackends } from "./factory"
+export { applyInstancePatch } from "./utils"