@wordpress-flow/cli 1.2.9 → 1.2.11

package/dist/index.js

@@ -78019,9 +78019,9 @@ var require_readdirp = __commonJS((exports, module) => {
     async _formatEntry(dirent, path8) {
       let entry;
       try {
-        const basename2 = this._isDirent ? dirent.name : dirent;
-        const fullPath = sysPath.resolve(sysPath.join(path8, basename2));
-        entry = { path: sysPath.relative(this._root, fullPath), fullPath, basename: basename2 };
+        const basename3 = this._isDirent ? dirent.name : dirent;
+        const fullPath = sysPath.resolve(sysPath.join(path8, basename3));
+        entry = { path: sysPath.relative(this._root, fullPath), fullPath, basename: basename3 };
         entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
       } catch (err) {
         this._onError(err);
@@ -79944,16 +79944,16 @@ var require_nodefs_handler = __commonJS((exports, module) => {
     _watchWithNodeFs(path8, listener) {
       const opts = this.fsw.options;
       const directory = sysPath.dirname(path8);
-      const basename2 = sysPath.basename(path8);
+      const basename3 = sysPath.basename(path8);
       const parent = this.fsw._getWatchedDir(directory);
-      parent.add(basename2);
+      parent.add(basename3);
       const absolutePath = sysPath.resolve(path8);
       const options = { persistent: opts.persistent };
       if (!listener)
         listener = EMPTY_FN;
       let closer;
       if (opts.usePolling) {
-        options.interval = opts.enableBinaryInterval && isBinaryPath(basename2) ? opts.binaryInterval : opts.interval;
+        options.interval = opts.enableBinaryInterval && isBinaryPath(basename3) ? opts.binaryInterval : opts.interval;
         closer = setFsWatchFileListener(path8, absolutePath, options, {
           listener,
           rawEmitter: this.fsw._emitRaw
@@ -79972,10 +79972,10 @@ var require_nodefs_handler = __commonJS((exports, module) => {
         return;
       }
       const dirname2 = sysPath.dirname(file);
-      const basename2 = sysPath.basename(file);
+      const basename3 = sysPath.basename(file);
       const parent = this.fsw._getWatchedDir(dirname2);
       let prevStats = stats;
-      if (parent.has(basename2))
+      if (parent.has(basename3))
         return;
       const listener = async (path8, newStats) => {
         if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
@@ -79998,9 +79998,9 @@ var require_nodefs_handler = __commonJS((exports, module) => {
               prevStats = newStats2;
             }
           } catch (error) {
-            this.fsw._remove(dirname2, basename2);
+            this.fsw._remove(dirname2, basename3);
           }
-        } else if (parent.has(basename2)) {
+        } else if (parent.has(basename3)) {
           const at2 = newStats.atimeMs;
           const mt = newStats.mtimeMs;
           if (!at2 || at2 <= mt || mt !== prevStats.mtimeMs) {
@@ -80768,8 +80768,10 @@ var DEFAULTS = {
     plugins: "./plugins"
   },
   sync: {
+    postTypes: ["post", "page"],
     excludePostTypes: [],
-    includedPostStatuses: ["publish", "draft"]
+    includedPostStatuses: ["publish", "draft"],
+    conflictResolution: "manual"
   },
   dev: {
     port: 8888,
@@ -80896,8 +80898,10 @@ class ConfigManager {
         partsOutput: `${theme}/parts`
       },
       sync: {
+        postTypes: raw.sync?.postTypes || DEFAULTS.sync.postTypes,
         excludePostTypes: raw.sync?.excludePostTypes || DEFAULTS.sync.excludePostTypes,
-        includedPostStatuses: raw.sync?.includedPostStatuses || DEFAULTS.sync.includedPostStatuses
+        includedPostStatuses: raw.sync?.includedPostStatuses || DEFAULTS.sync.includedPostStatuses,
+        conflictResolution: raw.sync?.conflictResolution || DEFAULTS.sync.conflictResolution
       },
       dev: {
         port: raw.dev?.port || DEFAULTS.dev.port,
@@ -85705,7 +85709,7 @@ class PullCommand {
       errors: []
     };
     try {
-      const postTypes = options.postTypes || ["post", "page"];
+      const postTypes = options.postTypes || config.sync.postTypes || ["post", "page"];
       const outputDir = options.outputDir || config.paths.content;
       fs3.mkdirSync(outputDir, { recursive: true });
       let totalProcessed = 0;
@@ -85779,7 +85783,6 @@ class PullCommand {
     const blocks = this.blockParser.parse(post.content.raw);
     const frontmatter = {
       title: post.title.rendered,
-      slug: post.slug,
       postId: post.id,
       status: post.status
     };
@@ -113176,13 +113179,16 @@ class PushCommand {
     if (!baseDir) {
       throw new Error("No base directory specified and no files provided");
     }
-    const postsPattern = path6.join(baseDir, "post/**/*.mdx");
-    const pagesPattern = path6.join(baseDir, "page/**/*.mdx");
+    const config = this.configManager.getConfig();
+    const postTypes = config.sync?.postTypes || ["post", "page"];
     try {
-      const postFiles = await glob(postsPattern);
-      const pageFiles = await glob(pagesPattern);
-      const allFiles = [...postFiles, ...pageFiles];
-      logger.debug(`Found ${postFiles.length} posts and ${pageFiles.length} pages`);
+      const allFiles = [];
+      for (const postType of postTypes) {
+        const pattern = path6.join(baseDir, `${postType}/**/*.mdx`);
+        const files = await glob(pattern);
+        allFiles.push(...files);
+        logger.debug(`Found ${files.length} ${postType}(s)`);
+      }
       return allFiles;
     } catch (error) {
       throw error;
@@ -113213,13 +113219,14 @@ ${"=".repeat(80)}`);
 `);
     const pathParts = filePath2.split(path6.sep);
     const postType = pathParts[pathParts.length - 2];
+    const slug = path6.basename(filePath2, ".mdx");
     const postData = {
       title: { raw: mdxFile.frontmatter.title },
       content: { raw: htmlContent },
       excerpt: mdxFile.frontmatter.excerpt ? { raw: mdxFile.frontmatter.excerpt } : undefined,
       status: mdxFile.frontmatter.status,
       type: postType,
-      slug: mdxFile.frontmatter.slug,
+      slug,
       categories: mdxFile.frontmatter.categories,
       tags: mdxFile.frontmatter.tags,
       meta: mdxFile.frontmatter.meta,
@@ -113265,13 +113272,14 @@ ${"=".repeat(80)}`);
     const htmlContent = await this.getBlockRenderer().renderMDXContentToHTML(mdxFile.content);
     const pathParts = filePath2.split(path6.sep);
     const postType = pathParts[pathParts.length - 2];
+    const slug = path6.basename(filePath2, ".mdx");
     const postData = {
       title: { raw: mdxFile.frontmatter.title },
       content: { raw: htmlContent },
       excerpt: mdxFile.frontmatter.excerpt ? { raw: mdxFile.frontmatter.excerpt } : undefined,
       status: mdxFile.frontmatter.status,
       type: postType,
-      slug: mdxFile.frontmatter.slug,
+      slug,
       categories: mdxFile.frontmatter.categories,
       tags: mdxFile.frontmatter.tags,
       meta: mdxFile.frontmatter.meta,
@@ -116177,7 +116185,7 @@ class DockerEnvManager {
 // package.json
 var package_default = {
   name: "@wordpress-flow/cli",
-  version: "1.2.9",
+  version: "1.2.11",
   type: "module",
   description: "TypeScript-based WordPress block creation system",
   main: "dist/index.js",
@@ -116537,14 +116545,18 @@ class DevModeOrchestrator {
   async performInitialContentPush() {
     if (!fs15.existsSync(this.contentDir))
       return;
-    const postDir = path17.join(this.contentDir, "post");
-    const pageDir = path17.join(this.contentDir, "page");
+    const config = this.configManager.getConfig();
+    const postTypes = config.sync.postTypes || ["post", "page"];
+    console.log(`[DEBUG] Initial push - Post types: ${JSON.stringify(postTypes)}`);
     const contentFiles = [];
-    if (fs15.existsSync(postDir)) {
-      contentFiles.push(...this.findMDXFiles(postDir));
-    }
-    if (fs15.existsSync(pageDir)) {
-      contentFiles.push(...this.findMDXFiles(pageDir));
+    for (const postType of postTypes) {
+      const typeDir = path17.join(this.contentDir, postType);
+      console.log(`[DEBUG] Checking directory: ${typeDir}, exists: ${fs15.existsSync(typeDir)}`);
+      if (fs15.existsSync(typeDir)) {
+        const files = this.findMDXFiles(typeDir);
+        console.log(`[DEBUG] Found ${files.length} files in ${postType}`);
+        contentFiles.push(...files);
+      }
     }
     if (contentFiles.length === 0) {
       return;
@@ -116743,8 +116755,13 @@ class DevModeOrchestrator {
   startPageWatcher() {
     if (!fs15.existsSync(this.contentDir))
       return;
-    logger.debug(`Watching pages: ${this.contentDir}`);
-    const watcher = $watch(["post/**/*.mdx", "page/**/*.mdx"], {
+    const config = this.configManager.getConfig();
+    const postTypes = config.sync.postTypes || ["post", "page"];
+    const watchPatterns = postTypes.map((type) => `${type}/**/*.mdx`);
+    console.log(`[DEBUG] Post types from config: ${JSON.stringify(postTypes)}`);
+    console.log(`[DEBUG] Watch patterns: ${JSON.stringify(watchPatterns)}`);
+    logger.debug(`Watching content: ${this.contentDir} (${postTypes.join(", ")})`);
+    const watcher = $watch(watchPatterns, {
       cwd: this.contentDir,
       ...this.getWatcherOptions()
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wordpress-flow/cli",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "type": "module",
   "description": "TypeScript-based WordPress block creation system",
   "main": "dist/index.js",