@algocare/react-native-code-push 10.3.2 → 11.0.1

package/cli/commands/common.js

@@ -33,7 +33,7 @@ async function getIdentifierValue() {
       type: 'list',
       name: 'identifier',
       message: 'Select the target env identifier',
-      choices: ['stg', 'prd'],
+      choices: ['dev', 'stg', 'prd'],
     },
   ])
   return identifier

package/cli/commands/createPullRequestHistoryCommand/createPullRequestHistory.js

@@ -3,12 +3,12 @@ const path = require('path')
 
 async function createPullRequestHistory(
   setReleaseHistory,
-  prNumber,
+  binaryVersion,
   app,
   platform
 ) {
   try {
-    const JSON_FILE_NAME = `${prNumber}.json`
+    const JSON_FILE_NAME = `${binaryVersion}.json`
     const JSON_FILE_PATH = path.resolve(process.cwd(), JSON_FILE_NAME)
 
     console.log(
@@ -17,7 +17,7 @@ async function createPullRequestHistory(
     )
     fs.writeFileSync(JSON_FILE_PATH, JSON.stringify({}))
 
-    await setReleaseHistory(prNumber, JSON_FILE_PATH, {}, app, platform)
+    await setReleaseHistory(binaryVersion, JSON_FILE_PATH, {}, app, platform)
 
     fs.unlinkSync(JSON_FILE_PATH)
   } catch (error) {

package/cli/commands/createPullRequestHistoryCommand/index.js

@@ -8,7 +8,6 @@ program
   .description('Creates a new pull request history.')
   .option('-a, --app <string>', 'target app (user/device)')
   .option('-p, --platform <string>', 'target platform (ios/android)')
-  .option('-r, --pr-number <number>', 'pull request number')
   .option(
     '-c, --config <path>',
     'set config file name (JS/TS)',
@@ -22,7 +21,7 @@ program
 
     await createPullRequestHistory(
       setReleaseHistory,
-      options.prNumber,
+      options.binaryVersion,
       options.app,
       options.platform
     )

package/cli/commands/createPullRequestReleaseCommand/addToPullRequestRelease.js

@@ -13,12 +13,17 @@ async function addToPullRequestRelease(
   setReleaseHistory,
   getReleaseHistory
 ) {
-  const releaseHistory = await getReleaseHistory(app, prNumber, platform)
-  const latestReleaseHistoryNumber = Object.keys(releaseHistory).at(-1)
+  const releaseHistory = await getReleaseHistory(app, binaryVersion, platform)
 
-  const newReleaseHistoryNumber = latestReleaseHistoryNumber
-    ? `${Number(latestReleaseHistoryNumber[0]) + 1}.0.0`
-    : '1.0.0'
+  const latestReleaseHistoryKeys = Object.keys(releaseHistory)
+  const releaseHistoryWithPRNumber = latestReleaseHistoryKeys.filter((key) =>
+    key.includes(prNumber)
+  )
+
+  const newReleaseHistoryNumber = getNewReleaseHistoryNumber(
+    releaseHistoryWithPRNumber,
+    prNumber
+  )
   const newReleaseHistory = structuredClone(releaseHistory)
 
   newReleaseHistory[newReleaseHistoryNumber] = {
@@ -30,7 +35,7 @@ async function addToPullRequestRelease(
   }
 
   try {
-    const JSON_FILE_NAME = `${prNumber}.json`
+    const JSON_FILE_NAME = `${binaryVersion}.json`
     const JSON_FILE_PATH = path.resolve(process.cwd(), JSON_FILE_NAME)
 
     console.log(
@@ -40,12 +45,13 @@ async function addToPullRequestRelease(
     fs.writeFileSync(JSON_FILE_PATH, JSON.stringify(newReleaseHistory))
 
     await setReleaseHistory(
-      prNumber,
+      binaryVersion,
       JSON_FILE_PATH,
       newReleaseHistory,
       app,
       platform
     )
+    process.stdout.write(packageHash)
   } catch (error) {
     console.error('Error occurred while updating history:', error)
     process.exit(1)
@@ -55,3 +61,13 @@ async function addToPullRequestRelease(
 module.exports = {
   addToPullRequestRelease,
 }
+
+function getNewReleaseHistoryNumber(releaseHistoryWithPRNumber, prNumber) {
+  if (releaseHistoryWithPRNumber.length) {
+    const [, latestVersion] = releaseHistoryWithPRNumber.at(-1).split('-')
+    const newVersion = `${prNumber}-${Number(latestVersion[0]) + 1}.0.0`
+    return newVersion
+  } else {
+    return `${prNumber}-1.0.0`
+  }
+}

package/cli/commands/releaseCommand/index.js

@@ -22,7 +22,7 @@ program
   )
   .option('-a, --app <string>', 'target app (user/device)')
   .option('-p, --platform <string>', 'target platform (ios/android)')
-  .option('-i, --identifier <string>', 'target env identifier (stg/prd)')
+  .option('-i, --identifier <string>', 'target env identifier (dev/stg/prd)')
   .option('-b, --binary-version <string>', 'target binary version (x.y.z)')
   .option('-v, --app-version <string>', 'target codepush version (x.y.z)')
   .option(
@@ -67,8 +67,11 @@ program
       throw new Error('Device app is not supported on iOS')
     }
 
-    if (options.identifier && !['stg', 'prd'].includes(options.identifier)) {
-      throw new Error('Identifier must be either "stg" or "prd"')
+    if (
+      options.identifier &&
+      !['dev', 'stg', 'prd'].includes(options.identifier)
+    ) {
+      throw new Error('Identifier must be either "dev" or "stg" or "prd"')
     }
 
     const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/

package/cli/index.js

@@ -55,9 +55,4 @@ require('./commands/createPullRequestReleaseCommand')
  */
 require('./commands/removePullRequestHistoryCommand')
 
-/**
- * npx code-push get-development-key
- */
-require('./commands/getDevelopmentKeyCommand')
-
 program.parse()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algocare/react-native-code-push",
-  "version": "10.3.2",
+  "version": "11.0.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",