@webspatial/core-sdk 1.6.1 → 2.0.0

package/src/coverage-boost.test.ts

@@ -80,15 +80,17 @@ describe('utils', () => {
       { x: 2, y: 3, z: 4 },
     )
 
+    // Use toMatchObject because happy-dom returns a real DOMPoint (which
+    // includes a `w` property) rather than a plain {x,y,z} object.
     const origin = m.transformPoint({ x: 0, y: 0, z: 0 })
-    expect(origin).toEqual({
+    expect(origin).toMatchObject({
       x: 10,
       y: 20,
       z: 30,
     })
 
     const p = m.transformPoint({ x: 1, y: 1, z: 1 })
-    expect(p).toEqual({ x: 12, y: 23, z: 34 })
+    expect(p).toMatchObject({ x: 12, y: 23, z: 34 })
   })
 })
 
@@ -171,20 +173,24 @@ describe('SpatialObject', () => {
   it('inspect returns data when command succeeds', async () => {
     vi.doMock('./JSBCommand', () => {
       return {
-        InspectCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: { a: 1 },
-            errorMessage: '',
-          }),
-        })),
-        DestroyCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: undefined,
-            errorMessage: '',
-          }),
-        })),
+        InspectCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: { a: 1 },
+              errorMessage: '',
+            }),
+          }
+        }),
+        DestroyCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: undefined,
+              errorMessage: '',
+            }),
+          }
+        }),
       }
     })
 
@@ -196,20 +202,24 @@ describe('SpatialObject', () => {
   it('inspect throws when command fails', async () => {
     vi.doMock('./JSBCommand', () => {
       return {
-        InspectCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: false,
-            data: undefined,
-            errorMessage: 'nope',
-          }),
-        })),
-        DestroyCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: undefined,
-            errorMessage: '',
-          }),
-        })),
+        InspectCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: false,
+              data: undefined,
+              errorMessage: 'nope',
+            }),
+          }
+        }),
+        DestroyCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: undefined,
+              errorMessage: '',
+            }),
+          }
+        }),
       }
     })
 
@@ -222,20 +232,24 @@ describe('SpatialObject', () => {
     const onDestroy = vi.fn()
     vi.doMock('./JSBCommand', () => {
       return {
-        InspectCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: undefined,
-            errorMessage: '',
-          }),
-        })),
-        DestroyCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: { ok: true },
-            errorMessage: '',
-          }),
-        })),
+        InspectCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: undefined,
+              errorMessage: '',
+            }),
+          }
+        }),
+        DestroyCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: { ok: true },
+              errorMessage: '',
+            }),
+          }
+        }),
       }
     })
 
@@ -253,6 +267,45 @@ describe('SpatialObject', () => {
     await expect(obj.destroy()).resolves.toBeUndefined()
     expect(onDestroy).toHaveBeenCalledTimes(1)
   })
