@contentstack/cli-cm-branches 1.0.11 → 1.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +1 -1
  2. package/lib/utils/entry-create-script.js +3 -1
  3. package/lib/utils/entry-create-update-script.js +3 -1
  4. package/lib/utils/entry-update-script.js +3 -1
  5. package/lib/utils/merge-helper.js +8 -8
  6. package/oclif.manifest.json +1 -1
  7. package/package.json +5 -7
package/README.md CHANGED
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
37
37
  $ csdx COMMAND
38
38
  running command...
39
39
  $ csdx (--version)
40
- @contentstack/cli-cm-branches/1.0.11 linux-x64 node-v18.17.1
40
+ @contentstack/cli-cm-branches/1.0.13 linux-x64 node-v18.17.1
41
41
  $ csdx --help [COMMAND]
42
42
  USAGE
43
43
  $ csdx COMMAND
package/lib/utils/entry-create-script.js CHANGED
@@ -468,7 +468,9 @@ function entryCreateScript(contentType) {
468
468
  .query({ query: { title: compareRefEntry.title } })
469
469
  .find();
470
470
 
471
- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
471
+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
472
+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
473
+ }
472
474
  }
473
475
  }
474
476
  }
package/lib/utils/entry-create-update-script.js CHANGED
@@ -487,7 +487,9 @@ function entryCreateUpdateScript(contentType) {
487
487
  .query({ query: { title: compareRefEntry.title } })
488
488
  .find();
489
489
 
490
- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
490
+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
491
+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
492
+ }
491
493
  }
492
494
  }
493
495
  }
package/lib/utils/entry-update-script.js CHANGED
@@ -486,7 +486,9 @@ function entryUpdateScript(contentType) {
486
486
  .query({ query: { title: compareRefEntry.title } })
487
487
  .find();
488
488
 
489
- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
489
+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
490
+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
491
+ }
490
492
  }
491
493
  }
492
494
  }
package/lib/utils/merge-helper.js CHANGED
@@ -54,14 +54,6 @@ const setupMergeInputs = async (mergeFlags) => {
54
54
  if (!mergeFlags['stack-api-key']) {
55
55
  mergeFlags['stack-api-key'] = await (0, _1.askStackAPIKey)();
56
56
  }
57
- if (!mergeFlags['compare-branch']) {
58
- if (!compare_branch) {
59
- mergeFlags['compare-branch'] = await (0, _1.askCompareBranch)();
60
- }
61
- else {
62
- mergeFlags['compare-branch'] = compare_branch;
63
- }
64
- }
65
57
  if (!mergeFlags['base-branch']) {
66
58
  if (!base_branch) {
67
59
  mergeFlags['base-branch'] = (0, _1.getbranchConfig)(mergeFlags['stack-api-key']);
@@ -76,6 +68,14 @@ const setupMergeInputs = async (mergeFlags) => {
76
68
  mergeFlags['base-branch'] = base_branch;
77
69
  }
78
70
  }
71
+ if (!mergeFlags['compare-branch']) {
72
+ if (!compare_branch) {
73
+ mergeFlags['compare-branch'] = await (0, _1.askCompareBranch)();
74
+ }
75
+ else {
76
+ mergeFlags['compare-branch'] = compare_branch;
77
+ }
78
+ }
79
79
  return mergeFlags;
80
80
  };
81
81
  exports.setupMergeInputs = setupMergeInputs;
package/oclif.manifest.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.0.11",
2
+ "version": "1.0.13",
3
3
  "commands": {
4
4
  "cm:branches:create": {
5
5
  "id": "cm:branches:create",
package/package.json CHANGED
@@ -1,14 +1,12 @@
1
1
  {
2
2
  "name": "@contentstack/cli-cm-branches",
3
3
  "description": "Contentstack CLI plugin to do branches operations",
4
- "version": "1.0.11",
4
+ "version": "1.0.13",
5
5
  "author": "Contentstack",
6
6
  "bugs": "https://github.com/contentstack/cli/issues",
7
7
  "dependencies": {
8
- "@contentstack/cli-command": "~1.2.11",
9
- "@contentstack/cli-utilities": "~1.5.1",
10
- "@oclif/command": "^1.8.16",
11
- "@oclif/config": "^1.18.3",
8
+ "@contentstack/cli-command": "~1.2.12",
9
+ "@contentstack/cli-utilities": "~1.5.2",
12
10
  "@oclif/core": "^2.9.3",
13
11
  "async": "^3.2.4",
14
12
  "big-json": "^3.2.0",
@@ -27,8 +25,8 @@
27
25
  "winston": "^3.7.2"
28
26
  },
29
27
  "devDependencies": {
30
- "@contentstack/cli-auth": "~1.3.11",
31
- "@contentstack/cli-config": "~1.4.9",
28
+ "@contentstack/cli-auth": "~1.3.13",
29
+ "@contentstack/cli-config": "~1.4.11",
32
30
  "@contentstack/cli-dev-dependencies": "~1.2.3",
33
31
  "@oclif/plugin-help": "^5.1.19",
34
32
  "@oclif/test": "^1.2.6",