Merge pull request nullstack#321 from nullstack/next

Next

Author: Mortaro

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.

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).

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,26 @@ 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) {
+            if (context.catch) {
+              context.catch(error)
+            } else {
+              throw 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

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)

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",

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 {

server/printError.js

@@ -1,4 +1,9 @@
+import context from './context'
+
 export default function (error) {
+  if (context.catch) {
+    context.catch(error)
+  }
   const lines = error.stack.split(`\n`)
   let initiator = lines.find((line) => line.indexOf('Proxy') > -1)
   if (initiator) {

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

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])
@@ -48,14 +49,17 @@ 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 })
           const result = await args[1](subcontext)
+          reqres.clear()
           response.json(result)
         } catch (error) {
           printError(error)
+          reqres.clear()
           response.status(500).json({})
         }
       })
@@ -224,6 +228,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 +246,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,21 +263,23 @@ 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()
     }
   })
 
+  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')

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)
@@ -12,4 +13,11 @@ context.start = function () {
   setTimeout(() => (context.startTimedValue = true), 1000)
 }
 
+context.catch = async function (error) {
+  CatchError.logError({ message: error.message })
+  if (context.environment.development) {
+    console.error(error)
+  }
+}
+
 export default context