@sitecore-feaas/clientside 0.3.0 → 0.3.2

package/test/FEAASComponentData.test.tsx

@@ -6,6 +6,7 @@ const earliest = new Date(2000, 1, 1, 0, 0, 0)
 const earlier = new Date(2000, 1, 2, 0, 0, 0)
 const now = new Date(2000, 1, 2, 12, 0, 0)
 
+var delayLength = 16
 describe('FEAAS component data', () => {
   beforeAll(() => {
     vi.setSystemTime(now)
@@ -28,12 +29,12 @@ describe('FEAAS component data', () => {
     expect(resolved.map(({ name }) => name)).to.eql(promises.map(({ name }) => name))
   }
 
-  const staleCacheSpy = (dataDelay = 100, htmlDelay = 100, stylesDelay = 100) => {
+  const freshRequestSpy = (dataDelay = 1, htmlDelay = 1, stylesDelay = 1) => {
     return vi
       .spyOn(global, 'fetch')
       .mockImplementation(async (url: string, options: Parameters<typeof fetch>[1] = {}) => {
         if (url.includes('.css')) {
-          await new Promise((resolve) => setTimeout(resolve, stylesDelay))
+          await new Promise((resolve) => setTimeout(resolve, stylesDelay * delayLength))
           return new Response('YESTERDAY {}', {
             headers: {
               date: now.toUTCString(),
@@ -43,8 +44,8 @@ describe('FEAAS component data', () => {
         }
 
         if (url.includes('CDN')) {
-          await new Promise((resolve) => setTimeout(resolve, htmlDelay))
-          return new Response('C', {
+          await new Promise((resolve) => setTimeout(resolve, htmlDelay * delayLength))
+          return new Response('<var data-path="text">Default</var>', {
             headers: {
               date: now.toUTCString(),
               'last-modified': earlier.toUTCString()
@@ -53,36 +54,28 @@ describe('FEAAS component data', () => {
         }
 
         if (url === 'http://my-url') {
-          await new Promise((resolve) => setTimeout(resolve, dataDelay))
+          await new Promise((resolve) => setTimeout(resolve, dataDelay * delayLength))
           return new Response(JSON.stringify({ text: 'My new text' }), {})
         }
 
         if (url === 'http://my-url2') {
-          await new Promise((resolve) => setTimeout(resolve, dataDelay))
+          await new Promise((resolve) => setTimeout(resolve, dataDelay * delayLength))
           return new Response(JSON.stringify({ text: 'My new text2' }), {})
         }
-
-        await new Promise((resolve) => setTimeout(resolve, htmlDelay))
-        return new Response('C', {
-          headers: {
-            date: now.toUTCString(),
-            'last-modified': earlier.toUTCString()
-          }
-        })
       })
   }
 
   describe('Should render component using stale cache, no data initially, then data as object', async () => {
     const runWithDelay = async (delays: number[]) => {
-      const spy = staleCacheSpy(delays[0], delays[1], delays[2])
-      document.body.innerHTML = `<feaas-component data-path="text" library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
+      const spy = freshRequestSpy(delays[0], delays[1], delays[2])
+      document.body.innerHTML = `<feaas-component library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
       const component = document.body.firstElementChild as FEAASComponent
       const updateCall = vi.spyOn(component, 'update')
       await expect(component.whenDataReady).resolves.toEqual({})
       await expect(component.whenRendered).resolves.toEqual(component)
       await expect(component.whenLoaded).resolves.toBeTruthy()
       expect(component.readyData).toEqual({})
-      expect(component.innerHTML).toEqual('C')
+      expect(component.innerHTML).toEqual('<var data-path="text">Default</var>')
       expect(spy).toHaveBeenCalledTimes(2)
       await checkRaceCondition([
         { promise: component.whenDataReady, name: 'when data ready' },
@@ -94,7 +87,7 @@ describe('FEAAS component data', () => {
       await expect(component.whenDataReady).resolves.toEqual({ text: 'this is text' })
       await expect(component.whenRendered).resolves.toEqual(component)
       expect(updateCall).toHaveBeenCalledTimes(2)
-      expect(component.innerHTML).toEqual('this is text')
+      expect(component.innerHTML).toEqual('<var data-path="text">this is text</var>')
       expect(component.readyData).toEqual({ text: 'this is text' })
       expect(spy).toHaveBeenCalledTimes(2)
       await expect(component.whenLoaded).resolves.toBeTruthy()
@@ -103,27 +96,32 @@ describe('FEAAS component data', () => {
         { promise: component.whenRendered, name: 'when rendered' },
         { promise: component.whenLoaded, name: 'when loaded' }
       ])
+      component.set({ data: { text: 'this is updated text' } })
+      await expect(component.whenDataReady).resolves.toEqual({ text: 'this is updated text' })
+      await expect(component.whenRendered).resolves.toEqual(component)
+      expect(updateCall).toHaveBeenCalledTimes(3)
+      expect(component.innerHTML).toEqual('<var data-path="text">this is updated text</var>')
     }
 
-    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([100, 200, 300]))
-    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([100, 300, 200]))
-    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([200, 100, 300]))
-    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([200, 300, 100]))
-    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([300, 100, 200]))
-    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([300, 200, 100]))
+    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([1, 2, 3]))
+    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([1, 3, 2]))
+    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([2, 1, 3]))
+    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([2, 3, 1]))
+    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([3, 1, 2]))
+    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([3, 2, 1]))
   })
 
   describe('Should render component using stale cache and data as object first, then settings', () => {
     const runWithDelay = async (delays: number[]) => {
-      const spy = staleCacheSpy(delays[0], delays[1], delays[2])
-      document.body.innerHTML = `<feaas-component data='{"text": "this is text"}' data-path="text" library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
+      const spy = freshRequestSpy(delays[0], delays[1], delays[2])
+      document.body.innerHTML = `<feaas-component data='{"text": "this is text"}' library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
       const component = document.body.firstElementChild as FEAASComponent
       const updateCall = vi.spyOn(component, 'update')
       await expect(component.whenDataReady).resolves.toEqual({ text: 'this is text' })
       await expect(component.whenRendered).resolves.toEqual(component)
       await expect(component.whenLoaded).resolves.toBeTruthy()
       expect(component.readyData).toEqual({ text: 'this is text' })
-      expect(component.innerHTML).toEqual('this is text')
+      expect(component.innerHTML).toEqual('<var data-path="text">this is text</var>')
       expect(spy).toHaveBeenCalledTimes(2)
       await checkRaceCondition([
         { promise: component.whenDataReady, name: 'when data ready' },
@@ -135,7 +133,7 @@ describe('FEAAS component data', () => {
       await expect(component.whenDataReady).resolves.toEqual({ text: 'My new text' })
       await expect(component.whenRendered).resolves.toEqual(component)
       expect(updateCall).toHaveBeenCalledTimes(2)
-      expect(component.innerHTML).toEqual('My new text')
+      expect(component.innerHTML).toEqual('<var data-path="text">My new text</var>')
       expect(component.readyData).toEqual({ text: 'My new text' })
       expect(spy).toHaveBeenCalledTimes(3)
       await expect(component.whenLoaded).resolves.toBeTruthy()
@@ -146,25 +144,25 @@ describe('FEAAS component data', () => {
       ])
     }
 
-    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([100, 200, 300]))
-    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([100, 300, 200]))
-    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([200, 100, 300]))
-    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([200, 300, 100]))
-    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([300, 100, 200]))
-    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([300, 200, 100]))
+    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([1, 2, 3]))
+    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([1, 3, 2]))
+    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([2, 1, 3]))
+    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([2, 3, 1]))
+    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([3, 1, 2]))
+    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([3, 2, 1]))
   })
 
   describe('Should render component using stale cache and data as settings', () => {
     const runWithDelay = async (delays: number[]) => {
-      const spy = staleCacheSpy(delays[0], delays[1], delays[2])
-      document.body.innerHTML = `<feaas-component data='{ "jsonpath": "$", "url": "http://my-url" }' data-path="text" library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
+      const spy = freshRequestSpy(delays[0], delays[1], delays[2])
+      document.body.innerHTML = `<feaas-component data='{ "jsonpath": "$", "url": "http://my-url" }' library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
       const component = document.body.firstElementChild as FEAASComponent
       const updateCall = vi.spyOn(component, 'update')
       await expect(component.whenDataReady).resolves.toEqual({ text: 'My new text' })
       await expect(component.whenRendered).resolves.toEqual(component)
       await expect(component.whenLoaded).resolves.toBeTruthy()
       expect(component.readyData).toEqual({ text: 'My new text' })
-      expect(component.innerHTML).toEqual('My new text')
+      expect(component.innerHTML).toEqual('<var data-path="text">My new text</var>')
       expect(spy).toHaveBeenCalledTimes(3)
       await checkRaceCondition([
         { promise: component.whenDataReady, name: 'when data ready' },
@@ -174,24 +172,30 @@ describe('FEAAS component data', () => {
       expect(updateCall).toHaveBeenCalledTimes(1)
     }
 
-    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([100, 200, 300]))
-    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([100, 300, 200]))
-    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([200, 100, 300]))
-    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([200, 300, 100]))
-    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([300, 100, 200]))
-    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([300, 200, 100]))
+    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([1, 2, 3]))
+    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([1, 3, 2]))
+    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([2, 1, 3]))
+    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([2, 3, 1]))
+    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([3, 1, 2]))
+    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([3, 2, 1]))
   })
 
   describe('Should render component using stale cache and data as mapping', () => {
     const runWithDelay = async (delays: number[]) => {
-      const spy = staleCacheSpy(delays[0], delays[1], delays[2])
+      const spy = freshRequestSpy(delays[0], delays[1], delays[2])
       document.body.innerHTML = `<feaas-component data='{ "datasource-1": {"jsonpath": "$", "url": "http://my-url"}, "datasource-2": {"jsonpath": "$", "url": "http://my-url2"} }' data-path="datasource-2.text" library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>`
       const component = document.body.firstElementChild as FEAASComponent
       const updateCall = vi.spyOn(component, 'update')
-      await expect(component.whenDataReady).resolves.toEqual({ 'datasource-1': { text: 'My new text' }, 'datasource-2': { text: 'My new text2' } })
+      await expect(component.whenDataReady).resolves.toEqual({
+        'datasource-1': { text: 'My new text' },
+        'datasource-2': { text: 'My new text2' }
+      })
       await expect(component.whenRendered).resolves.toEqual(component)
       await expect(component.whenLoaded).resolves.toBeTruthy()
-      expect(component.readyData).toEqual({ 'datasource-1': { text: 'My new text' }, 'datasource-2': { text: 'My new text2' } })
+      expect(component.readyData).toEqual({
+        'datasource-1': { text: 'My new text' },
+        'datasource-2': { text: 'My new text2' }
+      })
       expect(component.innerHTML).toEqual('My new text2')
       expect(spy).toHaveBeenCalledTimes(4)
       await checkRaceCondition([
@@ -202,12 +206,12 @@ describe('FEAAS component data', () => {
       expect(updateCall).toHaveBeenCalledTimes(1)
     }
 
-    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([100, 200, 300]))
-    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([100, 300, 200]))
-    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([200, 100, 300]))
-    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([200, 300, 100]))
-    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([300, 100, 200]))
-    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([300, 200, 100]))
+    it('DATA -> HTML -> STYLESHEET', async () => await runWithDelay([1, 2, 3]))
+    it('DATA -> STYLESHEET -> HTML', async () => await runWithDelay([1, 3, 2]))
+    it('HTML -> DATA -> STYLESHEET', async () => await runWithDelay([2, 1, 3]))
+    it('STYLESHEET -> DATA -> HTML', async () => await runWithDelay([2, 3, 1]))
+    it('HTML -> STYLESHEET -> DATA', async () => await runWithDelay([3, 1, 2]))
+    it('STYLESHEET -> HTML -> DATA', async () => await runWithDelay([3, 2, 1]))
   })
 
   // TODO

