@marvalt/wadapter 2.0.0 → 2.2.0

package/dist/index.js

@@ -52,19 +52,7 @@ class WordPressClient {
             'Content-Type': 'application/json',
         };
         // Add authentication based on mode
-        if (this.config.authMode === 'cloudflare_proxy') {
-            // Add Cloudflare proxy authentication headers
-            if (this.config.appId) {
-                headers['x-app-id'] = this.config.appId;
-            }
-            if (this.config.workerSecret) {
-                headers['x-app-secret'] = this.config.workerSecret;
-            }
-            if (this.config.cfAccessClientId && this.config.cfAccessClientSecret) {
-                headers['CF-Access-Client-Id'] = this.config.cfAccessClientId;
-                headers['CF-Access-Client-Secret'] = this.config.cfAccessClientSecret;
-            }
-        }
+        if (this.config.authMode === 'cloudflare_proxy') ;
         else {
             // Direct mode - use basic auth
             if (this.config.username && this.config.password) {
@@ -298,19 +286,7 @@ class GravityFormsClient {
             ...options.headers,
         };
         // Add authentication based on mode
-        if (this.config.authMode === 'cloudflare_proxy') {
-            // Add Cloudflare proxy authentication headers
-            if (this.config.appId) {
-                headers['x-app-id'] = this.config.appId;
-            }
-            if (this.config.workerSecret) {
-                headers['x-app-secret'] = this.config.workerSecret;
-            }
-            if (this.config.cfAccessClientId && this.config.cfAccessClientSecret) {
-                headers['CF-Access-Client-Id'] = this.config.cfAccessClientId;
-                headers['CF-Access-Client-Secret'] = this.config.cfAccessClientSecret;
-            }
-        }
+        if (this.config.authMode === 'cloudflare_proxy') ;
         else {
             // Direct mode - use basic auth
             if (this.config.username && this.config.password) {
@@ -2107,6 +2083,205 @@ function getFormById(id) {
     return (gravityFormsStaticData?.forms ?? []).find(f => String(f.id) === key);
 }
 
+let document;
+let offset;
+let output;
+let stack;
+const tokenizer = /<!--\s+(\/)?wp:([a-z][a-z0-9_-]*\/)?([a-z][a-z0-9_-]*)\s+({(?:(?=([^}]+|}+(?=})|(?!}\s+\/?-->)[^])*)\5|[^]*?)}\s+)?(\/)?-->/g;
+function Block(blockName, attrs, innerBlocks, innerHTML, innerContent) {
+  return {
+    blockName,
+    attrs,
+    innerBlocks,
+    innerHTML,
+    innerContent
+  };
+}
+function Freeform(innerHTML) {
+  return Block(null, {}, [], innerHTML, [innerHTML]);
+}
+function Frame(block, tokenStart, tokenLength, prevOffset, leadingHtmlStart) {
+  return {
+    block,
+    tokenStart,
+    tokenLength,
+    prevOffset: prevOffset || tokenStart + tokenLength,
+    leadingHtmlStart
+  };
+}
+const parse = (doc) => {
+  document = doc;
+  offset = 0;
+  output = [];
+  stack = [];
+  tokenizer.lastIndex = 0;
+  do {
+  } while (proceed());
+  return output;
+};
+function proceed() {
+  const stackDepth = stack.length;
+  const next = nextToken();
+  const [tokenType, blockName, attrs, startOffset, tokenLength] = next;
+  const leadingHtmlStart = startOffset > offset ? offset : null;
+  switch (tokenType) {
+    case "no-more-tokens":
+      if (0 === stackDepth) {
+        addFreeform();
+        return false;
+      }
+      if (1 === stackDepth) {
+        addBlockFromStack();
+        return false;
+      }
+      while (0 < stack.length) {
+        addBlockFromStack();
+      }
+      return false;
+    case "void-block":
+      if (0 === stackDepth) {
+        if (null !== leadingHtmlStart) {
+          output.push(
+            Freeform(
+              document.substr(
+                leadingHtmlStart,
+                startOffset - leadingHtmlStart
+              )
+            )
+          );
+        }
+        output.push(Block(blockName, attrs, [], "", []));
+        offset = startOffset + tokenLength;
+        return true;
+      }
+      addInnerBlock(
+        Block(blockName, attrs, [], "", []),
+        startOffset,
+        tokenLength
+      );
+      offset = startOffset + tokenLength;
+      return true;
+    case "block-opener":
+      stack.push(
+        Frame(
+          Block(blockName, attrs, [], "", []),
+          startOffset,
+          tokenLength,
+          startOffset + tokenLength,
+          leadingHtmlStart
+        )
+      );
+      offset = startOffset + tokenLength;
+      return true;
+    case "block-closer":
+      if (0 === stackDepth) {
+        addFreeform();
+        return false;
+      }
+      if (1 === stackDepth) {
+        addBlockFromStack(startOffset);
+        offset = startOffset + tokenLength;
+        return true;
+      }
+      const stackTop = stack.pop();
+      const html = document.substr(
+        stackTop.prevOffset,
+        startOffset - stackTop.prevOffset
+      );
+      stackTop.block.innerHTML += html;
+      stackTop.block.innerContent.push(html);
+      stackTop.prevOffset = startOffset + tokenLength;
+      addInnerBlock(
+        stackTop.block,
+        stackTop.tokenStart,
+        stackTop.tokenLength,
+        startOffset + tokenLength
+      );
+      offset = startOffset + tokenLength;
+      return true;
+    default:
+      addFreeform();
+      return false;
+  }
+}
+function parseJSON(input) {
+  try {
+    return JSON.parse(input);
+  } catch (e) {
+    return null;
+  }
+}
+function nextToken() {
+  const matches = tokenizer.exec(document);
+  if (null === matches) {
+    return ["no-more-tokens", "", null, 0, 0];
+  }
+  const startedAt = matches.index;
+  const [
+    match,
+    closerMatch,
+    namespaceMatch,
+    nameMatch,
+    attrsMatch,
+    ,
+    voidMatch
+  ] = matches;
+  const length = match.length;
+  const isCloser = !!closerMatch;
+  const isVoid = !!voidMatch;
+  const namespace = namespaceMatch || "core/";
+  const name = namespace + nameMatch;
+  const hasAttrs = !!attrsMatch;
+  const attrs = hasAttrs ? parseJSON(attrsMatch) : {};
+  if (isVoid) {
+    return ["void-block", name, attrs, startedAt, length];
+  }
+  if (isCloser) {
+    return ["block-closer", name, null, startedAt, length];
+  }
+  return ["block-opener", name, attrs, startedAt, length];
+}
+function addFreeform(rawLength) {
+  const length = document.length - offset;
+  if (0 === length) {
+    return;
+  }
+  output.push(Freeform(document.substr(offset, length)));
+}
+function addInnerBlock(block, tokenStart, tokenLength, lastOffset) {
+  const parent = stack[stack.length - 1];
+  parent.block.innerBlocks.push(block);
+  const html = document.substr(
+    parent.prevOffset,
+    tokenStart - parent.prevOffset
+  );
+  if (html) {
+    parent.block.innerHTML += html;
+    parent.block.innerContent.push(html);
+  }
+  parent.block.innerContent.push(null);
+  parent.prevOffset = lastOffset ? lastOffset : tokenStart + tokenLength;
+}
+function addBlockFromStack(endOffset) {
+  const { block, leadingHtmlStart, prevOffset, tokenStart } = stack.pop();
+  const html = endOffset ? document.substr(prevOffset, endOffset - prevOffset) : document.substr(prevOffset);
+  if (html) {
+    block.innerHTML += html;
+    block.innerContent.push(html);
+  }
+  if (null !== leadingHtmlStart) {
+    output.push(
+      Freeform(
+        document.substr(
+          leadingHtmlStart,
+          tokenStart - leadingHtmlStart
+        )
+      )
+    );
+  }
+  output.push(block);
+}
+
 /**
  * @license GPL-3.0-or-later
  *
@@ -2137,6 +2312,8 @@ class WordPressGenerator {
         const data = await client.getAllData({
             per_page: this.config.maxItems || 100,
             _embed: this.config.includeEmbedded || false,
+            // required for content.raw with Gutenberg comments
+            context: 'edit',
         });
         // Create the static data structure matching the existing format
         const staticData = {
@@ -2158,7 +2335,17 @@ class WordPressGenerator {
             },
             // Map the data to the expected structure
             posts: data.posts,
-            pages: data.pages,
+            pages: (data.pages || []).map((p) => {
+                let blocks = [];
+                try {
+                    const raw = p?.content?.raw || '';
+                    blocks = raw ? parse(raw) : [];
+                }
+                catch (e) {
+                    console.warn('⚠️ Failed to parse Gutenberg blocks for page', p?.id, e);
+                }
+                return { ...p, blocks };
+            }),
             media: data.media,
             categories: data.categories,
             tags: data.tags,