🐛 empty class inheritance

Author: Mortaro

client/invoke.js

@@ -2,6 +2,7 @@ import deserialize from '../shared/deserialize'
 import prefix from '../shared/prefix'
 import page from './page'
 import worker from './worker'
+import client from './client'
 
 export default function invoke(name, hash) {
   return async function _invoke(params = {}) {
@@ -15,7 +16,8 @@ export default function invoke(name, hash) {
     let finalHash = hash === this.hash ? hash : `${hash}-${this.hash}`
     let url = `${worker.api}/${prefix}/${finalHash}/${name}.json`
     if (module.hot) {
-      url = `${worker.api}/${prefix}/${this.__hashes[name]}/${finalHash}/${name}.json`
+      const version = client.klasses[hash].__hashes[name]
+      url = `${worker.api}/${prefix}/${version}/${finalHash}/${name}.json`
     }
     const body = JSON.stringify(params || {})
     const options = {

package.json

@@ -43,7 +43,7 @@
     "sass-loader": "13.2.0",
     "style-loader": "^3.3.1",
     "swc-loader": "0.2.3",
-    "swc-plugin-nullstack": "0.1.1",
+    "swc-plugin-nullstack": "0.1.2",
     "terser-webpack-plugin": "5.3.6",
     "time-analytics-webpack-plugin": "^0.1.20",
     "webpack": "^5.0.0",

server/registry.js

@@ -19,6 +19,7 @@ function bindStaticProps(klass) {
   while (parent !== Nullstack) {
     const props = Object.getOwnPropertyNames(parent)
     for (const prop of props) {
+      if (prop === 'caller' || prop === 'callee' || prop === 'arguments') continue
       const underscored = prop.startsWith('_')
       if (typeof klass[prop] === 'function') {
         if (!underscored && !registry[`${parent.hash}.${prop}`]) {

tests/src/Application.njs

@@ -59,6 +59,7 @@ import WorkerVerbs from './WorkerVerbs'
 import LazyComponent from './LazyComponent'
 import LazyComponentLoader from './LazyComponentLoader'
 import NestedFolder from './nested/NestedFolder'
+import ChildComponentWithoutServerFunctions from './ChildComponentWithoutServerFunctions'
 import './Application.css'
 
 class Application extends Nullstack {
@@ -148,6 +149,7 @@ class Application extends Nullstack {
         <Logo route="/logo" />
         <NestedFolder route="/nested/folder" />
         <LazyComponent route="/lazy-importer" prop="works" />
+        <ChildComponentWithoutServerFunctions route="/child-component-without-server-functions" />
         <ErrorPage route="*" />
       </body>
     )

tests/src/ChildComponentWithoutServerFunctions.njs

@@ -0,0 +1,24 @@
+import ParentComponent from './ParentComponent'
+
+class ChildComponentWithoutServerFunctions extends ParentComponent {
+
+  async initiate() {
+    this.parentThis = await this.getParentThis()
+  }
+
+  async hydrate() {
+    this.hydratedParentThis = await this.getParentThis()
+  }
+  
+  render() {
+    return (
+      <div>
+        <div data-parent-this={this.parentThis === this.constructor.name} />
+        <div data-hydrated-parent-this={this.hydratedParentThis === this.constructor.name} />
+      </div>
+    )
+  }
+
+}
+
+export default ChildComponentWithoutServerFunctions

tests/src/ChildComponentWithoutServerFunctions.test.js

@@ -0,0 +1,16 @@
+beforeAll(async () => {
+  await page.goto('http://localhost:6969/child-component-without-server-functions')
+})
+
+describe('ChildComponentWithoutServerFunctions', () => {
+  test('inherited server functions are bound to the class ssr', async () => {
+    const element = await page.$('[data-parent-this]')
+    expect(element).toBeTruthy()
+  })
+
+  test('inherited server functions are bound to the class spa', async () => {
+    await page.waitForSelector('[data-hydrated-parent-this]')
+    const element = await page.$('[data-hydrated-parent-this]')
+    expect(element).toBeTruthy()
+  })
+})