easy-soft-develop 2.0.110 → 2.0.139

package/bin/cli.js

@@ -7,6 +7,7 @@ const createAssistScripts = require('../src/cliCollection/create-assist-scripts.
 const checkAllPackageVersion = require('../src/cliCollection/check-all-package-version');
 const updateAllPackageVersion = require('../src/cliCollection/update-all-package-version');
 const sleep = require('../src/cliCollection/sleep');
+const publish = require('../src/cliCollection/publish');
 const commitRefresh = require('../src/cliCollection/commit-refresh');
 const createLernaProject = require('../src/cliCollection/create-lerna-project');
 const clearAllDependence = require('../src/cliCollection/clear-all-dependence');
@@ -50,6 +51,13 @@ program
     sleep.run(a, o);
   });
 
+program
+  .command('publish')
+  .description('publish to npm by script "z:publish:npm-all"')
+  .action(() => {
+    publish.run();
+  });
+
 program
   .command('commit-refresh')
   .description('update a flag file when commit')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.0.110",
+  "version": "2.0.139",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -13,26 +13,29 @@
   "license": "ISC",
   "author": "",
   "main": "src/index.js",
+  "types": "types/index.d.ts",
   "bin": {
     "easy-soft-develop": "./bin/cli.js"
   },
   "directories": {
-    "src": "src"
+    "src": "src",
+    "types": "types"
   },
   "files": [
-    "src/"
+    "src/",
+    "types/"
   ],
   "scripts": {
-    "change:nrm:local": "nrm use local",
-    "change:nrm:npm": "nrm use npm",
+    "change:npm:registry:local": "nrm use local",
+    "change:npm:registry:npm": "nrm use npm",
     "commitlint": "npx commitlint --edit",
-    "precz": "node ./bin/cli.js commit-refresh && git stage -A",
+    "precz": "node ./bin/cli.js commit-refresh && npm run z:tsc:build && git stage -A",
     "cz": "cz",
     "postcz": "git push",
     "publish:npm": "npm run publish:patch:npm",
-    "prepublish:patch:npm": "npm run cz&& npm version patch && npm run change:nrm:npm",
+    "prepublish:patch:npm": "npm run cz&& npm version patch && npm run change:npm:registry:npm",
     "publish:patch:npm": "npm publish",
-    "postpublish:patch:npm": "npm run change:nrm:local",
+    "postpublish:patch:npm": "npm run change:npm:registry:local",
     "test:bin:check-all-package-version": "node ./bin/cli.js check-all-package-version",
     "test:bin:commit-refresh": "node ./bin/cli.js commit-refresh",
     "test:bin:create-assist-scripts": "node ./bin/cli.js create-assist-scripts",
@@ -46,7 +49,8 @@
     "test:createPackageUpdateAllVersionScriptFile": "node ./test/createPackageUpdateAllVersionScriptFile.test.js",
     "test:createSleepScriptFile": "node ./test/createSleepScriptFile.test.js",
     "test:inner:assignObject": "node ./test/assignObject.test.js",
-    "z:prettier:format:all": "npx prettier --write ."
+    "z:prettier:format:all": "npx prettier --write .",
+    "z:tsc:build": "echo show tsc version and create declaration file && tsc -v && tsc -p ./tsconfig.types.json && echo declaration file generate complete"
   },
   "dependencies": {
     "commander": "^10.0.0",

package/src/cliCollection/publish.js

@@ -0,0 +1,9 @@
+const { exit, exec } = require('../tools/meta');
+
+exports.run = function () {
+  exec('npm run npm run z:change:npm:registry:npm');
+  exec(`npm run z:publish:npm-all`);
+  exec('npm run npm run z:change:npm:registry:local');
+
+  exit();
+};

package/src/index.js

@@ -18,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 {
@@ -34,7 +34,7 @@ module.exports = {
   clean,
   commitRefresh,
   initialEnvironment,
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
   loopPackage,
   checkAllPackageVersion,
   updateSpecialPackageVersion,

package/src/templates/eslint.template.js

@@ -10,6 +10,7 @@ const content = \`#
 **/.history
 **/.vs
 **/.swc
+**/docs
 
 *.d.ts
 *.log
@@ -119,7 +120,7 @@ const coreRules = {
 
 const reactRules = {
   'react/sort-comp': 0,
-  'react/jsx-uses-react': 'off',
+  'react/jsx-uses-react': 2,
   'react/react-in-jsx-scope': 'off',
   'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
   'react/jsx-wrap-multilines': 0,
@@ -485,7 +486,7 @@ module.exports = {
 const parserFile = {
   folderPath: `${folderPath}/config/items/parser`,
   fileName: 'index.js',
-  coverFile: false,
+  coverFile: true,
   fileContent: parserFileContent,
 };
 

package/src/templates/lint-staged.template.js

@@ -10,7 +10,7 @@ const content = \`{
     "npx prettier --cache --write"
   ],
   "*.{css,less,scss}": [
-    "stylelint",
+    "stylelint --allow-empty-input",
     "npx prettier --cache --write"
   ],
   "*.{ts,tsx}": [

package/src/templates/package.template.js

@@ -22,15 +22,15 @@ const lintScript = {
   'z:lint:script:all:fix': 'npx eslint --fix --ext .js,.jsx,.ts,.tsx ./src',
   'postz:lint:script:all:fix': 'npm run z:prettier:format:all',
   'z:lint:script:change': 'npx eslint --cache --ext .js,.jsx,.ts,.tsx ./src',
-  'z:lint:script:change:fix': 'npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ./src && npm run z:lint:style:fix',
-  'postz:lint:script:change:fix': 'npm run prettier:format:change',
+  'z:lint:script:change:fix': 'npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ./src',
+  'postz:lint:script:change:fix': 'npm run z:prettier:format:change',
   'z:lint:staged': 'npx lint-staged --quiet',
-  'z:lint:style:all': 'npx stylelint "./src/**/*.less"',
-  'z:lint:style:all:fix': 'npx stylelint --fix "./src/**/*.less"',
+  'z:lint:style:all': 'npx stylelint --allow-empty-input "./src/**/*.{css,scss,less}"',
+  'z:lint:style:all:fix': 'npx stylelint --allow-empty-input --fix "./src/**/*.{css,scss,less}"',
   'postz:lint:style:all:fix': 'npm run z:prettier:format:all',
-  'z:lint:style:change': 'npx stylelint --cache "./src/**/*.less"',
-  'z:lint:style:change:fix': 'npx stylelint --cache --fix "./src/**/*.less"',
-  'postz:lint:style:change:fix': 'npm run prettier:format:change',
+  'z:lint:style:change': 'npx stylelint --allow-empty-input --cache "./src/**/*.{css,scss,less}"',
+  'z:lint:style:change:fix': 'npx stylelint --allow-empty-input --cache --fix "./src/**/*.{css,scss,less}"',
+  'postz:lint:style:change:fix': 'npm run z:prettier:format:change',
 };
 
 const prettierScript = {
@@ -45,6 +45,7 @@ const tscScript = {
 
 module.exports = {
   ...commitScript,
+  ...documentationScript,
   ...lintScript,
   ...prettierScript,
   ...tscScript,
@@ -81,12 +82,10 @@ const toolsScript = {
 const publishScript = {
   changelog:
     'lerna version --conventional-commits --no-push --no-git-tag-version',
-  'prez:publish-npm-all': 'npm run z:change:nrm:npm',
-  'z:publish-npm-all': 'npm run z:publish:npm-all',
-  'postz:publish-npm-all': 'npm run z:change:nrm:local',
-  'prez:publish:lerna': 'npm run z:change:nrm:npm',
+  'z:publish-npm-all': 'npx easy-soft-develop publish',
+  'prez:publish:lerna': 'npm run z:change:npm:registry:npm',
   'z:publish:lerna': 'lerna updated && npm run z:lerna:publish',
-  'postz:publish:lerna': 'npm run z:change:nrm:local && npm run z:publish-npm-all',
+  'postz:publish:lerna': 'npm run z:change:npm:registry:local && npm run z:publish-npm-all',
   'prez:publish:build': 'npm run z:install && npm run cz && npm run z:build:all',
   'z:publish:build': 'npm run z:publish:lerna',
 };
@@ -102,7 +101,6 @@ const environmentScript = {
 
 const lernaScript = {
   'z:lerna:publish': 'lerna publish --yes',
-  'prez:lerna:bootstrap': 'npm run z:change:nrm:local',
   'z:lerna:bootstrap':
     'npm run z:clean && npm run z:husky:install && git pull && npm run z:install',
 };
@@ -110,14 +108,16 @@ const lernaScript = {
 const installScript = {
   "z:reinstall": 'npm run z:lerna:bootstrap',
   "postinstall": "npm run z:initial:environment",
+  "prez:install.global.develop.dependence": "npm run z:change:npm:registry:local",
   "z:install.global.develop.dependence": "node ./develop/assists/install.global.develop.dependence",
   "postz:install.global.develop.dependence": "npm run z:install",
+  "prez:install": "npm run z:change:npm:registry:local",
   "z:install": "pnpm install",
 };
 
 const nrmScript = {
-  "z:change:nrm:local": "nrm use local",
-  "z:change:nrm:npm": "nrm use npm",
+  "z:change:npm:registry:local": "nrm use local",
+  "z:change:npm:registry:npm": "nrm use npm",
 };
 
 const commitScript = {

package/src/templates/prettier.template.js

@@ -42,7 +42,7 @@ module.exports = generalConfig;
 \`;
 
 const packageContent = \`${fileGlobalHeader}
-var { generalConfig } = require("../../develop/config/prettier/config");
+const { generalConfig } = require("../../develop/config/prettier/config");
 
 module.exports = generalConfig;
 \`;

package/src/tools/commit.refresh.js

@@ -30,7 +30,7 @@ function commitRefresh(fileName = '', relativeFolder = '') {
 
   const scriptFilePath = `${filePath}/${relativeFolderAdjust}/${fileNameAdjust}`;
 
-  writeFileSync(scriptFilePath, content);
+  writeFileSync(scriptFilePath, content, { coverFile: true });
 
   const log = `${fileNameAdjust} refresh success in folder "./${relativeFolderAdjust}/"`;
 

package/src/tools/develop.file.js

@@ -63,6 +63,99 @@ const {
   configFile: stylelintConfigFile,
 } = require('../templates/stylelint.template');
 
+const childrenDevelopPackageConfigContent = `${fileGlobalHeader}
+const childrenDevelopPackageList = [];
+
+module.exports = {
+  childrenDevelopPackageList,
+};
+`;
+
+const childrenSpecialDevelopPackageConfigContent = `${fileGlobalHeader}
+const childrenSpecialDevelopPackageList = {};
+
+module.exports = {
+  childrenSpecialDevelopPackageList,
+};
+`;
+
+const cleanConfigContent = `${fileGlobalHeader}
+const cleanCommand = 'lerna clean -y';
+
+const cleanCollection = [];
+
+module.exports = {
+  cleanCommand,
+  cleanCollection,
+};
+`;
+
+const globalDevelopPackageConfigContent = `${fileGlobalHeader}
+const globalDevelopPackageList = [];
+
+module.exports = {
+  globalDevelopPackageList,
+};
+`;
+
+const mainDevelopPackageConfigContent = `${fileGlobalHeader}
+const mainDevelopPackageList = [];
+
+module.exports = {
+  mainDevelopPackageList,
+};
+`;
+
+const updatePackageFromPackageConfigContent = `${fileGlobalHeader}
+const updatePackageFromPackageOptions = {
+  agent: '',
+  localFile: '',
+  packageUrl: '',
+  repo: '',
+};
+
+module.exports = {
+  updatePackageFromPackageOptions,
+};
+`;
+
+const updateSpecialPackageConfigContent = `${fileGlobalHeader}
+const updateSpecialPackageCollection = [];
+
+module.exports = {
+  updateSpecialPackageCollection,
+};
+`;
+
+const assistConfigIndexContent = `${fileGlobalHeader}
+const {
+  childrenDevelopPackageList,
+} = require('./childrenDevelopPackage.config');
+const {
+  childrenSpecialDevelopPackageList,
+} = require('./childrenSpecialDevelopPackage.config');
+const { cleanCollection, cleanCommand } = require('./clean.config');
+const { globalDevelopPackageList } = require('./globalDevelopPackage.config');
+const { mainDevelopPackageList } = require('./mainDevelopPackage.config');
+const {
+  updatePackageFromPackageOptions,
+} = require('./updatePackageFromPackage.config');
+const {
+  updateSpecialPackageCollection,
+} = require('./updateSpecialPackage.config');
+
+module.exports = {
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+  cleanCollection,
+  cleanCommand,
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  updatePackageFromPackageOptions,
+  updateSpecialPackageCollection,
+};
+`;
+
 function createScriptFile(folderPath, fileName, content, coverFile = false) {
   mkdirSync(folderPath);
 
@@ -125,37 +218,61 @@ auto-install-peers=true`,
 }
 
 function createAssistConfigScriptFile() {
-  const content = `${fileGlobalHeader}
-const cleanCommand = '';
+  createScriptFile(
+    `./develop/assists/config`,
+    'childrenDevelopPackage.config.js',
+    childrenDevelopPackageConfigContent,
+    false,
+  );
 
-const cleanCollection = [];
+  createScriptFile(
+    `./develop/assists/config`,
+    'childrenSpecialDevelopPackage.config.js',
+    childrenSpecialDevelopPackageConfigContent,
+    false,
+  );
 
-const developDependencePackageCollection = [];
+  createScriptFile(
+    `./develop/assists/config`,
+    'clean.config.js',
+    cleanConfigContent,
+    false,
+  );
 
-const updateSpecialPackageCollection = [];
+  createScriptFile(
+    `./develop/assists/config`,
+    'globalDevelopPackage.config.js',
+    globalDevelopPackageConfigContent,
+    false,
+  );
 
-const updatePackageFromPackageOptions = {
-  agent: '',
-  localFile: '',
-  packageUrl: '',
-  repo: '',
-};
+  createScriptFile(
+    `./develop/assists/config`,
+    'mainDevelopPackage.config.js',
+    mainDevelopPackageConfigContent,
+    false,
+  );
 
-module.exports = {
-  cleanCommand,
-  cleanCollection,
-  developDependencePackageCollection,
-  updateSpecialPackageCollection,
-  updatePackageFromPackageOptions,
-};
-`;
+  createScriptFile(
+    `./develop/assists/config`,
+    'updatePackageFromPackage.config.js',
+    updatePackageFromPackageConfigContent,
+    false,
+  );
 
-  return createScriptFile(
+  createScriptFile(
     `./develop/assists/config`,
-    'index.js',
-    content,
+    'updateSpecialPackage.config.js',
+    updateSpecialPackageConfigContent,
     false,
   );
+
+  createScriptFile(
+    `./develop/assists/config`,
+    'index.js',
+    assistConfigIndexContent,
+    true,
+  );
 }
 
 function createCleanScriptFile() {
@@ -210,11 +327,21 @@ updateSpecialPackageVersion(updateSpecialPackageCollection);
 
 function createInstallGlobalDevelopDependenceScriptFile() {
   const content = `${fileGlobalHeader}
-const { installGlobalDevelopDependencePackages } = require('easy-soft-develop');
+const { installDevelopDependencePackages } = require('easy-soft-develop');
 
-const { developDependencePackageCollection } = require('./config');
-
-installGlobalDevelopDependencePackages(developDependencePackageCollection);
+const {
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+} = require('./config');
+
+installDevelopDependencePackages({
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+});
 `;
 
   try {
@@ -238,6 +365,7 @@ const eslintIgnoreFile = require('../config/eslint/template/ignore.content');
 const prettierFile = require('../config/prettier/template/content');
 const prettierIgnoreFile = require('../config/prettier/template/ignore.content');
 const stylelintFile = require('../config/stylelint/template/content');
+const stylelintIgnoreFile = require('../config/stylelint/template/ignore.content');
 const editorFile = require('../config/editor/template/content');
 const editorAttributesFile = require('../config/git/template/attributes.content');
 const editorIgnoreFile = require('../config/git/template/ignore.content');
@@ -258,6 +386,9 @@ const packagePrettierContent = prettierFile.packageContent;
 const prettierIgnoreContent = prettierIgnoreFile.content;
 
 const mainStylelintContent = stylelintFile.mainContent;
+
+const stylelintIgnoreContent = stylelintIgnoreFile.content;
+
 const packageStylelintContent = stylelintFile.packageContent;
 
 const editorConfigContent = editorFile.content;
@@ -278,11 +409,21 @@ const mainFileContentList = [
     content: mainPrettierContent,
     coverFile: true,
   },
+  {
+    name: '.prettierignore',
+    content: prettierIgnoreContent,
+    coverFile: false,
+  },
   {
     name: '.stylelintrc.js',
     content: mainStylelintContent,
     coverFile: true,
   },
+  {
+    name: '.stylelintignore',
+    content: stylelintIgnoreContent,
+    coverFile: false,
+  },
   {
     name: '.editorconfig',
     content: editorConfigContent,
@@ -293,11 +434,6 @@ const mainFileContentList = [
     content: eslintIgnoreContent,
     coverFile: false,
   },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
-    coverFile: false,
-  },
   {
     name: '.gitattributes',
     content: gitAttributesContent,
@@ -326,11 +462,21 @@ const packageFileContentList = [
     content: packagePrettierContent,
     coverFile: true,
   },
+  {
+    name: '.prettierignore',
+    content: prettierIgnoreContent,
+    coverFile: false,
+  },
   {
     name: '.stylelintrc.js',
     content: packageStylelintContent,
     coverFile: true,
   },
+  {
+    name: '.stylelintignore',
+    content: stylelintIgnoreContent,
+    coverFile: false,
+  },
   {
     name: '.editorconfig',
     content: editorConfigContent,
@@ -341,11 +487,6 @@ const packageFileContentList = [
     content: eslintIgnoreContent,
     coverFile: false,
   },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
-    coverFile: false,
-  },
   {
     name: '.gitattributes',
     content: gitAttributesContent,

package/src/tools/initial.environment.js

@@ -1,3 +1,4 @@
+const { checkInCollection } = require('./meta');
 const {
   promptSuccess,
   writeFileSync,
@@ -60,18 +61,34 @@ function createPackageFile(fileWithContentCollection) {
   promptEmptyLine();
 }
 
-function adjustMainPackageJson({ scripts }) {
+function adjustMainPackageJsonScript({ scripts }) {
   const mainProjectPath = resolvePath(`./package.json`);
 
   const packageJson = readJsonFileSync(mainProjectPath);
 
+  const originalScript = packageJson.scripts;
+
+  const ignoreDeleteScript = ['z:build:all', 'z:publish:npm-all'];
+
+  Object.keys(originalScript).forEach((o) => {
+    if (!checkInCollection(ignoreDeleteScript, o)) {
+      if (
+        o.startsWith('z:') ||
+        o.startsWith('prez:') ||
+        o.startsWith('postz:')
+      ) {
+        delete originalScript[o];
+      }
+    }
+  });
+
   packageJson.scripts = assignObject(
     {
       'z:build:all': 'echo please supplement build all packages commend',
       'z:publish:npm-all': 'echo please supplement publish to npm commend',
     },
     globalScript,
-    packageJson.scripts || {},
+    originalScript || {},
     scripts,
   );
 
@@ -81,7 +98,7 @@ function adjustMainPackageJson({ scripts }) {
   promptEmptyLine();
 }
 
-function adjustChildrenPackageJson({ scripts }) {
+function adjustChildrenPackageJsonScript({ scripts }) {
   loopPackage(({ name, absolutePath }) => {
     const itemPath = absolutePath;
 
@@ -89,7 +106,19 @@ function adjustChildrenPackageJson({ scripts }) {
 
     const packageJson = readJsonFileSync(childPackageJsonPath);
 
-    packageJson.scripts = assignObject(packageJson.scripts || {}, scripts);
+    const originalScript = packageJson.scripts;
+
+    Object.keys(originalScript).forEach((o) => {
+      if (
+        o.startsWith('z:') ||
+        o.startsWith('prez:') ||
+        o.startsWith('postz:')
+      ) {
+        delete originalScript[o];
+      }
+    });
+
+    packageJson.scripts = assignObject(originalScript || {}, scripts);
 
     writeJsonFileSync(childPackageJsonPath, packageJson, { coverFile: true });
 
@@ -108,9 +137,9 @@ function initialEnvironment({
 
   createPackageFile(packageFileContentList || []);
 
-  adjustMainPackageJson({ scripts: mainScripts || {} });
+  adjustMainPackageJsonScript({ scripts: mainScripts || {} });
 
-  adjustChildrenPackageJson({ scripts: childScripts || {} });
+  adjustChildrenPackageJsonScript({ scripts: childScripts || {} });
 
   prettierAllPackageJson();
 }

package/src/tools/meta.js

@@ -36,6 +36,31 @@ function getArgCollection() {
   return process.argv;
 }
 
+/**
+ * Check value in the collection.
+ * @param {Array} collection value collection
+ * @param {*} target the target value will be checked
+ */
+function checkInCollection(collection, target) {
+  let result = false;
+
+  if (!isArray(collection)) {
+    return result;
+  }
+
+  collection.some((o) => {
+    if (o === target) {
+      result = true;
+
+      return true;
+    }
+
+    return false;
+  });
+
+  return result;
+}
+
 function checkStringIsEmpty(v) {
   v = ((v || null) == null ? '' : toString(v))
     .trim()
@@ -219,6 +244,7 @@ module.exports = {
   exec,
   cd,
   getArgCollection,
+  checkInCollection,
   existFileSync,
   existDirectorySync,
   writeFileSync,