@operato/shell 10.29.37 → 10.29.39

package/package.json

@@ -2,7 +2,7 @@
   "name": "@operato/shell",
   "description": "WebApplication architecturing shell following open-wc recommendations",
   "author": "heartyoh",
-  "version": "10.29.37",
+  "version": "10.29.39",
   "type": "module",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
@@ -60,11 +60,11 @@
   },
   "dependencies": {
     "@material/web": "^2.0.0",
-    "@operato/graphql": "^10.29.37",
+    "@operato/graphql": "^10.29.39",
     "@operato/i18n": "^10.29.27",
-    "@operato/popup": "^10.29.37",
+    "@operato/popup": "^10.29.39",
     "@operato/styles": "^10.29.30",
-    "@operato/utils": "^10.29.37",
+    "@operato/utils": "^10.29.39",
     "@webcomponents/scoped-custom-element-registry": "^0.0.9",
     "lit": "^3.1.2",
     "lodash-es": "^4.17.21",
@@ -103,5 +103,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "38361a65226ee9f23814747b4f0520edf42c3184"
+  "gitHead": "f48742480ad2b9ce87f0b3b4c3ac5923f4866ad6"
 }

package/test/drafts.test.ts

@@ -52,7 +52,7 @@ describe('draft decision', () => {
     expect(draftDecision({ at: now - DRAFT_LIFETIME_MS - 1, base: 7 }, 7, now)).to.equal('drop')
   })
 
-  it('a key never lets one user read another\'s draft, and survives odd names', () => {
+  it("a key never lets one user read another's draft, and survives odd names", () => {
     expect(draftKey(at('x', 'u1'))).to.not.equal(draftKey(at('x', 'u2')))
     expect(draftKey({ user: 'a/b', domain: 'd', screen: 's', target: 't' })).to.not.equal(
       draftKey({ user: 'a', domain: 'b/d', screen: 's', target: 't' })
@@ -69,7 +69,7 @@ describe('draft store', () => {
     expect(read?.base).to.equal(7)
   })
 
-  it('★ sign-out takes one user\'s drafts, and only theirs', async () => {
+  it("★ sign-out takes one user's drafts, and only theirs", async () => {
     await writeDraft({ key: draftKey(at('a', 'leaving')), value: 1, base: null, at: 1 })
     await writeDraft({ key: draftKey(at('b', 'leaving')), value: 2, base: null, at: 1 })
     await writeDraft({ key: draftKey(at('a', 'staying')), value: 3, base: null, at: 1 })
@@ -84,10 +84,15 @@ describe('draft store', () => {
 
 describe('UnsavedDraftController', () => {
   const originalOpen = OxPrompt.open
-  afterEach(() => ((OxPrompt as any).open = originalOpen))
+  const hosts: Host[] = []
+  afterEach(() => {
+    ;(OxPrompt as any).open = originalOpen
+    hosts.splice(0).forEach(host => host.disconnect())
+  })
 
   function screen(target: string, state: { value?: number; base: number | null; saved: number | null }) {
     const host = new Host()
+    hosts.push(host)
     const restored: any[] = []
     const controller = new UnsavedDraftController<number>(host as any, {
       address: () => at(target),
@@ -138,8 +143,9 @@ describe('UnsavedDraftController', () => {
     expect(await readDraft(draftKey(at('saved')))).to.equal(undefined)
   })
 
-  it('★ where drafts cannot be kept, the browser\'s own question comes back while something is unsaved', async () => {
+  it("★ where drafts cannot be kept, the browser's own question comes back while something is unsaved", async () => {
     const { controller } = screen('fallback', { value: 1, base: null, saved: null })
+    await controller.flush()
     ;(controller as any).cannotKeep = true
     const event = new Event('beforeunload', { cancelable: true })
     window.dispatchEvent(event)
@@ -150,4 +156,84 @@ describe('UnsavedDraftController', () => {
     window.dispatchEvent(kept)
     expect(kept.defaultPrevented).to.equal(false)
   })
+  it('a changed edit is not reported durable before its transaction has committed', async () => {
+    const state = { value: 1, base: 7, saved: 7 }
+    const { controller, host } = screen('durable', state)
+    expect(controller.keeps).to.equal(false)
+    await controller.flush()
+    expect(controller.keeps).to.equal(true)
+    state.value = 2
+    expect(controller.keeps).to.equal(false)
+    await controller.flush()
+    expect(controller.keeps).to.equal(true)
+    host.disconnect()
+  })
+
+  it('an edit captured before changing queries keeps its original key and value', async () => {
+    const host = new Host()
+    hosts.push(host)
+    let target = 'october'
+    let value = 10
+    const controller = new UnsavedDraftController(host as any, {
+      address: () => at(target),
+      snapshot: () => ({ value, base: 1 }),
+      savedRevision: () => 1,
+      restore() {}
+    })
+    host.connect()
+    const storing = controller.flush()
+    target = 'november'
+    value = 11
+    await storing
+    expect((await readDraft<number>(draftKey(at('october'))))?.value).to.equal(10)
+    expect(await readDraft(draftKey(at('november')))).to.equal(undefined)
+    expect(controller.keeps).to.equal(false)
+    host.disconnect()
+  })
+
+  it('disconnecting an owner cancels restoration even if its old question later accepts', async () => {
+    const first = screen('stale-offer', { value: 42, base: 5, saved: 5 })
+    await first.controller.flush()
+    let answer!: (accepted: boolean) => void
+    ;(OxPrompt as any).open = () =>
+      new Promise(resolve => {
+        answer = resolve
+      })
+    const second = screen('stale-offer', { base: 5, saved: 5 })
+    const offered = second.controller.offer()
+    while (!answer) await new Promise(resolve => setTimeout(resolve, 0))
+    second.host.disconnect()
+    answer(true)
+    expect(await offered).to.equal(false)
+    expect(second.restored).to.deep.equal([])
+    expect(await readDraft(draftKey(at('stale-offer')))).not.to.equal(undefined)
+    first.host.disconnect()
+  })
+
+  it('a signed-out owner cannot restore or delete its old draft from a late answer', async () => {
+    const host = new Host()
+    hosts.push(host)
+    let signedIn = true
+    const restored: number[] = []
+    const controller = new UnsavedDraftController(host as any, {
+      address: () => (signedIn ? at('signed-out') : undefined),
+      snapshot: () => ({ value: 42, base: 5 }),
+      savedRevision: () => 5,
+      restore: value => restored.push(value)
+    })
+    host.connect()
+    await controller.flush()
+    let answer!: (accepted: boolean) => void
+    ;(OxPrompt as any).open = () =>
+      new Promise(resolve => {
+        answer = resolve
+      })
+    const offered = controller.offer()
+    while (!answer) await new Promise(resolve => setTimeout(resolve, 0))
+    signedIn = false
+    answer(true)
+    expect(await offered).to.equal(false)
+    expect(restored).to.deep.equal([])
+    host.disconnect()
+  })
 })