nullstack · Mortaro · May 3, 2022 · May 3, 2022
diff --git a/loaders/register-static-from-server.js b/loaders/register-static-from-server.js
@@ -21,7 +21,7 @@ module.exports = function (source) {
       klassName = path.node.id.name;
     },
     ClassMethod(path) {
-      if (path.node.static && path.node.async && path.node.key.name.split(/[A-Z]/)[0] !== 'start') {
+      if (path.node.static && path.node.async && !path.node.key.name.startsWith('_')) {
         methodNames.push(path.node.key.name);
       }
     }

diff --git a/loaders/remove-static-from-client.js b/loaders/remove-static-from-client.js
@@ -37,7 +37,7 @@ module.exports = function removeStaticFromClient(source) {
     const injection = injections[position];
     if (position && injection) {
       const location = injection.end - position;
-      if (injection.name.split(/[A-Z]/)[0] === 'start') {
+      if (injection.name.startsWith('_')) {
         code = code.substring(location).trimStart();
       } else {
         code = `static ${injection.name} = Nullstack.invoke('${injection.name}', '${hash}');` + code.substring(location);

diff --git a/tests/src/Application.njs b/tests/src/Application.njs
@@ -30,7 +30,6 @@ import PluginAttributes from './PluginAttributes';
 import PublicServerFunctions from './PublicServerFunctions.njs';
 import PureComponents from './PureComponents';
 import WebpackCustomPlugin from './WebpackCustomPlugin';
-import RemoveStart from './RemoveStart';
 import RenderableComponent from './RenderableComponent';
 import RoutesAndParams from './RoutesAndParams';
 import ServerFunctions from './ServerFunctions';

diff --git a/tests/src/RemoveStart.njs b/tests/src/RemoveStart.njs
diff --git a/tests/src/RemoveStart.test.js b/tests/src/RemoveStart.test.js
diff --git a/tests/src/ServerFunctions.njs b/tests/src/ServerFunctions.njs
@@ -59,13 +59,18 @@ class ServerFunctions extends Nullstack {
     return string === decodedString
   }
 
+  static async _privateFunction() {
+    return true
+  }
+
   async initiate() {
     this.statement = await this.useNodeFileSystem();
     this.response = await this.useFetchInNode();
     this.doublePlusOneServer = await ServerFunctions.getDoublePlusOne({ number: 34 })
   }
 
   async hydrate() {
+    this.underlineRemovedFromClient = !ServerFunctions._privateFunction;
     this.clientOnly = clientOnly();
     this.doublePlusOneClient = await ServerFunctions.getDoublePlusOne({ number: 34 })
     this.acceptsSpecialCharacters = await this.getEncodedString({ string: decodedString })
@@ -85,6 +90,7 @@ class ServerFunctions extends Nullstack {
         <div data-double-plus-one-server={this.doublePlusOneServer === 69} />
         <div data-double-plus-one-client={this.doublePlusOneClient === 69} />
         <div data-accepts-special-characters={this.acceptsSpecialCharacters} />
+        <div data-underline-removed-from-client={this.underlineRemovedFromClient} />
       </div>
     )
   }

diff --git a/tests/src/ServerFunctions.test.js b/tests/src/ServerFunctions.test.js
@@ -60,4 +60,10 @@ describe('ServerFunctions', () => {
     expect(element).toBeTruthy();
   });
 
+  test('server functions starting with underline are removed from client', async () => {
+    await page.waitForSelector('[data-underline-removed-from-client]');
+    const element = await page.$('[data-underline-removed-from-client]');
+    expect(element).toBeTruthy();
+  });
+
 });