@marvalt/wadapter 2.0.0 → 2.0.1

package/README.md

@@ -59,6 +59,14 @@ The generators fetch WordPress and Gravity Forms data and write static JSON:
 
 You can wire them into npm scripts using your preferred runner. Example entry points are included in the docs.
 
+### Pages now include Gutenberg blocks
+
+- Pages are fetched with `context=edit` so `content.raw` is available.
+- We parse `content.raw` using `@wordpress/block-serialization-default-parser` and persist `pages[n].blocks`.
+- Posts remain unchanged (HTML `content.rendered`).
+
+Proxy mode note: the Cloudflare worker can inject Basic Auth for `context=edit` if `WP_BASIC_AUTH_USERNAME` and `WP_BASIC_AUTH_PASSWORD` are set.
+
 ## Runtime access (static-only)
 
 - Loaders
@@ -71,6 +79,19 @@ You can wire them into npm scripts using your preferred runner. Example entry po
 
 Note: These selectors read only from static JSON. They do not fetch live content at runtime.
 
+## Exports and types
+
+- Generators
+  - `WordPressGenerator`, `generateWordPressData`
+  - `GravityFormsGenerator`, `generateGravityFormsData`
+  - Generator output type for GF: `GravityFormsStaticBundle`
+
+- Static runtime selectors
+  - WordPress: `loadWordPressData`, `getWordPressPosts`, `getWordPressPages`, `getWordPressMedia`, `getWordPressCategories`, `getWordPressTags`
+  - Gravity Forms: `loadGravityFormsData`, `hasGravityFormsStatic`, `getActiveForms`, `getPublishedForms`, `getFormById`
+
+> Note: The generator bundle type was renamed to avoid conflicts with runtime static selectors.
+
 ## Form submissions
 
 Use the package Gravity Forms client. It routes per mode:

package/dist/generators/gravity-forms/gravity-forms-generator.d.ts

@@ -20,7 +20,7 @@ export interface GravityFormsGeneratorConfig extends GravityFormsConfig {
     formIds?: number[];
     includeInactive?: boolean;
 }