+
+  it('treats missing native spatial objects as already destroyed', async () => {
+    const onDestroy = vi.fn()
+    vi.doMock('./JSBCommand', () => {
+      return {
+        InspectCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: true,
+              data: undefined,
+              errorMessage: '',
+            }),
+          }
+        }),
+        DestroyCommand: vi.fn().mockImplementation(function () {
+          return {
+            execute: vi.fn().mockResolvedValue({
+              success: false,
+              data: undefined,
+              errorMessage:
+                'Failed to destroy SpatialObject: invalid inspect spatial object id obj-2 not exsit!',
+            }),
+          }
+        }),
+      }
+    })
+
+    const { SpatialObject } = await import('./SpatialObject')
+    class TestObject extends SpatialObject {
+      protected onDestroy() {
+        onDestroy()
+      }
+    }
+
+    const obj = new TestObject('obj-2')
+    await expect(obj.destroy()).resolves.toBeUndefined()
+    expect(obj.isDestroyed).toBe(true)
+    expect(onDestroy).toHaveBeenCalledTimes(1)
+  })
 })
 
 describe('platform adapters', () => {
@@ -263,132 +316,6 @@ describe('platform adapters', () => {
     vi.unmock('./JSBCommand')
   })
 
-  // it('AndroidPlatform.callJSB resolves from async SpatialWebEvent callback', async () => {
-  //   const postMessage = vi.fn((rId: string) => {
-  //     expect(rId.startsWith('rId_')).toBe(true)
-  //     return ''
-  //   })
-  //   ;(window as any).webspatialBridge = { postMessage }
-
-  //   const { AndroidPlatform } = await import(
-  //     './platform-adapter/android/AndroidPlatform'
-  //   )
-  //   const { SpatialWebEvent: SpatialWebEventInstance } = await import(
-  //     './SpatialWebEvent'
-  //   )
-  //   const platform = new AndroidPlatform()
-  //   const p = platform.callJSB('c', '{"a":1}')
-
-  //   const rId = postMessage.mock.calls[0]?.[0] as string
-  //   SpatialWebEventInstance.eventReceiver[rId]({
-  //     success: true,
-  //     data: { ok: true },
-  //   })
-
-  //   await expect(p).resolves.toEqual({
-  //     success: true,
-  //     data: { ok: true },
-  //     errorCode: '',
-  //     errorMessage: '',
-  //   })
-  // })
-
-  // it('AndroidPlatform.callJSB handles sync bridge response and failures', async () => {
-  //   ;(window as any).webspatialBridge = {
-  //     postMessage: vi.fn(() =>
-  //       JSON.stringify({
-  //         success: false,
-  //         data: { code: 'E_SYNC', message: 'bad' },
-  //       }),
-  //     ),
-  //   }
-
-  //   const { AndroidPlatform } = await import(
-  //     './platform-adapter/android/AndroidPlatform'
-  //   )
-  //   const platform = new AndroidPlatform()
-  //   await expect(platform.callJSB('c', '{}')).resolves.toEqual({
-  //     success: false,
-  //     data: undefined,
-  //     errorCode: 'E_SYNC',
-  //     errorMessage: 'bad',
-  //   })
-  // })
-
-  // it('AndroidPlatform.callWebSpatialProtocol polls and returns injected SpatialId', async () => {
-  //   vi.useFakeTimers()
-
-  //   let canCount = 0
-  //   vi.doMock('./JSBCommand', () => {
-  //     return {
-  //       CheckWebViewCanCreateCommand: vi.fn().mockImplementation(() => ({
-  //         execute: vi.fn().mockImplementation(() => {
-  //           canCount += 1
-  //           return Promise.resolve({
-  //             success: true,
-  //             data: { can: canCount >= 2 },
-  //             errorCode: '',
-  //             errorMessage: '',
-  //           })
-  //         }),
-  //       })),
-  //     }
-  //   })
-
-  //   const windowProxy: any = {}
-  //   const openFn = vi.fn()
-  //   ;(window as any).open = vi.fn(() => windowProxy)
-
-  //   setTimeout(() => {
-  //     windowProxy.open = openFn
-  //   }, 20)
-
-  //   const { AndroidPlatform } = await import(
-  //     './platform-adapter/android/AndroidPlatform'
-  //   )
-  //   const { SpatialWebEvent: SpatialWebEventInstance } = await import(
-  //     './SpatialWebEvent'
-  //   )
-  //   const platform = new AndroidPlatform()
-  //   const p = platform.callWebSpatialProtocol('open', 'x=1', '_blank', '')
-
-  //   const receiverIds = Object.keys(SpatialWebEventInstance.eventReceiver)
-  //   const createdId = receiverIds[0] as string
-  //   const loadedId = receiverIds[1] as string
-  //   SpatialWebEventInstance.eventReceiver[createdId]?.({ spatialId: 'temp' })
-  //   await vi.advanceTimersByTimeAsync(100)
-  //   SpatialWebEventInstance.eventReceiver[loadedId]?.({
-  //     spatialId: 'spatial-1',
-  //   })
-
-  //   await vi.advanceTimersByTimeAsync(200)
-
-  //   const result = await p
-  //   expect(result.success).toBe(true)
-  //   expect(result.data.id).toBe('spatial-1')
-  //   expect(result.data.windowProxy).toBe(windowProxy)
-  //   const call = openFn.mock.calls[0] as unknown as [string, string | undefined]
-  //   expect(call?.[0]).toMatch(/^about:blank\?rid=/)
-  //   expect(call?.[1]).toBe('_self')
-  // })
-
-  it('SSRPlatform returns successful no-op results', async () => {
-    const { SSRPlatform } = await import('./platform-adapter/ssr/SSRPlatform')
-    const platform = new SSRPlatform()
-
-    await expect(platform.callJSB('c', '{}')).resolves.toMatchObject({
-      success: true,
-    })
-    await expect(
-      platform.callWebSpatialProtocol('s', '', '', ''),
-    ).resolves.toMatchObject({
-      success: true,
-    })
-    expect(platform.callWebSpatialProtocolSync('s', '', '', '')).toMatchObject({
-      success: true,
-    })
-  })
-
   it('VisionOSPlatform.callJSB returns success and parses failures', async () => {
     ;(window as any).webkit = {
       messageHandlers: {
@@ -437,11 +364,11 @@ describe('platform adapters', () => {
       './platform-adapter/vision-os/VisionOSPlatform'
     )
     const platform = new VisionOSPlatform()
-    const r = await platform.callWebSpatialProtocol('open', 'a=1')
+    const r = await platform.createNativeSpatialDiv()
 
     expect(r.success).toBe(true)
-    expect(r.data.id).toBe(uuid)
-    expect(r.data.windowProxy).toBe(windowProxy)
+    expect(r.data?.id).toBe(uuid)
+    expect(r.data?.windowProxy).toBe(windowProxy)
   })
 })
 
@@ -570,6 +497,44 @@ describe('spatialWindowPolyfill', () => {
     expect(updateSpatialProperties).toHaveBeenCalledWith({
       material: 'none',
     })
+
+    await Promise.resolve()
+    await Promise.resolve()
+    updateSpatialProperties.mockClear()
+    ;(document.documentElement.style as any)['--xr-background-material'] =
+      'translucent'
+    expect(updateSpatialProperties).toHaveBeenCalledWith({
+      material: 'translucent',
+    })
+    expect(
+      getComputedStyle(document.documentElement)
+        .getPropertyValue('--xr-background-material')
+        .trim(),
+    ).toBe('translucent')
+    expect(
+      (
+        (document.documentElement.style as any)[
+          '--xr-background-material'
+        ] as string
+      ).trim(),
+    ).toBe('translucent')
+
+    updateSpatialProperties.mockClear()
+    document.documentElement.style.setProperty('border-radius', '80px')
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(updateSpatialProperties).toHaveBeenCalledWith({
+      cornerRadius: {
+        topLeading: 80,
+        topTrailing: 80,
+        bottomLeading: 80,
+        bottomTrailing: 80,
+      },
+    })
+    expect(updateSpatialProperties).not.toHaveBeenCalledWith({
+      material: 'none',
+    })
   })
 })
 
@@ -584,6 +549,14 @@ describe('SpatializedElementCreator', () => {
     const windowProxy: any = {
       document: { head: { innerHTML: '' } },
     }
+    vi.doMock('./spatial-host', () => ({
+      createNativeSpatialDiv: vi.fn().mockResolvedValue({
+        success: true,
+        data: { id: 'w1', windowProxy },
+        errorCode: '',
+        errorMessage: '',
+      }),
+    }))
 
     vi.doMock('./JSBCommand', () => {
       class OkCommand {
@@ -607,34 +580,42 @@ describe('SpatializedElementCreator', () => {
         UpdateSpatializedDynamic3DElementProperties: OkCommand,
         SetParentForEntityCommand: OkCommand,
         AddEntityToDynamic3DCommand: OkCommand,
-        createSpatialized2DElementCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: true,
-            data: { id: 'w1', windowProxy },
-            errorCode: '',
-            errorMessage: '',
+        createSpatialized2DElementCommand: vi
+          .fn()
+          .mockImplementation(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: true,
+                data: { id: 'w1', windowProxy },
+                errorCode: '',
+                errorMessage: '',
+              }),
+            }
           }),
-        })),
         CreateSpatializedStatic3DElementCommand: vi
           .fn()
-          .mockImplementation(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: true,
-              data: { id: 's-default' },
-              errorCode: '',
-              errorMessage: '',
-            }),
-          })),
+          .mockImplementation(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: true,
+                data: { id: 's-default' },
+                errorCode: '',
+                errorMessage: '',
+              }),
+            }
+          }),
         CreateSpatializedDynamic3DElementCommand: vi
           .fn()
