easy-soft-develop 2.1.216 → 2.1.220

package/bin/cli.js

@@ -15,8 +15,8 @@ const createRepositoryProject = require('../src/cliCollection/create-repository-
 const clearAllDependence = require('../src/cliCollection/clear-all-dependence');
 const updatePackageFromPackage = require('../src/cliCollection/update-package-from-package');
 const createProjectWithTemplate = require('../src/cliCollection/create-project-with-template');
-const createProjectWithMasterTemplate = require('../src/cliCollection/create-project-with-master-template');
-const updateProjectWithMasterTemplate = require('../src/cliCollection/update-project-with-master-template');
+const createProjectFromRepository = require('../src/cliCollection/create-project-from-repository');
+const updateProjectFromRepository = require('../src/cliCollection/update-project-from-repository');
 const prompt = require('../src/cliCollection/prompt');
 const code = require('../src/cliCollection/createCode');
 const rimraf = require('../src/cliCollection/rimraf');
@@ -159,20 +159,20 @@ program
   });
 
 program
-  .command('create-project-with-master-template')
+  .command('create-project-from-repository')
   .description('update package from local or remote package.json file')
-  .option('--templateUrl <string>', 'template url with download')
+  .option('--repository <string>', 'repository with download')
   .option('--folder <string>', 'folder name create project in it')
   .option(
     '--exampleUrl <string>',
     'example url, if it has value, will prompt info after create',
   )
   .action((a, o) => {
-    createProjectWithMasterTemplate.run(a, o);
+    createProjectFromRepository.run(a, o);
   });
 
 program
-  .command('update-project-with-master-template')
+  .command('update-project-from-repository')
   .description('update from master template repository')
   .option('--projectPath <string>', 'target project path that will be updated')
   .option(
@@ -180,7 +180,7 @@ program
     'web agent for remote , if it has value, will use the agent to access remote url',
   )
   .action((a, o) => {
-    updateProjectWithMasterTemplate.run(a, o);
+    updateProjectFromRepository.run(a, o);
   });
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.216",
+  "version": "2.1.220",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -32,13 +32,14 @@
     "test:bin:check-all-package-version": "node ./bin/cli.js check-all-package-version",
     "test:bin:code": "node ./bin/cli.js code --dataPath ./develop/generatorCodeSource/code.json",
     "test:bin:create-assist-scripts": "node ./bin/cli.js create-assist-scripts",
+    "test:bin:create-project-from-repository": "node ./bin/cli.js create-project-from-repository --repository kityandhero/mono-antd-management-fast-master-template --folder ./temp/create-project-from-repository-demo",
     "test:bin:create-repository-project": "node ./bin/cli.js create-repository-project",
     "test:bin:exit": "node ./bin/cli.js exit",
     "test:bin:publish": "node ./bin/cli.js publish --packages ss --otp true",
     "test:bin:rimraf": "node ./bin/cli.js rimraf --path ./testRemoveThisPath",
     "test:bin:sleep": "node ./bin/cli.js sleep --second 2 --showInfo true",
     "test:bin:update-all-package-version": "node ./bin/cli.js update-all-package-version",
-    "test:bin:update-project-with-master-template": "node ./bin/cli.js update-project-with-master-template --projectPath E:\\temp\\2\\test",
+    "test:bin:update-project-from-repository": "node ./bin/cli.js update-project-from-repository --projectPath E:\\temp\\2\\test",
     "test:commitRefresh": "node ./test/commitRefresh.test.js",
     "test:createCleanScriptFile": "node ./test/createCleanScriptFile.test.js",
     "test:createCommitRefreshScriptFile": "node ./test/createCommitRefreshScriptFile.test.js",
@@ -91,19 +92,19 @@
     "@commitlint/config-pnpm-scopes": "^19.1.0",
     "commitizen": "^4.3.0",
     "conventional-changelog-conventionalcommits": "^8.0.0",
-    "cz-git": "^1.9.3",
+    "cz-git": "^1.9.4",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-formatter-pretty": "^6.0.1",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^6.4.0",
-    "husky": "^9.0.11",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-promise": "^6.6.0",
+    "husky": "^9.1.1",
     "lint-staged": "^15.2.7",
     "npm-check-updates": "^16.14.20",
     "prettier": "^3.3.3",
-    "prettier-plugin-packagejson": "^2.5.0"
+    "prettier-plugin-packagejson": "^2.5.1"
   }
 }