-export interface GravityFormsStaticData {
+export interface GravityFormsStaticBundle {
     generated_at: string;
     total_forms: number;
     forms: GravityForm[];
@@ -28,9 +28,9 @@ export interface GravityFormsStaticData {
 export declare class GravityFormsGenerator {
     private config;
     constructor(config: GravityFormsGeneratorConfig);
-    generateStaticData(): Promise<GravityFormsStaticData>;
+    generateStaticData(): Promise<GravityFormsStaticBundle>;
     private writeStaticData;
     generateFormConfig(formId: number): Promise<GravityForm>;
 }
-export declare function generateGravityFormsData(config: GravityFormsGeneratorConfig): Promise<GravityFormsStaticData>;
+export declare function generateGravityFormsData(config: GravityFormsGeneratorConfig): Promise<GravityFormsStaticBundle>;
 //# sourceMappingURL=gravity-forms-generator.d.ts.map

package/dist/generators/gravity-forms/gravity-forms-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gravity-forms-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/gravity-forms/gravity-forms-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI5E,MAAM,WAAW,2BAA4B,SAAQ,kBAAkB;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAA8B;gBAEhC,MAAM,EAAE,2BAA2B;IAIzC,kBAAkB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAyE3D,OAAO,CAAC,eAAe;IAWjB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAI/D;AAGD,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAGnH"}
+{"version":3,"file":"gravity-forms-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/gravity-forms/gravity-forms-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI5E,MAAM,WAAW,2BAA4B,SAAQ,kBAAkB;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAA8B;gBAEhC,MAAM,EAAE,2BAA2B;IAIzC,kBAAkB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAyE7D,OAAO,CAAC,eAAe;IAWjB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAI/D;AAGD,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAGrH"}

package/dist/generators/wordpress/wordpress-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wordpress-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/wordpress/wordpress-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAmC,MAAM,uBAAuB,CAAC;AAIvI,MAAM,WAAW,wBAAyB,SAAQ,eAAe;IAC/D,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE;YACzB,SAAS,EAAE,MAAM,CAAC;YAClB,gBAAgB,EAAE,OAAO,CAAC;YAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;YACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;SACvB,CAAC,CAAC;KACJ,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;gBAE7B,MAAM,EAAE,wBAAwB;IAItC,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC;IAiDpD,OAAO,CAAC,eAAe;IAWjB,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK7C,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK7C,iBAAiB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;CAIrD;AAGD,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,eAAe,CAAC,CAGtG"}
+{"version":3,"file":"wordpress-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/wordpress/wordpress-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAmC,MAAM,uBAAuB,CAAC;AAKvI,MAAM,WAAW,wBAAyB,SAAQ,eAAe;IAC/D,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE;YACzB,SAAS,EAAE,MAAM,CAAC;YAClB,gBAAgB,EAAE,OAAO,CAAC;YAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;YACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;SACvB,CAAC,CAAC;KACJ,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;gBAE7B,MAAM,EAAE,wBAAwB;IAItC,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC;IA4DpD,OAAO,CAAC,eAAe;IAWjB,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK7C,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK7C,iBAAiB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;CAIrD;AAGD,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,eAAe,CAAC,CAGtG"}

package/dist/index.d.ts

@@ -35,6 +35,7 @@ interface WordPressPost {
     content: {
         rendered: string;
         protected: boolean;
+        raw?: string;
     };
     excerpt: {
         rendered: string;
@@ -346,6 +347,7 @@ interface WordPressQueryParams {
     include?: number[];
     offset?: number;
     _embed?: boolean;
+    context?: 'view' | 'embed' | 'edit';
 }
 
 /**
@@ -823,12 +825,12 @@ declare function getWordPressTags(): WordPressTag[];
  * See the GNU General Public License for more details.
  */
 
-interface GravityFormsStaticData$1 {
+interface GravityFormsStaticData {
     generated_at?: string;
     total_forms: number;
     forms: GravityForm$1[];
 }
-declare function loadGravityFormsData(path?: string): Promise<GravityFormsStaticData$1 | null>;
+declare function loadGravityFormsData(path?: string): Promise<GravityFormsStaticData | null>;
 declare function hasGravityFormsStatic(): boolean;
 declare function getActiveForms(): GravityForm$1[];
 declare function getPublishedForms(): GravityForm$1[];
@@ -909,7 +911,7 @@ interface GravityFormsGeneratorConfig extends GravityFormsConfig {
     formIds?: number[];
     includeInactive?: boolean;
 }
-interface GravityFormsStaticData {
+interface GravityFormsStaticBundle {
     generated_at: string;
     total_forms: number;
     forms: GravityForm$1[];
@@ -917,11 +919,11 @@ interface GravityFormsStaticData {
 declare class GravityFormsGenerator {
     private config;
     constructor(config: GravityFormsGeneratorConfig);
-    generateStaticData(): Promise<GravityFormsStaticData>;
+    generateStaticData(): Promise<GravityFormsStaticBundle>;
     private writeStaticData;
     generateFormConfig(formId: number): Promise<GravityForm$1>;
 }
-declare function generateGravityFormsData(config: GravityFormsGeneratorConfig): Promise<GravityFormsStaticData>;
+declare function generateGravityFormsData(config: GravityFormsGeneratorConfig): Promise<GravityFormsStaticBundle>;
 
 /**
  * @license GPL-3.0-or-later
@@ -1069,4 +1071,4 @@ declare function validateFormData(formData: Record<string, any>, rules: Record<s
 };
 
 export { FormProtectionGenerator, GravityForm, GravityFormsClient, GravityFormsGenerator, GravityFormsProvider, WordPressClient, WordPressContent, WordPressGenerator, WordPressProvider, createFormProtectionConfig, createGravityFormsConfig, createWordPressConfig, generateFormProtectionData, generateGravityFormsData, generateWordPressData, getActiveForms, getFormById, getPublishedForms, getWordPressCategories, getWordPressMedia, getWordPressPages, getWordPressPosts, getWordPressTags, hasGravityFormsStatic, hasWordPressStatic, loadGravityFormsData, loadWordPressData, sanitizeHtml, transformWordPressMedia, transformWordPressMediaItems, transformWordPressPage, transformWordPressPages, transformWordPressPost, transformWordPressPosts, useGravityForms, useGravityFormsConfig, useGravityFormsContext, useWordPress, useWordPressCategories, useWordPressContext, useWordPressMedia, useWordPressPage, useWordPressPages, useWordPressPost, useWordPressPosts, useWordPressTags, validateEmail, validateFormData, validateFormProtectionConfig, validateGravityFormsConfig, validateMaxLength, validateMinLength, validatePhoneNumber, validateRequired, validateUrl, validateWordPressConfig };
-export type { EmailVerificationData, FormProtectionConfig, FormProtectionGeneratorConfig, FormProtectionResult, FormProtectionStaticData, FormProtectionValidation, GravityFormConfirmation, GravityFormField, GravityFormNotification, GravityFormSubmission, GravityFormSubmissionResult, GravityFormsConfig, GravityFormsGeneratorConfig, StaticDataStore, TransformedWordPressMedia, TransformedWordPressPage, TransformedWordPressPost, UseGravityFormsResult, UseWordPressResult, WordPressAuthor, WordPressCategory, WordPressConfig, WordPressGeneratorConfig, WordPressMedia, WordPressPage, WordPressPost, WordPressQueryParams, WordPressStaticData, WordPressTag };
+export type { EmailVerificationData, FormProtectionConfig, FormProtectionGeneratorConfig, FormProtectionResult, FormProtectionStaticData, FormProtectionValidation, GravityFormConfirmation, GravityFormField, GravityFormNotification, GravityFormSubmission, GravityFormSubmissionResult, GravityFormsConfig, GravityFormsGeneratorConfig, GravityFormsStaticBundle, GravityFormsStaticData, StaticDataStore, TransformedWordPressMedia, TransformedWordPressPage, TransformedWordPressPost, UseGravityFormsResult, UseWordPressResult, WordPressAuthor, WordPressCategory, WordPressConfig, WordPressGeneratorConfig, WordPressMedia, WordPressPage, WordPressPost, WordPressQueryParams, WordPressStaticData, WordPressTag };

package/dist/index.esm.js

@@ -2105,6 +2105,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
  *
@@ -2135,6 +2334,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 = {
@@ -2156,7 +2357,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,