-          .mockImplementation(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: true,
-              data: { id: 'd-default' },
-              errorCode: '',
-              errorMessage: '',
-            }),
-          })),
+          .mockImplementation(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: true,
+                data: { id: 'd-default' },
+                errorCode: '',
+                errorMessage: '',
+              }),
+            }
+          }),
       }
     })
 
@@ -649,6 +630,15 @@ describe('SpatializedElementCreator', () => {
   })
 
   it('createSpatialized2DElement throws when command fails', async () => {
+    vi.doMock('./spatial-host', () => ({
+      createNativeSpatialDiv: vi.fn().mockResolvedValue({
+        success: false,
+        data: undefined,
+        errorCode: 'E',
+        errorMessage: 'bad',
+      }),
+    }))
+
     vi.doMock('./JSBCommand', () => {
       class OkCommand {
         execute() {
@@ -671,14 +661,18 @@ describe('SpatializedElementCreator', () => {
         UpdateSpatializedDynamic3DElementProperties: OkCommand,
         SetParentForEntityCommand: OkCommand,
         AddEntityToDynamic3DCommand: OkCommand,
-        createSpatialized2DElementCommand: vi.fn().mockImplementation(() => ({
-          execute: vi.fn().mockResolvedValue({
-            success: false,
-            data: undefined,
-            errorCode: 'E',
-            errorMessage: 'bad',
+        createSpatialized2DElementCommand: vi
+          .fn()
+          .mockImplementation(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: false,
+                data: undefined,
+                errorCode: 'E',
+                errorMessage: 'bad',
+              }),
+            }
           }),
-        })),
         CreateSpatializedStatic3DElementCommand: vi.fn(),
         CreateSpatializedDynamic3DElementCommand: vi.fn(),
       }
@@ -719,22 +713,26 @@ describe('SpatializedElementCreator', () => {
         CreateSpatializedDynamic3DElementCommand: vi.fn(),
         CreateSpatializedStatic3DElementCommand: vi
           .fn()
-          .mockImplementationOnce(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: true,
-              data: { id: 's3' },
-              errorCode: '',
-              errorMessage: '',
-            }),
-          }))
-          .mockImplementationOnce(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: false,
-              data: undefined,
-              errorCode: 'E',
-              errorMessage: 'bad',
-            }),
-          })),
+          .mockImplementationOnce(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: true,
+                data: { id: 's3' },
+                errorCode: '',
+                errorMessage: '',
+              }),
+            }
+          })
+          .mockImplementationOnce(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: false,
+                data: undefined,
+                errorCode: 'E',
+                errorMessage: 'bad',
+              }),
+            }
+          }),
       }
     })
 
