@shisho/plugin-sdk 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shisho/plugin-sdk",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "TypeScript SDK for Shisho plugin development — types, host API declarations, and test utilities",
   "homepage": "https://github.com/shishobooks/shisho/blob/master/packages/plugin-sdk/README.md",
   "types": "index.d.ts",

package/testing/index.js

@@ -59,24 +59,26 @@ function parseXML(content) {
     const parsed = parser.parse(content);
     return convertXMLNode(parsed[0] ?? {});
 }
-function convertXMLNode(node) {
-    const keys = Object.keys(node).filter((k) => k !== ":@" && k !== "#text" && k !== "#cdata" && k !== "#comment");
-    const tagWithNs = keys[0] ?? "";
-    const colonIdx = tagWithNs.indexOf(":");
-    const tag = colonIdx >= 0 ? tagWithNs.slice(colonIdx + 1) : tagWithNs;
-    const nsPrefix = colonIdx >= 0 ? tagWithNs.slice(0, colonIdx) : "";
+function convertXMLNode(node, inheritedNamespaces) {
+    // Inherit parent namespace map and add any new declarations from this element
+    const namespaces = { ...(inheritedNamespaces ?? {}) };
     const attrs = node[":@"] ?? {};
     const attributes = {};
-    let namespace = "";
     for (const [k, v] of Object.entries(attrs)) {
-        if (k === `xmlns:${nsPrefix}` && nsPrefix) {
-            namespace = String(v);
+        if (k.startsWith("xmlns:")) {
+            namespaces[k.slice(6)] = String(v);
         }
-        else if (k === "xmlns" && !nsPrefix) {
-            namespace = String(v);
+        else if (k === "xmlns") {
+            namespaces[""] = String(v);
         }
         attributes[k] = String(v);
     }
+    const keys = Object.keys(node).filter((k) => k !== ":@" && k !== "#text" && k !== "#cdata" && k !== "#comment");
+    const tagWithNs = keys[0] ?? "";
+    const colonIdx = tagWithNs.indexOf(":");
+    const tag = colonIdx >= 0 ? tagWithNs.slice(colonIdx + 1) : tagWithNs;
+    const nsPrefix = colonIdx >= 0 ? tagWithNs.slice(0, colonIdx) : "";
+    const namespace = namespaces[nsPrefix] ?? "";
     const childNodes = node[tagWithNs] ?? [];
     let text = "";
     const children = [];
@@ -87,7 +89,7 @@ function convertXMLNode(node) {
                 text += String(c["#text"]);
             }
             else {
-                children.push(convertXMLNode(c));
+                children.push(convertXMLNode(c, namespaces));
             }
         }
     }
@@ -308,7 +310,7 @@ export function createMockShisho(options = {}) {
                     parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
                 }
             }
-            return parts.join("&");
+            return parts.join("&").replace(/%20/g, "+");
         },
         parse(urlStr) {
             const parsed = new URL(urlStr);

package/testing/index.ts

@@ -108,28 +108,34 @@ function parseXML(content: string): XMLElement {
   return convertXMLNode(parsed[0] ?? {});
 }
 
-function convertXMLNode(node: Record<string, unknown>): XMLElement {
-  const keys = Object.keys(node).filter(
-    (k) => k !== ":@" && k !== "#text" && k !== "#cdata" && k !== "#comment",
-  );
-  const tagWithNs = keys[0] ?? "";
-  const colonIdx = tagWithNs.indexOf(":");
-  const tag = colonIdx >= 0 ? tagWithNs.slice(colonIdx + 1) : tagWithNs;
-  const nsPrefix = colonIdx >= 0 ? tagWithNs.slice(0, colonIdx) : "";
+function convertXMLNode(
+  node: Record<string, unknown>,
+  inheritedNamespaces?: Record<string, string>,
+): XMLElement {
+  // Inherit parent namespace map and add any new declarations from this element
+  const namespaces = { ...(inheritedNamespaces ?? {}) };
 
   const attrs: Record<string, unknown> =
     (node[":@"] as Record<string, unknown>) ?? {};
   const attributes: Record<string, string> = {};
-  let namespace = "";
   for (const [k, v] of Object.entries(attrs)) {
-    if (k === `xmlns:${nsPrefix}` && nsPrefix) {
-      namespace = String(v);
-    } else if (k === "xmlns" && !nsPrefix) {
-      namespace = String(v);
+    if (k.startsWith("xmlns:")) {
+      namespaces[k.slice(6)] = String(v);
+    } else if (k === "xmlns") {
+      namespaces[""] = String(v);
     }
     attributes[k] = String(v);
   }
 
+  const keys = Object.keys(node).filter(
+    (k) => k !== ":@" && k !== "#text" && k !== "#cdata" && k !== "#comment",
+  );
+  const tagWithNs = keys[0] ?? "";
+  const colonIdx = tagWithNs.indexOf(":");
+  const tag = colonIdx >= 0 ? tagWithNs.slice(colonIdx + 1) : tagWithNs;
+  const nsPrefix = colonIdx >= 0 ? tagWithNs.slice(0, colonIdx) : "";
+  const namespace = namespaces[nsPrefix] ?? "";
+
   const childNodes = (node[tagWithNs] as unknown[]) ?? [];
   let text = "";
   const children: XMLElement[] = [];
@@ -139,7 +145,7 @@ function convertXMLNode(node: Record<string, unknown>): XMLElement {
       if ("#text" in c) {
         text += String(c["#text"]);
       } else {
-        children.push(convertXMLNode(c));
+        children.push(convertXMLNode(c, namespaces));
       }
     }
   }
@@ -417,7 +423,7 @@ export function createMockShisho(
         }
       }
 
-      return parts.join("&");
+      return parts.join("&").replace(/%20/g, "+");
     },
 
     parse(urlStr: string): ParsedURL {