@zyrab/domo 1.4.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zyrab/domo",
-  "version": "1.4.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/base.client.js

@@ -20,7 +20,8 @@ class BaseClient {
   constructor(el = "div") {
     this.element = document.createElement(String(el || "div").toLowerCase());
   }
-  island(enabled = false) {
+  island(component, enabled = true) {
+    this.element.appendChild(this._handleElementInstance(component()));
     return this;
   }
   /**

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

@@ -1,4 +1,4 @@
-import { fileURLToPath } from "url";
+// import { fileURLToPath } from "url";
 /**
  * @class BaseServer
  * @description Foundational class for Server-side (Virtual) Domo elements.
@@ -30,8 +30,8 @@ class BaseServer {
       _events: [],
       _refs: [],
       _island: false,
+      __island: null,
       _state: {},
-      __file: null,
     };
   }
 
@@ -39,12 +39,14 @@ class BaseServer {
    * Manually mark this element/component as an island.
    * This signals the SSG to bundle the Domo client runtime.
    */
-  island(enabled = true) {
+  island(component, enabled = true) {
     this.element._island = enabled;
-    this._getOrSetId();
+    this._getOrSetId(component.name);
+
     if (enabled) {
-      this.element.__file = this._getCallerFile(2); // Captures the component file path
+      this.element.__island = component;
     }
+
     return this;
   }
 
@@ -56,65 +58,39 @@ class BaseServer {
   ref(callback) {
     if (typeof callback === "function") {
       this.element._refs.push({
-        name: meta._name || callback.name || "anonymous",
-        path: meta._source || null, // The absolute path s
+        // 2. Use callback.name, or fallback to "anonymous"
+        // (Removed 'meta' reference which caused the crash)
+        name: callback.name || "anonymous",
         handler: callback,
       });
+
       // 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() {
-    const existing = this.element._attr["data-domo-id"] || this.element._attr["id"];
-    if (existing) {
-      return existing;
-    }
+  _getOrSetId(handler) {
+    const existing = this.element._attr["data-domo-id"];
+    if (existing) return existing;
 
-    // Simple stable hash based on tag and current metadata state
-    const hash = Math.random().toString(36).substring(2, 7);
+    let funcName = handler.name || handler.toString();
+    const hash = this._fastHash(funcName);
     const id = `d-${hash}`;
     this.element._attr["data-domo-id"] = id;
     return id;
   }
-  /**
-   * Gets the file path of the caller in the stack trace.
-   * @param {number} depth - How many steps back to look (default 2: the caller of the caller)
-   */
-  _getCallerFile(depth = 2) {
-    const originalPrepare = Error.prepareStackTrace;
-    Error.prepareStackTrace = (_, stack) => stack;
-    const stack = new Error().stack;
-    Error.prepareStackTrace = originalPrepare;
 
-    if (!stack || !stack[depth]) return null;
-
-    const filename = stack[depth].getFileName();
-
-    // Clean up "file://" prefixes for Windows/ESM compatibility
-    if (filename && filename.startsWith("file://")) {
-      return fileURLToPath(filename);
-    }
-    return filename;
-  }
-  _getExternalPath(fn, currentFile) {
-    // If the function has no name and is very short, it's likely an inline arrow fn
-    // However, the most reliable way in Node is checking the stack
-    const caller = getCallerFile(3); // Adjust depth based on where this is called
-
-    // Logic: If we can't find a source, or the source is the same as the
-    // component currently being built, we treat it as "inline".
-    if (!caller || caller === currentFile) {
-      return null;
+  _fastHash(str) {
+    let hash = 5381;
+    for (let i = 0; i < str.length; i++) {
+      hash = (hash * 33) ^ str.charCodeAt(i);
     }
-
-    return caller;
+    return (hash >>> 0).toString(36);
   }
 }
 

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
   }
 }