jsii 5.4.16-dev.6 → 5.4.16-dev.7

package/lib/case.d.ts

@@ -2,5 +2,4 @@ export declare const camel: (text: string) => string;
 export declare const constant: (text: string) => string;
 export declare const pascal: (text: string) => string;
 export declare const snake: (text: string) => string;
-export declare const kebab: (text: string) => string;
 //# sourceMappingURL=case.d.ts.map

package/lib/case.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kebab = exports.snake = exports.pascal = exports.constant = exports.camel = void 0;
+exports.snake = exports.pascal = exports.constant = exports.camel = void 0;
 const Case = require("case");
 const withCache = (func) => (text) => Cache.fetch(text, func);
 exports.camel = withCache(Case.camel);
 exports.constant = withCache(Case.constant);
 exports.pascal = withCache(Case.pascal);
 exports.snake = withCache(Case.snake);
-exports.kebab = withCache(Case.kebab);
 class Cache {
     static fetch(text, func) {
         // Check whether we have a cache for this function...

package/lib/case.js.map

@@ -1 +1 @@
-{"version":3,"file":"case.js","sourceRoot":"","sources":["../src/case.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,MAAM,SAAS,GACb,CAAC,IAA8B,EAA8B,EAAE,CAC/D,CAAC,IAAY,EAAE,EAAE,CACf,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAEf,QAAA,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9B,QAAA,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACpC,QAAA,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChC,QAAA,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9B,QAAA,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAE3C,MAAM,KAAK;IACF,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,IAA8B;QAC9D,qDAAqD;QACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,wBAAwB;YACxB,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,0DAA0D;QAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,yBAAyB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,gBAAuB,CAAC;;AAHxB,uFAAuF;AAC/D,YAAM,GAAG,IAAI,OAAO,EAAiC,CAAC;AAKhF,MAAM,QAAQ;IACL,MAAM,CAAC,GAAG,CAAC,IAAS;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;QAC5C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,gBAAuB,CAAC;;AAHxB,iGAAiG;AACzE,cAAK,GAAG,IAAI,GAAG,EAA0B,CAAC","sourcesContent":["import * as Case from 'case';\n\nconst withCache =\n  (func: (text: string) => string): ((text: string) => string) =>\n  (text: string) =>\n    Cache.fetch(text, func);\n\nexport const camel = withCache(Case.camel);\nexport const constant = withCache(Case.constant);\nexport const pascal = withCache(Case.pascal);\nexport const snake = withCache(Case.snake);\nexport const kebab = withCache(Case.kebab);\n\nclass Cache {\n  public static fetch(text: string, func: (text: string) => string): string {\n    // Check whether we have a cache for this function...\n    const cacheKey = CacheKey.for(func);\n    let cache = this.CACHES.get(cacheKey);\n    if (cache == null) {\n      // If not, create one...\n      cache = new Map<string, string>();\n      this.CACHES.set(cacheKey, cache);\n    }\n\n    // Check if the current cache has a value for this text...\n    const cached = cache.get(text);\n    if (cached != null) {\n      return cached;\n    }\n\n    // If not, compute one...\n    const result = func(text);\n    cache.set(text, result);\n    return result;\n  }\n\n  // Cache is indexed on a weak CacheKey so the cache can be purged under memory pressure\n  private static readonly CACHES = new WeakMap<CacheKey, Map<string, string>>();\n\n  private constructor() {}\n}\n\nclass CacheKey {\n  public static for(data: any) {\n    const entry = this.STORE.get(data)?.deref();\n    if (entry != null) {\n      return entry;\n    }\n    const newKey = new CacheKey();\n    this.STORE.set(data, new WeakRef(newKey));\n    return newKey;\n  }\n\n  // Storing cache keys as weak references to allow garbage collection if there is memory pressure.\n  private static readonly STORE = new Map<any, WeakRef<CacheKey>>();\n\n  private constructor() {}\n}\n"]}
+{"version":3,"file":"case.js","sourceRoot":"","sources":["../src/case.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,MAAM,SAAS,GACb,CAAC,IAA8B,EAA8B,EAAE,CAC/D,CAAC,IAAY,EAAE,EAAE,CACf,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAEf,QAAA,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9B,QAAA,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACpC,QAAA,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChC,QAAA,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAE3C,MAAM,KAAK;IACF,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,IAA8B;QAC9D,qDAAqD;QACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,wBAAwB;YACxB,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,0DAA0D;QAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,yBAAyB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,gBAAuB,CAAC;;AAHxB,uFAAuF;AAC/D,YAAM,GAAG,IAAI,OAAO,EAAiC,CAAC;AAKhF,MAAM,QAAQ;IACL,MAAM,CAAC,GAAG,CAAC,IAAS;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;QAC5C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,gBAAuB,CAAC;;AAHxB,iGAAiG;AACzE,cAAK,GAAG,IAAI,GAAG,EAA0B,CAAC","sourcesContent":["import * as Case from 'case';\n\nconst withCache =\n  (func: (text: string) => string): ((text: string) => string) =>\n  (text: string) =>\n    Cache.fetch(text, func);\n\nexport const camel = withCache(Case.camel);\nexport const constant = withCache(Case.constant);\nexport const pascal = withCache(Case.pascal);\nexport const snake = withCache(Case.snake);\n\nclass Cache {\n  public static fetch(text: string, func: (text: string) => string): string {\n    // Check whether we have a cache for this function...\n    const cacheKey = CacheKey.for(func);\n    let cache = this.CACHES.get(cacheKey);\n    if (cache == null) {\n      // If not, create one...\n      cache = new Map<string, string>();\n      this.CACHES.set(cacheKey, cache);\n    }\n\n    // Check if the current cache has a value for this text...\n    const cached = cache.get(text);\n    if (cached != null) {\n      return cached;\n    }\n\n    // If not, compute one...\n    const result = func(text);\n    cache.set(text, result);\n    return result;\n  }\n\n  // Cache is indexed on a weak CacheKey so the cache can be purged under memory pressure\n  private static readonly CACHES = new WeakMap<CacheKey, Map<string, string>>();\n\n  private constructor() {}\n}\n\nclass CacheKey {\n  public static for(data: any) {\n    const entry = this.STORE.get(data)?.deref();\n    if (entry != null) {\n      return entry;\n    }\n    const newKey = new CacheKey();\n    this.STORE.set(data, new WeakRef(newKey));\n    return newKey;\n  }\n\n  // Storing cache keys as weak references to allow garbage collection if there is memory pressure.\n  private static readonly STORE = new Map<any, WeakRef<CacheKey>>();\n\n  private constructor() {}\n}\n"]}

package/lib/compiler.d.ts

@@ -1,7 +1,6 @@
 import * as ts from 'typescript';
 import { Emitter } from './emitter';
 import { ProjectInfo } from './project-info';
-import { TypeScriptConfigValidationRuleSet } from './tsconfig';
 export declare const DIAGNOSTICS = "diagnostics";
 export declare const JSII_DIAGNOSTICS_CODE = 9999;
 export interface CompilerOptions {
@@ -20,38 +19,30 @@ export interface CompilerOptions {
     /** Whether to add warnings for deprecated elements */
     addDeprecationWarnings?: boolean;
     /**
-     * The name of the tsconfig file to generate.
-     * Cannot be used at the same time as `typeScriptConfig`.
+     * The name of the tsconfig file to generate
      * @default "tsconfig.json"
      */
     generateTypeScriptConfig?: string;
-    /**
-     * The name of the tsconfig file to use.
-     * Cannot be used at the same time as `generateTypeScriptConfig`.
-     * @default - generate the tsconfig file
-     */
-    typeScriptConfig?: string;
-    /**
-     * The ruleset to validate the provided tsconfig file against.
-     * Can only be used when `typeScriptConfig` is provided.
-     * @default TypeScriptConfigValidationRuleSet.STRICT - if `typeScriptConfig` is provided
-     */
-    validateTypeScriptConfig?: TypeScriptConfigValidationRuleSet;
     /**
      * Whether to compress the assembly
      * @default false
      */
     compressAssembly?: boolean;
 }
+export interface TypescriptConfig {
+    compilerOptions: ts.CompilerOptions;
+    include?: string[];
+    exclude?: string[];
+    references?: ts.ProjectReference[];
+}
 export declare class Compiler implements Emitter {
     private readonly options;
     private readonly system;
     private readonly compilerHost;
-    private readonly userProvidedTypeScriptConfig;
-    private readonly tsconfig;
+    private typescriptConfig?;
     private rootFiles;
     private readonly configPath;
-    private readonly projectRoot;
+    private readonly projectReferences;
     constructor(options: CompilerOptions);
     /**
      * Compiles the configured program.
@@ -70,33 +61,18 @@ export declare class Compiler implements Emitter {
      *
      * @param files the files that were specified as input in the CLI invocation.
      */
-    private configureTypeScript;
-    /**
-     * Final preparations of the project for build.
-     *
-     * These are preparations that either
-     * - must happen immediately before the build, or
-     * - can be different for every build like assigning the relevant root file(s).
-     *
-     * @param files the files that were specified as input in the CLI invocation.
-     */
-    private prepareForBuild;
+    private _prepareForBuild;
     /**
      * Do a single build
      */
-    private buildOnce;
-    private consumeProgram;
+    private _buildOnce;
+    private _consumeProgram;
     /**
-     * Build the TypeScript config object from jsii config
+     * Build the TypeScript config object
      *
-     * This is the object that will be written to disk
-     * unless an existing tsconfig was provided.
+     * This is the object that will be written to disk.
      */
     private buildTypeScriptConfig;
-    /**
-     * Load the TypeScript config object from a provided file
-     */
-    private readTypeScriptConfig;
     /**
      * Creates a `tsconfig.json` file to improve the IDE experience.
      *

package/lib/compiler.js

@@ -7,15 +7,34 @@ const chalk = require("chalk");
 const log4js = require("log4js");
 const ts = require("typescript");
 const assembler_1 = require("./assembler");
+const Case = require("./case");
 const find_utils_1 = require("./common/find-utils");
 const downlevel_dts_1 = require("./downlevel-dts");
 const jsii_diagnostic_1 = require("./jsii-diagnostic");
 const deprecation_warnings_1 = require("./transforms/deprecation-warnings");
-const tsconfig_1 = require("./tsconfig");
-const compiler_options_1 = require("./tsconfig/compiler-options");
-const tsconfig_validator_1 = require("./tsconfig/tsconfig-validator");
-const validator_1 = require("./tsconfig/validator");
 const utils = require("./utils");
+const BASE_COMPILER_OPTIONS = {
+    alwaysStrict: true,
+    declaration: true,
+    experimentalDecorators: true,
+    incremental: true,
+    lib: ['lib.es2020.d.ts'],
+    module: ts.ModuleKind.CommonJS,
+    noEmitOnError: true,
+    noFallthroughCasesInSwitch: true,
+    noImplicitAny: true,
+    noImplicitReturns: true,
+    noImplicitThis: true,
+    noUnusedLocals: true,
+    noUnusedParameters: true,
+    resolveJsonModule: true,
+    skipLibCheck: true,
+    strict: true,
+    strictNullChecks: true,
+    strictPropertyInitialization: true,
+    stripInternal: false,
+    target: ts.ScriptTarget.ES2020,
+};
 const LOG = log4js.getLogger('jsii/compiler');
 exports.DIAGNOSTICS = 'diagnostics';
 exports.JSII_DIAGNOSTICS_CODE = 9999;
@@ -23,27 +42,28 @@ class Compiler {
     constructor(options) {
         this.options = options;
         this.rootFiles = [];
-        if (options.generateTypeScriptConfig != null && options.typeScriptConfig != null) {
-            throw new Error('Cannot use `generateTypeScriptConfig` and `typeScriptConfig` together. Provide only one of them.');
-        }
-        this.projectRoot = this.options.projectInfo.projectRoot;
-        const configFileName = options.typeScriptConfig ?? options.generateTypeScriptConfig ?? 'tsconfig.json';
-        this.configPath = path.join(this.projectRoot, configFileName);
-        this.userProvidedTypeScriptConfig = Boolean(options.typeScriptConfig);
-        this.tsconfig = this.configureTypeScript();
+        const rootDir = this.options.projectInfo.projectRoot;
         this.system = {
             ...ts.sys,
-            getCurrentDirectory: () => this.projectRoot,
-            createDirectory: (pth) => ts.sys.createDirectory(path.resolve(this.projectRoot, pth)),
-            deleteFile: ts.sys.deleteFile && ((pth) => ts.sys.deleteFile(path.join(this.projectRoot, pth))),
-            fileExists: (pth) => ts.sys.fileExists(path.resolve(this.projectRoot, pth)),
-            getFileSize: ts.sys.getFileSize && ((pth) => ts.sys.getFileSize(path.resolve(this.projectRoot, pth))),
-            readFile: (pth, encoding) => ts.sys.readFile(path.resolve(this.projectRoot, pth), encoding),
+            getCurrentDirectory: () => rootDir,
+            createDirectory: (pth) => ts.sys.createDirectory(path.resolve(rootDir, pth)),
+            deleteFile: ts.sys.deleteFile && ((pth) => ts.sys.deleteFile(path.join(rootDir, pth))),
+            fileExists: (pth) => ts.sys.fileExists(path.resolve(rootDir, pth)),
+            getFileSize: ts.sys.getFileSize && ((pth) => ts.sys.getFileSize(path.resolve(rootDir, pth))),
+            readFile: (pth, encoding) => ts.sys.readFile(path.resolve(rootDir, pth), encoding),
             watchFile: ts.sys.watchFile &&
-                ((pth, callback, pollingInterval, watchOptions) => ts.sys.watchFile(path.resolve(this.projectRoot, pth), callback, pollingInterval, watchOptions)),
-            writeFile: (pth, data, writeByteOrderMark) => ts.sys.writeFile(path.resolve(this.projectRoot, pth), data, writeByteOrderMark),
+                ((pth, callback, pollingInterval, watchOptions) => ts.sys.watchFile(path.resolve(rootDir, pth), callback, pollingInterval, watchOptions)),
+            writeFile: (pth, data, writeByteOrderMark) => ts.sys.writeFile(path.resolve(rootDir, pth), data, writeByteOrderMark),
         };
-        this.compilerHost = ts.createIncrementalCompilerHost(this.tsconfig.compilerOptions, this.system);
+        this.compilerHost = ts.createIncrementalCompilerHost(BASE_COMPILER_OPTIONS, this.system);
+        const configFileName = options.generateTypeScriptConfig ?? 'tsconfig.json';
+        this.configPath = path.join(this.options.projectInfo.projectRoot, configFileName);
+        this.projectReferences =
+            options.projectReferences !== undefined
+                ? options.projectReferences
+                : options.projectInfo.projectReferences !== undefined
+                    ? options.projectInfo.projectReferences
+                    : false;
     }
     /**
      * Compiles the configured program.
@@ -51,15 +71,18 @@ class Compiler {
      * @param files can be specified to override the standard source code location logic. Useful for example when testing "negatives".
      */
     emit(...files) {
-        this.prepareForBuild(...files);
-        return this.buildOnce();
+        this._prepareForBuild(...files);
+        return this._buildOnce();
     }
     async watch(opts) {
-        this.prepareForBuild();
+        this._prepareForBuild();
+        const pi = this.options.projectInfo;
+        const projectRoot = pi.projectRoot;
         const host = ts.createWatchCompilerHost(this.configPath, {
-            ...this.tsconfig.compilerOptions,
+            ...pi.tsc,
+            ...BASE_COMPILER_OPTIONS,
             noEmitOnError: false,
-        }, this.system, ts.createEmitAndSemanticDiagnosticsBuilderProgram, opts?.reportDiagnostics, opts?.reportWatchStatus, this.tsconfig.watchOptions);
+        }, this.system, ts.createEmitAndSemanticDiagnosticsBuilderProgram, opts?.reportDiagnostics, opts?.reportWatchStatus);
         if (!host.getDefaultLibLocation) {
             throw new Error('No default library location was found on the TypeScript compiler host!');
         }
@@ -69,9 +92,9 @@ class Compiler {
         //
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         host.afterProgramCreate = (builderProgram) => {
-            const emitResult = this.consumeProgram(builderProgram.getProgram(), host.getDefaultLibLocation());
+            const emitResult = this._consumeProgram(builderProgram.getProgram(), host.getDefaultLibLocation());
             for (const diag of emitResult.diagnostics.filter((d) => d.code === exports.JSII_DIAGNOSTICS_CODE)) {
-                utils.logDiagnostic(diag, this.projectRoot);
+                utils.logDiagnostic(diag, projectRoot);
             }
             if (orig) {
                 orig.call(host, builderProgram);
@@ -94,72 +117,35 @@ class Compiler {
      *
      * @param files the files that were specified as input in the CLI invocation.
      */
-    configureTypeScript() {
-        if (this.userProvidedTypeScriptConfig) {
-            const config = this.readTypeScriptConfig();
-            // emit a warning if validation is disabled
-            const rules = this.options.validateTypeScriptConfig ?? tsconfig_1.TypeScriptConfigValidationRuleSet.NONE;
-            if (rules === tsconfig_1.TypeScriptConfigValidationRuleSet.NONE) {
-                utils.logDiagnostic(jsii_diagnostic_1.JsiiDiagnostic.JSII_4009_DISABLED_TSCONFIG_VALIDATION.create(undefined, this.configPath), this.projectRoot);
-            }
-            // validate the user provided config
-            if (rules !== tsconfig_1.TypeScriptConfigValidationRuleSet.NONE) {
-                const configName = path.relative(this.projectRoot, this.configPath);
-                try {
-                    const validator = new tsconfig_validator_1.TypeScriptConfigValidator(rules);
-                    validator.validate({
-                        ...config,
-                        // convert the internal format to the user format which is what the validator operates on
-                        compilerOptions: (0, compiler_options_1.convertForJson)(config.compilerOptions),
-                    });
-                }
-                catch (error) {
-                    if (error instanceof validator_1.ValidationError) {
-                        utils.logDiagnostic(jsii_diagnostic_1.JsiiDiagnostic.JSII_4000_FAILED_TSCONFIG_VALIDATION.create(undefined, configName, rules, error.violations), this.projectRoot);
-                    }
-                    throw new Error(`Failed validation of tsconfig "compilerOptions" in "${configName}" against rule set "${rules}"!`);
-                }
-            }
-            return config;
-        }
-        // generated config if none is provided by the user
-        return this.buildTypeScriptConfig();
-    }
-    /**
-     * Final preparations of the project for build.
-     *
-     * These are preparations that either
-     * - must happen immediately before the build, or
-     * - can be different for every build like assigning the relevant root file(s).
-     *
-     * @param files the files that were specified as input in the CLI invocation.
-     */
-    prepareForBuild(...files) {
-        if (!this.userProvidedTypeScriptConfig) {
-            this.writeTypeScriptConfig();
-        }
+    _prepareForBuild(...files) {
+        this.buildTypeScriptConfig();
+        this.writeTypeScriptConfig();
         this.rootFiles = this.determineSources(files);
     }
     /**
      * Do a single build
      */
-    buildOnce() {
+    _buildOnce() {
         if (!this.compilerHost.getDefaultLibLocation) {
             throw new Error('No default library location was found on the TypeScript compiler host!');
         }
-        const tsconf = this.tsconfig;
+        const tsconf = this.typescriptConfig;
+        const pi = this.options.projectInfo;
         const prog = ts.createIncrementalProgram({
             rootNames: this.rootFiles.concat(_pathOfLibraries(this.compilerHost)),
-            options: tsconf.compilerOptions,
+            options: {
+                ...pi.tsc,
+                ...(tsconf?.compilerOptions ?? BASE_COMPILER_OPTIONS),
+            },
             // Make the references absolute for the compiler
             projectReferences: tsconf.references?.map((ref) => ({
                 path: path.resolve(path.dirname(this.configPath), ref.path),
             })),
             host: this.compilerHost,
         });
-        return this.consumeProgram(prog.getProgram(), this.compilerHost.getDefaultLibLocation());
+        return this._consumeProgram(prog.getProgram(), this.compilerHost.getDefaultLibLocation());
     }
-    consumeProgram(program, stdlib) {
+    _consumeProgram(program, stdlib) {
         const diagnostics = [...ts.getPreEmitDiagnostics(program)];
         let hasErrors = false;
         if (!hasErrors && this.diagsHaveAbortableErrors(diagnostics)) {
@@ -219,28 +205,22 @@ class Compiler {
         };
     }
     /**
-     * Build the TypeScript config object from jsii config
+     * Build the TypeScript config object
      *
-     * This is the object that will be written to disk
-     * unless an existing tsconfig was provided.
+     * This is the object that will be written to disk.
      */
     buildTypeScriptConfig() {
         let references;
-        const isComposite = this.options.projectReferences !== undefined
-            ? this.options.projectReferences
-            : this.options.projectInfo.projectReferences !== undefined
-                ? this.options.projectInfo.projectReferences
-                : false;
-        if (isComposite) {
+        if (this.projectReferences) {
             references = this.findProjectReferences();
         }
         const pi = this.options.projectInfo;
-        return {
+        this.typescriptConfig = {
             compilerOptions: {
                 ...pi.tsc,
-                ...compiler_options_1.BASE_COMPILER_OPTIONS,
+                ...BASE_COMPILER_OPTIONS,
                 // Enable composite mode if project references are enabled
-                composite: isComposite,
+                composite: this.projectReferences,
                 // When incremental, configure a tsbuildinfo file
                 tsBuildInfoFile: path.join(pi.tsc?.outDir ?? '.', 'tsconfig.tsbuildinfo'),
             },
@@ -261,25 +241,6 @@ class Compiler {
             references: references?.map((p) => ({ path: p })),
         };
     }
-    /**
-     * Load the TypeScript config object from a provided file
-     */
-    readTypeScriptConfig() {
-        const projectRoot = this.options.projectInfo.projectRoot;
-        const { config, error } = ts.readConfigFile(this.configPath, ts.sys.readFile);
-        if (error) {
-            utils.logDiagnostic(error, projectRoot);
-            throw new Error(`Failed to load tsconfig at ${this.configPath}`);
-        }
-        const extended = ts.parseJsonConfigFileContent(config, ts.sys, projectRoot);
-        // the tsconfig parser adds this in, but it is not an expected compilerOption
-        delete extended.options.configFilePath;
-        return {
-            compilerOptions: extended.options,
-            watchOptions: extended.watchOptions,
-            include: extended.fileNames,
-        };
-    }
     /**
      * Creates a `tsconfig.json` file to improve the IDE experience.
      *
@@ -288,7 +249,7 @@ class Compiler {
     writeTypeScriptConfig() {
         const commentKey = '_generated_by_jsii_';
         const commentValue = 'Generated by jsii - safe to delete, and ideally should be in .gitignore';
-        this.tsconfig[commentKey] = commentValue;
+        this.typescriptConfig[commentKey] = commentValue;
         if (fs.existsSync(this.configPath)) {
             const currentConfig = JSON.parse(fs.readFileSync(this.configPath, 'utf-8'));
             if (!(commentKey in currentConfig)) {
@@ -296,11 +257,43 @@ class Compiler {
             }
         }
         const outputConfig = {
-            ...this.tsconfig,
-            compilerOptions: (0, compiler_options_1.convertForJson)(this.tsconfig?.compilerOptions),
+            ...this.typescriptConfig,
+            compilerOptions: {
+                ...this.typescriptConfig?.compilerOptions,
+                lib: this.typescriptConfig?.compilerOptions?.lib?.map((lib) => 
+                // Drop the "lib." prefix and ".d.ts" suffix before writing up the tsconfig.json file
+                lib.slice(4, lib.length - 5)),
+                // Re-write the module, targets & jsx to be the JSON format instead of Programmatic API
+                module: (this.typescriptConfig?.compilerOptions?.module &&
+                    ts.ModuleKind[this.typescriptConfig.compilerOptions.module]),
+                newLine: newLineForTsconfigJson(this.typescriptConfig?.compilerOptions.newLine),
+                target: (this.typescriptConfig?.compilerOptions?.target &&
+                    ts.ScriptTarget[this.typescriptConfig.compilerOptions.target]),
+                jsx: (this.typescriptConfig?.compilerOptions?.jsx &&
+                    Case.snake(ts.JsxEmit[this.typescriptConfig.compilerOptions.jsx])),
+            },
         };
         LOG.debug(`Creating or updating ${chalk.blue(this.configPath)}`);
         fs.writeFileSync(this.configPath, JSON.stringify(outputConfig, null, 2), 'utf8');
+        /**
+         * This is annoying - the values expected in the tsconfig.json file are not
+         * the same as the enum constant names, or their values. So we need this
+         * function to map the "compiler API version" to the "tsconfig.json version"
+         *
+         * @param newLine the compiler form of the new line configuration
+         *
+         * @return the requivalent value to put in tsconfig.json
+         */
+        function newLineForTsconfigJson(newLine) {
+            switch (newLine) {
+                case ts.NewLineKind.CarriageReturnLineFeed:
+                    return 'crlf';
+                case ts.NewLineKind.LineFeed:
+                    return 'lf';
+                default:
+                    return undefined;
+            }
+        }
     }
     /**
      * Find all dependencies that look like TypeScript projects.
@@ -353,18 +346,16 @@ class Compiler {
      * This makes it so that running 'typescript' and running 'jsii' has the same behavior.
      */
     determineSources(files) {
-        // explicitly requested files
+        const ret = new Array();
         if (files.length > 0) {
-            return [...files];
+            ret.push(...files);
         }
-        // for user provided config we already have parsed the full list of files
-        if (this.userProvidedTypeScriptConfig) {
-            return [...(this.tsconfig.include ?? [])];
+        else {
+            const parseConfigHost = parseConfigHostFromCompilerHost(this.compilerHost);
+            const parsed = ts.parseJsonConfigFileContent(this.typescriptConfig, parseConfigHost, this.options.projectInfo.projectRoot);
+            ret.push(...parsed.fileNames);
         }
-        // finally get the file list for the generated config
-        const parseConfigHost = parseConfigHostFromCompilerHost(this.compilerHost);
-        const parsed = ts.parseJsonConfigFileContent(this.tsconfig, parseConfigHost, this.options.projectInfo.projectRoot);
-        return [...parsed.fileNames];
+        return ret;
     }
     /**
      * Resolve the given dependency name from the current package, and find the associated tsconfig.json location
@@ -414,14 +405,14 @@ class Compiler {
 }
 exports.Compiler = Compiler;
 function _pathOfLibraries(host) {
-    if (!compiler_options_1.BASE_COMPILER_OPTIONS.lib || compiler_options_1.BASE_COMPILER_OPTIONS.lib.length === 0) {
+    if (!BASE_COMPILER_OPTIONS.lib || BASE_COMPILER_OPTIONS.lib.length === 0) {
         return [];
     }
     const lib = host.getDefaultLibLocation?.();
     if (!lib) {
-        throw new Error(`Compiler host doesn't have a default library directory available for ${compiler_options_1.BASE_COMPILER_OPTIONS.lib.join(', ')}`);
+        throw new Error(`Compiler host doesn't have a default library directory available for ${BASE_COMPILER_OPTIONS.lib.join(', ')}`);
     }
-    return compiler_options_1.BASE_COMPILER_OPTIONS.lib.map((name) => path.join(lib, name));
+    return BASE_COMPILER_OPTIONS.lib.map((name) => path.join(lib, name));
 }
 function parseConfigHostFromCompilerHost(host) {
     // Copied from upstream