@wordpress-flow/cli 1.2.8 → 1.2.10

package/dist/index.js

@@ -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,
@@ -84899,15 +84903,27 @@ class DatabaseClient {
     await this.connect();
     try {
       logger.debug("Creating new post in database...");
-      const query = `
+      const useSpecificId = post.id !== undefined;
+      const query = useSpecificId ? `
+        INSERT INTO wp_posts (
+          ID, post_title, post_content, post_excerpt, post_status, 
+          post_type, post_name, post_author, post_date, 
+          post_date_gmt, post_modified, post_modified_gmt, 
+          guid, comment_status, ping_status, to_ping, pinged, 
+          post_content_filtered, post_password, post_parent, 
+          menu_order, post_mime_type, comment_count
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW(), UTC_TIMESTAMP(), NOW(), UTC_TIMESTAMP(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      ` : `
         INSERT INTO wp_posts (
           post_title, post_content, post_excerpt, post_status, 
           post_type, post_name, post_author, post_date, 
           post_date_gmt, post_modified, post_modified_gmt, 
-          guid, comment_status, ping_status
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, NOW(), UTC_TIMESTAMP(), NOW(), UTC_TIMESTAMP(), ?, ?, ?)
+          guid, comment_status, ping_status, to_ping, pinged, 
+          post_content_filtered, post_password, post_parent, 
+          menu_order, post_mime_type, comment_count
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, NOW(), UTC_TIMESTAMP(), NOW(), UTC_TIMESTAMP(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `;
-      const values = [
+      const baseValues = [
         post.title.raw || post.title.rendered,
         post.content.raw,
         post.excerpt?.raw || post.excerpt?.rendered || "",
@@ -84917,10 +84933,21 @@ class DatabaseClient {
         post.author || 1,
         "",
         post.comment_status || "open",
-        post.ping_status || "open"
+        post.ping_status || "open",
+        "",
+        "",
+        "",
+        "",
+        0,
+        0,
+        "",
+        0
       ];
+      const values = useSpecificId ? [post.id, ...baseValues] : baseValues;
+      logger.debug(`useSpecificId: ${useSpecificId}, values count: ${values.length}`);
+      logger.debug(`Query: ${query}`);
       const [result2] = await this.connection.execute(query, values);
-      const insertId = result2.insertId;
+      const insertId = useSpecificId ? post.id : result2.insertId;
       const guid = `${this.config.wordpressUrl}/?p=${insertId}`;
       await this.connection.execute("UPDATE wp_posts SET guid = ? WHERE ID = ?", [guid, insertId]);
       if (post.meta) {
@@ -113153,13 +113180,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;
@@ -113199,12 +113229,20 @@ ${"=".repeat(80)}`);
       slug: mdxFile.frontmatter.slug,
       categories: mdxFile.frontmatter.categories,
       tags: mdxFile.frontmatter.tags,
-      meta: mdxFile.frontmatter.meta
+      meta: mdxFile.frontmatter.meta,
+      id: isUpdate ? mdxFile.frontmatter.postId : undefined
     };
     let updatedPost;
     if (isUpdate) {
-      updatedPost = await connection.updatePost(mdxFile.frontmatter.postId, postData);
-      logger.debug(`Updated post: ${updatedPost.title.rendered} (ID: ${updatedPost.id})`);
+      const existingPost = await connection.getPost(mdxFile.frontmatter.postId);
+      if (existingPost) {
+        updatedPost = await connection.updatePost(mdxFile.frontmatter.postId, postData);
+        logger.debug(`Updated post: ${updatedPost.title.rendered} (ID: ${updatedPost.id})`);
+      } else {
+        logger.debug(`Post ${mdxFile.frontmatter.postId} not found, creating new post`);
+        updatedPost = await connection.createPost(postData);
+        logger.info(`Created new post: ${updatedPost.title.rendered} (ID: ${updatedPost.id})`);
+      }
       await this.updateMDXAfterPush(filePath2, updatedPost);
     } else {
       updatedPost = await connection.createPost(postData);
@@ -113213,18 +113251,24 @@ ${"=".repeat(80)}`);
     }
   }
   async processFileQuiet(filePath2, options, connection, result2) {
+    logger.debug(`[processFileQuiet] Starting to process: ${filePath2}`);
     const mdxFile = await this.parseFile(filePath2);
     const isUpdate = !!mdxFile.frontmatter.postId;
+    logger.debug(`[processFileQuiet] isUpdate: ${isUpdate}, postId: ${mdxFile.frontmatter.postId}`);
     if (isUpdate && !options.force) {
+      logger.debug(`[processFileQuiet] Checking for conflicts...`);
       const conflict = await this.checkForConflicts(mdxFile, connection);
       if (conflict) {
+        logger.debug(`[processFileQuiet] Conflict found, skipping`);
         result2.conflicts.push(conflict);
         return;
       }
     }
     if (options.dryRun) {
+      logger.debug(`[processFileQuiet] Dry run, skipping`);
       return;
     }
+    logger.debug(`[processFileQuiet] Rendering MDX to HTML...`);
     const htmlContent = await this.getBlockRenderer().renderMDXContentToHTML(mdxFile.content);
     const pathParts = filePath2.split(path6.sep);
     const postType = pathParts[pathParts.length - 2];
@@ -113237,15 +113281,29 @@ ${"=".repeat(80)}`);
       slug: mdxFile.frontmatter.slug,
       categories: mdxFile.frontmatter.categories,
       tags: mdxFile.frontmatter.tags,
-      meta: mdxFile.frontmatter.meta
+      meta: mdxFile.frontmatter.meta,
+      id: isUpdate ? mdxFile.frontmatter.postId : undefined
     };
     let updatedPost;
     if (isUpdate) {
-      updatedPost = await connection.updatePost(mdxFile.frontmatter.postId, postData);
+      logger.debug(`[processFileQuiet] Checking if post ${mdxFile.frontmatter.postId} exists...`);
+      const existingPost = await connection.getPost(mdxFile.frontmatter.postId);
+      if (existingPost) {
+        logger.debug(`[processFileQuiet] Post ${mdxFile.frontmatter.postId} exists, updating...`);
+        updatedPost = await connection.updatePost(mdxFile.frontmatter.postId, postData);
+      } else {
+        logger.debug(`[processFileQuiet] Post ${mdxFile.frontmatter.postId} not found, creating new...`);
+        updatedPost = await connection.createPost(postData);
+        logger.debug(`[processFileQuiet] Created new post with ID: ${updatedPost.id}`);
+      }
     } else {
+      logger.debug(`[processFileQuiet] No postId, creating new post...`);
       updatedPost = await connection.createPost(postData);
+      logger.debug(`[processFileQuiet] Created new post with ID: ${updatedPost.id}`);
     }
+    logger.debug(`[processFileQuiet] Updating MDX file...`);
     await this.updateMDXAfterPush(filePath2, updatedPost);
+    logger.debug(`[processFileQuiet] Done`);
   }
   async checkForConflicts(mdxFile, connection) {
     if (!mdxFile.frontmatter.postId) {
@@ -113254,13 +113312,7 @@ ${"=".repeat(80)}`);
     try {
       const wpPost = await connection.getPost(mdxFile.frontmatter.postId);
       if (!wpPost) {
-        return {
-          postId: mdxFile.frontmatter.postId,
-          localPath: mdxFile.path,
-          wordpressPost: null,
-          localFile: mdxFile,
-          conflictType: "missing-source"
-        };
+        return null;
       }
       return null;
     } catch (error) {
@@ -115894,7 +115946,7 @@ class DockerEnvManager {
     });
   }
   async stop() {
-    logger.info("\uD83D\uDC33 Stopping Docker containers...");
+    logger.progress("\uD83D\uDC33 Stopping Docker containers...");
     try {
       execSync(`docker stop ${this.containerNames.wordpress}`, {
         stdio: "pipe"
@@ -116132,7 +116184,7 @@ class DockerEnvManager {
 // package.json
 var package_default = {
   name: "@wordpress-flow/cli",
-  version: "1.2.8",
+  version: "1.2.10",
   type: "module",
   description: "TypeScript-based WordPress block creation system",
   main: "dist/index.js",
@@ -116492,14 +116544,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;
@@ -116698,8 +116754,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.8",
+  "version": "1.2.10",
   "type": "module",
   "description": "TypeScript-based WordPress block creation system",
   "main": "dist/index.js",