merge-tsconfigs 0.0.6 → 0.1.0

package/README.md

@@ -128,12 +128,16 @@ const config = mergeTsconfigs({
 
 ---
 
-## How do I install this?
+## How do I start using this?
+
+Install merge-tsconfigs with your preferred package manager.
 
 ```sh
 npm install merge-tsconfigs --save-dev
 ```
 
+\*unpkg and skypack support coming very soon! 🚀
+
 ---
 
 Made by [@yowainwright](https://github.com/yowainwright), MIT 2023

package/dist/index.cjs

@@ -63,21 +63,29 @@ function resolveJSON(path, debug = false) {
     const json = JSON.parse((0, import_fs.readFileSync)(path, "utf8"));
     return json;
   } catch (err) {
+    console.log({ err });
     if (debug)
       logger({ isDebugging: debug })("error")("resolveJSON")("There was an error:")(err);
     return {};
   }
 }
 var mergeConfigContent = (tsconfigs, debug = false) => tsconfigs.reduce((acc = {}, tsconfig) => {
-  let tsconfigJSON = resolveJSON(tsconfig, true);
-  if (tsconfigJSON?.extends) {
-    const parentTsconfig = resolveJSON(tsconfigJSON.extends, true);
+  let tsconfigJSON = resolveJSON(tsconfig, debug);
+  const parentPath = tsconfigJSON?.extends;
+  if (parentPath) {
+    const relativeParentPath = (0, import_path.join)((0, import_path.dirname)(tsconfig), parentPath);
+    const parentTsconfig = resolveJSON(relativeParentPath, debug);
     if (parentTsconfig?.extends) {
-      logger({ isDebugging: false })("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 = {
       ...parentTsconfig,
-      ...tsconfigJSON
+      ...tsconfigWithoutExtends,
+      compilerOptions: {
+        ...parentTsconfig?.compilerOptions,
+        ...tsconfigWithoutExtends?.compilerOptions
+      }
     };
   }
   if (!tsconfigJSON) {
@@ -87,10 +95,16 @@ var mergeConfigContent = (tsconfigs, debug = false) => tsconfigs.reduce((acc = {
   }
   return {
     ...acc,
-    ...tsconfigJSON
+    ...tsconfigJSON,
+    compilerOptions: {
+      ...acc?.compilerOptions,
+      ...tsconfigJSON?.compilerOptions
+    }
   };
 }, {});
-var writeTsconfig = (tsconfig, out) => {
+var writeTsconfig = (tsconfig, out, isTesting) => {
+  if (isTesting)
+    return tsconfig;
   const path = out.length ? out : "./tsconfig.merged.json";
   (0, import_fs.mkdirSync)((0, import_path.dirname)(path), { recursive: true });
   (0, import_fs.writeFileSync)(path, JSON.stringify(tsconfig, null, 2));
@@ -102,7 +116,8 @@ var mergeTsConfigs = ({
   include = [],
   compilerOptions: compilerOptions2 = {},
   debug = false,
-  out = ""
+  out = "",
+  isTesting = false
 }) => {
   if (tsconfigs.length === 0) {
     if (debug)
@@ -118,7 +133,7 @@ var mergeTsConfigs = ({
     include: [...updatedTsconfig.include || [], ...include],
     ...compilerOptions2
   };
-  return writeTsconfig(tsconfig, out);
+  return writeTsconfig(tsconfig, out, isTesting);
 };
 var script = mergeTsConfigs;
 var scripts_default = mergeTsConfigs;
@@ -172,7 +187,7 @@ var compilerOptions = {
 async function action(files, options = {}) {
   const { debug = false, isTesting = false, isTestingCLI = false, ...compilerOptions2 } = options;
   if (isTestingCLI) {
-    console.info({ files });
+    console.info({ files, options });
     return;
   }
   try {
@@ -183,9 +198,11 @@ async function action(files, options = {}) {
 }
 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("-t, --isTestingCLI", "enable CLI only testing");
+).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");
 Object.keys(compilerOptions).map((name) => ({ name, value: compilerOptions[name] })).forEach(({ name, value }) => {
-  if (["string", "boolean"].includes(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}`);

package/dist/index.d.ts

@@ -8,6 +8,7 @@ interface ConfigOptions {
     tsconfigs?: string[];
     exclude?: string[];
     include?: string[];
+    isTesting?: boolean;
 }
 type LoggerParams = {
     isDebugging?: boolean;
@@ -25,8 +26,8 @@ interface TsConfig {
 declare const logger: ({ isDebugging, emoji, gap, name }: LoggerParams) => (type: string) => (section: string) => (message: string) => (err: unknown) => void;
 declare function resolveJSON(path: string, debug?: boolean): TsConfig;
 declare const mergeConfigContent: (tsconfigs: string[], debug?: boolean) => TsConfig;
-declare const writeTsconfig: (tsconfig: TsConfig, out: string) => TsConfig;
-declare const mergeTsConfigs: ({ tsconfigs, exclude, include, compilerOptions, debug, out, }: ConfigOptions) => TsConfig | undefined;
-declare const script: ({ tsconfigs, exclude, include, compilerOptions, debug, out, }: ConfigOptions) => TsConfig | undefined;
+declare const writeTsconfig: (tsconfig: TsConfig, out: string, isTesting: boolean) => TsConfig;
+declare const mergeTsConfigs: ({ tsconfigs, exclude, include, compilerOptions, debug, out, isTesting, }: ConfigOptions) => TsConfig | undefined;
+declare const script: ({ tsconfigs, exclude, include, compilerOptions, debug, out, isTesting, }: ConfigOptions) => TsConfig | undefined;
 
 export { mergeTsConfigs as default, logger, mergeConfigContent, mergeTsConfigs, resolveJSON, script, writeTsconfig };

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/scripts.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
-import { dirname } from "path";
+import { dirname, join } from "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}:` : "";
@@ -31,21 +31,29 @@ function resolveJSON(path, debug = false) {
     const json = JSON.parse(readFileSync(path, "utf8"));
     return json;
   } catch (err) {
+    console.log({ err });
     if (debug)
       logger({ isDebugging: debug })("error")("resolveJSON")("There was an error:")(err);
     return {};
   }
 }
 var mergeConfigContent = (tsconfigs, debug = false) => tsconfigs.reduce((acc = {}, tsconfig) => {
-  let tsconfigJSON = resolveJSON(tsconfig, true);
-  if (tsconfigJSON?.extends) {
-    const parentTsconfig = resolveJSON(tsconfigJSON.extends, true);
+  let tsconfigJSON = resolveJSON(tsconfig, debug);
+  const parentPath = tsconfigJSON?.extends;
+  if (parentPath) {
+    const relativeParentPath = join(dirname(tsconfig), parentPath);
+    const parentTsconfig = resolveJSON(relativeParentPath, debug);
     if (parentTsconfig?.extends) {
-      logger({ isDebugging: false })("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 = {
       ...parentTsconfig,
-      ...tsconfigJSON
+      ...tsconfigWithoutExtends,
+      compilerOptions: {
+        ...parentTsconfig?.compilerOptions,
+        ...tsconfigWithoutExtends?.compilerOptions
+      }
     };
   }
   if (!tsconfigJSON) {
@@ -55,10 +63,16 @@ var mergeConfigContent = (tsconfigs, debug = false) => tsconfigs.reduce((acc = {
   }
   return {
     ...acc,
-    ...tsconfigJSON
+    ...tsconfigJSON,
+    compilerOptions: {
+      ...acc?.compilerOptions,
+      ...tsconfigJSON?.compilerOptions
+    }
   };
 }, {});
-var writeTsconfig = (tsconfig, out) => {
+var writeTsconfig = (tsconfig, out, isTesting) => {
+  if (isTesting)
+    return tsconfig;
   const path = out.length ? out : "./tsconfig.merged.json";
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, JSON.stringify(tsconfig, null, 2));
@@ -70,7 +84,8 @@ var mergeTsConfigs = ({
   include = [],
   compilerOptions: compilerOptions2 = {},
   debug = false,
-  out = ""
+  out = "",
+  isTesting = false
 }) => {
   if (tsconfigs.length === 0) {
     if (debug)
@@ -86,7 +101,7 @@ var mergeTsConfigs = ({
     include: [...updatedTsconfig.include || [], ...include],
     ...compilerOptions2
   };
-  return writeTsconfig(tsconfig, out);
+  return writeTsconfig(tsconfig, out, isTesting);
 };
 var script = mergeTsConfigs;
 var scripts_default = mergeTsConfigs;
@@ -140,7 +155,7 @@ var compilerOptions = {
 async function action(files, options = {}) {
   const { debug = false, isTesting = false, isTestingCLI = false, ...compilerOptions2 } = options;
   if (isTestingCLI) {
-    console.info({ files });
+    console.info({ files, options });
     return;
   }
   try {
@@ -151,9 +166,11 @@ async function action(files, options = {}) {
 }
 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("-t, --isTestingCLI", "enable CLI only testing");
+).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");
 Object.keys(compilerOptions).map((name) => ({ name, value: compilerOptions[name] })).forEach(({ name, value }) => {
-  if (["string", "boolean"].includes(value)) {
+  if (value === "boolean") {
+    program.option(`--${name}`, `tsconfig.compilerOptions.${name}`);
+  } else if (value === "string") {
     program.option(`--${name} <${value}>`, `tsconfig.compilerOptions.${name}`);
   } else if (value === "array") {
     program.option(`--${name} [${value}...]`, `tsconfig.compilerOptions.${name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-tsconfigs",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "Merge-tsconfigs is a CLI and node tool for merging tsconfig files into the exact tsconfig file you want 🛣️",
   "type": "module",
   "module": "dist/index.js",