@nodaro/shared 3.1.0 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodaro/shared",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Shared types, model catalog, wire contracts, and structural vocabularies for the Nodaro platform and SDK.",
   "type": "module",
   "license": "Apache-2.0",

package/src/__tests__/scene3d-base-visibility.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest"
+import { scene3DPlanV2Schema } from "../scene3d-v2-plan.js"
+import { applyScene3DV2EditOperations } from "../scene3d-v2-edit.js"
+import { computeScene3DPlanV2ContentHash, verifyScene3DPlanV2ContentHash } from "../scene3d-v2-resources.js"
+import { planV2 } from "./scene3d-v2-fixtures.js"
+
+describe("baked entity visibility", () => {
+  it("round-trips false without adding a default to existing revisions", async () => {
+    const original = planV2()
+    const hidden = { ...original, objects: original.objects.map(e => ({ ...e, visible: false })) }
+    expect(scene3DPlanV2Schema.parse(hidden).objects.every(e => e.visible === false)).toBe(true)
+    expect(scene3DPlanV2Schema.parse(original).objects.every(e => !("visible" in e))).toBe(true)
+    expect(await computeScene3DPlanV2ContentHash(hidden)).not.toBe(await computeScene3DPlanV2ContentHash(original))
+    expect(scene3DPlanV2Schema.safeParse({ ...hidden, objects: hidden.objects.map(e => ({ ...e, visible: "false" })) }).success).toBe(false)
+  })
+
+  it("keeps baked visibility when a temporary show override is added and removed", async () => {
+    const original = planV2()
+    const hidden = { ...original, overrides: [], objects: original.objects.map(e => ({ ...e, visible: e.id !== "e2" })) }
+    hidden.provenance = { ...hidden.provenance, contentHash: await computeScene3DPlanV2ContentHash(hidden) }
+    const shown = await applyScene3DV2EditOperations(hidden, [{ op: "set-override", override: {
+      kind: "entity-visibility", entityId: "e2", visible: true,
+    } }], { expectedRevisionId: hidden.revisionId })
+    expect(shown.ok).toBe(true)
+    if (!shown.ok) return
+    const override = shown.plan.overrides!.find(o => o.kind === "entity-visibility")!
+    const reset = await applyScene3DV2EditOperations(shown.plan, [{ op: "remove-override", overrideId: override.id }], {
+      expectedRevisionId: shown.plan.revisionId,
+    })
+    expect(reset.ok).toBe(true)
+    if (!reset.ok) return
+    expect(reset.plan.objects.find(e => e.id === "e2")?.visible).toBe(false)
+    expect(reset.plan.overrides).toEqual([])
+    expect(await verifyScene3DPlanV2ContentHash(reset.plan)).toBe(true)
+  })
+})

package/src/scene3d-v2.ts

@@ -314,6 +314,8 @@ export interface Scene3DEntityV2 {
   position?: Vec3
   rotation?: Vec3
   scale?: Vec3
+  /** Baked visibility before manual overlays. Absent means visible. */
+  visible?: boolean
   /** The selection/identity chip colour. Opaque hex, sRGB. */
   identityColor?: string
   anchors?: Scene3DAnchor[]
@@ -541,6 +543,7 @@ export const scene3DEntityV2Schema = z
     position: vec3Schema.optional(),
     rotation: rotationVec3Schema.optional(),
     scale: scaleVec3Schema.optional(),
+    visible: z.boolean().optional(),
     identityColor: scene3DColorSchema.optional(),
     anchors: z.array(scene3DAnchorSchema).max(SCENE3D_V2_LIMITS.maxAnchorsPerEntity).optional(),
     capabilities: z.array(scene3DEntityCapabilitySchema).max(SCENE3D_ENTITY_CAPABILITIES.length).optional(),