easy-soft-develop 2.1.222 → 2.1.227

package/bin/cli.js

@@ -53,15 +53,17 @@ program
 program
   .command('update-all-package-version')
   .description('update all package version for your project')
-  .action(() => {
-    updateAllPackageVersion.run();
+  .option('--autoInstall <bool>', 'show wait second info')
+  .action((a, o) => {
+    updateAllPackageVersion.run(a, o);
   });
 
 program
   .command('update-every-package-version')
   .description('update all package version for your project')
-  .action(() => {
-    updateEveryPackageVersion.run();
+  .option('--autoInstall <bool>', 'show wait second info')
+  .action((a, o) => {
+    updateEveryPackageVersion.run(a, o);
   });
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.222",
+  "version": "2.1.227",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {

package/src/cliCollection/update-all-package-version.js

@@ -1,5 +1,9 @@
 const { updateAllPackageVersion } = require('../tools/package.update');
 
-exports.run = function () {
-  updateAllPackageVersion();
+exports.run = function (s, o) {
+  const {
+    _optionValues: { autoInstall = true },
+  } = o;
+
+  updateAllPackageVersion({ autoInstall: autoInstall || false });
 };

package/src/cliCollection/update-every-package-version.js

@@ -1,5 +1,9 @@
 const { updateEveryPackageVersion } = require('../tools/package.update');
 
-exports.run = function () {
-  updateEveryPackageVersion();
+exports.run = function (s, o) {
+  const {
+    _optionValues: { autoInstall = true },
+  } = o;
+
+  updateEveryPackageVersion({ autoInstall: autoInstall || false });
 };

package/src/config/develop.update.project.from.repository.js

@@ -9,8 +9,9 @@ const developUpdateProjectFromRepository = {
   repository: '',
   sourcePath: '',
   targetPath: '',
-  folders: [],
-  files: [],
+  syncFolders: [],
+  syncFiles: [],
+  ignoreSyncWhenExistFiles: [],
 };
 
 const developUpdateProjectFromRepositoryConfigFilePath =

package/src/templates/package.template.js

@@ -143,7 +143,7 @@ const ncuScript = {
   'z:check:all-package-version': 'npx easy-soft-develop check-all-package-version',
   'z:check:every-package-version': 'npx easy-soft-develop check-every-package-version',
   'prez:update:all-package-version': 'node ./develop/assists/install.global.develop.dependence',
-  'z:update:all-package-version': 'npx easy-soft-develop update-all-package-version',
+  'z:update:all-package-version': 'npx easy-soft-develop update-all-package-version --autoInstall false',
   'postz:update:all-package-version': 'npm run z:reinstall',
   'prez:update:every-package-version': 'node ./develop/assists/install.global.develop.dependence',
   'z:update:every-package-version': 'npx easy-soft-develop update-every-package-version',

package/src/tools/package.update.js

@@ -45,7 +45,7 @@ function updateSpecialPackageVersion(packageList) {
   promptSuccess('check success');
 }
 
-function updateAllPackageVersion() {
+function updateAllPackageVersion({ autoInstall = true }) {
   exec('npm run z:initial:environment');
 
   const ncuCommand = `npx npm-check-updates --configFilePath ./.ncurc.js --packageFile package.json --registry https://registry.npmjs.org --workspaces --root -u`;
@@ -56,10 +56,12 @@ function updateAllPackageVersion() {
 
   promptSuccess('update success, exec install with z:install');
 
-  exec('npm run z:install');
+  if (autoInstall) {
+    exec('npm run z:install');
+  }
 }
 
-function updateEveryPackageVersion() {
+function updateEveryPackageVersion({ autoInstall = true }) {
   exec('npm run z:initial:environment');
 
   const ncuCommand = `npx npm-check-updates --configFilePath ./.ncurc.js --packageFile package.json --registry https://registry.npmjs.org -u`;
@@ -72,7 +74,9 @@ function updateEveryPackageVersion() {
 
   promptSuccess('update success, exec install with z:install');
 
-  exec('npm run z:install');
+  if (autoInstall) {
+    exec('npm run z:install');
+  }
 }
 
 function checkAllPackageVersion() {
@@ -87,8 +91,6 @@ function checkAllPackageVersion() {
   adjustMainPackageJsonByCommand(ncuCommand);
 
   promptSuccess('update success, exec install with z:install');
-
-  exec('npm run z:install');
 }
 
 function checkEveryPackageVersion() {
@@ -105,8 +107,6 @@ function checkEveryPackageVersion() {
   adjustChildrenPackageJsonByCommand(ncuCommand);
 
   promptSuccess('update success, exec install with z:install');
-
-  exec('npm run z:install');
 }
 
 module.exports = {

package/src/tools/update.project.from.repository.js

@@ -15,6 +15,8 @@ const {
   copyFileSync,
   copyFolderSync,
   promptTip,
+  existFileSync,
+  promptEmptyLine,
 } = require('./meta');
 
 const {
@@ -44,8 +46,9 @@ function handlePackage({
   zipPath,
   sourcePath,
   targetPath,
-  folders,
-  files,
+  syncFolders,
+  syncFiles,
+  ignoreSyncWhenExistFiles,
 }) {
   const unzipPath = resolvePath(`./temp/source/`);
 
@@ -63,7 +66,16 @@ function handlePackage({
 
     promptLine();
 
-    for (const itemFolder of folders) {
+    promptTip('*', 'sync folders.');
+    promptEmptyLine();
+
+    if (syncFolders.length === 0) {
+      promptWarn(
+        'none folders will sync, if need, please set "syncFolders" in "develop.update.project.from.repository.json".',
+      );
+    }
+
+    for (const itemFolder of syncFolders) {
       copyFolderSync({
         sourceMainPath,
         targetMainPath,
@@ -71,7 +83,37 @@ function handlePackage({
       });
     }
 
-    for (const itemFile of files) {
+    promptTip('*', 'sync files.');
+    promptEmptyLine();
+
+    if (syncFiles.length === 0) {
+      promptWarn(
+        'none file will force sync, if need, please set "syncFiles" in "develop.update.project.from.repository.json".',
+      );
+    }
+
+    for (const itemFile of syncFiles) {
+      copyFileSync({
+        sourceMainPath,
+        targetMainPath,
+        filepath: itemFile,
+      });
+    }
+
+    promptTip('*', 'sync files when not exist.');
+    promptEmptyLine();
+
+    if (ignoreSyncWhenExistFiles.length === 0) {
+      promptWarn(
+        'none file will sync when it not exist, if need, please set "ignoreSyncWhenExistFiles" in "develop.update.project.from.repository.json".',
+      );
+    }
+
+    for (const itemFile of ignoreSyncWhenExistFiles) {
+      if (existFileSync(`./${targetMainPath}/${itemFile}`)) {
+        continue;
+      }
+
       copyFileSync({
         sourceMainPath,
         targetMainPath,
@@ -79,6 +121,9 @@ function handlePackage({
       });
     }
 
+    promptTip('*', 'clear resource.');
+    promptEmptyLine();
+
     clearResource();
   });
 }
@@ -138,14 +183,16 @@ async function updateProjectFromRepository({ projectPath = '.', agent }) {
     repository = '',
     sourcePath = '',
     targetPath = '',
-    folders = [],
-    files = [],
+    syncFolders = [],
+    syncFiles = [],
+    ignoreSyncWhenExistFiles = [],
   } = {
     repository: '',
     sourcePath: '',
     targetPath: '',
-    folders: [],
-    files: [],
+    syncFolders: [],
+    syncFiles: [],
+    ignoreSyncWhenExistFiles: [],
     ...getDevelopUpdateProjectFromRepositoryConfig(),
   };
 
@@ -188,8 +235,9 @@ async function updateProjectFromRepository({ projectPath = '.', agent }) {
     zipPath,
     sourcePath,
     targetPath,
-    folders,
-    files,
+    syncFolders,
+    syncFiles,
+    ignoreSyncWhenExistFiles,
   });
 }
 

package/types/cliCollection/update-all-package-version.d.ts

@@ -1 +1 @@
-export function run(): void;
+export function run(s: any, o: any): void;

package/types/cliCollection/update-every-package-version.d.ts

@@ -1 +1 @@
-export function run(): void;
+export function run(s: any, o: any): void;

package/types/tools/package.update.d.ts

@@ -1,7 +1,15 @@
 export function checkAllPackageVersion(): void;
 export function checkEveryPackageVersion(): void;
-export function updateAllPackageVersion(): void;
-export function updateEveryPackageVersion(): void;
+export function updateAllPackageVersion({
+  autoInstall,
+}: {
+  autoInstall?: boolean | undefined;
+}): void;
+export function updateEveryPackageVersion({
+  autoInstall,
+}: {
+  autoInstall?: boolean | undefined;
+}): void;
 /**
  * update special package version
  * @param {Array} packageList