package/test/ServerComponent.test.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ServerComponent } from '../src/ui/react.js'
 import { FEAASComponent } from '../src/components/FEAASComponent.js'
-import {test} from './FEAASComponent.react.test.js'
+import { test } from './FEAASComponent.react.test.js'
 
 const earliest = new Date(2000, 1, 1, 0, 0, 0)
 const earlier = new Date(2000, 1, 2, 0, 0, 0)
@@ -18,16 +18,27 @@ describe('React Server', () => {
     document.write()
   })
 
-  it('render server component', async () => {
+  it('render with data settings', async () => {
     vi.spyOn(global, 'fetch').mockImplementation(
       async (url: string, options: Parameters<typeof fetch>[1] = {}) => new Response('{"data": "1"}')
     )
 
-    const Component = await ServerComponent({ src: 'library/test', data: { url: 'http://localhost:4000/api/data' } })
+    const Component = await ServerComponent({ src: 'library/test', data: { url: 'http://127.0.0.1:4000/api/data' } })
 
     await test(
       <>{Component}</>,
       `<feaas-component library="library" component="test" src="library/test" data="{&quot;data&quot;:&quot;1&quot;}">{"data": "1"}</feaas-component>`
     )
   })
+  it('render with object data', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(
+      async (url: string, options: Parameters<typeof fetch>[1] = {}) => new Response('Test')
+    )
+
+    const Component = await ServerComponent({ src: 'library/test', data: { data: '2' } })
+    await test(
+      <>{Component}</>,
+      `<feaas-component library="library" component="test" src="library/test" data="{&quot;data&quot;:&quot;2&quot;}">Test</feaas-component>`
+    )
+  })
 })

