fenge 0.1.7 → 0.2.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # fenge
 
+## 0.2.0-beta.0
+
+### Minor Changes
+
+- be7e3d5: chore(fenge): upgrade `prettier` to 3.4.1
+- 4c6fa59: refactor(fenge): optimize tsconfig exports and rename tsconfig.json to index.json
+
+### Patch Changes
+
+- Updated dependencies [5adeeed]
+- Updated dependencies [36d1fb0]
+- Updated dependencies [3605e14]
+- Updated dependencies [0d71378]
+- Updated dependencies [a5fb6f8]
+- Updated dependencies [41c783a]
+- Updated dependencies [b1fc095]
+- Updated dependencies [3f4e737]
+- Updated dependencies [1f5fce3]
+- Updated dependencies [51502cc]
+- Updated dependencies [2f12ec2]
+  - @fenge/prettier-config@0.1.3-beta.0
+  - @fenge/eslint-config@0.4.0-beta.0
+  - @fenge/types@0.2.0-beta.0
+  - @fenge/tsconfig@0.1.1-beta.0
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies [1848169]
+- Updated dependencies [9f04b44]
+- Updated dependencies [55cf874]
+  - @fenge/prettier-config@0.1.2
+  - @fenge/eslint-config@0.3.0
+
 ## 0.1.7
 
 ### Patch Changes

package/README.md

@@ -125,7 +125,7 @@ Config `tsconfig.json` file in your project root.
 }
 ```
 
-Config `tsconfig.build.json` file in sub-package or project root.
+Config `tsconfig.build.json` file in your project root.
 
 ```json
 {
@@ -242,7 +242,6 @@ export default {
         omit: ["no-var"], // these rules will not work for js files
       })
       .enableTypescript({
-        project: "tsconfig.json", // tsconfig.json path
         extend: {
           // apply additional rules for ts files
           "@typescript-eslint/no-explicit-any": "error",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fenge",
-  "version": "0.1.7",
+  "version": "0.2.0-beta.0",
   "description": "A CLI tool for code quality",
   "keywords": [
     "cli",
@@ -35,9 +35,12 @@
     "./types": {
       "types": "./types/index.d.ts"
     },
-    "./tsconfig": "./tsconfig/tsconfig.json",
-    "./tsconfig/*": "./tsconfig/*.json",
-    "./tsconfig/*.json": "./tsconfig/*.json"
+    "./tsconfig": "./tsconfig/index.json",
+    "./tsconfig.json": "./tsconfig/index.json",
+    "./tsconfig/esm": "./tsconfig/esm.json",
+    "./tsconfig/esm.json": "./tsconfig/esm.json",
+    "./tsconfig/cjs": "./tsconfig/cjs.json",
+    "./tsconfig/cjs.json": "./tsconfig/cjs.json"
   },
   "bin": "./src/bin/cli.js",
   "dependencies": {
@@ -47,15 +50,15 @@
     "lilconfig": "3.1.2",
     "lint-staged": "15.2.10",
     "ora": "8.1.1",
-    "prettier": "3.3.3",
-    "@fenge/eslint-config": "0.2.1",
-    "@fenge/tsconfig": "0.1.0",
-    "@fenge/prettier-config": "0.1.1",
-    "@fenge/types": "0.1.0",
+    "prettier": "3.4.1",
+    "@fenge/eslint-config": "0.4.0-beta.0",
+    "@fenge/prettier-config": "0.1.3-beta.0",
+    "@fenge/tsconfig": "0.1.1-beta.0",
+    "@fenge/types": "0.2.0-beta.0",
     "prettier-ignore": "0.1.3"
   },
   "devDependencies": {
-    "@types/node": "22.7.5"
+    "@types/node": "22.9.1"
   },
   "peerDependencies": {
     "typescript": "^5.6.0"
@@ -69,6 +72,6 @@
     "node": ">=18"
   },
   "scripts": {
-    "build": "tsc --noEmit -p tsconfig.build.json"
+    "build": "tsc --noEmit"
   }
 }

package/src/command/format.js

@@ -9,15 +9,14 @@ import { dir, execAsync, getBinPath } from "../utils.js";
  * @param {{update?: boolean, write?: boolean, dryRun?: boolean, config?: string, default?: boolean}} options
  */
 export async function format(paths = [], options = {}) {
-  const { update = false, write = false, dryRun = false, config } = options;
-  const useDefaultConfig = options["default"] ?? false;
+  const {
+    update = false,
+    write = false,
+    dryRun = false,
+    config,
+    default: useDefaultConfig,
+  } = options;
 
-  if (config) {
-    process.env["FENGE_CONFIG"] = config;
-  }
-  if (useDefaultConfig) {
-    process.env["FENGE_USE_DEFAULT_CONFIG"] = "true";
-  }
   const ignores = [".gitignore", ".prettierignore", prettierignore]
     .map((p) => path.resolve(p))
     .flatMap((p) => ["--ignore-path", p]);
@@ -37,6 +36,13 @@ export async function format(paths = [], options = {}) {
         path.resolve(process.cwd(), p),
       ),
     ],
-    { topic: "💃 Checking formatting", dryRun },
+    {
+      topic: "💃 Checking formatting",
+      dryRun,
+      env: {
+        ...(config && { FENGE_CONFIG: config }),
+        ...(useDefaultConfig && { FENGE_USE_DEFAULT_CONFIG: "true" }),
+      },
+    },
   );
 }

