merge-tsconfigs 0.2.2 → 0.2.4

package/README.md

@@ -2,8 +2,6 @@
 
 ![Typed with TypeScript](https://flat.badgen.net/badge/icon/Typed?icon=typescript&label&labelColor=blue&color=555555)
 [![npm version](https://badge.fury.io/js/merge-tsconfigs.svg)](https://badge.fury.io/js/merge-tsconfigs)
-[![unpkg](https://img.shields.io/badge/unpkg-blue.svg)](https://unpkg.com/merge-tsconfigs@0.1.1/dist/index.js)
-[![skypack](https://img.shields.io/badge/skypack-blueviolet.svg)](https://cdn.skypack.dev/merge-tsconfigs?min)
 ![ci](https://github.com/yowainwright/merge-tsconfigs/actions/workflows/ci.yml/badge.svg)
 [![Github](https://badgen.net/badge/icon/github?icon=github&label&color=grey)](https://github.com/yowainwright/merge-tsconfigs)
 ![Twitter](https://img.shields.io/twitter/url?url=https%3A%2F%2Fgithub.com%2Fyowainwright%2Fmerge-tsconfigs)
@@ -29,6 +27,7 @@ By providing an easy way to create the tsconfig you want, your everyday tsconfig
 ### _For example_
 
 By running `merge-tsconfigs ./tsconfig.build.json` you'll merge `tsconfig.json`
+
 ```ts
 {
   "compilerOptions": {
@@ -38,6 +37,7 @@ By running `merge-tsconfigs ./tsconfig.build.json` you'll merge `tsconfig.json`
 ```
 
 and, `tsconfig.build.json`
+
 ```ts
 {
   "compilerOptions": {
@@ -48,6 +48,7 @@ and, `tsconfig.build.json`
 ```
 
 into `tsconfig.merged.json`
+
 ```ts
 {
   "compilerOptions": {
@@ -66,6 +67,7 @@ Which you can now use for deployment, dockerfiles, or any other use case. And, y
 Merge-tsconfigs is built to be uses as a CLI first and foremost. It also exports node functions which can be used to preform the same merge operation.
 
 ---
+
 ### CLI API
 
 Listed below are the CLI options and arguments to execute merge-tsconfigs. To \*_view all_ cli options in your browser, run `merge-tsconfigs --help`!
@@ -199,7 +201,7 @@ merge-tsconfigs ./tsconfig.json ./tsconfig.build.json --path '{"item/*": ["foo":
 The node API works exactly the same as the CLI API.
 
 ```ts
-import mergeTsconfigs from 'merge-tsconfigs';
+import mergeTsconfigs from 'merge-tsconfigs'
 
 mergeTsconfigs({
   files: ['./tsconfig.json', './tsconfig.build.json'],
@@ -210,8 +212,7 @@ mergeTsconfigs({
     allowJs: true,
     noEmit: true,
   },
-});
-
+})
 ```
 
 You can use any compiler options provided by [Typescript](https://www.typescriptlang.org/docs/handbook/compiler-options.html). Object keys aren't currently implemented but can be upon feature request.
@@ -223,7 +224,7 @@ Merge tsconfig files into a single tsconfig
 ```ts
 const config = mergeTsconfigs({
   files: ['./tsconfig.json', './tsconfig.build.json'],
-});
+})
 // ./tsconfig.json + ./tsconfig.build.json => ./tsconfig.merged.json
 ```
 
@@ -233,7 +234,7 @@ Merge tsconfig files into a custom output file
 const config = mergeTsconfigs({
   files: ['./tsconfig.json', './tsconfig.build.json'],
   out: './new-dir/tsconfig.out.json',
-});
+})
 // ./tsconfig.json + ./tsconfig.build.json => ./tsconfig.out.json
 ```
 
@@ -247,15 +248,6 @@ Install merge-tsconfigs with your preferred package manager.
 npm install merge-tsconfigs --save-dev
 ```
 
-\*_Untested_: In, Deno, Snowpack, or other options, you can import merge-tsconfigs directly into your project.
-```ts
-import mergeTsconfigs from 'npm:merge-tsconfigs';
-// or
-import mergeTsconfigs from "https://cdn.skypack.dev/merge-tsconfigs@latest";
-// or
-import mergeTsconfigs from "https://unpkg.com/merge-tsconfigs@latest/dist/index.js";
-```
-
 ---
 
 Made by [@yowainwright](https://github.com/yowainwright), MIT 2023

package/dist/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,36 +15,30 @@ 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
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default,
+var index_exports = {};
+__export(index_exports, {
+  default: () => index_default,
   logger: () => logger,
   mergeConfigContent: () => mergeConfigContent,
   mergeConfigObjects: () => mergeConfigObjects,
   mergeTsConfigs: () => mergeTsConfigs,
+  parseJson: () => parseJson,
   parsePath: () => parsePath,
   resolveJSON: () => resolveJSON,
   script: () => script,
+  stripJsonComments: () => stripJsonComments,
+  stripTrailingCommas: () => stripTrailingCommas,
   updateCompilerOptions: () => updateCompilerOptions,
   writeTsconfig: () => writeTsconfig
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/scripts.ts
-var import_fs = require("fs");
-var import_path = require("path");
-var import_json5 = __toESM(require("json5"), 1);
+var import_node_fs = require("fs");
+var import_node_path = require("path");
 var logger = ({ isDebugging = false, emoji = `\u{1F6E3}\uFE0F`, gap = ` => `, name = "merge-tsconfigs" }) => (type) => (section) => (message) => (err) => {
   const debugMsg = isDebugging ? "debugging:" : "";
   const sectionMsg = section.length ? `${section}:` : "";
@@ -54,31 +46,100 @@ var logger = ({ isDebugging = false, emoji = `\u{1F6E3}\uFE0F`, gap = ` => `, na
   const secondLine = message ? `${emoji}${gap}${message}` : "";
   if (type === "error") {
     console.error(firstLine);
-    if (secondLine)
-      console.error(secondLine);
-    if (err)
-      console.error(err);
+    if (secondLine) console.error(secondLine);
+    if (err) console.error(err);
   } else if (type === "debug") {
     console.debug(firstLine);
-    if (secondLine)
-      console.debug(secondLine);
+    if (secondLine) console.debug(secondLine);
   } else if (type === "info") {
     console.info(firstLine);
-    if (secondLine)
-      console.info(secondLine);
+    if (secondLine) console.info(secondLine);
   } else {
     console.log(firstLine);
-    if (secondLine)
-      console.log(secondLine);
+    if (secondLine) console.log(secondLine);
   }
 };
+function stripJsonComments(source) {
+  let output = "";
+  let inString = false;
+  let isEscaped = false;
+  for (let index = 0; index < source.length; index += 1) {
+    const char = source[index];
+    const nextChar = source[index + 1];
+    if (inString) {
+      output += char;
+      if (isEscaped) {
+        isEscaped = false;
+      } else if (char === "\\") {
+        isEscaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      output += char;
+      continue;
+    }
+    if (char === "/" && nextChar === "/") {
+      while (index < source.length && source[index] !== "\n") index += 1;
+      output += "\n";
+      continue;
+    }
+    if (char === "/" && nextChar === "*") {
+      index += 2;
+      while (index < source.length && !(source[index] === "*" && source[index + 1] === "/")) {
+        if (source[index] === "\n") output += "\n";
+        index += 1;
+      }
+      index += 1;
+      continue;
+    }
+    output += char;
+  }
+  return output;
+}
+function stripTrailingCommas(source) {
+  let output = "";
+  let inString = false;
+  let isEscaped = false;
+  for (let index = 0; index < source.length; index += 1) {
+    const char = source[index];
+    if (inString) {
+      output += char;
+      if (isEscaped) {
+        isEscaped = false;
+      } else if (char === "\\") {
+        isEscaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      output += char;
+      continue;
+    }
+    if (char === ",") {
+      let nextIndex = index + 1;
+      while (/\s/.test(source[nextIndex] || "")) nextIndex += 1;
+      if (source[nextIndex] === "}" || source[nextIndex] === "]") continue;
+    }
+    output += char;
+  }
+  return output;
+}
+function parseJson(source) {
+  return JSON.parse(stripTrailingCommas(stripJsonComments(source.trim())));
+}
 function resolveJSON(path, debug = false) {
   try {
-    const json = import_json5.default.parse((0, import_fs.readFileSync)(path, "utf8"));
+    const json = parseJson((0, import_node_fs.readFileSync)(path, "utf8"));
     return json;
   } catch (err) {
-    if (debug)
-      logger({ isDebugging: debug })("error")("resolveJSON")("There was an error:")(err);
+    if (debug) logger({ isDebugging: debug })("error")("resolveJSON")("There was an error:")(err);
     return {};
   }
 }
@@ -90,16 +151,10 @@ var mergeConfigObjects = (tsconfig1, tsconfig2) => ({
     ...tsconfig2?.compilerOptions
   },
   ...tsconfig1?.exclude || tsconfig2?.exclude ? {
-    exclude: [
-      ...tsconfig1?.exclude || [],
-      ...tsconfig2?.exclude || []
-    ]
+    exclude: [...tsconfig1?.exclude || [], ...tsconfig2?.exclude || []]
   } : {},
   ...tsconfig1?.include || tsconfig2?.include ? {
-    include: [
-      ...tsconfig1?.include || [],
-      ...tsconfig2?.include || []
-    ]
+    include: [...tsconfig1?.include || [], ...tsconfig2?.include || []]
   } : {}
 });
 var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((acc = {}, tsconfig) => {
@@ -107,58 +162,72 @@ var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((ac
   let tsconfigJSON = resolveJSON(path, debug);
   const parentPath = tsconfigJSON?.extends;
   if (parentPath) {
-    const relativeParentPath = (0, import_path.join)((0, import_path.dirname)(path), parentPath);
+    const relativeParentPath = (0, import_node_path.join)((0, import_node_path.dirname)(path), parentPath);
     const parentTsconfig = resolveJSON(relativeParentPath, debug);
     if (parentTsconfig?.extends) {
-      logger({ isDebugging: debug })("error")("mergeConfigContent")("Parent tsconfig:merge-tsconfigs only handles extending from a parent, consider extending tsconfigs less.")(parentTsconfig);
+      logger({ isDebugging: debug })("error")("mergeConfigContent")(
+        "Parent tsconfig:merge-tsconfigs only handles extending from a parent, consider extending tsconfigs less."
+      )(parentTsconfig);
     }
     const { extends: _, ...tsconfigWithoutExtends } = tsconfigJSON;
     tsconfigJSON = mergeConfigObjects(parentTsconfig, tsconfigWithoutExtends);
   }
   if (!tsconfigJSON) {
-    if (debug)
-      logger({ isDebugging: debug })("error")("mergeConfigContent")("There was an error:")(tsconfigJSON);
+    if (debug) logger({ isDebugging: debug })("error")("mergeConfigContent")("There was an error:")(tsconfigJSON);
     return acc;
   }
   return mergeConfigObjects(acc, tsconfigJSON);
 }, {});
 var writeTsconfig = (tsconfig, cwd, out, isTesting) => {
-  if (isTesting)
-    return tsconfig;
+  if (isTesting) return tsconfig;
   const path = `${cwd}/${out}`;
-  (0, import_fs.mkdirSync)((0, import_path.dirname)(path), { recursive: true });
-  (0, import_fs.writeFileSync)(path, JSON.stringify(tsconfig, null, 2));
+  (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(path), { recursive: true });
+  (0, import_node_fs.writeFileSync)(path, JSON.stringify(tsconfig, null, 2));
   return tsconfig;
 };
-var updateCompilerOptions = (compilerOptions2 = {}, currentCompilerOptions, updatedPath) => {
-  const compilerOptionKeys = compilerOptions2 ? Object.keys(compilerOptions2) : [];
+var updateCompilerOptions = (compilerOptions = {}, currentCompilerOptions = {}, updatedPath = {}) => {
+  const compilerOptionKeys = compilerOptions ? Object.keys(compilerOptions) : [];
   const hasCompilerOptions = compilerOptionKeys.length > 0;
-  if (!hasCompilerOptions)
-    return {};
-  return compilerOptionKeys.reduce((acc = {}, key) => {
-    const updatedOptions = { ...acc, ...currentCompilerOptions };
-    const value = compilerOptions2?.[key];
-    if (updatedOptions?.[key] === "delete") {
-      delete updatedOptions[key];
-      return updatedOptions || {};
-    }
-    const paths = {
-      ...updatedOptions.paths || {},
-      ...key === "paths" ? { value } : {},
-      ...updatedPath ? { ...updatedPath } : {}
+  const hasUpdatedPath = Object.keys(updatedPath || {}).length > 0;
+  if (!hasCompilerOptions && !hasUpdatedPath) return {};
+  const updatedOptions = compilerOptionKeys.reduce(
+    (acc, key) => {
+      const value = compilerOptions?.[key];
+      if (value === "delete") {
+        const { [key]: _deletedOption, ...remainingOptions } = acc;
+        return remainingOptions;
+      }
+      const parsedPath = key === "paths" && typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+      const paths = {
+        ...acc.paths || {},
+        ...parsedPath
+      };
+      return {
+        ...acc,
+        [key]: value,
+        ...Object.keys(paths).length > 0 ? { paths } : {}
+      };
+    },
+    { ...currentCompilerOptions }
+  );
+  if (hasUpdatedPath) {
+    return {
+      ...updatedOptions,
+      paths: {
+        ...updatedOptions.paths || {},
+        ...updatedPath
+      }
     };
-    return { ...updatedOptions, [key]: value, ...Object.keys(paths).length > 0 ? { paths } : {} };
-  }, {});
+  }
+  return updatedOptions;
 };
 var parsePath = (path = "", debug = false) => {
-  if (!path)
-    return {};
+  if (!path) return {};
   try {
-    const json = import_json5.default.parse(path);
+    const json = parseJson(path);
     return json;
   } catch (err) {
-    if (debug)
-      logger({ isDebugging: debug })("error")("parsePath")("There was an error:")(err);
+    if (debug) logger({ isDebugging: debug })("error")("parsePath")("There was an error:")(err);
     return {};
   }
 };
@@ -166,24 +235,22 @@ var mergeTsConfigs = ({
   tsconfigs = [],
   exclude,
   include,
-  compilerOptions: compilerOptions2,
+  compilerOptions,
   debug = false,
   out = "tsconfig.merged.json",
   path,
   isTesting = false
 }) => {
   if (tsconfigs.length === 0) {
-    if (debug)
-      logger({ isDebugging: debug })("error")("mergeTsConfig")("No tsconfig files were provided.")(null);
+    if (debug) logger({ isDebugging: debug })("error")("mergeTsConfig")("No tsconfig files were provided.")(null);
     return;
   }
   const cwd = process.cwd();
   const updatedTsconfig = mergeConfigContent(tsconfigs, cwd, debug);
-  if (debug)
-    logger({ isDebugging: debug })("debug")("mergeTsConfig")("Updated tsconfig:")(updatedTsconfig);
+  if (debug) logger({ isDebugging: debug })("debug")("mergeTsConfig")("Updated tsconfig:")(updatedTsconfig);
   const updatedPath = parsePath(path, debug);
   const updatedCompilerOptions = updateCompilerOptions(
-    compilerOptions2,
+    compilerOptions,
     updatedTsconfig?.compilerOptions || {},
     updatedPath
   );
@@ -200,100 +267,20 @@ var mergeTsConfigs = ({
 var script = mergeTsConfigs;
 var scripts_default = mergeTsConfigs;
 
-// src/program.ts
-var import_commander = require("commander");
-
-// src/config.ts
-var compilerOptions = {
-  target: "string",
-  module: "string",
-  lib: "array",
-  allowJs: "boolean",
-  checkJs: "boolean",
-  jsx: "string",
-  declaration: "boolean",
-  sourceMap: "boolean",
-  outFile: "string",
-  outDir: "string",
-  rootDir: "string",
-  removeComments: "boolean",
-  noEmit: "boolean",
-  importHelpers: "boolean",
-  downlevelIteration: "boolean",
-  isolatedModules: "boolean",
-  strict: "boolean",
-  noImplicitAny: "boolean",
-  strictNullChecks: "boolean",
-  noImplicitThis: "boolean",
-  alwaysStrict: "boolean",
-  noUnusedLocals: "boolean",
-  noUnusedParameters: "boolean",
-  noImplicitReturns: "boolean",
-  noFallthroughCasesInSwitch: "boolean",
-  moduleResolution: "string",
-  baseUrl: "string",
-  paths: "object",
-  rootDirs: "array",
-  typeRoots: "array",
-  types: "array",
-  allowSyntheticDefaultImports: "boolean",
-  sourceRoot: "string",
-  mapRoot: "string",
-  inlineSourceMap: "boolean",
-  inlineSources: "boolean",
-  experimentalDecorators: "boolean",
-  emitDecoratorMetadata: "boolean"
-};
-
-// src/program.ts
-function action(files, options = {}) {
-  try {
-    const {
-      debug = false,
-      exclude,
-      include,
-      isTesting = false,
-      isTestingCLI = false,
-      out,
-      path,
-      ...compilerOptions2
-    } = options;
-    if (isTestingCLI) {
-      console.info({ files, options });
-      return;
-    }
-    script({ debug, exclude, include, isTesting, path, out, tsconfigs: files, compilerOptions: compilerOptions2 });
-  } catch (err) {
-    logger({ isDebugging: options.debug })("error")("action")("There was an error:")(err);
-  }
-}
-import_commander.program.name("merge-tsconfigs").description(
-  "Merge-tsconfigs is a CLI and node tool for merging tsconfig files into the exact tsconfig file you want \u{1F6E3}\uFE0F"
-).argument("[files...]", "files to check, matches an array pattern").option("-d, --debug", "enable debugging").option("-e, --exclude [exclude...]", "files to exclude, matches a glob or array pattern").option("-i, --include [include...]", "files to include, matches a glob or array pattern").option("--isTesting", "enable testing").option("-o, --out <file>", "output file, otherwise, the file will be written to tsconfig.merged.json").option("--isTesting", "enable testing").option("-t, --isTestingCLI", "enable CLI only testing").option("-p, --path <path>", 'a json parseable string wrapped object, e.g. {"item/*": ["foo": "bar"]}');
-Object.keys(compilerOptions).map((name) => ({ name, value: compilerOptions[name] })).forEach(({ name, value }) => {
-  if (value === "boolean") {
-    import_commander.program.option(`--${name}`, `tsconfig.compilerOptions.${name}`);
-  } else if (value === "string") {
-    import_commander.program.option(`--${name} <${value}>`, `tsconfig.compilerOptions.${name}`);
-  } else if (value === "array") {
-    import_commander.program.option(`--${name} [${value}...]`, `tsconfig.compilerOptions.${name}`);
-  } else if (value === "object") {
-    import_commander.program.option(`--${name} <${value}>`, `tsconfig.compilerOptions.${name}`);
-  }
-});
-import_commander.program.action(action).parse(process.argv);
-
 // src/index.ts
-var src_default = scripts_default;
+var index_default = scripts_default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   logger,
   mergeConfigContent,
   mergeConfigObjects,
   mergeTsConfigs,
+  parseJson,
   parsePath,
   resolveJSON,
   script,
+  stripJsonComments,
+  stripTrailingCommas,
   updateCompilerOptions,
   writeTsconfig
 });