change uid to ojs-id to avoid clashes with other frameworks

Author: levizwannah

package.json

@@ -1,6 +1,6 @@
 {
   "name": "modular-openscriptjs",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "OpenScriptJs Framework - A lightweight, reactive JavaScript framework for building modern web applications",
   "type": "module",
   "main": "./dist/modular-openscriptjs.umd.js",

src/component/Component.js

@@ -8,7 +8,6 @@ import {
   destroyNodeDeep,
   getOjsChildren,
 } from "../utils/helpers.js";
-import DOM from "../utils/DOM.js";
 
 /**
  * Base Component Class
@@ -260,7 +259,7 @@ export default class Component {
     if (!parent) parent = h.dom;
 
     return parent.querySelectorAll(
-      `ojs-${this.kebab(this.name)}[uid="${this.id}"]`,
+      `ojs-${this.kebab(this.name)}[ojs-uid="${this.id}"]`,
     );
   }
 
@@ -411,7 +410,7 @@ export default class Component {
 
       let current =
         h.dom.querySelectorAll(
-          `ojs-${this.kebab(this.name)}[uid="${
+          `ojs-${this.kebab(this.name)}[ojs-uid="${
             this.id
           }"][s-${stateId}="${stateId}"]`,
         ) ?? [];
@@ -462,7 +461,7 @@ export default class Component {
     }
 
     let attr = {
-      uid: uuid,
+      ojs_uid: uuid,
       resetParent,
       replaceParent,
       firstOfParent,
@@ -593,7 +592,7 @@ export default class Component {
     children.forEach((child) => {
       let component = container
         .resolve("repository")
-        .findComponent(child.getAttribute("uid"));
+        .findComponent(child.getAttribute("ojs-uid"));
       if (component) component.emit(this.EVENTS.mounted, component.id);
     });
   }

src/component/MarkupEngine.js

@@ -449,12 +449,12 @@ export default class MarkupEngine {
    * @param {function} f - This function should return an HTMLElement or a string or an Array of either
    * @returns {HTMLElement|string|Array<HTMLElement|string>}
    */
-  call = (
-    f = () => {
+  call = (f = null) => {
+    if (!f) {
       const h = container.resolve("h");
       return h["ojs-group"]();
-    },
-  ) => {
+    }
+
     return f();
   };
 

src/index.js

@@ -262,15 +262,15 @@ const observer = new MutationObserver((mutations) => {
 
       if (/OJS-.*/g.test(node.nodeName)) {
         node.querySelectorAll(".__ojs-c-class__").forEach((n) => {
-          let uid = Number(n.getAttribute("uid"));
+          let uid = Number(n.getAttribute("ojs-uid"));
           let instance = component(uid);
 
           if (!instance) return;
           instance.unmount();
           app("repository").removeComponent(uid);
         });
 
-        let uid = Number(node.getAttribute("uid"));
+        let uid = Number(node.getAttribute("ojs-uid"));
 
         if (uid) {
           let instance = component(uid);