easy-soft-develop 2.1.161 → 2.1.167

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.161",
+  "version": "2.1.167",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -85,7 +85,7 @@
     "terminal-kit": "^3.1.1"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.2",
+    "@changesets/cli": "^2.27.3",
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
     "@commitlint/config-pnpm-scopes": "^19.1.0",
@@ -101,7 +101,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.4",
     "npm-check-updates": "^16.14.20",
     "prettier": "^3.2.5",
     "prettier-plugin-packagejson": "^2.5.0"

package/src/tools/createCode.js

@@ -12,6 +12,7 @@ const {
 
 function getCodeContent(code) {
   const v = `${code}`.replaceAll('`', '\\`').replaceAll('$', '\\$');
+
   return `export const code = \`${v}\`;
 `;
 }

package/src/tools/meta.js

@@ -109,25 +109,141 @@ function promptEmptyLine() {
   console.log('');
 }
 
-function promptSuccess(message) {
+function promptSuccess(message, emptyLine = true) {
   term.green(`${message}\r\n`);
-  promptEmptyLine();
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
 }
 
-function promptWarn(message) {
+function promptTip(title, message, emptyLine = true) {
+  term.red(`${title}: `).white(message);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptWarn(message, emptyLine = true) {
   term.magenta(`${message}\r\n`);
-  promptEmptyLine();
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
 }
 
-function promptInfo(message) {
+function promptInfo(message, emptyLine = true) {
   term.white(`${message}\r\n`);
-  promptEmptyLine();
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
 }
 
-function promptError(error) {
+function promptError(error, emptyLine = true) {
   console.error(error);
 
-  promptEmptyLine();
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptMessage(message, config, emptyLine = true) {
+  let o = term;
+
+  const { bold, dim, italic, underline, blink, inverse, strike } = {
+    bold: false,
+    dim: false,
+    italic: false,
+    underline: false,
+    blink: false,
+    inverse: false,
+    strike: false,
+    ...config,
+  };
+
+  if (bold) {
+    o = o.bold;
+  }
+
+  if (dim) {
+    o = o.dim;
+  }
+
+  if (italic) {
+    o = o.italic;
+  }
+
+  if (underline) {
+    o = o.underline;
+  }
+
+  if (blink) {
+    o = o.blink;
+  }
+
+  if (inverse) {
+    o = o.inverse;
+  }
+
+  if (strike) {
+    o = o.strike;
+  }
+
+  o(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptBlack(message, emptyLine = true) {
+  term.black(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptBackgroundBlack(message, emptyLine = true) {
+  term.bgBlack(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptRed(message, emptyLine = true) {
+  term.red(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptBackgroundRed(message, emptyLine = true) {
+  term.bgRed(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptGreen(message, emptyLine = true) {
+  term.green(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
+}
+
+function promptBackgroundGreen(message, emptyLine = true) {
+  term.bgGreen(`${message}\r\n`);
+
+  if (emptyLine) {
+    promptEmptyLine();
+  }
 }
 
 function existPathSync(path) {
@@ -310,6 +426,7 @@ module.exports = {
   promptInfo,
   promptWarn,
   promptError,
+  promptTip,
   isObject,
   isArray,
   assignObject,
@@ -321,4 +438,11 @@ module.exports = {
   resolvePath,
   exit,
   rimraf,
+  promptBlack,
+  promptBackgroundBlack,
+  promptRed,
+  promptBackgroundRed,
+  promptGreen,
+  promptBackgroundGreen,
+  promptMessage,
 };

package/src/tools/package.update.js

@@ -40,7 +40,7 @@ function updateSpecialPackageVersion(packageList) {
 
   const packages = packageList.join(' ');
 
-  const ncuCommand = `npx npm-check-updates --configFilePath ./.ncurc.js ${packages} --packageFile package.json -u`;
+  const ncuCommand = `npx npm-check-updates --configFilePath ./.ncurc.js --packageFile package.json -u ${packages}`;
 
   promptInfo(`${packageList.join()} will check update`);
 

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

@@ -112,7 +112,7 @@ function handlePackage(projectPath, zipPath) {
         copyFile({
           sourceMainPath,
           targetMainPath,
-          filepath: 'generatorConfig/function.data.extra.json',
+          filepath: 'generatorConfig/general/',
           callback: () => {
             copyFile({
               sourceMainPath,

package/types/tools/meta.d.ts

@@ -23,10 +23,11 @@ export function checkStringIsEmpty(v: any): boolean;
  */
 export function promptLine(): void;
 export function promptEmptyLine(): void;
-export function promptSuccess(message: any): void;
-export function promptInfo(message: any): void;
-export function promptWarn(message: any): void;
-export function promptError(error: any): void;
+export function promptSuccess(message: any, emptyLine?: boolean): void;
+export function promptInfo(message: any, emptyLine?: boolean): void;
+export function promptWarn(message: any, emptyLine?: boolean): void;
+export function promptError(error: any, emptyLine?: boolean): void;
+export function promptTip(title: any, message: any, emptyLine?: boolean): void;
 export function isObject(value: any): boolean;
 export function isArray(value: any): boolean;
 export function assignObject(source: any, ...mergeData: any[]): any;
@@ -62,3 +63,14 @@ export function writeFileWithOptionsSync({
 export function resolvePath(path: any): any;
 export function exit(): any;
 export function rimraf(path: any): void;
+export function promptBlack(message: any, emptyLine?: boolean): void;
+export function promptBackgroundBlack(message: any, emptyLine?: boolean): void;
+export function promptRed(message: any, emptyLine?: boolean): void;
+export function promptBackgroundRed(message: any, emptyLine?: boolean): void;
+export function promptGreen(message: any, emptyLine?: boolean): void;
+export function promptBackgroundGreen(message: any, emptyLine?: boolean): void;
+export function promptMessage(
+  message: any,
+  config: any,
+  emptyLine?: boolean,
+): void;