package/test/cdn.ts

@@ -7,7 +7,7 @@ import {
   parseStylesheetSource,
   getStylesheetURL
 } from '../src/cdn.js'
-import { CH1Node, serializeCH1RichText } from '../src/dom/data.js'
+import { CH1Node, serializeCH1RichText } from '../src/utils/data.js'
 describe('CDN', function () {
   it('should parse and serialize component src', function () {
     ;[

package/test/datasettings.test.ts

@@ -0,0 +1,248 @@
+import { vi, describe, it, expect } from 'vitest'
+import { DataSettings } from '../src/utils/settings.js'
+
+describe('DataSettings', () => {
+  describe('.clean', () => {
+    it('should clean', () => {
+      expect(
+        DataSettings.clean({
+          url: 'http://url',
+          method: 'post',
+          params: { first: '1' },
+          headers: { 'Content-type': 'multipart/form-data' },
+          body: { key: 'value' }
+        })
+      ).to.eql({
+        url: 'http://url',
+        method: 'POST',
+        params: { first: '1' },
+        headers: { 'Content-Type': 'multipart/form-data' },
+        body: { key: 'value' }
+      })
+      expect(DataSettings.clean({})).to.eql({ url: '' })
+      expect(
+        DataSettings.clean({
+          headers: {
+            accept: 'a-z'
+          }
+        })
+      ).to.eql({
+        url: '',
+        headers: {
+          Accept: 'a-z'
+        }
+      })
+    })
+  })
+  describe('.toFetchArguments', () => {
+    it('with no settings', () => {
+      const fetchArgs = DataSettings.toFetchArguments()
+
+      expect(fetchArgs).toEqual([
+        '',
+        {
+          body: undefined,
+          headers: { Accept: 'application/json' },
+          method: 'GET'
+        }
+      ])
+    })
+
+    it('with url, params and post', () => {
+      const fetchArgs = DataSettings.toFetchArguments({ url: 'http://url', method: 'post', params: { first: '1' } })
+
+      expect(fetchArgs).toEqual([
+        'http://url?first=1',
+        { method: 'POST', body: undefined, headers: { Accept: 'application/json' } }
+      ])
+    })
+
+    it('with url, params and post, body and headers application/json', () => {
+      const fetchArgs = DataSettings.toFetchArguments({
+        url: 'http://url',
+        method: 'Post',
+        params: { first: '1' },
+        headers: { 'content-type': 'application/json', accept: 'abc' },
+        body: { key: 'value' }
+      })
+
+      expect(fetchArgs).toEqual([
+        'http://url?first=1',
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', Accept: 'abc' },
+          body: '{"key":"value"}'
+        }
+      ])
+    })
+
+    it('with url, params and post, body and headers multipart-form-data', () => {
+      const fetchArgs = DataSettings.toFetchArguments({
+        url: 'http://url',
+        method: 'post',
+        params: { first: '1' },
+        headers: { 'Content-type': 'multipart/form-data' },
+        body: { key: 'value' }
+      })
+
+      const form = new FormData()
+
+      form.append('key', 'value')
+
+      expect(fetchArgs).toEqual([
+        'http://url?first=1',
+        {
+          method: 'POST',
+          headers: { Accept: 'application/json', 'Content-Type': 'multipart/form-data' },
+          body: form
+        }
+      ])
+    })
+
+    it('with url, params and post, body and headers url params', () => {
+      const fetchArgs = DataSettings.toFetchArguments({
+        url: 'http://url',
+        method: 'post',
+        params: { first: '1', second: '2' },
+        headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+        body: { key: 'value' }
+      })
+
+      expect(fetchArgs).toEqual([
+        'http://url?first=1&second=2',
+        {
+          method: 'POST',
+          headers: { Accept: 'application/json', 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: new URLSearchParams({ key: 'value' })
+        }
+      ])
+    })
+  })
+  describe('.fetch', () => {
+    it('fetches when passed data object', async () => {
+      const result = await DataSettings.fetch({ hello: 'world' })
+
+      expect(result).toEqual({ hello: 'world' })
+    })
+
+    it('fetches when passed settings object', async () => {
+      const spy = vi.spyOn(global, 'fetch')
+      spy.mockImplementation(
+        async (url: string, options?: Parameters<typeof fetch>[1]) =>
+          new Response(JSON.stringify({ data: 'My data' }), {})
+      )
+
+      const result = await DataSettings.fetch({ jsonpath: '$', url: 'http://my-url' })
+
+      expect(result).toEqual({ data: 'My data' })
+
+      expect(spy).toHaveBeenCalledOnce()
+    })
+
+    it('fetches when passed mapping object', async () => {
+      const spy = vi.spyOn(global, 'fetch')
+      spy.mockImplementation(async (url: string, options?: Parameters<typeof fetch>[1]) => {
+        if (url === 'http://my-url1') return new Response(JSON.stringify({ data: 'My data1' }), {})
+        if (url === 'http://my-url2') return new Response(JSON.stringify({ data: 'My data2' }), {})
+        throw new Error('Fetch failed')
+      })
+
+      const inputData = {
+        datasourceId1: { jsonpath: '$', url: 'http://my-url1' },
+        datasourceId2: { data: 'This is plain data' },
+        datasourceId3: { jsonpath: '$', url: 'http://my-url2' },
+        datasourceId4: { jsonpath: '$', url: 'http://bad-url' }
+      }
+
+      const result = await DataSettings.fetch(inputData)
+
+      expect(result).to.have.property('datasourceId1')
+      expect((result as Record<keyof typeof inputData, any>).datasourceId1).toEqual({ data: 'My data1' })
+
+      expect(result).to.have.property('datasourceId2')
+      expect((result as Record<keyof typeof inputData, any>).datasourceId2).toEqual({ data: 'This is plain data' })
+
+      expect(result).to.have.property('datasourceId3')
+      expect((result as Record<keyof typeof inputData, any>).datasourceId3).toEqual({ data: 'My data2' })
+
+      expect(result).to.have.property('datasourceId4')
+      expect((result as Record<keyof typeof inputData, any>).datasourceId4).toEqual({})
+
+      expect(spy).toHaveBeenCalledTimes(3)
+    })
+
+    it('should serialize body', async () => {
+      const spy = vi.spyOn(global, 'fetch')
+      spy.mockImplementation(async (url: string, options?: Parameters<typeof fetch>[1]) => {
+        return new Response(JSON.stringify(options), {})
+      })
+
+      const inputData = {
+        datasourceId1: {
+          url: 'http://my-url1',
+          headers: { 'content-type': 'application/json' },
+          body: { a: 1 },
+          method: 'put'
+        },
+        datasourceId2: {
+          url: 'http://my-url2',
+          headers: { 'content-type': 'multipart/form-data' },
+          body: { a: 1 },
+          method: 'post'
+        },
+        datasourceId3: {
+          url: 'http://my-url3',
+          headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+          body: { a: 1 },
+          method: 'patch'
+        },
+        datasourceId4: {
+          url: 'http://my-url4',
+          body: { a: 1 }
+        }
+      }
+
+      const result = await DataSettings.fetch(inputData)
+
+      expect(spy).toHaveBeenNthCalledWith(1, 'http://my-url1', {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        },
+        body: '{"a":1}',
+        method: 'put'
+      })
+      expect(spy).toHaveBeenNthCalledWith(2, 'http://my-url2', {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'multipart/form-data'
+        },
+        body: (() => {
+          const f = new FormData()
+          f.append('a', '1')
+          return f
+        })(),
+        method: 'post'
+      })
+      expect(spy).toHaveBeenNthCalledWith(3, 'http://my-url3', {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        body: (() => {
+          const f = new URLSearchParams()
+          f.append('a', '1')
+          return f
+        })(),
+        method: 'patch'
+      })
+      expect(spy).toHaveBeenNthCalledWith(4, 'http://my-url4', {
+        body: undefined,
+        headers: {
+          Accept: 'application/json'
+        },
+        method: 'get'
+      })
+    })
+  })
+})

package/test/{extras.ts → extras.test.ts}

@@ -1,5 +1,5 @@
 import { describe, it, assert, beforeAll, expect } from 'vitest'
-import { CH1Node, serializeCH1RichText } from '../src/dom/data.js'
+import { CH1Node, serializeCH1RichText } from '../src/utils/data.js'
 describe('Extras', function () {
   it('should serialize content hub', function () {
     const data: CH1Node = {

package/test/fetch.ts

@@ -1,5 +1,5 @@
 import { vi, describe, it, assert, beforeAll, expect, beforeEach } from 'vitest'
-import { CH1Node, serializeCH1RichText } from '../src/dom/data.js'
+import { CH1Node, serializeCH1RichText } from '../src/utils/data.js'
 import { clearFetchCache, fetchAndRevalidate } from '../src/fetch.js'
 const yesterday = new Date(2000, 1, 1, 0, 0, 0)
 const yesterdayNoon = new Date(2000, 1, 2, 12, 0, 0)
@@ -113,7 +113,7 @@ describe('Fetch', () => {
         })
       } else {
         return new Response('A', {
-          headers: {  
+          headers: {
             date: yesterday.toUTCString()
           }
         })

package/types/components/FEAASComponent.d.ts

@@ -1,7 +1,8 @@
 import { ControlledPromise } from '../utils/promise.js';
+import { DataOptions } from '../utils/settings.js';
 import { FEAASElement } from './FEAASElement.js';
 export declare function FEAASComponentsProps(element: FEAASElement): {
-    data: any;
+    data: DataOptions;
     cdn: string;
     library: string;
     component: string;
@@ -45,7 +46,7 @@ export declare class FEAASComponent extends FEAASElement<FEAASComponentsProps, s
     whenDataReady: ControlledPromise<any>;
     static observedAttributes: string[];
     defaultProps: Partial<{
-        data: any;
+        data: DataOptions;
         cdn: string;
         library: string;
         component: string;
@@ -60,9 +61,9 @@ export declare class FEAASComponent extends FEAASElement<FEAASComponentsProps, s
         withStylesheet: boolean;
     }>;
     needsRefresh: boolean;
-    setData(data: any): void;
+    setData(data: DataOptions): void;
     getProps(): {
-        data: any;
+        data: DataOptions;
         cdn: string;
         library: string;
         component: string;
@@ -76,6 +77,7 @@ export declare class FEAASComponent extends FEAASElement<FEAASComponentsProps, s
         lastModified: string;
         withStylesheet: boolean;
     };
+    isJSONAttribute(prop: keyof FEAASComponentsProps): boolean;
     attributeChangedCallback(name: string, oldValue: string, newValue: string): void;
     fetchData(): Promise<void>;
     getEditor(): any;
@@ -94,6 +96,7 @@ declare global {
         interface IntrinsicElements {
             'feaas-component': {
                 data?: any;
+                suppressHydrationWarning?: boolean;
                 template?: string;
                 instance?: string;
                 editable?: boolean;

package/types/components/FEAASComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAkCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAOsB;IAElC,YAAY,EAAE,OAAO,CAAA;IAErB,OAAO,CAAC,IAAI,EAAE,GAAG;IAIjB,QAAQ;;;;;;;;;;;;;;;IAIR,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAkBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAkCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAaP;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,EAAE,CAAA;aAC1C,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}
+{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAkCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAQsB;IAElC,YAAY,EAAE,OAAO,CAAA;IAErB,OAAO,CAAC,IAAI,EAAE,WAAW;IAIzB,QAAQ;;;;;;;;;;;;;;;IAIR,eAAe,CAAC,IAAI,EAAE,MAAM,oBAAoB;IAIhD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAkBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAkCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAaP;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,wBAAwB,CAAC,EAAE,OAAO,CAAA;gBAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,EAAE,CAAA;aAC1C,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}

package/types/components/FEAASElement.d.ts

@@ -75,6 +75,7 @@ export declare class FEAASElement<Props = any, Payload = any> extends WebCompone
      */
     mount(): void;
     dispatchEventIndirectly(event: Event): void;
+    isJSONAttribute(attribute: keyof Props): boolean;
     log(...args: any): void;
     /** Nothing special happens on unmount, except setting a flag */
     unmount(): void;

package/types/components/FEAASElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FEAASElement.d.ts","sourceRoot":"","sources":["../../src/components/FEAASElement.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FEAASElement.d.ts","sourceRoot":"","sources":["../../src/components/FEAASElement.tsx"],"names":[],"mappings":"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"}

package/types/dom/component.d.ts

@@ -1,6 +1,6 @@
-import { Datascopes } from './data.js';
+import { DataScopes } from '../utils/settings.js';
 import { FEAASComponentProps } from './rendering.js';
-export declare function renderComponentElement(content: string, datasources?: Datascopes): HTMLDivElement;
+export declare function renderComponentElement(content: string, datasources?: DataScopes): HTMLDivElement;
 export declare function renderComponent(props: FEAASComponentProps, root?: HTMLElement): HTMLElement;
 export declare function renderComponentPromise(props: FEAASComponentProps, root?: HTMLElement): Promise<HTMLElement>;
 //# sourceMappingURL=component.d.ts.map