@kithinji/orca 1.0.7 → 1.0.8

package/dist/browser/index.iife.js

@@ -883,13 +883,14 @@ var kithinjiorca = (() => {
   };
 
   // src/shared/renderers/stream.ts
+  var import_jsdom = __require("jsdom");
   var StreamRenderer = class {
     constructor(rootInjector, options = {}) {
       this.rootInjector = rootInjector;
       this.pending = /* @__PURE__ */ new Map();
       this.processedIds = /* @__PURE__ */ new Set();
       this.queueResolvers = [];
-      this.pushQueue = (u) => this.queueResolvers.shift()?.(u);
+      this.idCounter = 0;
       this.options = {
         timeout: options.timeout ?? 3e4
       };
@@ -930,25 +931,7 @@ var kithinjiorca = (() => {
           return this.renderClassComponent(vnode, injector);
         }
         if (isIntrinsicElement(vnode)) {
-          const dangerousHTML = vnode.props?.dangerouslySetInnerHTML;
-          let children;
-          if (dangerousHTML && dangerousHTML.__html) {
-            children = this.parseHTMLToJSX(dangerousHTML.__html, injector);
-          } else {
-            children = this.mapChildren(vnode.props?.children, injector);
-          }
-          return {
-            $typeof: ORCA_ELEMENT_TYPE,
-            type: vnode.type,
-            id: vnode.id,
-            props: {
-              ...vnode.props,
-              dangerouslySetInnerHTML: void 0,
-              // Remove after processing
-              children
-            },
-            key: vnode.key ?? null
-          };
+          return this.renderIntrinsicElement(vnode, injector);
         }
         if (isFragment(vnode)) {
           return {
@@ -966,6 +949,28 @@ var kithinjiorca = (() => {
         this.renderingNodes.delete(vnode);
       }
     }
+    renderIntrinsicElement(vnode, injector) {
+      const { dangerouslySetInnerHTML, children, ...restProps } = vnode.props || {};
+      let processedChildren;
+      if (dangerouslySetInnerHTML?.__html) {
+        processedChildren = this.parseHTMLToJSX(
+          dangerouslySetInnerHTML.__html,
+          injector
+        );
+      } else {
+        processedChildren = this.mapChildren(children, injector);
+      }
+      return {
+        $$typeof: ORCA_ELEMENT_TYPE,
+        type: vnode.type,
+        id: vnode.id,
+        props: {
+          ...restProps,
+          children: processedChildren
+        },
+        key: vnode.key ?? null
+      };
+    }
     renderClassComponent(vnode, injector) {
       const ComponentClass = vnode.type;
       const isComponent = Reflect.getMetadata(COMPONENT, ComponentClass);
@@ -988,7 +993,9 @@ var kithinjiorca = (() => {
       return this.buildSyncTree(childVNode, componentInjector);
     }
     mapChildren(children, injector) {
-      if (children == null || typeof children === "string" || typeof children === "number") {
+      if (children == null)
+        return void 0;
+      if (typeof children === "string" || typeof children === "number") {
         return children;
       }
       if (Array.isArray(children)) {
@@ -997,32 +1004,39 @@ var kithinjiorca = (() => {
       return this.buildSyncTree(children, injector);
     }
     parseHTMLToJSX(html, injector) {
-      const parser = new DOMParser();
-      const doc = parser.parseFromString(html, "text/html");
+      const dom = new import_jsdom.JSDOM(html);
+      const document2 = dom.window.document;
       const convertNode = (node) => {
-        if (node.nodeType === Node.TEXT_NODE) {
-          return node.textContent;
+        if (node.nodeType === 3) {
+          const text = node.textContent || "";
+          return text.trim() ? text : null;
         }
-        if (node.nodeType === Node.ELEMENT_NODE) {
+        if (node.nodeType === 1) {
           const element = node;
           const tagName = element.tagName.toLowerCase();
           const props = {};
-          for (let i = 0; i < element.attributes.length; i++) {
-            const attr = element.attributes[i];
-            let propName = attr.name;
-            if (propName === "class")
-              propName = "className";
-            if (propName === "for")
-              propName = "htmlFor";
-            props[propName] = attr.value;
-          }
+          Array.from(element.attributes).forEach((attr) => {
+            let name = attr.name;
+            if (name === "class")
+              name = "className";
+            else if (name === "for")
+              name = "htmlFor";
+            else if (name.startsWith("data-") || name.startsWith("aria-")) {
+            } else if (name.includes("-")) {
+              name = name.replace(
+                /-([a-z])/g,
+                (_, letter) => letter.toUpperCase()
+              );
+            }
+            props[name] = attr.value;
+          });
           const children = [];
-          for (let i = 0; i < element.childNodes.length; i++) {
-            const child = convertNode(element.childNodes[i]);
-            if (child !== null && child !== "") {
-              children.push(child);
+          element.childNodes.forEach((child) => {
+            const converted = convertNode(child);
+            if (converted != null) {
+              children.push(converted);
             }
-          }
+          });
           const jsxElement = {
             $$typeof: ORCA_ELEMENT_TYPE,
             type: tagName,
@@ -1037,17 +1051,14 @@ var kithinjiorca = (() => {
         }
         return null;
       };
-      const bodyChildren = [];
-      for (let i = 0; i < doc.body.childNodes.length; i++) {
-        const child = convertNode(doc.body.childNodes[i]);
-        if (child !== null && child !== "") {
-          bodyChildren.push(child);
+      const result = [];
+      document2.body.childNodes.forEach((node) => {
+        const converted = convertNode(node);
+        if (converted != null) {
+          result.push(converted);
         }
-      }
-      return bodyChildren.length === 0 ? void 0 : bodyChildren.length === 1 ? bodyChildren[0] : bodyChildren;
-    }
-    generateId() {
-      return `jsx_${Math.random().toString(36).substr(2, 9)}`;
+      });
+      return result.length === 0 ? void 0 : result.length === 1 ? result[0] : result;
     }
     createPendingReference(vnode, promise, injector) {
       const id = vnode.id;
@@ -1074,13 +1085,13 @@ var kithinjiorca = (() => {
         if (this.processedIds.has(id))
           return;
         this.processedIds.add(id);
-        this.pushQueue({
+        this.queueResolvers.shift()?.({
           ...resolved,
           action: "update"
         });
         this.pending.delete(id);
       }).catch((e) => {
-        this.pushQueue({
+        this.queueResolvers.shift()?.({
           $$typeof: ERROR_ELEMENT,
           type: "error",
           action: "error",
@@ -1100,6 +1111,9 @@ var kithinjiorca = (() => {
         key: vnode.key ?? null
       };
     }
+    generateId() {
+      return `jsx_${++this.idCounter}`;
+    }
     cleanup() {
       for (const { abortController } of this.pending.values()) {
         abortController.abort();