package/src/command/lint.js

@@ -8,16 +8,14 @@ import { dir, execAsync, getBinPath } from "../utils.js";
  * @param {{update?: boolean, fix?: boolean, dryRun?: boolean, config?: string, default?: boolean}} options
  */
 export async function lint(paths = [], options = {}) {
-  const { update = false, fix = false, dryRun = false, config } = options;
-  const useDefaultConfig = options["default"] ?? false;
+  const {
+    update = false,
+    fix = false,
+    dryRun = false,
+    config,
+    default: useDefaultConfig,
+  } = options;
 
-  if (config) {
-    process.env["FENGE_CONFIG"] = config;
-  }
-  if (useDefaultConfig) {
-    process.env["FENGE_USE_DEFAULT_CONFIG"] = "true";
-  }
-  process.env["ESLINT_USE_FLAT_CONFIG"] = "true"; // TODO remove it once upgrade to eslint 9
   return execAsync(
     [
       // "node",
@@ -29,6 +27,14 @@ export async function lint(paths = [], options = {}) {
         path.resolve(process.cwd(), p),
       ),
     ],
-    { topic: "📏 Checking linting", dryRun },
+    {
+      topic: "📏 Checking linting",
+      dryRun,
+      env: {
+        ESLINT_USE_FLAT_CONFIG: "true", // TODO remove it once upgrade to eslint 9
+        ...(config && { FENGE_CONFIG: config }),
+        ...(useDefaultConfig && { FENGE_USE_DEFAULT_CONFIG: "true" }),
+      },
+    },
   );
 }

package/src/config/lint-staged.config.js

@@ -3,7 +3,5 @@ import path from "node:path";
 import { dir, resolveConfig } from "../utils.js";
 
 const cliPath = path.resolve(dir(import.meta.url), "..", "bin", "cli.js");
-const defaultConfig = {
-  "*": [`${cliPath} -w`],
-};
+const defaultConfig = { "*": [`${cliPath} -w`] };
 export default (await resolveConfig("lint-staged"))?.config ?? defaultConfig;

package/src/utils.js

@@ -48,7 +48,7 @@ export async function resolveConfig(module, loadPath) {
  */
 export async function importJson(importMetaUrl, jsonPath) {
   return JSON.parse(
-    await fs.readFile(path.resolve(dir(importMetaUrl), jsonPath), "utf-8"),
+    await fs.readFile(path.resolve(dir(importMetaUrl), jsonPath), "utf8"),
   );
 }
 
@@ -69,23 +69,25 @@ function getSpentTime(startTime) {
 
 /**
  * @param {string[]} command
- * @param {{topic: string, dryRun: boolean}} options
+ * @param {{topic: string, dryRun: boolean, env: Record<string, string>}} options
  * @returns {Promise<number>}
  */
-export async function execAsync(command, { topic, dryRun }) {
-  const [cmd, ...args] = command;
-  if (!cmd) {
-    throw new Error("cmd not found");
-  }
-  if (dryRun) {
-    console.log(`${chalk.green(cmd)} ${args.join(" ")}`);
-    return 0;
-  }
-  const startTime = Date.now();
-  return new Promise((resolve) => {
+export function execAsync(command, { topic, dryRun, env }) {
+  return new Promise((resolve, reject) => {
+    const startTime = Date.now();
+
+    const [cmd, ...args] = command;
+    if (!cmd) {
+      return reject(new Error("cmd not found"));
+    }
+    if (dryRun) {
+      console.log(`${chalk.green(cmd)} ${args.join(" ")}`);
+      return resolve(0);
+    }
+
     const spinner = ora(`${topic}...`).start();
     const cp = childProcess.spawn(cmd, args, {
-      env: { FORCE_COLOR: "true", ...process.env },
+      env: { FORCE_COLOR: "true", ...process.env, ...env },
     });
     let stdout = Buffer.from([]);
     let stderr = Buffer.from([]);

package/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./tsconfig/tsconfig.json"
+  "extends": "./tsconfig/index.json"
 }

package/tsconfig.build.json

@@ -1,5 +0,0 @@
-{
-  "extends": "./tsconfig",
-  "include": ["src"],
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
-}