@@ -776,22 +774,26 @@ describe('SpatializedElementCreator', () => {
         CreateSpatializedStatic3DElementCommand: vi.fn(),
         CreateSpatializedDynamic3DElementCommand: vi
           .fn()
-          .mockImplementationOnce(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: true,
-              data: { id: 'd3' },
-              errorCode: '',
-              errorMessage: '',
-            }),
-          }))
-          .mockImplementationOnce(() => ({
-            execute: vi.fn().mockResolvedValue({
-              success: false,
-              data: undefined,
-              errorCode: 'E',
-              errorMessage: 'bad',
-            }),
-          })),
+          .mockImplementationOnce(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: true,
+                data: { id: 'd3' },
+                errorCode: '',
+                errorMessage: '',
+              }),
+            }
+          })
+          .mockImplementationOnce(function () {
+            return {
+              execute: vi.fn().mockResolvedValue({
+                success: false,
+                data: undefined,
+                errorCode: 'E',
+                errorMessage: 'bad',
+              }),
+            }
+          }),
       }
     })
 
@@ -814,72 +816,7 @@ describe('SpatializedStatic3DElement', () => {
     vi.unmock('./JSBCommand')
   })
 
-  it('resets ready when modelURL changes and resolves on load events', async () => {
-    const execute = vi.fn().mockResolvedValue({
-      success: true,
-      data: undefined,
-      errorCode: '',
-      errorMessage: '',
-    })
-    vi.doMock('./JSBCommand', () => {
-      class OkCommand {
-        execute() {
-          return Promise.resolve({
-            success: true,
-            data: undefined,
-            errorCode: '',
-            errorMessage: '',
-          })
-        }
-      }
-
-      return {
-        InspectCommand: OkCommand,
-        DestroyCommand: OkCommand,
-        UpdateSpatializedElementTransform: OkCommand,
-        UpdateSpatialized2DElementProperties: OkCommand,
-        AddSpatializedElementToSpatialized2DElement: OkCommand,
-        UpdateSpatializedDynamic3DElementProperties: OkCommand,
-        SetParentForEntityCommand: OkCommand,
-        AddEntityToDynamic3DCommand: OkCommand,
-        createSpatialized2DElementCommand: vi.fn(),
-        CreateSpatializedStatic3DElementCommand: vi.fn(),
-        CreateSpatializedDynamic3DElementCommand: vi.fn(),
-        UpdateSpatializedStatic3DElementProperties: vi
-          .fn()
-          .mockImplementation(() => ({ execute })),
-      }
-    })
-
-    const { SpatializedStatic3DElement } = await import(
-      './SpatializedStatic3DElement'
-    )
-    const { SpatialWebMsgType } = await import('./WebMsgCommand')
-
-    const el = new SpatializedStatic3DElement('m1')
-    const onLoad = vi.fn()
-    const onFail = vi.fn()
-    el.onLoadCallback = onLoad
-    el.onLoadFailureCallback = onFail
-
-    const p1 = el.ready
-    await el.updateProperties({ modelURL: 'a.glb' } as any)
-    expect(execute).toHaveBeenCalledTimes(1)
-    const p2 = el.ready
-    expect(p2).not.toBe(p1)
-
-    el.onReceiveEvent({ type: SpatialWebMsgType.modelloaded } as any)
-    await expect(p2).resolves.toBe(true)
-    expect(onLoad).toHaveBeenCalledTimes(1)
-
-    await el.updateProperties({ modelURL: 'b.glb' } as any)
-    const p3 = el.ready
-    el.onReceiveEvent({ type: SpatialWebMsgType.modelloadfailed } as any)
-    await expect(p3).resolves.toBe(false)
-    expect(onFail).toHaveBeenCalledTimes(1)
-  })
-
-  it('updateModelTransform passes float64 array to updateProperties', async () => {
+  it('entityTransform setter passes float64 array to updateProperties', async () => {
     const execute = vi.fn().mockResolvedValue({
       success: true,
       data: undefined,
@@ -912,7 +849,9 @@ describe('SpatializedStatic3DElement', () => {
         CreateSpatializedDynamic3DElementCommand: vi.fn(),
         UpdateSpatializedStatic3DElementProperties: vi
           .fn()
-          .mockImplementation(() => ({ execute })),
+          .mockImplementation(function () {
+            return { execute }
+          }),
       }
     })
 
@@ -929,7 +868,7 @@ describe('SpatializedStatic3DElement', () => {
     }
 
     const el = new SpatializedStatic3DElement('m2')
-    el.updateModelTransform(new DOMMatrixWithArray() as any)
+    el.entityTransform = new DOMMatrixWithArray() as any
     expect(execute).toHaveBeenCalledTimes(1)
   })
 })
@@ -972,9 +911,9 @@ describe('SpatializedDynamic3DElement', () => {
         CreateSpatializedStatic3DElementCommand: vi.fn(),
         CreateSpatializedDynamic3DElementCommand: vi.fn(),
         AddEntityToDynamic3DCommand: OkCommand,
-        SetParentForEntityCommand: vi
-          .fn()
-          .mockImplementation(() => ({ execute })),
+        SetParentForEntityCommand: vi.fn().mockImplementation(function () {
+          return { execute }
+        }),
       }
     })
 
@@ -1024,7 +963,9 @@ describe('SpatializedDynamic3DElement', () => {
         CreateSpatializedDynamic3DElementCommand: vi.fn(),
         UpdateSpatializedDynamic3DElementProperties: vi
           .fn()
-          .mockImplementation(() => ({ execute })),
+          .mockImplementation(function () {
+            return { execute }
+          }),
       }
     })
 
