detype 0.6.2 → 0.6.3

package/dist/cli.js

@@ -14,16 +14,20 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 
 // src/cli-lib.ts
-var import_fs2 = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
+var import_node_fs2 = __toESM(require("fs"));
+var import_node_path = __toESM(require("path"));
 
 // src/transformFile.ts
-var import_fs = __toESM(require("fs"));
+var import_node_fs = __toESM(require("fs"));
 
 // src/transform.ts
 var import_core = require("@babel/core");
@@ -92,10 +96,11 @@ async function removeTypes(code, fileName, options) {
       }
     }
   };
-  const babelOutput = await (0, import_core.transformAsync)(code, {
+  const babelConfig = {
     filename: fileName,
     retainLines: true,
     plugins: [
+      // Plugin to remove leading comments attached to TypeScript-only constructs
       {
         name: "detype-comment-remover",
         visitor: {
@@ -111,7 +116,11 @@ async function removeTypes(code, fileName, options) {
     generatorOpts: {
       shouldPrintComment: (comment) => comment !== "@detype: remove-me" && (!options.removeTsComments || !comment.match(/^\s*(@ts-ignore|@ts-expect-error)/))
     }
-  });
+  };
+  if (options.customizeBabelConfig) {
+    options.customizeBabelConfig(babelConfig);
+  }
+  const babelOutput = await (0, import_core.transformAsync)(code, babelConfig);
   if (!babelOutput || babelOutput.code === void 0 || babelOutput.code === null) {
     throw new Error("Babel error");
   }
@@ -207,7 +216,7 @@ function removeMagicComments(code, fileName, prettierOptions) {
 
 // src/transformFile.ts
 var import_prettier2 = require("prettier");
-var { readFile, writeFile } = import_fs.default.promises;
+var { readFile, writeFile } = import_node_fs.default.promises;
 async function transformFile(inputFileName, outputFileName, options = {}) {
   const code = await readFile(inputFileName, "utf-8");
   const prettierOptions = await (0, import_prettier2.resolveConfig)(inputFileName);
@@ -230,7 +239,7 @@ var import_fast_glob = __toESM(require("fast-glob"));
 // package.json
 var package_default = {
   name: "detype",
-  version: "0.6.2",
+  version: "0.6.3",
   description: "Removes TypeScript type annotations but keeps the formatting",
   main: "dist/index.js",
   bin: "detype.js",
@@ -254,27 +263,28 @@ var package_default = {
     "index.d.ts"
   ],
   dependencies: {
-    "@babel/core": "^7.20.5",
-    "@babel/preset-typescript": "^7.18.6",
+    "@babel/core": "^7.21.4",
+    "@babel/preset-typescript": "^7.21.4",
+    "@vue/compiler-dom": "^3.2.47",
     "@vuedx/compiler-sfc": "0.7.1",
     "@vuedx/template-ast-types": "0.7.1",
     "fast-glob": "^3.2.12",
-    prettier: "^2.8.0",
+    prettier: "^2.8.7",
     "string.prototype.replaceall": "^1.0.7"
   },
   devDependencies: {
-    "@babel/traverse": "^7.20.5",
-    "@cyco130/eslint-config": "^2.1.2",
-    "@types/babel__core": "^7.1.20",
+    "@babel/traverse": "^7.21.4",
+    "@cyco130/eslint-config": "^3.0.2",
+    "@types/babel__core": "^7.20.0",
     "@types/babel__traverse": "^7.18.3",
-    "@types/node": "18.11.11",
-    "@types/prettier": "^2.7.1",
-    eslint: "^8.29.0",
+    "@types/node": "18.15.11",
+    "@types/prettier": "^2.7.2",
+    eslint: "^8.37.0",
     "npm-run-all": "^4.1.5",
-    rimraf: "^3.0.2",
-    tsup: "^6.5.0",
-    typescript: "^4.9.3",
-    vitest: "0.25.5"
+    rimraf: "^4.4.1",
+    tsup: "^6.7.0",
+    typescript: "^5.0.3",
+    vitest: "0.29.8"
   },
   repository: {
     type: "git",
@@ -295,7 +305,7 @@ var package_default = {
 };
 
 // src/cli-lib.ts
-var { stat, mkdir } = import_fs2.default.promises;
+var { stat, mkdir } = import_node_fs2.default.promises;
 async function cli(...args2) {
   let dashDash = false;
   const params = [];
@@ -346,23 +356,23 @@ async function cli(...args2) {
     const files = (await (0, import_fast_glob.default)(unixify(input + "/**/*.{ts,tsx,vue}"))).filter(
       (file) => !file.endsWith(".d.ts")
     );
-    const dirs = [...new Set(files.map((file) => import_path.default.dirname(file)))].sort();
-    await mkdir(import_path.default.normalize(output), { recursive: true });
+    const dirs = [...new Set(files.map((file) => import_node_path.default.dirname(file)))].sort();
+    await mkdir(import_node_path.default.normalize(output), { recursive: true });
     for (const dir of dirs) {
-      const outDir = import_path.default.join(output, import_path.default.relative(input, dir));
+      const outDir = import_node_path.default.join(output, import_node_path.default.relative(input, dir));
       if (outDir === output)
         continue;
-      await mkdir(import_path.default.normalize(outDir), { recursive: true });
+      await mkdir(import_node_path.default.normalize(outDir), { recursive: true });
     }
     for (const file of files) {
-      const inputDir = import_path.default.dirname(import_path.default.relative(input, file));
-      const outputName = inferName(file, import_path.default.join(output, inputDir));
+      const inputDir = import_node_path.default.dirname(import_node_path.default.relative(input, file));
+      const outputName = inferName(file, import_node_path.default.join(output, inputDir));
       removeMagic ? await removeMagicCommentsFromFile(
-        import_path.default.normalize(file),
-        import_path.default.normalize(outputName)
+        import_node_path.default.normalize(file),
+        import_node_path.default.normalize(outputName)
       ) : await transformFile(
-        import_path.default.normalize(file),
-        import_path.default.normalize(outputName),
+        import_node_path.default.normalize(file),
+        import_node_path.default.normalize(outputName),
         { removeTsComments }
       );
     }
@@ -391,28 +401,28 @@ async function cli(...args2) {
     }
     output = inferName(input);
   }
-  const outputDir = import_path.default.dirname(output);
+  const outputDir = import_node_path.default.dirname(output);
   if (outputDir) {
-    await mkdir(import_path.default.normalize(outputDir), { recursive: true });
+    await mkdir(import_node_path.default.normalize(outputDir), { recursive: true });
   }
   removeMagic ? await removeMagicCommentsFromFile(
-    import_path.default.normalize(input),
-    import_path.default.normalize(output)
-  ) : await transformFile(import_path.default.normalize(input), import_path.default.normalize(output), {
+    import_node_path.default.normalize(input),
+    import_node_path.default.normalize(output)
+  ) : await transformFile(import_node_path.default.normalize(input), import_node_path.default.normalize(output), {
     removeTsComments
   });
   return true;
   function inferName(input2, outputDir2) {
     let output2;
-    const { dir, name, ext } = import_path.default.parse(input2);
+    const { dir, name, ext } = import_node_path.default.parse(input2);
     if (removeMagic) {
-      output2 = import_path.default.join(outputDir2 ?? dir, `${name}${ext}`);
+      output2 = import_node_path.default.join(outputDir2 ?? dir, `${name}${ext}`);
     } else if (ext === ".ts") {
-      output2 = import_path.default.join(outputDir2 ?? dir, name + ".js");
+      output2 = import_node_path.default.join(outputDir2 ?? dir, name + ".js");
     } else if (ext === ".tsx") {
-      output2 = import_path.default.join(outputDir2 ?? dir, name + ".jsx");
+      output2 = import_node_path.default.join(outputDir2 ?? dir, name + ".jsx");
     } else if (ext === ".vue") {
-      output2 = import_path.default.join(outputDir2 ?? dir, name + ".vue");
+      output2 = import_node_path.default.join(outputDir2 ?? dir, name + ".vue");
     } else {
       throw new Error(`Unknwon file extension ${input2}`);
     }
@@ -446,7 +456,7 @@ var USAGE = `Usage:
     Print this help and exit`;
 var VERSION = package_default.version;
 function unixify(name) {
-  return name.replaceAll(import_path.default.sep, "/");
+  return name.replaceAll(import_node_path.default.sep, "/");
 }
 
 // src/cli.ts

package/dist/index.d.ts

@@ -1,9 +1,12 @@
 import { Options } from 'prettier';
 export { Options as PrettierOptions } from 'prettier';
+import { TransformOptions as TransformOptions$1 } from '@babel/core';
 
 interface RemoveTypeOptions {
     /** Whether to remove ts-ignore and ts-expect-error comments */
     removeTsComments?: boolean;
+    /** Escape hatch for customizing Babel configuration */
+    customizeBabelConfig?(config: TransformOptions$1): void;
 }
 interface TransformOptions extends RemoveTypeOptions {
     /** Prettier options */

package/dist/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -100,10 +104,11 @@ async function removeTypes(code, fileName, options) {
       }
     }
   };
-  const babelOutput = await (0, import_core.transformAsync)(code, {
+  const babelConfig = {
     filename: fileName,
     retainLines: true,
     plugins: [
+      // Plugin to remove leading comments attached to TypeScript-only constructs
       {
         name: "detype-comment-remover",
         visitor: {
@@ -119,7 +124,11 @@ async function removeTypes(code, fileName, options) {
     generatorOpts: {
       shouldPrintComment: (comment) => comment !== "@detype: remove-me" && (!options.removeTsComments || !comment.match(/^\s*(@ts-ignore|@ts-expect-error)/))
     }
-  });
+  };
+  if (options.customizeBabelConfig) {
+    options.customizeBabelConfig(babelConfig);
+  }
+  const babelOutput = await (0, import_core.transformAsync)(code, babelConfig);
   if (!babelOutput || babelOutput.code === void 0 || babelOutput.code === null) {
     throw new Error("Babel error");
   }
@@ -214,9 +223,9 @@ function removeMagicComments(code, fileName, prettierOptions) {
 }
 
 // src/transformFile.ts
-var import_fs = __toESM(require("fs"));
+var import_node_fs = __toESM(require("fs"));
 var import_prettier2 = require("prettier");
-var { readFile, writeFile } = import_fs.default.promises;
+var { readFile, writeFile } = import_node_fs.default.promises;
 async function transformFile(inputFileName, outputFileName, options = {}) {
   const code = await readFile(inputFileName, "utf-8");
   const prettierOptions = await (0, import_prettier2.resolveConfig)(inputFileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "detype",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Removes TypeScript type annotations but keeps the formatting",
   "main": "dist/index.js",
   "bin": "detype.js",
@@ -12,27 +12,28 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@babel/core": "^7.20.5",
-    "@babel/preset-typescript": "^7.18.6",
+    "@babel/core": "^7.21.4",
+    "@babel/preset-typescript": "^7.21.4",
+    "@vue/compiler-dom": "^3.2.47",
     "@vuedx/compiler-sfc": "0.7.1",
     "@vuedx/template-ast-types": "0.7.1",
     "fast-glob": "^3.2.12",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.7",
     "string.prototype.replaceall": "^1.0.7"
   },
   "devDependencies": {
-    "@babel/traverse": "^7.20.5",
-    "@cyco130/eslint-config": "^2.1.2",
-    "@types/babel__core": "^7.1.20",
+    "@babel/traverse": "^7.21.4",
+    "@cyco130/eslint-config": "^3.0.2",
+    "@types/babel__core": "^7.20.0",
     "@types/babel__traverse": "^7.18.3",
-    "@types/node": "18.11.11",
-    "@types/prettier": "^2.7.1",
-    "eslint": "^8.29.0",
+    "@types/node": "18.15.11",
+    "@types/prettier": "^2.7.2",
+    "eslint": "^8.37.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
-    "tsup": "^6.5.0",
-    "typescript": "^4.9.3",
-    "vitest": "0.25.5"
+    "rimraf": "^4.4.1",
+    "tsup": "^6.7.0",
+    "typescript": "^5.0.3",
+    "vitest": "0.29.8"
   },
   "repository": {
     "type": "git",