decap-cms-backend-bitbucket 3.3.0 → 3.4.0

package/dist/esm/API.js

@@ -1,9 +1,9 @@
 import flow from 'lodash/flow';
 import get from 'lodash/get';
 import { localForage, unsentRequest, responseParser, then, basename, Cursor, APIError, readFile, CMS_BRANCH_PREFIX, generateContentKey, labelToStatus, isCMSLabel, EditorialWorkflowError, statusToLabel, DEFAULT_PR_BODY, MERGE_COMMIT_MESSAGE, PreviewState, parseContentKey, branchFromContentKey, requestWithBackoff, readFileMetadata, throwOnConflictingBranches } from 'decap-cms-lib-util';
-import { dirname } from 'path';
 import { oneLine } from 'common-tags';
 import { parse } from 'what-the-diff';
+import { dirname } from 'path';
 var BitBucketPullRequestState = /*#__PURE__*/function (BitBucketPullRequestState) {
   BitBucketPullRequestState["MERGED"] = "MERGED";
   BitBucketPullRequestState["SUPERSEDED"] = "SUPERSEDED";
@@ -253,7 +253,8 @@ export default class API {
   async uploadFiles(files, {
     commitMessage,
     branch,
-    parentSha
+    parentSha,
+    hasSubfolders = true
   }) {
     const formData = new FormData();
     const toMove = [];
@@ -266,7 +267,8 @@ export default class API {
         toMove.push({
           from: file.path,
           to: file.newPath,
-          contentBlob
+          contentBlob,
+          hasSubfolders
         });
       } else {
         // add/modify the file
@@ -278,25 +280,39 @@ export default class API {
     for (const {
       from,
       to,
-      contentBlob
+      contentBlob,
+      hasSubfolders
     } of toMove) {
-      const sourceDir = dirname(from);
-      const destDir = dirname(to);
-      const filesBranch = parentSha ? this.branch : branch;
-      const files = await this.listAllFiles(sourceDir, 100, filesBranch);
-      for (const file of files) {
+      if (!hasSubfolders) {
+        // New behavior (subfolders: false): Only move the specific file
         // to move a file in Bitbucket we need to delete the old path
         // and upload the file content to the new path
         // NOTE: this is very wasteful, and also the Bitbucket `diff` API
         // reports these files as deleted+added instead of renamed
         // delete current path
-        formData.append('files', file.path);
+        formData.append('files', from);
         // create in new path
-        const content = file.path === from ? contentBlob : await this.readFile(file.path, null, {
-          branch: filesBranch,
-          parseText: false
-        });
-        formData.append(file.path.replace(sourceDir, destDir), content, basename(file.path));
+        formData.append(to, contentBlob, basename(to));
+      } else {
+        // Legacy behavior (subfolders: true, default): Move all files in the directory
+        const sourceDir = dirname(from);
+        const destDir = dirname(to);
+        const filesBranch = parentSha ? this.branch : branch;
+        const files = await this.listAllFiles(sourceDir, 100, filesBranch);
+        for (const file of files) {
+          // to move a file in Bitbucket we need to delete the old path
+          // and upload the file content to the new path
+          // NOTE: this is very wasteful, and also the Bitbucket `diff` API
+          // reports these files as deleted+added instead of renamed
+          // delete current path
+          formData.append('files', file.path);
+          // create in new path
+          const content = file.path === from ? contentBlob : await this.readFile(file.path, null, {
+            branch: filesBranch,
+            parseText: false
+          });
+          formData.append(file.path.replace(sourceDir, destDir), content, basename(file.path));
+        }
       }
     }
     if (commitMessage) {
@@ -331,13 +347,15 @@ export default class API {
   }
   async persistFiles(dataFiles, mediaFiles, options) {
     const files = [...dataFiles, ...mediaFiles];
+    const hasSubfolders = options.hasSubfolders !== false; // default to true
     if (options.useWorkflow) {
       const slug = dataFiles[0].slug;
       return this.editorialWorkflowGit(files, slug, options);
     } else {
       return this.uploadFiles(files, {
         commitMessage: options.commitMessage,
-        branch: this.branch
+        branch: this.branch,
+        hasSubfolders
       });
     }
   }
@@ -419,12 +437,14 @@ export default class API {
     const contentKey = generateContentKey(options.collectionName, slug);
     const branch = branchFromContentKey(contentKey);
     const unpublished = options.unpublished || false;
+    const hasSubfolders = options.hasSubfolders !== false; // default to true
     if (!unpublished) {
       const defaultBranchSha = await this.branchCommitSha(this.branch);
       await this.uploadFiles(files, {
         commitMessage: options.commitMessage,
         branch,
-        parentSha: defaultBranchSha
+        parentSha: defaultBranchSha,
+        hasSubfolders
       });
       await this.createPullRequest(branch, options.commitMessage, options.status || this.initialWorkflowStatus);
     } else {
@@ -441,7 +461,8 @@ export default class API {
       }
       await this.uploadFiles([...files, ...toDelete], {
         commitMessage: options.commitMessage,
-        branch
+        branch,
+        hasSubfolders
       });
     }
   }

package/dist/esm/git-lfs-client.js

@@ -1,4 +1,4 @@
-import minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { unsentRequest } from 'decap-cms-lib-util';
 export class GitLfsClient {
   static defaultContentHeaders = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-bitbucket",
   "description": "Bitbucket backend for Decap CMS",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-backend-bitbucket",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -40,5 +40,5 @@
   "browser": {
     "path": "path-browserify"
   },
-  "gitHead": "d3465f53b7f056ad5d872948a07eaa8e4ae63315"
+  "gitHead": "ae01ad6f2b139f93472c8f0d049d35277d8583ca"
 }

package/src/API.ts

@@ -24,9 +24,9 @@ import {
   readFileMetadata,
   throwOnConflictingBranches,
 } from 'decap-cms-lib-util';
-import { dirname } from 'path';
 import { oneLine } from 'common-tags';
 import { parse } from 'what-the-diff';
+import { dirname } from 'path';
 
 import type {
   ApiRequest,
@@ -432,17 +432,18 @@ export default class API {
       commitMessage,
       branch,
       parentSha,
-    }: { commitMessage: string; branch: string; parentSha?: string },
+      hasSubfolders = true,
+    }: { commitMessage: string; branch: string; parentSha?: string; hasSubfolders?: boolean },
   ) {
     const formData = new FormData();
-    const toMove: { from: string; to: string; contentBlob: Blob }[] = [];
+    const toMove: { from: string; to: string; contentBlob: Blob; hasSubfolders: boolean }[] = [];
     files.forEach(file => {
       if (file.delete) {
         // delete the file
         formData.append('files', file.path);
       } else if (file.newPath) {
         const contentBlob = get(file, 'fileObj', new Blob([(file as DataFile).raw]));
-        toMove.push({ from: file.path, to: file.newPath, contentBlob });
+        toMove.push({ from: file.path, to: file.newPath, contentBlob, hasSubfolders });
       } else {
         // add/modify the file
         const contentBlob = get(file, 'fileObj', new Blob([(file as DataFile).raw]));
@@ -450,27 +451,44 @@ export default class API {
         formData.append(file.path, contentBlob, basename(file.path));
       }
     });
-    for (const { from, to, contentBlob } of toMove) {
-      const sourceDir = dirname(from);
-      const destDir = dirname(to);
-      const filesBranch = parentSha ? this.branch : branch;
-      const files = await this.listAllFiles(sourceDir, 100, filesBranch);
-      for (const file of files) {
+    for (const { from, to, contentBlob, hasSubfolders } of toMove) {
+      if (!hasSubfolders) {
+        // New behavior (subfolders: false): Only move the specific file
         // to move a file in Bitbucket we need to delete the old path
         // and upload the file content to the new path
         // NOTE: this is very wasteful, and also the Bitbucket `diff` API
         // reports these files as deleted+added instead of renamed
         // delete current path
-        formData.append('files', file.path);
+        formData.append('files', from);
         // create in new path
-        const content =
-          file.path === from
-            ? contentBlob
-            : await this.readFile(file.path, null, {
-                branch: filesBranch,
-                parseText: false,
-              });
-        formData.append(file.path.replace(sourceDir, destDir), content, basename(file.path));
+        formData.append(to, contentBlob, basename(to));
+      } else {
+        // Legacy behavior (subfolders: true, default): Move all files in the directory
+        const sourceDir = dirname(from);
+        const destDir = dirname(to);
+        const filesBranch = parentSha ? this.branch : branch;
+        const files = await this.listAllFiles(sourceDir, 100, filesBranch);
+        for (const file of files) {
+          // to move a file in Bitbucket we need to delete the old path
+          // and upload the file content to the new path
+          // NOTE: this is very wasteful, and also the Bitbucket `diff` API
+          // reports these files as deleted+added instead of renamed
+          // delete current path
+          formData.append('files', file.path);
+          // create in new path
+          const content =
+            file.path === from
+              ? contentBlob
+              : await this.readFile(file.path, null, {
+                  branch: filesBranch,
+                  parseText: false,
+                });
+          formData.append(
+            file.path.replace(sourceDir, destDir),
+            content as Blob,
+            basename(file.path),
+          );
+        }
       }
     }
 
@@ -508,11 +526,16 @@ export default class API {
 
   async persistFiles(dataFiles: DataFile[], mediaFiles: AssetProxy[], options: PersistOptions) {
     const files = [...dataFiles, ...mediaFiles];
+    const hasSubfolders = options.hasSubfolders !== false; // default to true
     if (options.useWorkflow) {
       const slug = dataFiles[0].slug;
       return this.editorialWorkflowGit(files, slug, options);
     } else {
-      return this.uploadFiles(files, { commitMessage: options.commitMessage, branch: this.branch });
+      return this.uploadFiles(files, {
+        commitMessage: options.commitMessage,
+        branch: this.branch,
+        hasSubfolders,
+      });
     }
   }
 
@@ -599,12 +622,14 @@ export default class API {
     const contentKey = generateContentKey(options.collectionName as string, slug);
     const branch = branchFromContentKey(contentKey);
     const unpublished = options.unpublished || false;
+    const hasSubfolders = options.hasSubfolders !== false; // default to true
     if (!unpublished) {
       const defaultBranchSha = await this.branchCommitSha(this.branch);
       await this.uploadFiles(files, {
         commitMessage: options.commitMessage,
         branch,
         parentSha: defaultBranchSha,
+        hasSubfolders,
       });
       await this.createPullRequest(
         branch,
@@ -624,6 +649,7 @@ export default class API {
       await this.uploadFiles([...files, ...toDelete], {
         commitMessage: options.commitMessage,
         branch,
+        hasSubfolders,
       });
     }
   }

package/src/git-lfs-client.ts

@@ -1,4 +1,4 @@
-import minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { unsentRequest } from 'decap-cms-lib-util';
 
 import type { ApiRequest, PointerFile } from 'decap-cms-lib-util';