@@ -1037,24 +978,25 @@ describe('SpatializedDynamic3DElement', () => {
   })
 })
 
-describe('ssr-polyfill', () => {
+describe('isSSREnv', () => {
   it('isSSREnv returns false in jsdom', async () => {
-    const { isSSREnv } = await import('./ssr-polyfill')
+    const { isSSREnv } = await import('./isSSREnv')
     expect(isSSREnv()).toBe(false)
   })
 })
 
 describe('platform-adapter', () => {
-  it('createPlatform returns SSRPlatform in SSR env', async () => {
+  it('createPlatform and createPlatformSync throw in SSR env', async () => {
     vi.resetModules()
-    vi.doMock('./ssr-polyfill', () => {
+    vi.doMock('./isSSREnv', () => {
       return { isSSREnv: () => true }
     })
 
-    const { createPlatform } = await import('./platform-adapter')
-    const p = createPlatform() as any
-    expect(typeof p.callJSB).toBe('function')
-    expect(typeof p.callWebSpatialProtocol).toBe('function')
-    expect(typeof p.callWebSpatialProtocolSync).toBe('function')
+    const { createPlatform, createPlatformSync } = await import(
+      './platform-adapter'
+    )
+    const expected = /cannot run during SSR/
+    await expect(createPlatform()).rejects.toThrow(expected)
+    expect(() => createPlatformSync()).toThrow(expected)
   })
 })