package/src/cliCollection/create-project-from-repository.js

@@ -0,0 +1,76 @@
+const createProjectFromRepository = require('download-git-repo');
+
+const {
+  promptError,
+  exit,
+  checkStringIsEmpty,
+  promptWarn,
+  mkdirSync,
+  existDirectorySync,
+  promptInfo,
+  resolvePath,
+  promptSuccess,
+  promptTip,
+} = require('../tools/meta');
+
+exports.run = function (s, o) {
+  const {
+    _optionValues: { repository, folder, exampleUrl = '' },
+  } = o;
+
+  if (checkStringIsEmpty(folder)) {
+    promptWarn('Please enter project folder name');
+
+    exit();
+  }
+
+  if (checkStringIsEmpty(folder)) {
+    promptWarn('project folder name not allow empty');
+
+    exit();
+  } else {
+    if (checkStringIsEmpty(repository)) {
+      promptError('repository not allow empty');
+
+      exit();
+    } else {
+      const repositoryAdjust = repository;
+
+      const folderPath = resolvePath(`./${folder}`);
+
+      if (existDirectorySync(folderPath)) {
+        promptWarn('project folder already exist, please choose another');
+
+        exit();
+      }
+
+      mkdirSync(folderPath);
+
+      promptTip('repository', repositoryAdjust);
+      promptTip('folder', folder);
+
+      promptInfo('download will start, please wait a moment...');
+
+      createProjectFromRepository(
+        repositoryAdjust,
+        folderPath,
+        { clone: false },
+        (err) => {
+          if (!err) {
+            promptSuccess('download success');
+
+            if (!checkStringIsEmpty(exampleUrl)) {
+              promptTip('here is a example project repo', exampleUrl);
+            }
+
+            promptInfo('please modify info in package.json file');
+          } else {
+            promptError(err);
+          }
+
+          exit();
+        },
+      );
+    }
+  }
+};

package/src/cliCollection/{update-project-with-master-template.js → update-project-from-repository.js}

