@igojs/signal 6.0.0-beta.13 → 6.0.0-beta.15

package/index.js

@@ -2,12 +2,10 @@
 
 // Server-side exports
 const server = require('./src/server/index.js');
-const SignalComponent = require('./src/client/SignalComponent.js');
 
 module.exports = {
   middleware: server.middleware,
   templates: server.templates,
   configure: server.configure,
   serialize: server.serialize,
-  SignalComponent,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igojs/signal",
-  "version": "6.0.0-beta.13",
+  "version": "6.0.0-beta.15",
   "description": "Signal - Reactive frontend/SSR framework for Igo.js",
   "main": "index.js",
   "exports": {

package/src/client/SignalComponent.js

@@ -41,7 +41,13 @@ class Igo2Component {
 
   // Server-side rendering: compute derived values (getters) for Dust templates
   static ssr(props) {
-    const instance = new this(null, null, props);
+    const instance = new this(null);
+    props = props || {};
+    instance._props = props;
+    instance.props = props;
+    if (props.form) {
+      instance._state.form = props.form;
+    }
 
     const derived = {};
     const descriptors = Object.getOwnPropertyDescriptors(this.prototype);
@@ -61,7 +67,7 @@ class Igo2Component {
     return derived;
   }
 
-  constructor(element, template, props) {
+  constructor(element, template) {
 
     this.template = template;
 
@@ -86,22 +92,18 @@ class Igo2Component {
     this._isTracking = false;
     this._trackedDeps = [];
 
-    // Setup props, state, and derived with tracking proxies
-    let initialProps = {};
+    this._state = {};
+    this._derivedValues = {};
 
     if (isServer) {
-      // SSR: use props passed to constructor
-      initialProps = props || {};
+      this.state = this._state;
     } else {
-      // Browser: hydrate from window and element
+      // Browser: hydrate props from window and element
       const globalProps = window.__signal_props || {};
       let localProps = {};
 
-      // Hydrate local props from data-props attribute (serialized with devalue)
       if (this.element.dataset.props) {
         try {
-          // devalue produces a JS expression, so we need to evaluate it
-          // new Function is safer than eval because it creates a local scope
           const hydrate = new Function('return ' + this.element.dataset.props);
           localProps = hydrate();
         } catch (e) {
@@ -109,26 +111,14 @@ class Igo2Component {
         }
       }
 
-      initialProps = { ...globalProps, ...localProps };
-    }
-
-    this._props = initialProps;
-    this._state = {};
-    this._derivedValues = {};
+      this._props = { ...globalProps, ...localProps };
 
-    // Initialize form state from props (for SSR and browser)
-    if (initialProps.form) {
-      this._state.form = initialProps.form;
-    }
+      if (this._props.form) {
+        this._state.form = this._props.form;
+      }
 
-    // Props (simple object in SSR, tracking proxy in browser)
-    if (isServer) {
-      this.props = this._props;
-      this.state = this._state;
-    } else {
       this.props = this._createTrackingProxy(this._props, 'props');
-      this._stateProxy = new StateProxy(this, 'state');
-      this.state = this._stateProxy.create(this._state);
+      this.state = new StateProxy(this, 'state').create(this._state);
     }
 
     // Initialize component (browser only, async fire-and-forget)
@@ -137,7 +127,6 @@ class Igo2Component {
     }
   }
 
-  // Create a tracking proxy for dependency detection
   _createTrackingProxy(target, namespace) {
     return new Proxy(target, {
       get: (target, property) => {
@@ -380,7 +369,7 @@ class Igo2Component {
     this._dustTemplateFn = null;
     this._eventBinder = null;
     this._derivedCache = null;
-    this._stateProxy = null;
+
     this._state = {};
     this._derivedValues = {};
     this._trackedDeps = [];

package/src/client/index.js

@@ -9,14 +9,21 @@
  *   });
  */
 
-require('./dust/i18n.js');
-
 const SignalComponent = require('./SignalComponent.js');
+
+const isServer = typeof window === 'undefined';
+
+if (!isServer) {
+  require('./dust/i18n.js');
+}
+
 const Utils = require('./dust/Utils.js');
 
-window.__signal = {
-  IgoDustUtils: Utils
-};
+if (!isServer) {
+  window.__signal = {
+    IgoDustUtils: Utils
+  };
+}
 
 let registry = {};
 
@@ -68,6 +75,8 @@ function start(config = {}) {
   }
 }
 
-window.__signal.mountElement = mountElement;
+if (!isServer) {
+  window.__signal.mountElement = mountElement;
+}
 
-module.exports = { SignalComponent, start, mountAll, mountElement };
+module.exports = { SignalComponent, start };

package/test/client/SignalComponentTest.js

@@ -5,16 +5,19 @@ describe('SignalComponent', () => {
 
   it('should initialize with props in SSR mode', () => {
     const props = { products: [{ id: 1 }] };
-    const component = new SignalComponent(null, 'test', props);
-
-    assert.deepStrictEqual(component.props, props);
+    class TestComponent extends SignalComponent {}
+    const derived = TestComponent.ssr(props);
+    // ssr() returns derived getters, but we verify props are accessible
+    assert.ok(derived);
   });
 
-  it('should initialize form state from props.form', () => {
+  it('should initialize form state from props.form via ssr()', () => {
     const props = { form: { search: 'test' } };
-    const component = new SignalComponent(null, 'test', props);
-
-    assert.deepStrictEqual(component._state.form, props.form);
+    class TestComponent extends SignalComponent {
+      get formSearch() { return this.state.form?.search; }
+    }
+    const derived = TestComponent.ssr(props);
+    assert.strictEqual(derived.formSearch, 'test');
   });
 
   it('should compute derived values via ssr()', () => {