@marvalt/wadapter 1.1.12 → 2.0.1

package/dist/index.js

@@ -39,7 +39,7 @@ class WordPressClient {
         });
         // Construct URL based on auth mode
         let url;
-        if (this.config.authMode === 'cloudflare_proxy' || this.config.authMode === 'supabase_proxy') {
+        if (this.config.authMode === 'cloudflare_proxy') {
             // For proxy modes, pass the full REST path including /wp-json as query parameter
             const fullEndpoint = `/wp-json${endpoint}?${queryString.toString()}`;
             url = `${baseUrl}?endpoint=${encodeURIComponent(fullEndpoint)}`;
@@ -65,12 +65,6 @@ class WordPressClient {
                 headers['CF-Access-Client-Secret'] = this.config.cfAccessClientSecret;
             }
         }
-        else if (this.config.authMode === 'supabase_proxy') {
-            // Add Supabase proxy authentication headers
-            if (this.config.supabaseAnonKey) {
-                headers['apikey'] = this.config.supabaseAnonKey;
-            }
-        }
         else {
             // Direct mode - use basic auth
             if (this.config.username && this.config.password) {
@@ -126,8 +120,6 @@ class WordPressClient {
         switch (this.config.authMode) {
             case 'cloudflare_proxy':
                 return this.config.cloudflareWorkerUrl || '';
-            case 'supabase_proxy':
-                return `${this.config.supabaseUrl}/functions/v1/wp-proxy`;
             default:
                 return this.config.apiUrl || '';
         }
@@ -291,7 +283,7 @@ class GravityFormsClient {
     async makeRequest(endpoint, options = {}) {
         // Construct URL based on auth mode
         let url;
-        if (this.config.authMode === 'cloudflare_proxy' || this.config.authMode === 'supabase_proxy') {
+        if (this.config.authMode === 'cloudflare_proxy') {
             // For proxy modes, pass the full REST path including /wp-json as query parameter
             const baseUrl = this.getBaseUrl();
             const fullEndpoint = `/wp-json${endpoint}`;
@@ -319,12 +311,6 @@ class GravityFormsClient {
                 headers['CF-Access-Client-Secret'] = this.config.cfAccessClientSecret;
             }
         }
-        else if (this.config.authMode === 'supabase_proxy') {
-            // Add Supabase proxy authentication headers
-            if (this.config.supabaseAnonKey) {
-                headers['apikey'] = this.config.supabaseAnonKey;
-            }
-        }
         else {
             // Direct mode - use basic auth
             if (this.config.username && this.config.password) {
@@ -359,29 +345,43 @@ class GravityFormsClient {
         switch (this.config.authMode) {
             case 'cloudflare_proxy':
                 return this.config.cloudflareWorkerUrl || '';
-            case 'supabase_proxy':
-                return `${this.config.supabaseUrl}/functions/v1/wp-proxy`;
             default:
                 return this.config.apiUrl || '';
         }
     }
     async getForm(id) {
-        return this.makeRequest(`/gf-api/v1/forms/${id}`);
+        // proxy: use enhanced gf-api/v1; direct: use official GF REST v2 (under /wp-json)
+        const endpoint = this.config.authMode === 'cloudflare_proxy'
+            ? `/gf-api/v1/forms/${id}`
+            : `/wp-json/gf/v2/forms/${id}`;
+        return this.makeRequest(endpoint);
     }
     async getForms() {
-        return this.makeRequest('/gf-api/v1/forms');
+        const endpoint = this.config.authMode === 'cloudflare_proxy'
+            ? '/gf-api/v1/forms'
+            : '/wp-json/gf/v2/forms';
+        return this.makeRequest(endpoint);
     }
     async getFormConfig(id) {
-        return this.makeRequest(`/gf-api/v1/forms/${id}/config`);
+        const endpoint = this.config.authMode === 'cloudflare_proxy'
+            ? `/gf-api/v1/forms/${id}/config`
+            : `/wp-json/gf/v2/forms/${id}`; // v2 returns full form including settings
+        return this.makeRequest(endpoint);
     }
     async submitForm(formId, submission) {
-        return this.makeRequest(`/gf-api/v1/forms/${formId}/submit`, {
+        const endpoint = this.config.authMode === 'cloudflare_proxy'
+            ? `/gf-api/v1/forms/${formId}/submit`
+            : `/wp-json/gf/v2/forms/${formId}/submissions`; // official GF REST v2 submissions
+        return this.makeRequest(endpoint, {
             method: 'POST',
             body: JSON.stringify(submission),
         });
     }
     async getHealth() {
-        return this.makeRequest('/gf-api/v1/health');
+        const endpoint = this.config.authMode === 'cloudflare_proxy'
+            ? '/gf-api/v1/health'
+            : '/wp-json/gf/v2/health';
+        return this.makeRequest(endpoint);
     }
 }
 
@@ -2011,6 +2011,301 @@ function useGravityFormsContext() {
     return context;
 }
 
+/**
+ * @license GPL-3.0-or-later
+ *
+ * This file is part of the MarVAlt Open SDK.
+ * Copyright (c) 2025 Vibune Pty Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+let wordpressStaticData = null;
+async function loadWordPressData(path = '/wordpress-data.json') {
+    try {
+        const res = await fetch(path);
+        if (!res.ok)
+            return null;
+        wordpressStaticData = (await res.json());
+        return wordpressStaticData;
+    }
+    catch {
+        return null;
+    }
+}
+function hasWordPressStatic() {
+    return !!wordpressStaticData && Array.isArray(wordpressStaticData.posts);
+}
+function getWordPressPosts() {
+    return wordpressStaticData?.posts ?? [];
+}
+function getWordPressPages() {
+    return wordpressStaticData?.pages ?? [];
+}
+function getWordPressMedia() {
+    return wordpressStaticData?.media ?? [];
+}
+function getWordPressCategories() {
+    return wordpressStaticData?.categories ?? [];
+}
+function getWordPressTags() {
+    return wordpressStaticData?.tags ?? [];
+}
+
+/**
+ * @license GPL-3.0-or-later
+ *
+ * This file is part of the MarVAlt Open SDK.
+ * Copyright (c) 2025 Vibune Pty Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+let gravityFormsStaticData = null;
+async function loadGravityFormsData(path = '/gravityForms.json') {
+    try {
+        const res = await fetch(path);
+        if (!res.ok)
+            return null;
+        const json = await res.json();
+        gravityFormsStaticData = {
+            generated_at: json.generated_at,
+            total_forms: json.total_forms,
+            forms: (json.forms ?? []),
+        };
+        return gravityFormsStaticData;
+    }
+    catch {
+        return null;
+    }
+}
+function hasGravityFormsStatic() {
+    return !!gravityFormsStaticData && Array.isArray(gravityFormsStaticData.forms);
+}
+function getActiveForms() {
+    return (gravityFormsStaticData?.forms ?? []).filter(f => f.is_active === true || f.isActive === true);
+}
+function getPublishedForms() {
+    return (gravityFormsStaticData?.forms ?? []).filter(f => f.is_trash === false || f.isPublished === true);
+}
+function getFormById(id) {
+    const key = String(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
  *
@@ -2041,6 +2336,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 = {
@@ -2062,7 +2359,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,
@@ -2319,9 +2626,8 @@ async function generateFormProtectionData(config) {
 function createWordPressConfig(overrides = {}) {
     return {
         apiUrl: process.env.VITE_WORDPRESS_API_URL || '',
-        authMode: process.env.VITE_WP_AUTH_MODE || 'cloudflare_proxy',
+        authMode: process.env.VITE_AUTH_MODE || 'cloudflare_proxy',
         cloudflareWorkerUrl: process.env.VITE_CLOUDFLARE_WORKER_URL,
-        supabaseUrl: process.env.VITE_SUPABASE_URL,
         username: process.env.VITE_WP_API_USERNAME,
         password: process.env.VITE_WP_APP_PASSWORD,
         timeout: 30000,
@@ -2332,9 +2638,8 @@ function createWordPressConfig(overrides = {}) {
 function createGravityFormsConfig(overrides = {}) {
     return {
         apiUrl: process.env.VITE_GRAVITY_FORMS_API_URL || '',
-        authMode: process.env.VITE_WP_AUTH_MODE || 'cloudflare_proxy',
+        authMode: process.env.VITE_AUTH_MODE || 'cloudflare_proxy',
         cloudflareWorkerUrl: process.env.VITE_CLOUDFLARE_WORKER_URL,
-        supabaseUrl: process.env.VITE_SUPABASE_URL,
         username: process.env.VITE_GRAVITY_FORMS_USERNAME || '',
         password: process.env.VITE_GRAVITY_FORMS_PASSWORD || '',
         timeout: 30000,
@@ -2362,9 +2667,7 @@ function validateWordPressConfig(config) {
     if (config.authMode === 'cloudflare_proxy' && !config.cloudflareWorkerUrl) {
         errors.push('Cloudflare Worker URL is required for cloudflare_proxy mode');
     }
-    if (config.authMode === 'supabase_proxy' && !config.supabaseUrl) {
-        errors.push('Supabase URL is required for supabase_proxy mode');
-    }
+    // no other proxy modes supported
     return errors;
 }
 function validateGravityFormsConfig(config) {
@@ -2492,6 +2795,18 @@ exports.createWordPressConfig = createWordPressConfig;
 exports.generateFormProtectionData = generateFormProtectionData;
 exports.generateGravityFormsData = generateGravityFormsData;
 exports.generateWordPressData = generateWordPressData;
+exports.getActiveForms = getActiveForms;
+exports.getFormById = getFormById;
+exports.getPublishedForms = getPublishedForms;
+exports.getWordPressCategories = getWordPressCategories;
+exports.getWordPressMedia = getWordPressMedia;
+exports.getWordPressPages = getWordPressPages;
+exports.getWordPressPosts = getWordPressPosts;
+exports.getWordPressTags = getWordPressTags;
+exports.hasGravityFormsStatic = hasGravityFormsStatic;
+exports.hasWordPressStatic = hasWordPressStatic;
+exports.loadGravityFormsData = loadGravityFormsData;
+exports.loadWordPressData = loadWordPressData;
 exports.sanitizeHtml = sanitizeHtml;
 exports.transformWordPressMedia = transformWordPressMedia;
 exports.transformWordPressMediaItems = transformWordPressMediaItems;