@@ -1,6 +1,6 @@
 const {
   updateProjectFromRepository,
-} = require('../tools/update.project.from.master.template');
+} = require('../tools/update.project.from.repository');
 
 exports.run = async function (s, o) {
   const {

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

@@ -0,0 +1,57 @@
+const {
+  writeJsonFileSync,
+  readJsonFileSync,
+  existFileSync,
+  mkdirSync,
+} = require('../tools/meta');
+
+const developUpdateProjectFromRepository = {
+  repository: '',
+  sourcePath: '',
+  targetPath: '',
+  folders: [],
+  files: [],
+};
+
+const developUpdateProjectFromRepositoryConfigFilePath =
+  './develop/config/develop.update.project.from.repository.json';
+
+function createDevelopUpdateProjectFromRepositoryConfigFile() {
+  mkdirSync(`./develop`);
+
+  mkdirSync(`./develop/config`);
+
+  writeJsonFileSync(
+    developUpdateProjectFromRepositoryConfigFilePath,
+    developUpdateProjectFromRepository,
+    {
+      coverFile: false,
+    },
+  );
+}
+
+function getDevelopUpdateProjectFromRepositoryConfig(
+  createFileWhenNoExist = false,
+) {
+  const developUpdateProjectFromRepositoryConfigFileExist = existFileSync(
+    developUpdateProjectFromRepositoryConfigFilePath,
+  );
+
+  if (!developUpdateProjectFromRepositoryConfigFileExist) {
+    if (createFileWhenNoExist) {
+      createDevelopUpdateProjectFromRepositoryConfigFile([]);
+    } else {
+      return developUpdateProjectFromRepository;
+    }
+  }
+
+  return {
+    ...developUpdateProjectFromRepository,
+    ...readJsonFileSync(developUpdateProjectFromRepositoryConfigFilePath),
+  };
+}
+
+module.exports = {
+  createDevelopUpdateProjectFromRepositoryConfigFile,
+  getDevelopUpdateProjectFromRepositoryConfig,
+};

package/src/project/initProject.js

@@ -32,6 +32,9 @@ const {
 const {
   createDevelopSubPathVersionNcuConfigFile,
 } = require('../config/develop.subPath.version.ncu');
+const {
+  createDevelopUpdateProjectFromRepositoryConfigFile,
+} = require('../config/develop.update.project.from.repository');
 
 function createRepositoryProjectFolder(name) {
   mkdirSync(`./${name}`);
@@ -200,6 +203,8 @@ function initialEnvironment() {
 
   createDevelopSubPathVersionNcuConfigFile(['packages']);
 
+  createDevelopUpdateProjectFromRepositoryConfigFile();
+
   promptSuccess(`step *: config environment`);
 
   promptEmptyLine();

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

@@ -0,0 +1,196 @@
+const download = require('download');
+const agent = require('hpagent');
+const zip = require('cross-zip');
+
+const {
+  promptSuccess,
+  promptLine,
+  promptError,
+  promptWarn,
+  exit,
+  resolvePath,
+  checkStringIsEmpty,
+  promptInfo,
+  exec,
+  copyFileSync,
+  copyFolderSync,
+  promptTip,
+} = require('./meta');
+
+const {
+  getDevelopUpdateProjectFromRepositoryConfig,
+} = require('../config/develop.update.project.from.repository');
+
+const { HttpsProxyAgent } = agent;
+
+const zipFileName = 'repositorySource';
+
+function clearResource() {
+  const removeSourceFolderCmd = `rimraf ${resolvePath(`./temp/source/`)}`;
+
+  promptInfo(`remove folder: "./temp/source/"`);
+
+  exec(removeSourceFolderCmd);
+
+  const removeZipFolderCmd = `rimraf ${resolvePath(`./temp/zip/`)}`;
+
+  promptInfo(`remove folder: "./temp/zip/"`);
+
+  exec(removeZipFolderCmd);
+}
+
+function handlePackage({
+  projectPath,
+  zipPath,
+  sourcePath,
+  targetPath,
+  folders,
+  files,
+}) {
+  const unzipPath = resolvePath(`./temp/source/`);
+
+  zip.unzip(zipPath, unzipPath, () => {
+    promptSuccess(`unzip success.`);
+
+    promptTip('repository zip file unzip to path', unzipPath);
+
+    const projectPathAdjust = resolvePath(projectPath);
+
+    promptInfo(`target project path: "${projectPathAdjust}".`);
+
+    const sourceMainPath = `./temp/source/${sourcePath}`;
+    const targetMainPath = `${projectPath}/${targetPath}`;
+
+    promptLine();
+
+    for (const itemFolder of folders) {
+      copyFolderSync({
+        sourceMainPath,
+        targetMainPath,
+        filepath: itemFolder,
+      });
+    }
+
+    for (const itemFile of files) {
+      copyFileSync({
+        sourceMainPath,
+        targetMainPath,
+        filepath: itemFile,
+      });
+    }
+
+    clearResource();
+  });
+}
+
+async function handleTempPackagePath({ agent, packageUrl, repo }) {
+  let zipPath = '';
+
+  let agentInfo = '';
+
+  if (checkStringIsEmpty(agent)) {
+    agentInfo = `download with none agent`;
+  } else {
+    agentInfo = `download with agent "${agent}"`;
+  }
+
+  promptInfo(
+    `try master management template ${repo} repository, ${agentInfo}.`,
+  );
+
+  if (agent) {
+    promptSuccess(`agent: ${agent}`);
+  }
+
+  promptInfo(`${repo} repository: "${packageUrl}".`);
+
+  await download(packageUrl, resolvePath(`./temp/zip`), {
+    ...(agent
+      ? {
+          agent: {
+            https: new HttpsProxyAgent({
+              keepAlive: true,
+              keepAliveMsecs: 1000,
+              maxSockets: 256,
+              maxFreeSockets: 256,
+              scheduling: 'lifo',
+              proxy: agent,
+            }),
+          },
+        }
+      : {}),
+    filename: `${zipFileName}.zip`,
+  });
+
+  promptSuccess(`download zip from ${repo} repository success!`);
+
+  zipPath = resolvePath(`./temp/zip/${zipFileName}.zip`);
+
+  promptInfo(`master template zip file Path: "${zipPath}".`);
+
+  return zipPath;
+}
+
+async function updateProjectFromRepository({ projectPath = '.', agent }) {
+  clearResource();
+
+  const {
+    repository = '',
+    sourcePath = '',
+    targetPath = '',
+    folders = [],
+    files = [],
+  } = {
+    repository: '',
+    sourcePath: '',
+    targetPath: '',
+    folders: [],
+    files: [],
+    ...getDevelopUpdateProjectFromRepositoryConfig(),
+  };
+
+  const repositoryRemoteUrl = repository;
+
+  if (checkStringIsEmpty(repositoryRemoteUrl)) {
+    promptError('please input primary remote package.json url');
+
+    exit();
+  }
+
+  let zipPath = '';
+
+  promptSuccess(`prepare to update from master template: `);
+
+  promptLine();
+
+  try {
+    zipPath = await handleTempPackagePath({
+      agent,
+      packageUrl: repositoryRemoteUrl,
+      repo: 'github',
+    });
+  } catch (error) {
+    if (checkStringIsEmpty(repositoryRemoteUrl)) {
+      promptError('please input repository remote url');
+
+      exit();
+    }
+
+    promptLine();
+
+    promptWarn(`use github repository failure! `);
+
+    promptLine();
+  }
+
+  handlePackage({
+    projectPath,
+    zipPath,
+    sourcePath,
+    targetPath,
+    folders,
+    files,
+  });
+}
+
+module.exports = { updateProjectFromRepository };

package/types/cliCollection/create-project-from-repository.d.ts

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

package/types/cliCollection/update-project-from-repository.d.ts

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

package/types/config/develop.update.project.from.repository.d.ts

@@ -0,0 +1,4 @@
+export function createDevelopUpdateProjectFromRepositoryConfigFile(): void;
+export function getDevelopUpdateProjectFromRepositoryConfig(
+  createFileWhenNoExist?: boolean,
+): any;

package/types/tools/update.project.from.repository.d.ts

@@ -0,0 +1,7 @@
+export function updateProjectFromRepository({
+  projectPath,
+  agent,
+}: {
+  projectPath?: string | undefined;
+  agent: any;
+}): Promise<void>;

package/src/cliCollection/create-project-with-master-template.js

@@ -1,65 +0,0 @@
-const download = require('download-git-repo');
-
-const {
-  promptError,
-  exit,
-  checkStringIsEmpty,
-  promptWarn,
-  mkdirSync,
-  existDirectorySync,
-  promptInfo,
-  resolvePath,
-  promptSuccess,
-} = require('../tools/meta');
-
-exports.run = function (s, o) {
-  const {
-    _optionValues: { templateUrl, folder, exampleUrl = '' },
-  } = o;
-
-  if (checkStringIsEmpty(folder)) {
-    promptWarn('Please enter project folder name');
-
-    exit();
-  }
-
-  if (checkStringIsEmpty(folder)) {
-    promptWarn('project folder name not allow empty');
-
-    exit();
-  } else {
-    const templateUrlAdjust = checkStringIsEmpty(templateUrl)
-      ? 'kityandhero/mono-antd-management-fast-master-template'
-      : templateUrl;
-
-    const folderPath = resolvePath(`./${folder}`);
-
-    if (existDirectorySync(folderPath)) {
-      promptWarn('project folder already exist, please choose another');
-
-      exit();
-    }
-
-    mkdirSync(folderPath);
-
-    promptInfo(`template url:${templateUrlAdjust}`);
-    promptInfo(`folder:${folder}`);
-    promptInfo('download will start, please wait a moment...');
-
-    download(templateUrlAdjust, folderPath, { clone: false }, (err) => {
-      if (!err) {
-        promptSuccess('download success');
-
-        if (!checkStringIsEmpty(exampleUrl)) {
-          promptInfo(`we build a example project repo is here: ${exampleUrl}`);
-        }
-
-        promptInfo('please modify info in package.json file');
-      } else {
-        promptError(err);
-      }
-
-      exit();
-    });
-  }
-};

package/src/tools/update.project.from.master.template.js

@@ -1,274 +0,0 @@
-const download = require('download');
-const agent = require('hpagent');
-const zip = require('cross-zip');
-
-const {
-  promptSuccess,
-  promptLine,
-  promptError,
-  promptWarn,
-  exit,
-  resolvePath,
-  checkStringIsEmpty,
-  promptInfo,
-  exec,
-  copyFileSync,
-  copyFolderSync,
-} = require('./meta');
-
-const { HttpsProxyAgent } = agent;
-
-function clearResource() {
-  const removeSourceFolderCmd = `rimraf ${resolvePath(`./temp/source/`)}`;
-
-  promptInfo(`remove folder: "./temp/source/"`);
-
-  exec(removeSourceFolderCmd);
-
-  const removeZipFolderCmd = `rimraf ${resolvePath(`./temp/zip/`)}`;
-
-  promptInfo(`remove folder: "./temp/zip/"`);
-
-  exec(removeZipFolderCmd);
-}
-
-function handlePackage(projectPath, zipPath) {
-  const unzipPath = resolvePath(`./temp/source/`);
-
-  zip.unzip(zipPath, unzipPath, () => {
-    promptSuccess(`unzip success.`);
-
-    promptInfo(
-      `master template zip unzip to path: "${resolvePath(`./temp/source/mono-antd-management-fast-master-template-main`)}".`,
-    );
-
-    const projectPathAdjust = resolvePath(projectPath);
-
-    promptInfo(`target project path: "${projectPathAdjust}".`);
-
-    const sourceMainPath = `./temp/source/mono-antd-management-fast-master-template-main/packages/master-management/`;
-    const targetMainPath = `${projectPath}/packages/master-management/`;
-
-    promptLine();
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'config/router.master.template.config.js',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'generatorConfig/general/',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/commonAssist/Action/actionGeneral.js',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/components/PageLoading/',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/customConfig/general/',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/customSpecialComponents/BaseUpdateRoleModal/',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/customSpecialComponents/CustomAssembly/menuHeader.js',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/customSpecialComponents/CustomAssembly/timeAndOperator.js',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/customSpecialComponents/UpdateModuleModalBase/',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/localeConfig/general/zh-CN/menu.js',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/locales/zh-CN/menu.js',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/pageBases/',
-    });
-
-    copyFolderSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/pages/',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/utils/init.js',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/utils/tools.jsx',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/access.js',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/app.jsx',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/global.less',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'src/overrides.less',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'plugin.ts',
-    });
-
-    copyFileSync({
-      sourceMainPath,
-      targetMainPath,
-      filepath: 'tsconfig.json',
-    });
-
-    clearResource();
-  });
-}
-
-async function handleTempPackagePath({ agent, packageUrl, repo }) {
-  let zipPath = '';
-
-  let agentInfo = '';
-
-  if (checkStringIsEmpty(agent)) {
-    agentInfo = `download with none agent`;
-  } else {
-    agentInfo = `download with agent "${agent}"`;
-  }
-
-  promptInfo(
-    `try master management template ${repo} repository, ${agentInfo}.`,
-  );
-
-  if (agent) {
-    promptSuccess(`agent: ${agent}`);
-  }
-
-  promptInfo(`${repo} repository: "${packageUrl}".`);
-
-  await download(packageUrl, resolvePath(`./temp/zip`), {
-    ...(agent
-      ? {
-          agent: {
-            https: new HttpsProxyAgent({
-              keepAlive: true,
-              keepAliveMsecs: 1000,
-              maxSockets: 256,
-              maxFreeSockets: 256,
-              scheduling: 'lifo',
-              proxy: agent,
-            }),
-          },
-        }
-      : {}),
-  });
-
-  promptSuccess(`download zip from ${repo} repository success!`);
-
-  zipPath = resolvePath(
-    `./temp/zip/mono-antd-management-fast-master-template-main.zip`,
-  );
-
-  promptInfo(`master template zip file Path: "${zipPath}".`);
-
-  return zipPath;
-}
-
-async function updateProjectFromRepository({ projectPath = '.', agent }) {
-  clearResource();
-
-  const repositoryRemoteUrl =
-    'https://codeload.github.com/kityandhero/mono-antd-management-fast-master-template/zip/refs/heads/main';
-
-  if (checkStringIsEmpty(repositoryRemoteUrl)) {
-    promptError('please input primary remote package.json url');
-
-    exit();
-  }
-
-  let zipPath = '';
-
-  promptSuccess(`prepare to update from master template: `);
-
-  promptLine();
-
-  try {
-    zipPath = await handleTempPackagePath({
-      agent,
-      packageUrl: repositoryRemoteUrl,
-      repo: 'github',
-    });
-  } catch (error) {
-    if (checkStringIsEmpty(repositoryRemoteUrl)) {
-      promptError('please input repository remote url');
-
-      exit();
-    }
-
-    promptLine();
-
-    promptWarn(`use github repository failure! `);
-
-    promptLine();
-  }
-
-  handlePackage(projectPath, zipPath);
-}
-
-module.exports = { updateProjectFromRepository };