@rnaga/wp-node 1.3.18 → 1.3.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnaga/wp-node",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && tsc --project tsconfig.build.json && npm run copyfiles && cp package.json ./dist/",

package/transactions/post.trx.d.ts

@@ -46,10 +46,12 @@ export declare class PostTrx extends Trx {
     updateMenuOrder(postId: number, menuOrder: number, options?: {
         checkParent?: boolean;
         reOrder?: boolean;
+        postTypes?: string[];
     }): Promise<boolean>;
     swapMenuOrder(postId1: number, postId2: number, options?: {
         reOrderOnEqual?: boolean;
         checkParent?: boolean;
+        postTypes?: string[];
     }): Promise<boolean>;
 }
 export {};

package/transactions/post.trx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.trx.d.ts","sourceRoot":"","sources":["../../src/transactions/post.trx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"post.trx.d.ts","sourceRoot":"","sources":["../../src/transactions/post.trx.ts"],"names":[],"mappings":"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"}

package/transactions/post.trx.js

@@ -190,8 +190,8 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         else if (update && !parsedInput.post_category) {
             postCategory = !postBefore
                 ? []
-                : (await postBefore.terms("category"))?.map((term) => term.term_id) ??
-                    [];
+                : ((await postBefore.terms("category"))?.map((term) => term.term_id) ??
+                    []);
         }
         // Make sure we set a valid category.
         if (0 >= postCategory.length &&
@@ -258,7 +258,7 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         data.post_author =
             parsedInput.post_author > 0
                 ? parsedInput.post_author
-                : current.user?.props?.ID ?? -1;
+                : (current.user?.props?.ID ?? -1);
         data.ping_status =
             parsedInput.ping_status ??
                 this.commentUtil.getDefaultStatus(data.post_type, "pingback");
@@ -902,6 +902,10 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         if (!post.props) {
             throw new Error(`Post not found - ${postId}`);
         }
+        const postTypes = options?.postTypes ?? [post.props.post_type];
+        if (!postTypes.includes(post.props.post_type)) {
+            throw new Error(`Post type of the post should be in ${postTypes.join(", ")} - ${postId}`);
+        }
         if (!reOrder) {
             const trx = await this.database.transaction;
             try {
@@ -925,7 +929,7 @@ let PostTrx = class PostTrx extends trx_1.Trx {
             try {
                 const query = trx
                     .table(this.tables.get("posts"))
-                    .where("post_type", post.props.post_type)
+                    .whereIn("post_type", postTypes)
                     .where("menu_order", ">", oldMenuOrder)
                     .where("menu_order", "<", menuOrder)
                     .whereNot("ID", postId);
@@ -946,7 +950,7 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         const queryUtil = this.components.get(query_util_1.QueryUtil);
         const collisionPosts = await queryUtil.posts((query) => {
             query
-                .where("post_type", post.props.post_type)
+                .whereIn("post_type", postTypes)
                 .where("menu_order", menuOrder)
                 .where("ID", postId, "!=");
             if (checkParent) {
@@ -959,7 +963,7 @@ let PostTrx = class PostTrx extends trx_1.Trx {
             try {
                 const query = trx
                     .table(this.tables.get("posts"))
-                    .where("post_type", post.props.post_type)
+                    .whereIn("post_type", postTypes)
                     .where("menu_order", ">=", menuOrder)
                     .whereNot("ID", postId);
                 if (oldMenuOrder > menuOrder) {
@@ -991,36 +995,40 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         await trxUpdate.commit();
         return true;
     }
-    // Note: menu order of post1 should be smaller than or equal to post2 before swapping, otherwise throws.
+    // Note: post1 and post2 are compared and the smaller menu_order is assigned to post1.
     // Performance note: not suitable for high-frequency or bulk use.
     // - Fetches both posts individually before writing (2 extra DB reads per call).
     // - Uses 2 separate transactions instead of one, creating a TOCTOU window
     //   where concurrent writes between the reads and updates can cause inconsistency.
     async swapMenuOrder(postId1, postId2, options) {
         const { reOrderOnEqual = true, checkParent = true } = options ?? {};
-        const post1 = await this.postUtil.get(postId1);
-        const post2 = await this.postUtil.get(postId2);
+        let post1 = await this.postUtil.get(postId1);
+        let post2 = await this.postUtil.get(postId2);
         if (!post1.props || !post2.props) {
             throw new Error(`Posts not found - ${postId1}, ${postId2}`);
         }
-        if (post1.props.post_type !== post2.props.post_type) {
-            throw new Error(`Posts should have the same post type - ${postId1}, ${postId2}`);
+        const postTypes = options?.postTypes ??
+            Array.from(new Set([post1.props.post_type, post2.props.post_type]));
+        if (!postTypes.includes(post1.props.post_type) ||
+            !postTypes.includes(post2.props.post_type)) {
+            throw new Error(`Post types of both posts should be in [${postTypes.join(", ")}] - ${postId1}, ${postId2}`);
         }
         if (checkParent && post1.props.post_parent !== post2.props.post_parent) {
             throw new Error(`Posts should have the same parent - ${postId1}, ${postId2}`);
         }
+        // Compare menu order and set menuOrder1 as smaller one.
         if (post1.props.menu_order > post2.props.menu_order) {
-            throw new Error(`Menu order of post ${postId1} should be smaller than post ${postId2} before swapping`);
+            // Swap post1 and post2 to make sure menu order of post1 is smaller than or equal to post2.
+            [post1, post2] = [post2, post1];
+            // Swap postId1 and postId2 to keep consistent with post1 and post2 after swap.
+            [postId1, postId2] = [postId2, postId1];
         }
         const menuOrder1 = post1.props.menu_order;
         const menuOrder2 = post2.props.menu_order;
         // Update menu order of post1.
         let trx = await this.database.transaction;
         try {
-            await trx
-                .table(this.tables.get("posts"))
-                .where("ID", postId1)
-                .update({
+            await trx.table(this.tables.get("posts")).where("ID", postId1).update({
                 menu_order: menuOrder2,
             });
         }
@@ -1030,17 +1038,11 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         }
         await trx.commit();
         // Update menu order of post2.
-        // If menu order of post1 and post2 are the same or true on reOrderOnEqual.
-        // 1. menu order of post2 should be increased by 1.
-        // 2. then the rest of posts with the same parent_post and menu order that's same or larger than menu order of post2 (&post1) should be increased by 1
+        // If the orders differ, or reOrderOnEqual is false, perform a plain swap: give post2 post1's old order.
         if (!reOrderOnEqual || menuOrder1 !== menuOrder2) {
-            // If menu order of post1 and post2 are different, just swap them.
             const trx = await this.database.transaction;
             try {
-                await trx
-                    .table(this.tables.get("posts"))
-                    .where("ID", postId2)
-                    .update({
+                await trx.table(this.tables.get("posts")).where("ID", postId2).update({
                     menu_order: menuOrder1,
                 });
             }
@@ -1058,9 +1060,9 @@ let PostTrx = class PostTrx extends trx_1.Trx {
         try {
             const query = trxRest
                 .table(this.tables.get("posts"))
-                .where("post_type", post1.props.post_type)
                 .where("menu_order", ">=", menuOrder2)
-                .whereNot("ID", postId1);
+                .whereNot("ID", postId1)
+                .whereIn("post_type", postTypes);
             if (checkParent) {
                 query.where("post_parent", post1.props.post_parent);
             }