easy-soft-develop 2.0.82 → 2.0.119

package/package.json

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

package/src/cliCollection/update-package-from-package.js

@@ -1,149 +1,17 @@
-const download = require('download');
-const agent = require('hpagent');
-
 const {
-  promptSuccess,
-  promptLine,
-  promptError,
-  promptWarn,
-  exit,
-  readJsonFileSync,
-  resolvePath,
-  writeJsonFileSync,
-  checkStringIsEmpty,
-} = require('../tools/meta');
-
-const { HttpsProxyAgent } = agent;
-
-function handlePackage({ packageFilePath, packageTempPath }) {
-  promptSuccess(`referential package.json :${packageTempPath}`);
-
-  const packageProjectPath = resolvePath(packageFilePath);
-
-  const packageJsonTemp = readJsonFileSync(packageTempPath);
-
-  const packageJsonTarget = readJsonFileSync(packageProjectPath);
-
-  const dependencies = packageJsonTemp.dependencies;
-  const devDependencies = packageJsonTemp.devDependencies;
-
-  packageJsonTarget.dependencies = dependencies;
-  packageJsonTarget.devDependencies = devDependencies;
-
-  writeJsonFileSync(packageProjectPath, packageJsonTarget, { coverFile: true });
-
-  promptSuccess(`update package.json success!`);
-
-  promptLine();
-
-  exit();
-}
-
-async function handleTempPackagePath({ agent, localFile, packageUrl, repo }) {
-  let packageTempPath = '';
-
-  if (localFile) {
-    promptSuccess(`use local referential package.json`);
-
-    promptSuccess(`file path: ${localFile}`);
-
-    promptLine();
-
-    packageTempPath = resolvePath(localFile);
-  } else {
-    promptSuccess(`try ${repo} repo`);
-
-    if (agent) {
-      promptSuccess(`agent: ${agent}`);
-    }
-
-    promptSuccess(`${repo} repo: ${packageUrl}`);
-
-    await download(packageUrl, resolvePath(`./temp`), {
-      ...(agent
-        ? {
-            agent: {
-              https: new HttpsProxyAgent({
-                keepAlive: true,
-                keepAliveMsecs: 1000,
-                maxSockets: 256,
-                maxFreeSockets: 256,
-                scheduling: 'lifo',
-                proxy: agent,
-              }),
-            },
-          }
-        : {}),
-    });
-
-    promptSuccess(`use ${repo} repo success!`);
-
-    packageTempPath = resolvePath(`./temp/package.json`);
-
-    promptSuccess(`packageTempPath: ${packageTempPath}`);
-  }
-
-  return packageTempPath;
-}
+  updatePackageFromPackage,
+} = require('../tools/update.package.from.package');
 
 exports.run = async function (s, o) {
   const {
     _optionValues: { path, primaryRemoteUrl, spareRemoteUrl, agent, localFile },
   } = o;
 
-  if (checkStringIsEmpty(primaryRemoteUrl)) {
-    promptError('please input primary remote package.json url');
-
-    exit();
-  }
-
-  let packageTempPath = '';
-
-  promptSuccess(`prepare to update package.json: `);
-
-  promptLine();
-
-  try {
-    packageTempPath = await handleTempPackagePath({
-      agent,
-      localFile,
-      packageUrl: primaryRemoteUrl,
-      repo: 'github',
-    });
-  } catch (error) {
-    if (checkStringIsEmpty(primaryRemoteUrl)) {
-      promptError('please input spare remote package.json url');
-
-      exit();
-    }
-
-    promptLine();
-
-    promptWarn(
-      `use github repo failure! switch to gitee, gitee repo possible update delay.`,
-    );
-
-    promptLine();
-
-    try {
-      packageTempPath = await handleTempPackagePath({
-        agent: '',
-        localFile,
-        packageUrl: spareRemoteUrl,
-        repo: 'gitee',
-      });
-    } catch (error) {
-      promptLine();
-
-      promptError(error);
-
-      promptLine();
-
-      promptWarn('download error, please check network');
-
-      exit();
-    }
-  }
-
-  handlePackage(path, packageTempPath);
+  await updatePackageFromPackage({
+    path,
+    primaryRemoteUrl,
+    spareRemoteUrl,
+    agent,
+    localFile,
+  });
 };

package/src/index.js

@@ -1,9 +1,11 @@
+const { exec } = require('./tools/meta');
+const { sleep } = require('./tools/sleep');
 const { clean } = require('./tools/clean');
 const { commitRefresh } = require('./tools/commit.refresh');
 const {
   createCleanScriptFile,
   createPackageCheckSpecialVersionScriptFile,
-  createInstallGlobalDevDependenceScriptFile,
+  createInstallGlobalDevelopDependenceScriptFile,
   createDevelopFiles,
 } = require('./tools/develop.file');
 const { initialEnvironment } = require('./tools/initial.environment');
@@ -16,7 +18,7 @@ const {
   prettierChangeFile,
 } = require('./tools/prettier.file');
 const {
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
 } = require('./tools/package.install.global.develop.dependence');
 const { loopPackage } = require('./tools/package.tools');
 const {
@@ -24,14 +26,15 @@ const {
   updateSpecialPackageVersion,
   updateAllPackageVersion,
 } = require('./tools/package.update');
-const { exec } = require('./tools/meta');
-const { sleep } = require('./tools/sleep');
+const {
+  updatePackageFromPackage,
+} = require('./tools/update.package.from.package');
 
 module.exports = {
   clean,
   commitRefresh,
   initialEnvironment,
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
   loopPackage,
   checkAllPackageVersion,
   updateSpecialPackageVersion,
@@ -40,10 +43,11 @@ module.exports = {
   sleep,
   createCleanScriptFile,
   createPackageCheckSpecialVersionScriptFile,
-  createInstallGlobalDevDependenceScriptFile,
+  createInstallGlobalDevelopDependenceScriptFile,
   createDevelopFiles,
   prettierAllFile,
   prettierChangeFile,
   prettierAllPackageJson,
   prettierCurrentPackageJson,
+  updatePackageFromPackage,
 };