@deot/dev-releaser 1.1.0 → 1.1.2

package/README.md

@@ -2,5 +2,8 @@
 
 用于发包流程, 自动生成changelog, tags....
 
-- 默认`dryRun`
-- 使用`dependencies`，非`peerDependencies`。主要考虑仅安装`@deot/dev-releaser`即可
+- 默认`dryRun`, `Skipping`表示会修改的内容，但是跳过了
+- 使用`dependencies`，非`peerDependencies`。主要考虑仅安装`@deot/dev-releaser`即可
+
+
+[API参考](../cli/src/index.ts)

package/dist/index.cjs.js

@@ -71,12 +71,10 @@ class Release {
     }
     async parseCommits() {
         const { workspace } = devShared.Locals.impl();
-        const { packageFolderName, packageName, commandOptions } = this;
-        let params = ['tag', '--list', `'${packageName}@*'`, '--sort', '-v:refname'];
-        const { stdout: tags } = await devShared.Shell.exec('git', params);
-        const [latestTag] = tags.split('\n');
+        const { packageFolderName, commandOptions } = this;
+        const [latestTag] = await this.getTags();
         devShared.Logger.log(chalk.yellow(`Last Release Tag`) + `: ${latestTag || '<none>'}`);
-        params = ['--no-pager', 'log', `${latestTag}..HEAD`, `--format=%B%n${HASH}%n%H${SUFFIX}`];
+        let params = ['--no-pager', 'log', `${latestTag}..HEAD`, `--format=%B%n${HASH}%n%H${SUFFIX}`];
         let { stdout } = await devShared.Shell.exec('git', params);
         let skipGetLog = false;
         if (latestTag) {
@@ -140,7 +138,7 @@ class Release {
                 skip = result.skip;
             }
             else if (typeof skipUpdatePackage === 'string'
-                && (skipUpdatePackage === '**'
+                && (skipUpdatePackage === '*'
                     || skipUpdatePackage.split(',').includes(this.packageName))) {
                 skip = true;
             }
@@ -166,7 +164,7 @@ class Release {
                 force = result.force;
             }
             else if (typeof forceUpdatePackage === 'string'
-                && (forceUpdatePackage === '**'
+                && (forceUpdatePackage === '*'
                     || forceUpdatePackage.split(',').includes(this.packageName))) {
                 force = true;
             }
@@ -187,6 +185,12 @@ class Release {
             }
         }
     }
+    async getTags() {
+        const { packageName } = this;
+        const params = ['tag', '--list', `'${packageName}@*'`, '--sort', '-v:refname'];
+        const { stdout } = await devShared.Shell.exec('git', params);
+        return stdout.split('\n');
+    }
     rebuildChangeLog(commits) {
         const { packageDir } = this;
         const { homepage, workspace } = devShared.Locals.impl();
@@ -297,10 +301,10 @@ class Release {
         if (!commits.length)
             return;
         const { packageName } = this;
-        const olds = this.commits.map(i => JSON.stringify(i));
+        const olds = this.commits.map(i => JSON.stringify({ ...i, effect: false }));
         const newCommits = commits
             .filter(i => {
-            return !olds.includes(JSON.stringify(i));
+            return !olds.includes(JSON.stringify({ ...i, effect: false }));
         })
             .map(j => {
             return {
@@ -407,10 +411,12 @@ class Release {
         await devShared.Shell.exec(`npm run build -- --package-name ${this.packageName}`);
     }
     async publish() {
-        if (!this.isChanged())
+        const { commandOptions } = this;
+        if (!this.isChanged() || !commandOptions.publish)
             return;
-        const { commandOptions, packageDir } = this;
-        if (commandOptions.dryRun || !commandOptions.publish) {
+        const { packageDir, packageName } = this;
+        devShared.Logger.log(chalk.magenta(`PUBLISH: `) + packageName);
+        if (commandOptions.dryRun) {
             devShared.Logger.log(chalk.yellow(`Skipping Publish`));
             return;
         }
@@ -420,11 +426,12 @@ class Release {
         });
     }
     async tag() {
-        if (!this.isChanged())
+        const { commandOptions } = this;
+        if (!this.isChanged() || !commandOptions.tag)
             return;
-        const { commandOptions, packageDir } = this;
-        const { packageName, packageOptions } = this;
-        if (commandOptions.dryRun || !commandOptions.tag) {
+        const { packageDir, packageName, packageOptions } = this;
+        devShared.Logger.log(chalk.magenta(`TAG: `) + packageName);
+        if (commandOptions.dryRun) {
             devShared.Logger.log(chalk.yellow(`Skipping Git Tag`));
             return;
         }
@@ -434,6 +441,28 @@ class Release {
             cwd: packageDir
         });
     }
+    async cleanTagsAndKeepLastTag() {
+        const { commandOptions } = this;
+        if (!commandOptions.keepLastTag)
+            return;
+        let tags = await this.getTags();
+        tags = tags.slice(1).filter(i => !!i).reverse();
+        if (!tags.length)
+            return;
+        const { packageName } = this;
+        devShared.Logger.log(chalk.magenta(`CLEAN TAGS: `) + packageName);
+        if (commandOptions.dryRun) {
+            devShared.Logger.log(chalk.yellow(`Skipping Tags Clean`));
+            return;
+        }
+        await tags
+            .reduce((preProcess, tag) => {
+            preProcess = preProcess
+                .then(() => devShared.Shell.spawn('git', ['push', 'origin', '--delete', tag]))
+                .then(() => devShared.Shell.spawn('git', ['tag', '--delete', tag]));
+            return preProcess;
+        }, Promise.resolve());
+    }
     async process() {
         const { workspace } = devShared.Locals.impl();
         const { packageName, packageDir, packageFolderName } = this;
@@ -456,6 +485,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         publish: true,
         commit: true,
         push: true,
+        keepLastTag: false,
         ...options
     };
     const locals = devShared.Locals.impl();
@@ -511,7 +541,10 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
     if (!isChanged) {
         devShared.Logger.log(chalk.magenta(`COMMIT: `) + 'Nothing Chanaged Found.');
     }
-    else if (options.dryRun || !options.commit) {
+    else if (!options.commit) {
+        devShared.Logger.log(chalk.magenta(`COMMIT: `) + 'Disabled.');
+    }
+    else if (options.dryRun) {
         devShared.Logger.log(chalk.magenta(`COMMIT: `) + chalk.yellow(`Skipping Git Commit`) + `\n${message}`);
     }
     else {
@@ -521,6 +554,11 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         await devShared.Shell.spawn('git', ['add', process.cwd()]);
         await devShared.Shell.spawn('git', ['commit', '--m', `'${message}'`]);
     }
+    if ((options.keepLastTag || options.push) && !options.dryRun) {
+        devShared.Logger.log(chalk.yellow('Git Fetch...'));
+        await devShared.Shell.spawn('git', ['fetch', '--prune', '--prune-tags']);
+    }
+    devShared.Logger.log(chalk.blue(`\n---------------------\n`));
     await inputs
         .reduce((preProcess, packageFolderName) => {
         const instance = instances[packageFolderName];
@@ -530,16 +568,30 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         return preProcess;
     }, Promise.resolve());
     devShared.Logger.log(chalk.blue(`\n---------------------\n`));
-    if (options.dryRun || !options.push) {
-        devShared.Logger.log(chalk.magenta(`FINISH: `) + 'Skipping Git Push');
+    if (!isChanged) {
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Nothing Chanaged.');
+    }
+    else if (!options.push) {
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Push Disabled.');
     }
-    else if (!isChanged) {
-        devShared.Logger.log(chalk.magenta(`FINISH: `) + 'Nothing Chanaged.');
+    else if (options.dryRun) {
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Skipping Git Push');
     }
     else {
+        devShared.Logger.log(chalk.yellow('Git Pull/Push...'));
+        await devShared.Shell.spawn('git', ['pull', '--rebase']);
         await devShared.Shell.spawn('git', ['push']);
         await devShared.Shell.spawn('git', ['push', '--tags']);
     }
+    devShared.Logger.log(chalk.blue(`\n---------------------\n`));
+    await inputs
+        .reduce((preProcess, packageFolderName) => {
+        const instance = instances[packageFolderName];
+        preProcess = preProcess
+            .then(() => instance.cleanTagsAndKeepLastTag());
+        return preProcess;
+    }, Promise.resolve());
+    devShared.Logger.log(chalk.magenta(`FINISH: `) + chalk.green(`Release Successed.`));
     if (options.dryRun) {
         devShared.Logger.log(chalk.green('NO DRY RUN WAY: ')
             + chalk.grey(`npm run release -- --no-dry-run\n`));
@@ -552,6 +604,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         else {
             devShared.Logger.error(e);
         }
+        devShared.Logger.log(chalk.magenta(`FINISH: `) + chalk.red(`Release Failed.`));
         process.exit(1);
     }
 });

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { Locals, Shell, Logger, Utils } from '@deot/dev-shared';
+import { Locals, Logger, Shell, Utils } from '@deot/dev-shared';
 import * as path from 'node:path';
 import fs from 'fs-extra';
 import { createRequire } from 'node:module';
@@ -50,12 +50,10 @@ class Release {
     }
     async parseCommits() {
         const { workspace } = Locals.impl();
-        const { packageFolderName, packageName, commandOptions } = this;
-        let params = ['tag', '--list', `'${packageName}@*'`, '--sort', '-v:refname'];
-        const { stdout: tags } = await Shell.exec('git', params);
-        const [latestTag] = tags.split('\n');
+        const { packageFolderName, commandOptions } = this;
+        const [latestTag] = await this.getTags();
         Logger.log(chalk.yellow(`Last Release Tag`) + `: ${latestTag || '<none>'}`);
-        params = ['--no-pager', 'log', `${latestTag}..HEAD`, `--format=%B%n${HASH}%n%H${SUFFIX}`];
+        let params = ['--no-pager', 'log', `${latestTag}..HEAD`, `--format=%B%n${HASH}%n%H${SUFFIX}`];
         let { stdout } = await Shell.exec('git', params);
         let skipGetLog = false;
         if (latestTag) {
@@ -119,7 +117,7 @@ class Release {
                 skip = result.skip;
             }
             else if (typeof skipUpdatePackage === 'string'
-                && (skipUpdatePackage === '**'
+                && (skipUpdatePackage === '*'
                     || skipUpdatePackage.split(',').includes(this.packageName))) {
                 skip = true;
             }
@@ -145,7 +143,7 @@ class Release {
                 force = result.force;
             }
             else if (typeof forceUpdatePackage === 'string'
-                && (forceUpdatePackage === '**'
+                && (forceUpdatePackage === '*'
                     || forceUpdatePackage.split(',').includes(this.packageName))) {
                 force = true;
             }
@@ -166,6 +164,12 @@ class Release {
             }
         }
     }
+    async getTags() {
+        const { packageName } = this;
+        const params = ['tag', '--list', `'${packageName}@*'`, '--sort', '-v:refname'];
+        const { stdout } = await Shell.exec('git', params);
+        return stdout.split('\n');
+    }
     rebuildChangeLog(commits) {
         const { packageDir } = this;
         const { homepage, workspace } = Locals.impl();
@@ -276,10 +280,10 @@ class Release {
         if (!commits.length)
             return;
         const { packageName } = this;
-        const olds = this.commits.map(i => JSON.stringify(i));
+        const olds = this.commits.map(i => JSON.stringify({ ...i, effect: false }));
         const newCommits = commits
             .filter(i => {
-            return !olds.includes(JSON.stringify(i));
+            return !olds.includes(JSON.stringify({ ...i, effect: false }));
         })
             .map(j => {
             return {
@@ -386,10 +390,12 @@ class Release {
         await Shell.exec(`npm run build -- --package-name ${this.packageName}`);
     }
     async publish() {
-        if (!this.isChanged())
+        const { commandOptions } = this;
+        if (!this.isChanged() || !commandOptions.publish)
             return;
-        const { commandOptions, packageDir } = this;
-        if (commandOptions.dryRun || !commandOptions.publish) {
+        const { packageDir, packageName } = this;
+        Logger.log(chalk.magenta(`PUBLISH: `) + packageName);
+        if (commandOptions.dryRun) {
             Logger.log(chalk.yellow(`Skipping Publish`));
             return;
         }
@@ -399,11 +405,12 @@ class Release {
         });
     }
     async tag() {
-        if (!this.isChanged())
+        const { commandOptions } = this;
+        if (!this.isChanged() || !commandOptions.tag)
             return;
-        const { commandOptions, packageDir } = this;
-        const { packageName, packageOptions } = this;
-        if (commandOptions.dryRun || !commandOptions.tag) {
+        const { packageDir, packageName, packageOptions } = this;
+        Logger.log(chalk.magenta(`TAG: `) + packageName);
+        if (commandOptions.dryRun) {
             Logger.log(chalk.yellow(`Skipping Git Tag`));
             return;
         }
@@ -413,6 +420,28 @@ class Release {
             cwd: packageDir
         });
     }
+    async cleanTagsAndKeepLastTag() {
+        const { commandOptions } = this;
+        if (!commandOptions.keepLastTag)
+            return;
+        let tags = await this.getTags();
+        tags = tags.slice(1).filter(i => !!i).reverse();
+        if (!tags.length)
+            return;
+        const { packageName } = this;
+        Logger.log(chalk.magenta(`CLEAN TAGS: `) + packageName);
+        if (commandOptions.dryRun) {
+            Logger.log(chalk.yellow(`Skipping Tags Clean`));
+            return;
+        }
+        await tags
+            .reduce((preProcess, tag) => {
+            preProcess = preProcess
+                .then(() => Shell.spawn('git', ['push', 'origin', '--delete', tag]))
+                .then(() => Shell.spawn('git', ['tag', '--delete', tag]));
+            return preProcess;
+        }, Promise.resolve());
+    }
     async process() {
         const { workspace } = Locals.impl();
         const { packageName, packageDir, packageFolderName } = this;
@@ -435,6 +464,7 @@ const run = (options) => Utils.autoCatch(async () => {
         publish: true,
         commit: true,
         push: true,
+        keepLastTag: false,
         ...options
     };
     const locals = Locals.impl();
@@ -490,7 +520,10 @@ const run = (options) => Utils.autoCatch(async () => {
     if (!isChanged) {
         Logger.log(chalk.magenta(`COMMIT: `) + 'Nothing Chanaged Found.');
     }
-    else if (options.dryRun || !options.commit) {
+    else if (!options.commit) {
+        Logger.log(chalk.magenta(`COMMIT: `) + 'Disabled.');
+    }
+    else if (options.dryRun) {
         Logger.log(chalk.magenta(`COMMIT: `) + chalk.yellow(`Skipping Git Commit`) + `\n${message}`);
     }
     else {
@@ -500,6 +533,11 @@ const run = (options) => Utils.autoCatch(async () => {
         await Shell.spawn('git', ['add', process.cwd()]);
         await Shell.spawn('git', ['commit', '--m', `'${message}'`]);
     }
+    if ((options.keepLastTag || options.push) && !options.dryRun) {
+        Logger.log(chalk.yellow('Git Fetch...'));
+        await Shell.spawn('git', ['fetch', '--prune', '--prune-tags']);
+    }
+    Logger.log(chalk.blue(`\n---------------------\n`));
     await inputs
         .reduce((preProcess, packageFolderName) => {
         const instance = instances[packageFolderName];
@@ -509,16 +547,30 @@ const run = (options) => Utils.autoCatch(async () => {
         return preProcess;
     }, Promise.resolve());
     Logger.log(chalk.blue(`\n---------------------\n`));
-    if (options.dryRun || !options.push) {
-        Logger.log(chalk.magenta(`FINISH: `) + 'Skipping Git Push');
+    if (!isChanged) {
+        Logger.log(chalk.magenta(`PUSH: `) + 'Nothing Chanaged.');
+    }
+    else if (!options.push) {
+        Logger.log(chalk.magenta(`PUSH: `) + 'Push Disabled.');
     }
-    else if (!isChanged) {
-        Logger.log(chalk.magenta(`FINISH: `) + 'Nothing Chanaged.');
+    else if (options.dryRun) {
+        Logger.log(chalk.magenta(`PUSH: `) + 'Skipping Git Push');
     }
     else {
+        Logger.log(chalk.yellow('Git Pull/Push...'));
+        await Shell.spawn('git', ['pull', '--rebase']);
         await Shell.spawn('git', ['push']);
         await Shell.spawn('git', ['push', '--tags']);
     }
+    Logger.log(chalk.blue(`\n---------------------\n`));
+    await inputs
+        .reduce((preProcess, packageFolderName) => {
+        const instance = instances[packageFolderName];
+        preProcess = preProcess
+            .then(() => instance.cleanTagsAndKeepLastTag());
+        return preProcess;
+    }, Promise.resolve());
+    Logger.log(chalk.magenta(`FINISH: `) + chalk.green(`Release Successed.`));
     if (options.dryRun) {
         Logger.log(chalk.green('NO DRY RUN WAY: ')
             + chalk.grey(`npm run release -- --no-dry-run\n`));
@@ -531,6 +583,7 @@ const run = (options) => Utils.autoCatch(async () => {
         else {
             Logger.error(e);
         }
+        Logger.log(chalk.magenta(`FINISH: `) + chalk.red(`Release Failed.`));
         process.exit(1);
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-releaser",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -13,9 +13,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-extract": "^1.1.0",
-    "@deot/dev-shared": "^1.1.0",
+    "@deot/dev-shared": "^1.1.1",
     "conventional-commits-parser": "^3.2.4",
+    "chalk": "^5.2.0",
+    "fs-extra": "^11.1.1",
+    "inquirer": "^9.1.5",
+    "inquirer-autocomplete-prompt": "^3.0.0",
     "semver": "^7.3.8"
+  },
+  "devDependencies": {
+    "cross-env": "^7.0.3"
   }
 }