From 9e3782c79747e5f01a14965be1d99946206fb7db Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Mon, 30 Jan 2023 20:28:40 -0300
Subject: [PATCH 01/12] :sparkles: allow bind textarea to undefined

---
 plugins/bindable.js              |  2 +-
 tests/src/TwoWayBindings.njs     |  2 ++
 tests/src/TwoWayBindings.test.js | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/plugins/bindable.js b/plugins/bindable.js
index efcf938e..b3424084 100644
--- a/plugins/bindable.js
+++ b/plugins/bindable.js
@@ -9,7 +9,7 @@ function transform({ node, environment }) {
   const object = node.attributes.bind.object ?? {}
   const property = node.attributes.bind.property
   if (node.type === 'textarea') {
-    node.children = [object[property]]
+    node.children = [object[property] ?? '']
   } else if (node.type === 'input' && node.attributes.type === 'checkbox') {
     node.attributes.checked = object[property]
   } else {
diff --git a/tests/src/TwoWayBindings.njs b/tests/src/TwoWayBindings.njs
index cc73b6b7..64a77596 100644
--- a/tests/src/TwoWayBindings.njs
+++ b/tests/src/TwoWayBindings.njs
@@ -97,6 +97,8 @@ class TwoWayBindings extends Nullstack {
         <input bind={this.object.count} name="count" />
         <input bind={this.undeclared} name="undeclared" data-undeclared />
         <input bind={this.undeclared?.nested} name="undeclared-nested" data-undeclared-nested />
+        <textarea bind={this.undeclaredTextarea} name="undeclared" data-undeclared />
+        <textarea bind={this.undeclaredTextarea?.nested} name="undeclared-nested" data-undeclared-nested />
         <input bind={this[this.keyName]} name="composedComputed" />
         <input bind={this[['by', 'Key', 'Name'].join('')]} name="logicalComputed" />
         <input bind={this.byKeyName} name="literalComputed" />
diff --git a/tests/src/TwoWayBindings.test.js b/tests/src/TwoWayBindings.test.js
index 80310fb8..885486f9 100644
--- a/tests/src/TwoWayBindings.test.js
+++ b/tests/src/TwoWayBindings.test.js
@@ -69,8 +69,13 @@ describe('TwoWayBindings', () => {
     expect(value).toMatch('a')
   })
 
-  test('binding to undefined sets the value to an empty string', async () => {
-    const value = await page.$eval('[data-undeclared]', (element) => element.value)
+  test('binding inputs to undefined sets the value to an empty string', async () => {
+    const value = await page.$eval('input[data-undeclared]', (element) => element.value)
+    expect(value).toMatch('')
+  })
+
+  test('binding textarea to undefined sets the value to an empty string', async () => {
+    const value = await page.$eval('textarea[data-undeclared]', (element) => element.value)
     expect(value).toMatch('')
   })
 
@@ -225,8 +230,13 @@ describe('TwoWayBindings', () => {
     expect(element).toBeTruthy()
   })
 
-  test('binding to nested undefined sets the value to an empty string', async () => {
-    const value = await page.$eval('[data-undeclared-nested]', (element) => element.value)
+  test('binding inputs to nested undefined sets the value to an empty string', async () => {
+    const value = await page.$eval('input[data-undeclared-nested]', (element) => element.value)
+    expect(value).toMatch('')
+  })
+
+  test('binding textareas to nested undefined sets the value to an empty string', async () => {
+    const value = await page.$eval('textarea[data-undeclared-nested]', (element) => element.value)
     expect(value).toMatch('')
   })
 

From c8afb3ca94da1e117d859e74cddb6bdff5d1f5dc Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Tue, 31 Jan 2023 02:21:19 -0300
Subject: [PATCH 02/12] :construction: context catch

---
 client/instanceProxyHandler.js | 20 ++++++++++++++---
 server/printError.js           |  3 +++
 server/server.js               |  5 +++++
 tests/client.js                |  4 ++++
 tests/server.js                |  8 +++++++
 tests/src/Application.njs      |  2 ++
 tests/src/CatchError.njs       | 39 ++++++++++++++++++++++++++++++++++
 7 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 tests/src/CatchError.njs

diff --git a/client/instanceProxyHandler.js b/client/instanceProxyHandler.js
index 6c68ac68..f8f16647 100644
--- a/client/instanceProxyHandler.js
+++ b/client/instanceProxyHandler.js
@@ -1,5 +1,5 @@
 import client from './client'
-import { generateContext } from './context'
+import context, { generateContext } from './context'
 import { generateObjectProxy } from './objectProxyHandler'
 
 export const instanceProxies = new WeakMap()
@@ -15,8 +15,22 @@ const instanceProxyHandler = {
       }
       const { [name]: named } = {
         [name]: (args) => {
-          const context = generateContext({ ...target._attributes, ...args })
-          return target[name].call(proxy, context)
+          const scopedContext = generateContext({ ...target._attributes, ...args })
+          let result
+          try {
+            result = target[name].call(proxy, scopedContext)
+          } catch (error) {
+            context.catch && context.catch(error)
+            return null
+          }
+          if (result instanceof Promise) {
+            return new Promise((resolve, reject) => {
+              result.then(resolve).catch((error) => {
+                context.catch ? context.catch(error) : reject(error)
+              })
+            })
+          }
+          return result
         },
       }
       return named
diff --git a/server/printError.js b/server/printError.js
index a2daa484..c375cf76 100644
--- a/server/printError.js
+++ b/server/printError.js
@@ -1,4 +1,7 @@
+import context from './context'
+
 export default function (error) {
+  context.catch && context.catch(error)
   const lines = error.stack.split(`\n`)
   let initiator = lines.find((line) => line.indexOf('Proxy') > -1)
   if (initiator) {
diff --git a/server/server.js b/server/server.js
index dac39bb9..30d023d6 100644
--- a/server/server.js
+++ b/server/server.js
@@ -270,6 +270,11 @@ server.start = function () {
     }
   })
 
+  server.use((error, _request, response, _next) => {
+    printError(error)
+    response.status(500).json({})
+  })
+
   if (!server.less) {
     if (!server.port) {
       console.info('\x1b[31mServer port is not defined!\x1b[0m')
diff --git a/tests/client.js b/tests/client.js
index 24b58b0e..48367738 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -12,4 +12,8 @@ context.start = function () {
   setTimeout(() => (context.startTimedValue = true), 1000)
 }
 
+context.catch = async function (error) {
+  console.info(error.name)
+}
+
 export default context
diff --git a/tests/server.js b/tests/server.js
index 62df2bbb..953ae2ea 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -57,6 +57,10 @@ for (const method of methods) {
   })
 }
 
+context.server.get('/vaidamerda', (req, res) => {
+  res.vaidamerda()
+})
+
 context.startIncrementalValue = 0
 
 context.start = async function () {
@@ -68,4 +72,8 @@ context.start = async function () {
   context.startIncrementalValue++
 }
 
+context.catch = async function (error) {
+  console.info(error.name)
+}
+
 export default context
diff --git a/tests/src/Application.njs b/tests/src/Application.njs
index 25ff8241..d96a64a1 100644
--- a/tests/src/Application.njs
+++ b/tests/src/Application.njs
@@ -4,6 +4,7 @@ import AnchorModifiers from './AnchorModifiers'
 import './Application.css'
 import ArrayAttributes from './ArrayAttributes'
 import BodyFragment from './BodyFragment'
+import CatchError from './CatchError'
 import ChildComponent from './ChildComponent'
 import ComponentTernary from './ComponentTernary'
 import Context from './Context'
@@ -137,6 +138,7 @@ class Application extends Nullstack {
         <RouteScroll route="/route-scroll/*" key="routeScroll" />
         <IsomorphicImport route="/isomorphic-import" />
         <ExposedServerFunctions route="/exposed-server-functions" />
+        <CatchError route="/catch-error" />
         <ErrorPage route="*" />
       </body>
     )
diff --git a/tests/src/CatchError.njs b/tests/src/CatchError.njs
new file mode 100644
index 00000000..2d2fc0e4
--- /dev/null
+++ b/tests/src/CatchError.njs
@@ -0,0 +1,39 @@
+import Nullstack from 'nullstack'
+
+const error = new Error('Panic in the system, someone missconfigured me!')
+
+class CatchError extends Nullstack {
+
+  static async getServerFunction() {
+    throw error
+  }
+
+  async oneErrorPls() {
+    throw error
+  }
+
+  async hydrate({ params }) {
+    if (params.error === 'hydrate') {
+      this.vaidamerda()
+    }
+  }
+
+  async initiate({ params, page }) {
+    if (params.error === 'initiate' && page.status === 200) {
+      this.vaidamerda()
+    } else if (params.error === 'initiateServerFunction') {
+      await this.getServerFunction()
+    }
+  }
+
+  render() {
+    return (
+      <div>
+        <button onclick={this.oneErrorPls}> Error </button>
+      </div>
+    )
+  }
+
+}
+
+export default CatchError

From 64aff90d36a090593a774ef7573040dc8c3dda5c Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Tue, 31 Jan 2023 15:51:22 -0300
Subject: [PATCH 03/12] :white_check_mark: test exceptions

---
 tests/client.js              |  3 ++-
 tests/server.js              |  7 ++++---
 tests/src/CatchError.njs     | 17 ++++++++++++++---
 tests/src/CatchError.test.js | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 tests/src/CatchError.test.js

diff --git a/tests/client.js b/tests/client.js
index 48367738..4b7a6f8a 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -1,6 +1,7 @@
 import Nullstack from 'nullstack'
 
 import Application from './src/Application'
+import CatchError from './src/CatchError.njs'
 import vueable from './src/plugins/vueable'
 
 Nullstack.use(vueable)
@@ -13,7 +14,7 @@ context.start = function () {
 }
 
 context.catch = async function (error) {
-  console.info(error.name)
+  CatchError.logError({ message: error.message })
 }
 
 export default context
diff --git a/tests/server.js b/tests/server.js
index 953ae2ea..4894443b 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -3,6 +3,7 @@ import Nullstack from 'nullstack'
 import cors from 'cors'
 
 import Application from './src/Application'
+import CatchError from './src/CatchError'
 import ContextProject from './src/ContextProject'
 import ContextSecrets from './src/ContextSecrets'
 import ContextSettings from './src/ContextSettings'
@@ -57,8 +58,8 @@ for (const method of methods) {
   })
 }
 
-context.server.get('/vaidamerda', (req, res) => {
-  res.vaidamerda()
+context.server.get('/vaidamerdanaapi.json', (_request, response) => {
+  response.vaidamerdanaapi()
 })
 
 context.startIncrementalValue = 0
@@ -73,7 +74,7 @@ context.start = async function () {
 }
 
 context.catch = async function (error) {
-  console.info(error.name)
+  CatchError.logError({ message: error.message })
 }
 
 export default context
diff --git a/tests/src/CatchError.njs b/tests/src/CatchError.njs
index 2d2fc0e4..f7e5d6ec 100644
--- a/tests/src/CatchError.njs
+++ b/tests/src/CatchError.njs
@@ -1,9 +1,16 @@
 import Nullstack from 'nullstack'
 
+import { appendFileSync } from 'fs'
+
 const error = new Error('Panic in the system, someone missconfigured me!')
 
 class CatchError extends Nullstack {
 
+  static async logError({ message, environment }) {
+    const folder = environment.production ? '.production' : '.development'
+    appendFileSync(`${folder}/exceptions.txt`, `${message}\n`)
+  }
+
   static async getServerFunction() {
     throw error
   }
@@ -14,13 +21,17 @@ class CatchError extends Nullstack {
 
   async hydrate({ params }) {
     if (params.error === 'hydrate') {
-      this.vaidamerda()
+      this.vaidamerdanoclient()
     }
   }
 
+  update() {
+    this.hydrated = true
+  }
+
   async initiate({ params, page }) {
     if (params.error === 'initiate' && page.status === 200) {
-      this.vaidamerda()
+      this.vaidamerdanoserver()
     } else if (params.error === 'initiateServerFunction') {
       await this.getServerFunction()
     }
@@ -28,7 +39,7 @@ class CatchError extends Nullstack {
 
   render() {
     return (
-      <div>
+      <div data-hydrated={this.hydrated}>
         <button onclick={this.oneErrorPls}> Error </button>
       </div>
     )
diff --git a/tests/src/CatchError.test.js b/tests/src/CatchError.test.js
new file mode 100644
index 00000000..838aff2c
--- /dev/null
+++ b/tests/src/CatchError.test.js
@@ -0,0 +1,34 @@
+const { readFileSync } = require('fs')
+
+describe('CatchError initiate', () => {
+  test('errors caused by instances can be caught on the server', async () => {
+    await page.goto('http://localhost:6969/catch-error?error=initiate')
+    const logs = readFileSync('.production/exceptions.txt', 'utf-8')
+    expect(logs.includes('this.vaidamerdanoserver is not a function')).toBeTruthy()
+  })
+})
+
+describe('CatchError initiateServerFunction', () => {
+  test('errors caused by server functions can be caught on the server', async () => {
+    await page.goto('http://localhost:6969/catch-error?error=initiateServerFunction')
+    const logs = readFileSync('.production/exceptions.txt', 'utf-8')
+    expect(logs.includes('Panic in the system, someone missconfigured me!')).toBeTruthy()
+  })
+})
+
+describe('CatchError hydrate', () => {
+  test('errors caused by instances can be caught on the client', async () => {
+    await page.goto('http://localhost:6969/catch-error?error=hydrate')
+    await page.waitForSelector('[data-hydrated]')
+    const logs = readFileSync('.production/exceptions.txt', 'utf-8')
+    expect(logs.includes('this.vaidamerdanoclient is not a function')).toBeTruthy()
+  })
+})
+
+describe('CatchError api', () => {
+  test('errors caused by api routes can be caught on the server', async () => {
+    await page.goto('http://localhost:6969/vaidamerdanaapi.json')
+    const logs = readFileSync('.production/exceptions.txt', 'utf-8')
+    expect(logs.includes('response.vaidamerdanaapi is not a function')).toBeTruthy()
+  })
+})

From befd7cef501552f2e985183077e07211f7050546 Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Tue, 31 Jan 2023 20:52:37 -0300
Subject: [PATCH 04/12] :bug: consistent reqres

---
 server/reqres.js          | 20 +++++++++-
 server/server.js          | 16 +++++---
 tests/client.js           |  1 +
 tests/server.js           |  5 +++
 tests/src/Application.njs |  2 +
 tests/src/ReqRes.njs      | 82 +++++++++++++++++++++++++++++++++++++++
 tests/src/ReqRes.test.js  | 42 ++++++++++++++++++++
 7 files changed, 161 insertions(+), 7 deletions(-)
 create mode 100644 tests/src/ReqRes.njs
 create mode 100644 tests/src/ReqRes.test.js

diff --git a/server/reqres.js b/server/reqres.js
index c743ad43..13cdb10c 100644
--- a/server/reqres.js
+++ b/server/reqres.js
@@ -1,2 +1,20 @@
-const reqres = {}
+class ReqRes {
+
+  request = null
+  response = null
+
+  set(request, response) {
+    this.request = request
+    this.response = response
+  }
+
+  clear() {
+    this.request = null
+    this.response = null
+  }
+
+}
+
+const reqres = new ReqRes()
+
 export default reqres
diff --git a/server/server.js b/server/server.js
index 30d023d6..96766186 100644
--- a/server/server.js
+++ b/server/server.js
@@ -40,6 +40,7 @@ for (const method of ['get', 'post', 'put', 'patch', 'delete', 'all']) {
   server[method] = function (...args) {
     if (typeof args[1] === 'function' && args[1].name === '_invoke') {
       return original(args[0], bodyParser.text({ limit: server.maximumPayloadSize }), async (request, response) => {
+        reqres.set(request, response)
         const params = {}
         for (const key of Object.keys(request.params)) {
           params[key] = extractParamValue(request.params[key])
@@ -53,9 +54,11 @@ for (const method of ['get', 'post', 'put', 'patch', 'delete', 'all']) {
         try {
           const subcontext = generateContext({ request, response, ...params })
           const result = await args[1](subcontext)
+          reqres.clear()
           response.json(result)
         } catch (error) {
           printError(error)
+          reqres.clear()
           response.status(500).json({})
         }
       })
@@ -224,6 +227,7 @@ server.start = function () {
 
   server.all(`/${prefix}/:hash/:methodName.json`, async (request, response) => {
     const payload = request.method === 'GET' ? request.query.payload : request.body
+    reqres.set(request, response)
     const args = deserialize(payload)
     const { hash, methodName } = request.params
     const [invokerHash, boundHash] = hash.split('-')
@@ -241,12 +245,15 @@ server.start = function () {
       try {
         const subcontext = generateContext({ request, response, ...args })
         const result = await method.call(boundKlass, subcontext)
+        reqres.clear()
         response.json({ result })
       } catch (error) {
         printError(error)
+        reqres.clear()
         response.status(500).json({})
       }
     } else {
+      reqres.clear()
       response.status(404).json({})
     }
   })
@@ -255,18 +262,15 @@ server.start = function () {
     if (request.originalUrl.split('?')[0].indexOf('.') > -1) {
       return next()
     }
-    reqres.request = request
-    reqres.response = response
+    reqres.set(request, response)
     const scope = await prerender(request, response)
     if (!response.headersSent) {
       const status = scope.context.page.status
       const html = template(scope)
-      reqres.request = null
-      reqres.response = null
+      reqres.clear()
       response.status(status).send(html)
     } else {
-      reqres.request = null
-      reqres.response = null
+      reqres.clear()
     }
   })
 
diff --git a/tests/client.js b/tests/client.js
index 4b7a6f8a..5fe6e42f 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -15,6 +15,7 @@ context.start = function () {
 
 context.catch = async function (error) {
   CatchError.logError({ message: error.message })
+  console.error(error)
 }
 
 export default context
diff --git a/tests/server.js b/tests/server.js
index 4894443b..715265c4 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -10,6 +10,7 @@ import ContextSettings from './src/ContextSettings'
 import ContextWorker from './src/ContextWorker'
 import ExposedServerFunctions from './src/ExposedServerFunctions'
 import vueable from './src/plugins/vueable'
+import ReqRes from './src/ReqRes'
 
 Nullstack.use(vueable)
 
@@ -41,6 +42,9 @@ context.server.put('/data/put/:param', ExposedServerFunctions.getData)
 context.server.patch('/data/patch/:param', ExposedServerFunctions.getData)
 context.server.delete('/data/delete/:param', ExposedServerFunctions.getData)
 
+context.server.get('/exposed-server-function-url.json', ReqRes.exposedServerFunction)
+context.server.get('/nested-exposed-server-function-url.json', ReqRes.nestedExposedServerFunction)
+
 context.server.get('/custom-api-before-start', (request, response) => {
   response.json({ startValue: context.startValue })
 })
@@ -75,6 +79,7 @@ context.start = async function () {
 
 context.catch = async function (error) {
   CatchError.logError({ message: error.message })
+  console.error(error)
 }
 
 export default context
diff --git a/tests/src/Application.njs b/tests/src/Application.njs
index d96a64a1..997742df 100644
--- a/tests/src/Application.njs
+++ b/tests/src/Application.njs
@@ -41,6 +41,7 @@ import PublicServerFunctions from './PublicServerFunctions.njs'
 import PureComponents from './PureComponents'
 import Refs from './Refs'
 import RenderableComponent from './RenderableComponent'
+import ReqRes from './ReqRes'
 import RoutesAndParams from './RoutesAndParams'
 import RouteScroll from './RouteScroll'
 import ServerFunctions from './ServerFunctions'
@@ -139,6 +140,7 @@ class Application extends Nullstack {
         <IsomorphicImport route="/isomorphic-import" />
         <ExposedServerFunctions route="/exposed-server-functions" />
         <CatchError route="/catch-error" />
+        <ReqRes route="/reqres" />
         <ErrorPage route="*" />
       </body>
     )
diff --git a/tests/src/ReqRes.njs b/tests/src/ReqRes.njs
new file mode 100644
index 00000000..8e10323f
--- /dev/null
+++ b/tests/src/ReqRes.njs
@@ -0,0 +1,82 @@
+import Nullstack from 'nullstack'
+
+class ReqRes extends Nullstack {
+
+  static async innerNestedServerFunctionFromClient(context) {
+    return context.request.originalUrl
+  }
+
+  static async nestedServerFunctionFromClient() {
+    return this.innerNestedServerFunctionFromClient()
+  }
+
+  static async serverFunctionFromClient(context) {
+    return context.request.originalUrl
+  }
+
+  static async innerNestedServerFunction(context) {
+    return context.request.originalUrl
+  }
+
+  static async serverFunction(context) {
+    return context.request.originalUrl
+  }
+
+  static async nestedServerFunction() {
+    return this.innerNestedServerFunction()
+  }
+
+  static async innerNestedExposedServerFunction(context) {
+    return context.request.originalUrl
+  }
+
+  static async nestedExposedServerFunction() {
+    return this.innerNestedExposedServerFunction()
+  }
+
+  static async exposedServerFunction(context) {
+    return context.request.originalUrl
+  }
+
+  async initiate() {
+    this.serverFunctionUrl = await ReqRes.serverFunction()
+    this.nestedServerFunctionUrl = await ReqRes.nestedServerFunction()
+  }
+
+  async fetchServerFunction({ slug }) {
+    const response = await fetch(`/${slug}.json`)
+    return response.json()
+  }
+
+  async hydrate() {
+    this.serverFunctionFromClientUrl = await ReqRes.serverFunctionFromClient()
+    this.nestedServerFunctionFromClientUrl = await ReqRes.nestedServerFunctionFromClient()
+    this.exposedServerFunctionUrl = await this.fetchServerFunction({ slug: 'exposed-server-function-url' })
+    this.nestedExposedServerFunctionUrl = await this.fetchServerFunction({ slug: 'nested-exposed-server-function-url' })
+  }
+
+  render() {
+    return (
+      <div
+        data-server-function={this.serverFunctionUrl === '/reqres'}
+        data-nested-server-function={this.nestedServerFunctionUrl === '/reqres'}
+        data-server-function-from-client={
+          this.serverFunctionFromClientUrl ===
+          '/nullstack/3f8aea65a953b05e7a7a412d1188ac14/serverFunctionFromClient.json'
+        }
+        data-nested-server-function-from-client={
+          this.nestedServerFunctionFromClientUrl ===
+          '/nullstack/3f8aea65a953b05e7a7a412d1188ac14/nestedServerFunctionFromClient.json'
+        }
+        data-exposed-server-function={this.exposedServerFunctionUrl === '/exposed-server-function-url.json'}
+        data-exposed-nested-server-function={
+          this.nestedExposedServerFunctionUrl === '/nested-exposed-server-function-url.json'
+        }
+        data-hydrated={this.hydrated}
+      />
+    )
+  }
+
+}
+
+export default ReqRes
diff --git a/tests/src/ReqRes.test.js b/tests/src/ReqRes.test.js
new file mode 100644
index 00000000..6c52e245
--- /dev/null
+++ b/tests/src/ReqRes.test.js
@@ -0,0 +1,42 @@
+beforeAll(async () => {
+  await page.goto('http://localhost:6969/reqres')
+  await page.waitForSelector('[data-hydrated]')
+})
+
+describe('ReqRes', () => {
+  test('server functions keep the request', async () => {
+    await page.waitForSelector('[data-server-function]')
+    const element = await page.$('[data-server-function]')
+    expect(element).toBeTruthy()
+  })
+
+  test('nested server functions keep the request', async () => {
+    await page.waitForSelector('[data-nested-server-function]')
+    const element = await page.$('[data-nested-server-function]')
+    expect(element).toBeTruthy()
+  })
+
+  test('server functions keep the request when invoked by the client', async () => {
+    await page.waitForSelector('[data-server-function-from-client]')
+    const element = await page.$('[data-server-function-from-client]')
+    expect(element).toBeTruthy()
+  })
+
+  test('nested server functions keep the request when invoked by the client', async () => {
+    await page.waitForSelector('[data-nested-server-function-from-client]')
+    const element = await page.$('[data-nested-server-function-from-client]')
+    expect(element).toBeTruthy()
+  })
+
+  test('exposed server functions keep the request', async () => {
+    await page.waitForSelector('[data-exposed-server-function]')
+    const element = await page.$('[data-exposed-server-function]')
+    expect(element).toBeTruthy()
+  })
+
+  test('nested exposed server functions keep the request', async () => {
+    await page.waitForSelector('[data-exposed-nested-server-function]')
+    const element = await page.$('[data-exposed-nested-server-function]')
+    expect(element).toBeTruthy()
+  })
+})

From 8427f527413306ff19687b425cb3bddf753750c5 Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Tue, 31 Jan 2023 22:44:10 -0300
Subject: [PATCH 05/12] :recycle: clean up tests

---
 tests/client.js          | 4 +++-
 tests/server.js          | 4 +++-
 tests/src/CatchError.njs | 7 ++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/client.js b/tests/client.js
index 5fe6e42f..9a0b4da5 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -15,7 +15,9 @@ context.start = function () {
 
 context.catch = async function (error) {
   CatchError.logError({ message: error.message })
-  console.error(error)
+  if (context.environment.development) {
+    console.error(error)
+  }
 }
 
 export default context
diff --git a/tests/server.js b/tests/server.js
index 715265c4..d7e877de 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -79,7 +79,9 @@ context.start = async function () {
 
 context.catch = async function (error) {
   CatchError.logError({ message: error.message })
-  console.error(error)
+  if (context.environment.development) {
+    console.error(error)
+  }
 }
 
 export default context
diff --git a/tests/src/CatchError.njs b/tests/src/CatchError.njs
index f7e5d6ec..490e7b40 100644
--- a/tests/src/CatchError.njs
+++ b/tests/src/CatchError.njs
@@ -20,15 +20,12 @@ class CatchError extends Nullstack {
   }
 
   async hydrate({ params }) {
+    setTimeout(() => (this.hydrated = true), 0)
     if (params.error === 'hydrate') {
-      this.vaidamerdanoclient()
+      await this.vaidamerdanoclient()
     }
   }
 
-  update() {
-    this.hydrated = true
-  }
-
   async initiate({ params, page }) {
     if (params.error === 'initiate' && page.status === 200) {
       this.vaidamerdanoserver()

From 1200de1f074c83d784f867471b9d7f473c785eb1 Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Tue, 31 Jan 2023 23:40:11 -0300
Subject: [PATCH 06/12] :white_check_mark: tests for reqres

---
 tests/src/ReqRes.njs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/src/ReqRes.njs b/tests/src/ReqRes.njs
index 8e10323f..8907b0c1 100644
--- a/tests/src/ReqRes.njs
+++ b/tests/src/ReqRes.njs
@@ -60,14 +60,12 @@ class ReqRes extends Nullstack {
       <div
         data-server-function={this.serverFunctionUrl === '/reqres'}
         data-nested-server-function={this.nestedServerFunctionUrl === '/reqres'}
-        data-server-function-from-client={
-          this.serverFunctionFromClientUrl ===
-          '/nullstack/3f8aea65a953b05e7a7a412d1188ac14/serverFunctionFromClient.json'
-        }
-        data-nested-server-function-from-client={
-          this.nestedServerFunctionFromClientUrl ===
-          '/nullstack/3f8aea65a953b05e7a7a412d1188ac14/nestedServerFunctionFromClient.json'
-        }
+        data-server-function-from-client={this.serverFunctionFromClientUrl?.endsWith?.(
+          '/serverFunctionFromClient.json',
+        )}
+        data-nested-server-function-from-client={this.nestedServerFunctionFromClientUrl?.endsWith?.(
+          '/nestedServerFunctionFromClient.json',
+        )}
         data-exposed-server-function={this.exposedServerFunctionUrl === '/exposed-server-function-url.json'}
         data-exposed-nested-server-function={
           this.nestedExposedServerFunctionUrl === '/nested-exposed-server-function-url.json'

From be6f19dfd997fca673eb898d25ec87392dd19cd6 Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Wed, 1 Mar 2023 10:20:59 -0300
Subject: [PATCH 07/12] :bug: fix spread with events

---
 loaders/add-source-to-node.js         |  4 +++-
 tests/src/RenderableComponent.njs     | 10 ++++++----
 tests/src/RenderableComponent.test.js |  5 +++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/loaders/add-source-to-node.js b/loaders/add-source-to-node.js
index 435306c6..c92bd5a0 100644
--- a/loaders/add-source-to-node.js
+++ b/loaders/add-source-to-node.js
@@ -13,7 +13,9 @@ module.exports = function (source) {
       if (path.parent.type === 'JSXAttribute') {
         if (path.node.name.startsWith('on')) {
           const element = path.findParent((p) => p.type === 'JSXOpeningElement' && p.node.attributes)
-          const hasSource = element.node.attributes.find((a) => a.name.name === 'source')
+          const hasSource = element.node.attributes.find((a) => {
+            return a.type === 'JSXAttribute' && a.name.name === 'source'
+          })
           if (!hasSource) {
             const start = element.node.attributes[0].start
             uniquePositions.add(start)
diff --git a/tests/src/RenderableComponent.njs b/tests/src/RenderableComponent.njs
index d469e803..59a00f25 100644
--- a/tests/src/RenderableComponent.njs
+++ b/tests/src/RenderableComponent.njs
@@ -28,6 +28,7 @@ class RenderableComponent extends Nullstack {
   render({ params }) {
     const list = params.shortList ? [1, 2, 3] : [1, 2, 3, 4, 5, 6]
     const html = '<a href="/"> Nullstack </a>'
+    const props = { disabled: true, 'aria-label': 'props' }
     return (
       <div class="RenderableComponent">
         <Falsy />
@@ -56,16 +57,17 @@ class RenderableComponent extends Nullstack {
         </head>
         {!!params.condition && <div class="condition"> conditionally rendered div </div>}
         <a params={{ shortList: true }} class="short-list">
-          {' '}
-          long list{' '}
+          long list
         </a>
         <a params={{ condition: true }} class="true-condition">
-          {' '}
-          long list{' '}
+          long list
         </a>
         <div data-condition={!!params.condition} />
         <div data-short-list={!!params.shortList} />
         <div data-name={this.name} />
+        <button {...props} onclick={() => {}}>
+          props
+        </button>
       </div>
     )
   }
diff --git a/tests/src/RenderableComponent.test.js b/tests/src/RenderableComponent.test.js
index 6eaf9920..c2a63b50 100644
--- a/tests/src/RenderableComponent.test.js
+++ b/tests/src/RenderableComponent.test.js
@@ -115,6 +115,11 @@ describe('RenderableComponent ?condition=true', () => {
     const element = await page.$('div.element')
     expect(element).toBeTruthy()
   })
+
+  test('elements can spread props and have named attributes', async () => {
+    const element = await page.$('[disabled][aria-label="props"]')
+    expect(element).toBeTruthy()
+  })
 })
 
 describe('RenderableComponent ?shortList=true', () => {

From 5f316bbd51a2cdc3af0ed67d82d377d8b630e64c Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Wed, 1 Mar 2023 10:37:01 -0300
Subject: [PATCH 08/12] :bug: ironic fix for errors catch

---
 client/instanceProxyHandler.js | 6 +++++-
 server/printError.js           | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/instanceProxyHandler.js b/client/instanceProxyHandler.js
index f8f16647..fb8d9d2d 100644
--- a/client/instanceProxyHandler.js
+++ b/client/instanceProxyHandler.js
@@ -20,7 +20,11 @@ const instanceProxyHandler = {
           try {
             result = target[name].call(proxy, scopedContext)
           } catch (error) {
-            context.catch && context.catch(error)
+            if (context.catch) {
+              context.catch(error)
+            } else {
+              throw error
+            }
             return null
           }
           if (result instanceof Promise) {
diff --git a/server/printError.js b/server/printError.js
index c375cf76..4fbd51d4 100644
--- a/server/printError.js
+++ b/server/printError.js
@@ -1,7 +1,9 @@
 import context from './context'
 
 export default function (error) {
-  context.catch && context.catch(error)
+  if (context.catch) {
+    context.catch(error)
+  }
   const lines = error.stack.split(`\n`)
   let initiator = lines.find((line) => line.indexOf('Proxy') > -1)
   if (initiator) {

From 5ff0e5d0d019292e8c735e264eb6c4031de60df4 Mon Sep 17 00:00:00 2001
From: Edy Segura <edysegura@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:19:41 -0300
Subject: [PATCH 09/12] Add MIT license file

---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..6581fe76
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Nullstack
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From e4952709789386c091efd29d2f91ca7cd65b5cb4 Mon Sep 17 00:00:00 2001
From: Edy Segura <edysegura@gmail.com>
Date: Fri, 3 Mar 2023 09:59:41 -0300
Subject: [PATCH 10/12] fix: update license link on README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0fb09b26..5d385b69 100644
--- a/README.md
+++ b/README.md
@@ -35,4 +35,4 @@ Get to know the [Nullstack Contributors](https://nullstack.app/contributors)
 
 ## License
 
-Nullstack is released under the [MIT License](https://opensource.org/licenses/MIT).
+Nullstack is released under the [MIT License](LICENSE).

From 7e978283d935d672d268bcc77f1c267608c0782e Mon Sep 17 00:00:00 2001
From: Edy Segura <edysegura@gmail.com>
Date: Fri, 14 Apr 2023 11:06:54 -0300
Subject: [PATCH 11/12] =?UTF-8?q?=F0=9F=90=9B=20fix:=20error=20thrown=20wh?=
 =?UTF-8?q?en=20using=20exposed=20server=20function=20with=20HTTP=20POST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/server.js                         |  3 +-
 tests/server.js                          |  2 ++
 tests/src/ExposedServerFunctions.jsx     | 35 ++++++++++++++++--------
 tests/src/ExposedServerFunctions.test.js | 32 +++++++++++++++++++---
 4 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/server/server.js b/server/server.js
index 96766186..3f612891 100644
--- a/server/server.js
+++ b/server/server.js
@@ -49,7 +49,8 @@ for (const method of ['get', 'post', 'put', 'patch', 'delete', 'all']) {
           params[key] = extractParamValue(request.query[key])
         }
         if (request.method !== 'GET') {
-          Object.assign(params, deserialize(request.body))
+          const payload = typeof request.body === 'object' ? JSON.stringify(request.body) : request.body
+          Object.assign(params, deserialize(payload))
         }
         try {
           const subcontext = generateContext({ request, response, ...params })
diff --git a/tests/server.js b/tests/server.js
index d7e877de..e5428264 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -1,6 +1,7 @@
 import Nullstack from 'nullstack'
 
 import cors from 'cors'
+import express from 'express'
 
 import Application from './src/Application'
 import CatchError from './src/CatchError'
@@ -24,6 +25,7 @@ context.server.use(
     optionsSuccessStatus: 200,
   }),
 )
+context.server.use(express.json())
 
 context.worker.staleWhileRevalidate = [/[0-9]/]
 context.worker.cacheFirst = [/[0-9]/]
diff --git a/tests/src/ExposedServerFunctions.jsx b/tests/src/ExposedServerFunctions.jsx
index 40951a87..16950726 100644
--- a/tests/src/ExposedServerFunctions.jsx
+++ b/tests/src/ExposedServerFunctions.jsx
@@ -1,14 +1,19 @@
 import Nullstack from 'nullstack'
 
-async function api(method) {
-  const body = {
+async function api(method, contentType = 'text/plain') {
+  const payload = {
     number: 69,
     date: new Date(),
     string: 'nullstack',
   }
   const response = await fetch(`/data/${method}/param?query=query&truthy=true&falsy=false`, {
     method: method.toUpperCase(),
-    body: method === 'get' ? undefined : JSON.stringify(body),
+    ...(method !== 'get' && {
+      headers: {
+        'Content-Type': contentType,
+      },
+      body: JSON.stringify(payload),
+    }),
   })
   const data = await response.json()
   return data.status
@@ -40,20 +45,28 @@ class ExposedServerFunctions extends Nullstack {
     this.chainableRegularFunction = await chainable('regular')
     this.all = await api('get')
     this.get = await api('get')
-    this.post = await api('post')
-    this.put = await api('put')
-    this.patch = await api('patch')
-    this.delete = await api('delete')
+    this.postTextPayload = await api('post')
+    this.postJsonPayload = await api('post', 'application/json')
+    this.putTextPayload = await api('put')
+    this.putJsonPayload = await api('put', 'application/json')
+    this.patchTextPayload = await api('patch')
+    this.patchJsonPayload = await api('patch', 'application/json')
+    this.deleteTextPayload = await api('delete')
+    this.deleteJsonPayload = await api('delete', 'application/json')
   }
 
   render() {
     return (
       <div
         data-get={this.get}
-        data-post={this.post}
-        data-put={this.put}
-        data-patch={this.patch}
-        data-delete={this.delete}
+        data-post={this.postTextPayload}
+        data-post-json={this.postJsonPayload}
+        data-put={this.putTextPayload}
+        data-put-json={this.putJsonPayload}
+        data-patch={this.patchTextPayload}
+        data-patch-json={this.patchJsonPayload}
+        data-delete={this.deleteTextPayload}
+        data-delete-json={this.deleteJsonPayload}
         data-all={this.all}
         data-chainable-server-function={this.chainableServerFunction}
         data-chainable-regular-function={this.chainableRegularFunction}
diff --git a/tests/src/ExposedServerFunctions.test.js b/tests/src/ExposedServerFunctions.test.js
index c086be35..81f79913 100644
--- a/tests/src/ExposedServerFunctions.test.js
+++ b/tests/src/ExposedServerFunctions.test.js
@@ -21,30 +21,54 @@ describe('ExposedServerFunctions', () => {
     expect(element).toBeTruthy()
   })
 
-  test('server functions can be exposed to POST and serialize params and query and body', async () => {
+  test('server functions can be exposed to POST and serialize params and query and body as text', async () => {
     await page.waitForSelector('[data-post]')
     const element = await page.$('[data-post]')
     expect(element).toBeTruthy()
   })
 
-  test('server functions can be exposed to PUT and serialize params and query and body', async () => {
+  test('server functions can be exposed to POST and serialize params and query and body as json', async () => {
+    await page.waitForSelector('[data-post-json]')
+    const element = await page.$('[data-post-json]')
+    expect(element).toBeTruthy()
+  })
+
+  test('server functions can be exposed to PUT and serialize params and query and body as text', async () => {
     await page.waitForSelector('[data-put]')
     const element = await page.$('[data-put]')
     expect(element).toBeTruthy()
   })
 
-  test('server functions can be exposed to PATCH and serialize params and query and body', async () => {
+  test('server functions can be exposed to PUT and serialize params and query and body as json', async () => {
+    await page.waitForSelector('[data-put-json]')
+    const element = await page.$('[data-put-json]')
+    expect(element).toBeTruthy()
+  })
+
+  test('server functions can be exposed to PATCH and serialize params and query and body as text', async () => {
     await page.waitForSelector('[data-patch]')
     const element = await page.$('[data-patch]')
     expect(element).toBeTruthy()
   })
 
-  test('server functions can be exposed to DELETE and serialize params and query and body', async () => {
+  test('server functions can be exposed to PATCH and serialize params and query and body as json', async () => {
+    await page.waitForSelector('[data-patch-json]')
+    const element = await page.$('[data-patch-json]')
+    expect(element).toBeTruthy()
+  })
+
+  test('server functions can be exposed to DELETE and serialize params and query and body as text', async () => {
     await page.waitForSelector('[data-delete]')
     const element = await page.$('[data-delete]')
     expect(element).toBeTruthy()
   })
 
+  test('server functions can be exposed to DELETE and serialize params and query and body as json', async () => {
+    await page.waitForSelector('[data-delete-json]')
+    const element = await page.$('[data-delete-json]')
+    expect(element).toBeTruthy()
+  })
+
   test('server functions can be exposed to ALL and serialize params and query and body', async () => {
     await page.waitForSelector('[data-all]')
     const element = await page.$('[data-all]')

From bc48788e42225356890d706ced8fc97e2705467a Mon Sep 17 00:00:00 2001
From: Christian Mortaro <christian.mortaro@gmail.com>
Date: Fri, 21 Apr 2023 04:11:31 -0300
Subject: [PATCH 12/12] :bookmark: version 0.17.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c45b534..bf2b945e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nullstack",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "description": "Full Stack Javascript Components for one-dev armies",
   "main": "nullstack.js",
   "author": "Mortaro",