@zyrab/domo 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zyrab/domo",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Minimalist DOM builder and chaining-friendly micro-framework with router support.",
   "main": "./src/index.js",
   "type": "module",

package/src/client/properties.client.js

@@ -47,7 +47,9 @@ class PropertiesClient extends BaseClient {
     if (typeof force === "boolean") {
       force ? this.element.setAttribute(attrName, "") : this.element.removeAttribute(attrName);
     } else {
-      this.element.hasAttribute(attrName) ? this.element.removeAttribute(attrName) : this.element.setAttribute(attrName, "");
+      this.element.hasAttribute(attrName)
+        ? this.element.removeAttribute(attrName)
+        : this.element.setAttribute(attrName, "");
     }
     return this;
   }

package/src/server/base.server.js

@@ -41,7 +41,7 @@ class BaseServer {
    */
   island(component, enabled = true) {
     this.element._island = enabled;
-    this._getOrSetId();
+    this._getOrSetId(component.name);
 
     if (enabled) {
       this.element.__island = component;
@@ -65,26 +65,33 @@ class BaseServer {
       });
 
       // Ensure element has a stable ID if it has a ref
-      this._getOrSetId();
+      this._getOrSetId(callback);
     }
     return this;
   }
-
   /**
    * Generates or retrieves a stable, hash-based ID for metadata association.
    * @protected
    * @returns {string} The data-domo-id.
    */
-  _getOrSetId() {
+  _getOrSetId(handler) {
     const existing = this.element._attr["data-domo-id"];
-    if (existing) {
-      return existing;
-    }
-    const hash = Math.random().toString(36).substring(2, 7);
+    if (existing) return existing;
+
+    let funcName = handler.name || handler.toString();
+    const hash = this._fastHash(funcName);
     const id = `d-${hash}`;
     this.element._attr["data-domo-id"] = id;
     return id;
   }
+
+  _fastHash(str) {
+    let hash = 5381;
+    for (let i = 0; i < str.length; i++) {
+      hash = (hash * 33) ^ str.charCodeAt(i);
+    }
+    return (hash >>> 0).toString(36);
+  }
 }
 
 export default BaseServer;

package/src/server/events.server.js

@@ -12,40 +12,35 @@ class EventsServer extends ClassesServer {
    * @param {object} [meta={}] - Injected by plugin: { _source, _name, ssg: boolean }
    */
   on(eventMapOrName, callback, meta = {}) {
-    // If user passed options (meta), check if ssg is explicitly disabled
     if (meta.ssg === false) return this;
 
-    const id = this._getOrSetId();
-
     if (typeof eventMapOrName === "object" && eventMapOrName !== null) {
       // In object mode: .on({ click: fn }, { _source: '...', _name: '...' })
       // callback actually acts as the 'meta' argument here
       const metadata = callback || {};
       for (const [event, value] of Object.entries(eventMapOrName)) {
         const handler = Array.isArray(value) ? value[0] : value;
-        this._pushEvent(id, "direct", event, handler, null, metadata);
+        this._pushEvent("direct", event, handler, null, metadata);
       }
     } else if (typeof callback === "function") {
       // In single mode: .on('click', fn, { _source: '...', _name: '...' })
-      this._pushEvent(id, "direct", eventMapOrName, callback, null, meta);
+      this._pushEvent("direct", eventMapOrName, callback, null, meta);
     }
     return this;
   }
 
   onClosest(event, selectors = {}, meta = {}) {
     if (meta.ssg === false) return this;
-    const id = this._getOrSetId();
     for (const [selector, handler] of Object.entries(selectors)) {
-      this._pushEvent(id, "closest", event, handler, selector, meta);
+      this._pushEvent("closest", event, handler, selector, meta);
     }
     return this;
   }
 
   onMatch(event, selectors = {}, meta = {}) {
     if (meta.ssg === false) return this;
-    const id = this._getOrSetId();
     for (const [selector, handler] of Object.entries(selectors)) {
-      this._pushEvent(id, "match", event, handler, selector, meta);
+      this._pushEvent("match", event, handler, selector, meta);
     }
     return this;
   }
@@ -54,25 +49,22 @@ class EventsServer extends ClassesServer {
    * Internal helper to push event metadata.
    * @private
    */
-  _pushEvent(id, type, event, handler, selector = null, meta = {}) {
+  _pushEvent(type, event, handler, selector = null, meta = {}) {
     const evArr = (this.element._events ??= []);
+    const id = this._getOrSetId(handler);
     let existing = evArr.find((e) => e.id === id && e.event === event);
 
     if (!existing) {
       existing = { id, event, handlers: [] };
       evArr.push(existing);
     }
-
-    // Capture path and name from the 'meta' object stamped by the plugin
+    console.log("testing", existing);
     existing.handlers.push({
       type,
       name: meta._name || handler.name || "anonymous",
       handler,
-      path: meta._source || null, // STAMPED PATH
       ...(selector && { selector }),
     });
-
-    // Tag as island so SSG knows to include domo.client.js
   }
 }