merge-tsconfigs 0.1.2 → 0.1.3

package/README.md

@@ -8,7 +8,7 @@
 [![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)
 
-_Merge-tsconfigs_ is a CLI and node tool for merging tsconfig files into the exact tsconfig file you want. 💪
+**WIP:** _Merge-tsconfigs_ is a CLI and node tool for merging tsconfig files into the exact tsconfig file you want. 💪
 
 ---
 
@@ -228,7 +228,14 @@ Install merge-tsconfigs with your preferred package manager.
 npm install merge-tsconfigs --save-dev
 ```
 
-\*[unpkg](https://unpkg.com/merge-tsconfigs@0.1.1/dist/index.js) and [skypack](https://cdn.skypack.dev/merge-tsconfigs?min) support coming very soon! 🚀
+\*_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";
+```
 
 ---
 

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  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
@@ -23,6 +29,7 @@ __export(src_exports, {
   default: () => src_default,
   logger: () => logger,
   mergeConfigContent: () => mergeConfigContent,
+  mergeConfigObjects: () => mergeConfigObjects,
   mergeTsConfigs: () => mergeTsConfigs,
   resolveJSON: () => resolveJSON,
   script: () => script,
@@ -34,6 +41,7 @@ module.exports = __toCommonJS(src_exports);
 // src/scripts.ts
 var import_fs = require("fs");
 var import_path = require("path");
+var import_json5 = __toESM(require("json5"), 1);
 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}:` : "";
@@ -61,7 +69,7 @@ var logger = ({ isDebugging = false, emoji = `\u{1F6E3}\uFE0F`, gap = ` => `, na
 };
 function resolveJSON(path, debug = false) {
   try {
-    const json = JSON.parse((0, import_fs.readFileSync)(path, "utf8"));
+    const json = import_json5.default.parse((0, import_fs.readFileSync)(path, "utf8"));
     return json;
   } catch (err) {
     console.log({ err });
@@ -70,6 +78,26 @@ function resolveJSON(path, debug = false) {
     return {};
   }
 }
+var mergeConfigObjects = (tsconfig1, tsconfig2) => ({
+  ...tsconfig1,
+  ...tsconfig2,
+  compilerOptions: {
+    ...tsconfig1?.compilerOptions,
+    ...tsconfig2?.compilerOptions
+  },
+  ...tsconfig1?.exclude || tsconfig2?.exclude ? {
+    exclude: [
+      ...tsconfig1?.exclude || [],
+      ...tsconfig2?.exclude || []
+    ]
+  } : {},
+  ...tsconfig1?.include || tsconfig2?.include ? {
+    include: [
+      ...tsconfig1?.include || [],
+      ...tsconfig2?.include || []
+    ]
+  } : {}
+});
 var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((acc = {}, tsconfig) => {
   const path = `${cwd}/${tsconfig}`;
   let tsconfigJSON = resolveJSON(path, debug);
@@ -81,33 +109,19 @@ var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((ac
       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,
-      ...tsconfigWithoutExtends,
-      compilerOptions: {
-        ...parentTsconfig?.compilerOptions,
-        ...tsconfigWithoutExtends?.compilerOptions
-      }
-    };
+    tsconfigJSON = mergeConfigObjects(parentTsconfig, tsconfigWithoutExtends);
   }
   if (!tsconfigJSON) {
     if (debug)
       logger({ isDebugging: debug })("error")("mergeConfigContent")("There was an error:")(tsconfigJSON);
     return acc;
   }
-  return {
-    ...acc,
-    ...tsconfigJSON,
-    compilerOptions: {
-      ...acc?.compilerOptions,
-      ...tsconfigJSON?.compilerOptions
-    }
-  };
+  return mergeConfigObjects(acc, tsconfigJSON);
 }, {});
 var writeTsconfig = (tsconfig, cwd, out, isTesting) => {
   if (isTesting)
     return tsconfig;
-  const path = out.length ? out : `${cwd}/tsconfig.merged.json`;
+  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));
   return tsconfig;
@@ -133,7 +147,7 @@ var mergeTsConfigs = ({
   include,
   compilerOptions: compilerOptions2,
   debug = false,
-  out = "",
+  out = "tsconfig.merged.json",
   isTesting = false
 }) => {
   if (tsconfigs.length === 0) {
@@ -146,8 +160,8 @@ var mergeTsConfigs = ({
   if (debug)
     logger({ isDebugging: debug })("debug")("mergeTsConfig")("Updated tsconfig:")(updatedTsconfig);
   const updatedCompilerOptions = updateCompilerOptions(compilerOptions2, updatedTsconfig?.compilerOptions || {});
-  const updatedExclude = exclude ? [...updatedTsconfig?.exclude || [], ...exclude] : updatedTsconfig?.exclude;
-  const updatedInclude = include ? [...updatedTsconfig.include || [], ...include] : updatedTsconfig?.include;
+  const updatedExclude = exclude ? { exclude: [...updatedTsconfig?.exclude || [], ...exclude] } : {};
+  const updatedInclude = include ? { include: [...updatedTsconfig.include || [], ...include] } : {};
   const tsconfig = {
     ...updatedTsconfig,
     ...updatedExclude,
@@ -205,14 +219,22 @@ var compilerOptions = {
 };
 
 // src/program.ts
-async function action(files, options = {}) {
-  const { debug = false, isTesting = false, isTestingCLI = false, ...compilerOptions2 } = options;
-  if (isTestingCLI) {
-    console.info({ files, options });
-    return;
-  }
+function action(files, options = {}) {
   try {
-    await script({ debug, tsconfigs: files, compilerOptions: compilerOptions2 });
+    const {
+      debug = false,
+      exclude,
+      include,
+      isTesting = false,
+      isTestingCLI = false,
+      out,
+      ...compilerOptions2
+    } = options;
+    if (isTestingCLI) {
+      console.info({ files, options });
+      return;
+    }
+    script({ debug, exclude, include, isTesting, out, tsconfigs: files, compilerOptions: compilerOptions2 });
   } catch (err) {
     logger({ isDebugging: options.debug })("error")("action")("There was an error:")(err);
   }
@@ -239,6 +261,7 @@ var src_default = scripts_default;
 0 && (module.exports = {
   logger,
   mergeConfigContent,
+  mergeConfigObjects,
   mergeTsConfigs,
   resolveJSON,
   script,

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import * as type_fest_source_partial_deep from 'type-fest/source/partial-deep';
+import * as typescript from 'typescript';
 import { CompilerOptions } from 'typescript';
 import { PartialDeep } from 'type-fest';
 
@@ -29,10 +31,113 @@ 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 mergeConfigObjects: (tsconfig1: TsConfig, tsconfig2: TsConfig) => {
+    include?: string[] | undefined;
+    exclude?: string[] | undefined;
+    compilerOptions: {
+        [x: string]: string | number | boolean | string[] | (string | number)[] | typescript.PluginImport[] | typescript.ProjectReference[] | type_fest_source_partial_deep.PartialObjectDeep<typescript.MapLike<string[]>, {}> | type_fest_source_partial_deep.PartialObjectDeep<typescript.TsConfigSourceFile, {}> | null | undefined;
+        allowJs?: boolean | undefined;
+        allowSyntheticDefaultImports?: boolean | undefined;
+        allowUmdGlobalAccess?: boolean | undefined;
+        allowUnreachableCode?: boolean | undefined;
+        allowUnusedLabels?: boolean | undefined;
+        alwaysStrict?: boolean | undefined;
+        baseUrl?: string | undefined;
+        charset?: string | undefined;
+        checkJs?: boolean | undefined;
+        declaration?: boolean | undefined;
+        declarationMap?: boolean | undefined;
+        emitDeclarationOnly?: boolean | undefined;
+        declarationDir?: string | undefined;
+        disableSizeLimit?: boolean | undefined;
+        disableSourceOfProjectReferenceRedirect?: boolean | undefined;
+        disableSolutionSearching?: boolean | undefined;
+        disableReferencedProjectLoad?: boolean | undefined;
+        downlevelIteration?: boolean | undefined;
+        emitBOM?: boolean | undefined;
+        emitDecoratorMetadata?: boolean | undefined;
+        exactOptionalPropertyTypes?: boolean | undefined;
+        experimentalDecorators?: boolean | undefined;
+        forceConsistentCasingInFileNames?: boolean | undefined;
+        importHelpers?: boolean | undefined;
+        importsNotUsedAsValues?: typescript.ImportsNotUsedAsValues | undefined;
+        inlineSourceMap?: boolean | undefined;
+        inlineSources?: boolean | undefined;
+        isolatedModules?: boolean | undefined;
+        jsx?: typescript.JsxEmit | undefined;
+        keyofStringsOnly?: boolean | undefined;
+        lib?: string[] | undefined;
+        locale?: string | undefined;
+        mapRoot?: string | undefined;
+        maxNodeModuleJsDepth?: number | undefined;
+        module?: typescript.ModuleKind | undefined;
+        moduleResolution?: typescript.ModuleResolutionKind | undefined;
+        moduleSuffixes?: string[] | undefined;
+        moduleDetection?: typescript.ModuleDetectionKind | undefined;
+        newLine?: typescript.NewLineKind | undefined;
+        noEmit?: boolean | undefined;
+        noEmitHelpers?: boolean | undefined;
+        noEmitOnError?: boolean | undefined;
+        noErrorTruncation?: boolean | undefined;
+        noFallthroughCasesInSwitch?: boolean | undefined;
+        noImplicitAny?: boolean | undefined;
+        noImplicitReturns?: boolean | undefined;
+        noImplicitThis?: boolean | undefined;
+        noStrictGenericChecks?: boolean | undefined;
+        noUnusedLocals?: boolean | undefined;
+        noUnusedParameters?: boolean | undefined;
+        noImplicitUseStrict?: boolean | undefined;
+        noPropertyAccessFromIndexSignature?: boolean | undefined;
+        assumeChangesOnlyAffectDirectDependencies?: boolean | undefined;
+        noLib?: boolean | undefined;
+        noResolve?: boolean | undefined;
+        noUncheckedIndexedAccess?: boolean | undefined;
+        out?: string | undefined;
+        outDir?: string | undefined;
+        outFile?: string | undefined;
+        paths?: type_fest_source_partial_deep.PartialObjectDeep<typescript.MapLike<string[]>, {}> | undefined;
+        preserveConstEnums?: boolean | undefined;
+        noImplicitOverride?: boolean | undefined;
+        preserveSymlinks?: boolean | undefined;
+        preserveValueImports?: boolean | undefined;
+        project?: string | undefined;
+        reactNamespace?: string | undefined;
+        jsxFactory?: string | undefined;
+        jsxFragmentFactory?: string | undefined;
+        jsxImportSource?: string | undefined;
+        composite?: boolean | undefined;
+        incremental?: boolean | undefined;
+        tsBuildInfoFile?: string | undefined;
+        removeComments?: boolean | undefined;
+        rootDir?: string | undefined;
+        rootDirs?: string[] | undefined;
+        skipLibCheck?: boolean | undefined;
+        skipDefaultLibCheck?: boolean | undefined;
+        sourceMap?: boolean | undefined;
+        sourceRoot?: string | undefined;
+        strict?: boolean | undefined;
+        strictFunctionTypes?: boolean | undefined;
+        strictBindCallApply?: boolean | undefined;
+        strictNullChecks?: boolean | undefined;
+        strictPropertyInitialization?: boolean | undefined;
+        stripInternal?: boolean | undefined;
+        suppressExcessPropertyErrors?: boolean | undefined;
+        suppressImplicitAnyIndexErrors?: boolean | undefined;
+        target?: typescript.ScriptTarget | undefined;
+        traceResolution?: boolean | undefined;
+        useUnknownInCatchVariables?: boolean | undefined;
+        resolveJsonModule?: boolean | undefined;
+        types?: string[] | undefined;
+        typeRoots?: string[] | undefined;
+        esModuleInterop?: boolean | undefined;
+        useDefineForClassFields?: boolean | undefined;
+    };
+    extends?: string | undefined;
+};
 declare const mergeConfigContent: (tsconfigs: string[], cwd: string, debug?: boolean) => TsConfig;
 declare const writeTsconfig: (tsconfig: TsConfig, cwd: string, out: string, isTesting: boolean) => TsConfig;
 declare const updateCompilerOptions: (compilerOptions: PartialCompilerOptions | undefined, currentCompilerOptions: PartialCompilerOptions) => PartialCompilerOptions;
 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, updateCompilerOptions, writeTsconfig };
+export { mergeTsConfigs as default, logger, mergeConfigContent, mergeConfigObjects, mergeTsConfigs, resolveJSON, script, updateCompilerOptions, writeTsconfig };

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/scripts.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
+import JSON5 from "json5";
 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}:` : "";
@@ -28,7 +29,7 @@ var logger = ({ isDebugging = false, emoji = `\u{1F6E3}\uFE0F`, gap = ` => `, na
 };
 function resolveJSON(path, debug = false) {
   try {
-    const json = JSON.parse(readFileSync(path, "utf8"));
+    const json = JSON5.parse(readFileSync(path, "utf8"));
     return json;
   } catch (err) {
     console.log({ err });
@@ -37,6 +38,26 @@ function resolveJSON(path, debug = false) {
     return {};
   }
 }
+var mergeConfigObjects = (tsconfig1, tsconfig2) => ({
+  ...tsconfig1,
+  ...tsconfig2,
+  compilerOptions: {
+    ...tsconfig1?.compilerOptions,
+    ...tsconfig2?.compilerOptions
+  },
+  ...tsconfig1?.exclude || tsconfig2?.exclude ? {
+    exclude: [
+      ...tsconfig1?.exclude || [],
+      ...tsconfig2?.exclude || []
+    ]
+  } : {},
+  ...tsconfig1?.include || tsconfig2?.include ? {
+    include: [
+      ...tsconfig1?.include || [],
+      ...tsconfig2?.include || []
+    ]
+  } : {}
+});
 var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((acc = {}, tsconfig) => {
   const path = `${cwd}/${tsconfig}`;
   let tsconfigJSON = resolveJSON(path, debug);
@@ -48,33 +69,19 @@ var mergeConfigContent = (tsconfigs, cwd, debug = false) => tsconfigs.reduce((ac
       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,
-      ...tsconfigWithoutExtends,
-      compilerOptions: {
-        ...parentTsconfig?.compilerOptions,
-        ...tsconfigWithoutExtends?.compilerOptions
-      }
-    };
+    tsconfigJSON = mergeConfigObjects(parentTsconfig, tsconfigWithoutExtends);
   }
   if (!tsconfigJSON) {
     if (debug)
       logger({ isDebugging: debug })("error")("mergeConfigContent")("There was an error:")(tsconfigJSON);
     return acc;
   }
-  return {
-    ...acc,
-    ...tsconfigJSON,
-    compilerOptions: {
-      ...acc?.compilerOptions,
-      ...tsconfigJSON?.compilerOptions
-    }
-  };
+  return mergeConfigObjects(acc, tsconfigJSON);
 }, {});
 var writeTsconfig = (tsconfig, cwd, out, isTesting) => {
   if (isTesting)
     return tsconfig;
-  const path = out.length ? out : `${cwd}/tsconfig.merged.json`;
+  const path = `${cwd}/${out}`;
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, JSON.stringify(tsconfig, null, 2));
   return tsconfig;
@@ -100,7 +107,7 @@ var mergeTsConfigs = ({
   include,
   compilerOptions: compilerOptions2,
   debug = false,
-  out = "",
+  out = "tsconfig.merged.json",
   isTesting = false
 }) => {
   if (tsconfigs.length === 0) {
@@ -113,8 +120,8 @@ var mergeTsConfigs = ({
   if (debug)
     logger({ isDebugging: debug })("debug")("mergeTsConfig")("Updated tsconfig:")(updatedTsconfig);
   const updatedCompilerOptions = updateCompilerOptions(compilerOptions2, updatedTsconfig?.compilerOptions || {});
-  const updatedExclude = exclude ? [...updatedTsconfig?.exclude || [], ...exclude] : updatedTsconfig?.exclude;
-  const updatedInclude = include ? [...updatedTsconfig.include || [], ...include] : updatedTsconfig?.include;
+  const updatedExclude = exclude ? { exclude: [...updatedTsconfig?.exclude || [], ...exclude] } : {};
+  const updatedInclude = include ? { include: [...updatedTsconfig.include || [], ...include] } : {};
   const tsconfig = {
     ...updatedTsconfig,
     ...updatedExclude,
@@ -172,14 +179,22 @@ var compilerOptions = {
 };
 
 // src/program.ts
-async function action(files, options = {}) {
-  const { debug = false, isTesting = false, isTestingCLI = false, ...compilerOptions2 } = options;
-  if (isTestingCLI) {
-    console.info({ files, options });
-    return;
-  }
+function action(files, options = {}) {
   try {
-    await script({ debug, tsconfigs: files, compilerOptions: compilerOptions2 });
+    const {
+      debug = false,
+      exclude,
+      include,
+      isTesting = false,
+      isTestingCLI = false,
+      out,
+      ...compilerOptions2
+    } = options;
+    if (isTestingCLI) {
+      console.info({ files, options });
+      return;
+    }
+    script({ debug, exclude, include, isTesting, out, tsconfigs: files, compilerOptions: compilerOptions2 });
   } catch (err) {
     logger({ isDebugging: options.debug })("error")("action")("There was an error:")(err);
   }
@@ -206,6 +221,7 @@ export {
   src_default as default,
   logger,
   mergeConfigContent,
+  mergeConfigObjects,
   mergeTsConfigs,
   resolveJSON,
   script,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-tsconfigs",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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",
@@ -22,6 +22,7 @@
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "clean": "rimraf dist config",
     "cmd:test": "ts-node src/program.ts --isTestingCLI",
+    "cmd:test:cli": "ts-node src/program.ts 'tsconfig.json' --out 'tsconfig.test.json' --outDir 'fooboo' --debug",
     "commit": "git-cz",
     "commit-msg": "commitlint --edit $1",
     "lint": "eslint src --ext .ts",
@@ -36,7 +37,8 @@
     "update": "codependence --update"
   },
   "dependencies": {
-    "commander": "^9.5.0"
+    "commander": "^9.5.0",
+    "json5": "^2.2.3"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.4.2",