Make Element.attributes an IterableIterator

Author: mrbbot

build.sh

@@ -16,6 +16,7 @@ wasm-pack build --target nodejs
 
 echo "---> Patching JavaScript glue code..."
 # Wraps write/end with asyncify magic and adds this returns for chaining
+# diff -uN pkg/html_rewriter.js pkg2/html_rewriter.js > html_rewriter.js.patch
 patch -uN pkg/html_rewriter.js < html_rewriter.js.patch
 
 echo "---> Copying required files to dist..."

html_rewriter.js.patch

@@ -1,5 +1,5 @@
---- pkg/html_rewriter.js	2021-07-21 19:45:46.000000000 +0100
-+++ pkg2/html_rewriter.js	2021-07-21 19:44:41.000000000 +0100
+--- pkg/html_rewriter.js	2021-07-22 16:09:24.000000000 +0100
++++ pkg2/html_rewriter.js	2021-07-22 16:10:13.000000000 +0100
 @@ -1,7 +1,7 @@
  let imports = {};
  imports['__wbindgen_placeholder__'] = module.exports;
@@ -77,6 +77,15 @@
      }
      /**
      * @returns {boolean}
+@@ -463,7 +472,7 @@
+     */
+     get attributes() {
+         var ret = wasm.element_attributes(this.ptr);
+-        return takeObject(ret);
++        return takeObject(ret)[Symbol.iterator]();
+     }
+     /**
+     * @param {string} name
 @@ -495,6 +504,7 @@
          var ptr1 = passStringToWasm0(value, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
          var len1 = WASM_VECTOR_LEN;

src/html_rewriter.d.ts

@@ -15,7 +15,7 @@ export class Element {
   append(content: string, options?: ContentTypeOptions): this;
   setInnerContent(content: string, options?: ContentTypeOptions): this;
   removeAndKeepContent(): this;
-  readonly attributes: [string, string][];
+  readonly attributes: IterableIterator<[string, string]>;
   readonly namespaceURI: string;
   readonly removed: boolean;
   tagName: string;
@@ -47,7 +47,7 @@ export class Doctype {
 }
 
 export class DocumentEnd {
-  append(content: string, options?: ContentTypeOptions): DocumentEnd;
+  append(content: string, options?: ContentTypeOptions): this;
 }
 
 export interface ElementHandlers {

test/element.spec.ts

@@ -19,15 +19,21 @@ const elementMutationsExpected = {
 };
 
 test("handles element properties", async (t) => {
-  t.plan(5);
+  t.plan(6);
   const res = await new HTMLRewriter()
     .on("p", {
       element(element) {
         t.is(element.tagName, "p");
         element.tagName = "h1";
-        t.deepEqual([...element.attributes], [["class", "red"]]);
         t.false(element.removed);
         t.is(element.namespaceURI, "http://www.w3.org/1999/xhtml");
+
+        // Check element.attributes is an IterableIterator
+        t.deepEqual(element.attributes.next(), {
+          value: ["class", "red"],
+          done: false,
+        });
+        t.deepEqual([...element.attributes], [["class", "red"]]);
       },
     })
     .transform('<p class="red">test</p>');