@rnx-kit/cli 0.9.54 → 0.9.55

package/coverage/lcov.info

@@ -1,113 +1,109 @@
 TN:
 SF:src/metro-config.ts
-FN:27,createSerializerHook
-FN:30,resetProject
-FN:38,getProject
-FN:47,(anonymous_3)
-FN:51,(anonymous_4)
-FN:78,(anonymous_5)
-FN:108,(anonymous_6)
-FN:121,customizeMetroConfig
-FNF:8
-FNH:1
-FNDA:0,createSerializerHook
-FNDA:0,resetProject
-FNDA:0,getProject
+FN:33,createSerializerHook
+FN:37,(anonymous_1)
+FN:39,(anonymous_2)
+FN:53,(anonymous_3)
+FN:58,(anonymous_4)
+FN:67,(anonymous_5)
+FN:72,(anonymous_6)
+FN:80,(anonymous_7)
+FN:96,(anonymous_8)
+FN:109,customizeMetroConfig
+FNF:10
+FNH:2
+FNDA:6,createSerializerHook
+FNDA:0,(anonymous_1)
+FNDA:0,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:0,(anonymous_4)
 FNDA:0,(anonymous_5)
 FNDA:0,(anonymous_6)
+FNDA:0,(anonymous_7)
+FNDA:0,(anonymous_8)
 FNDA:6,customizeMetroConfig
-DA:28,0
-DA:31,0
-DA:32,0
-DA:33,0
-DA:34,0
-DA:39,0
+DA:34,6
+DA:36,6
+DA:37,6
+DA:39,6
 DA:40,0
+DA:41,0
 DA:42,0
-DA:43,0
-DA:44,0
-DA:45,0
 DA:46,0
-DA:47,0
-DA:48,0
 DA:51,0
 DA:53,0
 DA:56,0
-DA:57,0
 DA:58,0
-DA:59,0
+DA:61,0
+DA:66,0
+DA:67,0
+DA:68,0
+DA:69,0
 DA:70,0
-DA:71,0
+DA:72,0
 DA:73,0
+DA:74,0
 DA:75,0
-DA:78,0
 DA:79,0
 DA:80,0
 DA:81,0
 DA:82,0
-DA:85,0
-DA:91,0
-DA:92,0
-DA:94,0
-DA:95,0
-DA:97,0
-DA:98,0
-DA:101,0
-DA:105,0
-DA:108,2
-DA:130,6
+DA:86,0
+DA:88,0
+DA:93,6
+DA:96,2
+DA:118,6
+DA:120,6
+DA:121,6
+DA:122,1
+DA:123,5
+DA:124,2
+DA:126,6
+DA:127,1
+DA:128,5
+DA:129,2
 DA:132,6
-DA:133,6
+DA:133,1
 DA:134,1
 DA:135,5
-DA:136,2
-DA:138,6
-DA:139,1
-DA:140,5
-DA:141,2
-DA:144,6
-DA:145,1
-DA:146,1
-DA:147,5
-DA:158,4
-DA:162,1
-DA:165,6
-LF:56
-LH:18
-BRDA:32,0,0,0
-BRDA:32,0,1,0
-BRDA:40,1,0,0
-BRDA:40,1,1,0
-BRDA:43,2,0,0
-BRDA:43,2,1,0
-BRDA:45,3,0,0
-BRDA:45,3,1,0
-BRDA:53,4,0,0
-BRDA:53,4,1,0
-BRDA:53,5,0,0
-BRDA:53,5,1,0
-BRDA:80,6,0,0
-BRDA:80,6,1,0
-BRDA:81,7,0,0
-BRDA:81,7,1,0
-BRDA:133,8,0,1
-BRDA:133,8,1,5
-BRDA:135,9,0,2
-BRDA:135,9,1,3
-BRDA:138,10,0,1
-BRDA:138,10,1,5
-BRDA:140,11,0,2
-BRDA:140,11,1,3
-BRDA:144,12,0,1
-BRDA:144,12,1,5
-BRDA:147,13,0,4
-BRDA:147,13,1,1
-BRDA:165,14,0,0
-BRDA:165,14,1,6
-BRF:30
-BRH:13
+DA:146,4
+DA:150,1
+DA:153,6
+DA:154,6
+DA:155,0
+DA:156,6
+DA:157,6
+DA:159,6
+LF:52
+LH:27
+BRDA:41,0,0,0
+BRDA:41,0,1,0
+BRDA:42,1,0,0
+BRDA:42,1,1,0
+BRDA:81,2,0,0
+BRDA:81,2,1,0
+BRDA:86,3,0,0
+BRDA:86,3,1,0
+BRDA:86,4,0,0
+BRDA:86,4,1,0
+BRDA:121,5,0,1
+BRDA:121,5,1,5
+BRDA:123,6,0,2
+BRDA:123,6,1,3
+BRDA:126,7,0,1
+BRDA:126,7,1,5
+BRDA:128,8,0,2
+BRDA:128,8,1,3
+BRDA:132,9,0,1
+BRDA:132,9,1,5
+BRDA:135,10,0,4
+BRDA:135,10,1,1
+BRDA:154,11,0,0
+BRDA:154,11,1,6
+BRDA:156,12,0,6
+BRDA:156,12,1,0
+BRF:26
+BRH:14
 end_of_record
 TN:
 SF:src/bundle/kit-config.ts
@@ -165,53 +161,47 @@ BRH:15
 end_of_record
 TN:
 SF:src/bundle/metro.ts
-FN:18,createMetroBundleArgs
-FN:66,metroBundle
+FN:16,createMetroBundleArgs
+FN:64,metroBundle
 FNF:2
 FNH:1
 FNDA:15,createMetroBundleArgs
 FNDA:0,metroBundle
+DA:30,15
+DA:31,15
 DA:32,15
-DA:33,15
-DA:34,15
-DA:37,15
-DA:38,14
-DA:42,15
-DA:43,15
-DA:46,15
-DA:71,0
-DA:74,0
-DA:75,0
-DA:79,0
-DA:80,0
+DA:35,15
+DA:36,14
+DA:40,15
+DA:41,15
+DA:44,15
+DA:68,0
+DA:70,0
+DA:73,0
+DA:81,0
+DA:84,0
+DA:85,0
 DA:87,0
-DA:94,0
-DA:102,0
-DA:105,0
-DA:106,0
-DA:108,0
-DA:111,0
-LF:20
+DA:90,0
+LF:16
 LH:8
-BRDA:32,0,0,12
-BRDA:32,0,1,3
-BRDA:32,1,0,15
-BRDA:32,1,1,4
-BRDA:37,2,0,14
-BRDA:37,2,1,1
-BRDA:38,3,0,14
-BRDA:38,3,1,1
-BRDA:42,4,0,15
-BRDA:42,4,1,0
-BRDA:74,5,0,0
-BRDA:74,5,1,0
-BRDA:79,6,0,0
-BRDA:79,6,1,0
-BRDA:106,7,0,0
-BRDA:106,7,1,0
-BRDA:108,8,0,0
-BRDA:108,8,1,0
-BRF:18
+BRDA:30,0,0,12
+BRDA:30,0,1,3
+BRDA:30,1,0,15
+BRDA:30,1,1,4
+BRDA:35,2,0,14
+BRDA:35,2,1,1
+BRDA:36,3,0,14
+BRDA:36,3,1,1
+BRDA:40,4,0,15
+BRDA:40,4,1,0
+BRDA:77,5,0,0
+BRDA:77,5,1,0
+BRDA:85,6,0,0
+BRDA:85,6,1,0
+BRDA:87,7,0,0
+BRDA:87,7,1,0
+BRF:16
 BRH:9
 end_of_record
 TN:
@@ -231,3 +221,85 @@ BRDA:49,0,1,1
 BRF:2
 BRH:2
 end_of_record
+TN:
+SF:src/typescript/project-cache.ts
+FN:51,createProjectCache
+FN:60,findProjectRoot
+FN:79,readTSConfig
+FN:87,(anonymous_3)
+FN:94,createProject
+FN:100,(anonymous_5)
+FN:128,getProject
+FN:139,clearPlatform
+FN:140,(anonymous_8)
+FNF:9
+FNH:1
+FNDA:6,createProjectCache
+FNDA:0,findProjectRoot
+FNDA:0,readTSConfig
+FNDA:0,(anonymous_3)
+FNDA:0,createProject
+FNDA:0,(anonymous_5)
+FNDA:0,getProject
+FNDA:0,clearPlatform
+FNDA:0,(anonymous_8)
+DA:54,6
+DA:55,6
+DA:58,6
+DA:62,0
+DA:63,0
+DA:64,0
+DA:69,0
+DA:70,0
+DA:71,0
+DA:76,0
+DA:80,0
+DA:82,0
+DA:83,0
+DA:84,0
+DA:85,0
+DA:86,0
+DA:87,0
+DA:88,0
+DA:91,0
+DA:96,0
+DA:100,0
+DA:101,0
+DA:102,0
+DA:103,0
+DA:104,0
+DA:105,0
+DA:115,0
+DA:123,0
+DA:125,0
+DA:129,0
+DA:130,0
+DA:131,0
+DA:133,0
+DA:134,0
+DA:136,0
+DA:140,0
+DA:141,0
+DA:142,0
+DA:143,0
+DA:144,0
+DA:149,6
+LF:41
+LH:4
+BRDA:63,0,0,0
+BRDA:63,0,1,0
+BRDA:70,1,0,0
+BRDA:70,1,1,0
+BRDA:83,2,0,0
+BRDA:83,2,1,0
+BRDA:85,3,0,0
+BRDA:85,3,1,0
+BRDA:130,4,0,0
+BRDA:130,4,1,0
+BRDA:133,5,0,0
+BRDA:133,5,1,0
+BRDA:142,6,0,0
+BRDA:142,6,1,0
+BRF:14
+BRH:0
+end_of_record

package/lib/bundle/metro.d.ts

@@ -1,5 +1,4 @@
 import { BundleArgs as MetroBundleArgs } from "@rnx-kit/metro-service";
-import { Service } from "@rnx-kit/typescript-service";
 import type { ConfigT } from "metro-config";
 import type { BundleConfig } from "./types";
 /**
@@ -16,5 +15,5 @@ export declare function createMetroBundleArgs({ entryPath: entryFile, distPath,
  * @param metroConfig Metro configuration
  * @param bundleConfig Bundle configuration
  */
-export declare function metroBundle(tsservice: Service, metroConfig: ConfigT, bundleConfig: BundleConfig): Promise<void>;
+export declare function metroBundle(metroConfig: ConfigT, bundleConfig: BundleConfig): Promise<void>;
 //# sourceMappingURL=metro.d.ts.map

package/lib/bundle/metro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metro.d.ts","sourceRoot":"","sources":["../../src/bundle/metro.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,UAAU,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAkB,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EAAE,SAAS,EACpB,QAAQ,EACR,UAAU,EAAE,UAAU,EACtB,YAAY,EACZ,cAAc,EACd,aAAa,EAAE,eAAe,EAC9B,uBAAuB,EAAE,oBAAoB,EAC7C,QAAQ,EACR,GAAG,EACH,MAAM,GACP,EAAE,YAAY,GAAG,eAAe,CA4BhC;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,OAAO,EAClB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CA0Cf"}
+{"version":3,"file":"metro.d.ts","sourceRoot":"","sources":["../../src/bundle/metro.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,UAAU,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EAAE,SAAS,EACpB,QAAQ,EACR,UAAU,EAAE,UAAU,EACtB,YAAY,EACZ,cAAc,EACd,aAAa,EAAE,eAAe,EAC9B,uBAAuB,EAAE,oBAAoB,EAC7C,QAAQ,EACR,GAAG,EACH,MAAM,GACP,EAAE,YAAY,GAAG,eAAe,CA4BhC;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,IAAI,CAAC,CAwBf"}

package/lib/bundle/metro.js

@@ -16,8 +16,6 @@ exports.metroBundle = exports.createMetroBundleArgs = void 0;
 const console_1 = require("@rnx-kit/console");
 const metro_service_1 = require("@rnx-kit/metro-service");
 const fs_1 = require("@rnx-kit/tools-node/fs");
-const typescript_service_1 = require("@rnx-kit/typescript-service");
-const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const metro_config_1 = require("../metro-config");
 /**
@@ -59,23 +57,13 @@ exports.createMetroBundleArgs = createMetroBundleArgs;
  * @param metroConfig Metro configuration
  * @param bundleConfig Bundle configuration
  */
-function metroBundle(tsservice, metroConfig, bundleConfig) {
+function metroBundle(metroConfig, bundleConfig) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, console_1.info)(`Bundling ${bundleConfig.platform}...`);
-        let tsprojectInfo;
-        if (bundleConfig.typescriptValidation) {
-            const configFileName = (0, typescript_service_1.findConfigFile)(bundleConfig.entryPath, "tsconfig.json");
-            if (!configFileName) {
-                (0, console_1.warn)(chalk_1.default.yellow("skipping TypeScript validation -- cannot find tsconfig.json for entry file %o"), bundleConfig.entryPath);
-            }
-            else {
-                tsprojectInfo = {
-                    service: tsservice,
-                    configFileName,
-                };
-            }
-        }
-        (0, metro_config_1.customizeMetroConfig)(metroConfig, bundleConfig.detectCyclicDependencies, bundleConfig.detectDuplicateDependencies, tsprojectInfo, bundleConfig.experimental_treeShake);
+        const typescriptValidationOptions = {
+            throwOnError: true,
+        };
+        (0, metro_config_1.customizeMetroConfig)(metroConfig, bundleConfig.detectCyclicDependencies, bundleConfig.detectDuplicateDependencies, bundleConfig.typescriptValidation ? typescriptValidationOptions : false, bundleConfig.experimental_treeShake);
         const metroBundleArgs = createMetroBundleArgs(bundleConfig);
         // ensure all output directories exist
         (0, fs_1.createDirectory)(path_1.default.dirname(metroBundleArgs.bundleOutput));

package/lib/bundle/metro.js.map

@@ -1 +1 @@
-{"version":3,"file":"metro.js","sourceRoot":"","sources":["../../src/bundle/metro.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA8C;AAC9C,0DAA+E;AAC/E,+CAAyD;AACzD,oEAAsE;AACtE,kDAA0B;AAE1B,gDAAwB;AACxB,kDAAuD;AAIvD;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,EACpC,SAAS,EAAE,SAAS,EACpB,QAAQ,EACR,UAAU,EAAE,UAAU,EACtB,YAAY,EACZ,cAAc,EACd,aAAa,EAAE,eAAe,EAC9B,uBAAuB,EAAE,oBAAoB,EAC7C,QAAQ,EACR,GAAG,EACH,MAAM,GACO;IACb,6CAA6C;IAC7C,MAAM,eAAe,GACnB,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrE,MAAM,UAAU,GAAG,GAAG,YAAY,IAAI,QAAQ,IAAI,eAAe,EAAE,CAAC;IACpE,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEnD,0CAA0C;IAC1C,IAAI,GAAG,EAAE;QACP,eAAe,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,UAAU,GAAG,MAAM,CAAC;KAC1D;IAED,gDAAgD;IAChD,IAAI,eAAe,EAAE;QACnB,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;KACxD;IAED,OAAO;QACL,UAAU;QACV,SAAS;QACT,MAAM;QACN,QAAQ;QACR,GAAG;QACH,YAAY,EAAE,UAAU;QACxB,cAAc;QACd,eAAe;QACf,oBAAoB;KACrB,CAAC;AACJ,CAAC;AAvCD,sDAuCC;AAED;;;;;;GAMG;AACH,SAAsB,WAAW,CAC/B,SAAkB,EAClB,WAAoB,EACpB,YAA0B;;QAE1B,IAAA,cAAI,EAAC,YAAY,YAAY,CAAC,QAAQ,KAAK,CAAC,CAAC;QAE7C,IAAI,aAAwC,CAAC;QAC7C,IAAI,YAAY,CAAC,oBAAoB,EAAE;YACrC,MAAM,cAAc,GAAG,IAAA,mCAAc,EACnC,YAAY,CAAC,SAAS,EACtB,eAAe,CAChB,CAAC;YACF,IAAI,CAAC,cAAc,EAAE;gBACnB,IAAA,cAAI,EACF,eAAK,CAAC,MAAM,CACV,+EAA+E,CAChF,EACD,YAAY,CAAC,SAAS,CACvB,CAAC;aACH;iBAAM;gBACL,aAAa,GAAG;oBACd,OAAO,EAAE,SAAS;oBAClB,cAAc;iBACf,CAAC;aACH;SACF;QAED,IAAA,mCAAoB,EAClB,WAAW,EACX,YAAY,CAAC,wBAAwB,EACrC,YAAY,CAAC,2BAA2B,EACxC,aAAa,EACb,YAAY,CAAC,sBAAsB,CACpC,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QAE5D,sCAAsC;QACtC,IAAA,oBAAe,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5D,eAAe,CAAC,eAAe;YAC7B,IAAA,oBAAe,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC;QACjE,eAAe,CAAC,UAAU,IAAI,IAAA,oBAAe,EAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE1E,oBAAoB;QACpB,MAAM,IAAA,sBAAM,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC;CAAA;AA9CD,kCA8CC"}
+{"version":3,"file":"metro.js","sourceRoot":"","sources":["../../src/bundle/metro.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAwC;AACxC,0DAA+E;AAC/E,+CAAyD;AAEzD,gDAAwB;AACxB,kDAAuD;AAIvD;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,EACpC,SAAS,EAAE,SAAS,EACpB,QAAQ,EACR,UAAU,EAAE,UAAU,EACtB,YAAY,EACZ,cAAc,EACd,aAAa,EAAE,eAAe,EAC9B,uBAAuB,EAAE,oBAAoB,EAC7C,QAAQ,EACR,GAAG,EACH,MAAM,GACO;IACb,6CAA6C;IAC7C,MAAM,eAAe,GACnB,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrE,MAAM,UAAU,GAAG,GAAG,YAAY,IAAI,QAAQ,IAAI,eAAe,EAAE,CAAC;IACpE,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEnD,0CAA0C;IAC1C,IAAI,GAAG,EAAE;QACP,eAAe,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,UAAU,GAAG,MAAM,CAAC;KAC1D;IAED,gDAAgD;IAChD,IAAI,eAAe,EAAE;QACnB,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;KACxD;IAED,OAAO;QACL,UAAU;QACV,SAAS;QACT,MAAM;QACN,QAAQ;QACR,GAAG;QACH,YAAY,EAAE,UAAU;QACxB,cAAc;QACd,eAAe;QACf,oBAAoB;KACrB,CAAC;AACJ,CAAC;AAvCD,sDAuCC;AAED;;;;;;GAMG;AACH,SAAsB,WAAW,CAC/B,WAAoB,EACpB,YAA0B;;QAE1B,IAAA,cAAI,EAAC,YAAY,YAAY,CAAC,QAAQ,KAAK,CAAC,CAAC;QAE7C,MAAM,2BAA2B,GAAgC;YAC/D,YAAY,EAAE,IAAI;SACnB,CAAC;QACF,IAAA,mCAAoB,EAClB,WAAW,EACX,YAAY,CAAC,wBAAwB,EACrC,YAAY,CAAC,2BAA2B,EACxC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,KAAK,EACvE,YAAY,CAAC,sBAAsB,CACpC,CAAC;QAEF,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QAE5D,sCAAsC;QACtC,IAAA,oBAAe,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5D,eAAe,CAAC,eAAe;YAC7B,IAAA,oBAAe,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC;QACjE,eAAe,CAAC,UAAU,IAAI,IAAA,oBAAe,EAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE1E,oBAAoB;QACpB,MAAM,IAAA,sBAAM,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC;CAAA;AA3BD,kCA2BC"}

package/lib/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAmB,MAAM,wBAAwB,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAOzE,oBAAY,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC9C,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,SAAS,CAC7B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EACpB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAmB,MAAM,wBAAwB,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAMzE,oBAAY,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC9C,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,SAAS,CAC7B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EACpB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/lib/bundle.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rnxBundle = void 0;
 const metro_service_1 = require("@rnx-kit/metro-service");
 const properties_1 = require("@rnx-kit/tools-language/properties");
-const typescript_service_1 = require("@rnx-kit/typescript-service");
 const kit_config_1 = require("./bundle/kit-config");
 const metro_1 = require("./bundle/metro");
 const overrides_1 = require("./bundle/overrides");
@@ -28,9 +27,8 @@ function rnxBundle(_argv, cliConfig, cliOptions) {
             dev: cliOptions.dev,
             minify: cliOptions.minify,
         });
-        const tsservice = new typescript_service_1.Service();
         for (const bundleConfig of bundleConfigs) {
-            yield (0, metro_1.metroBundle)(tsservice, metroConfig, bundleConfig);
+            yield (0, metro_1.metroBundle)(metroConfig, bundleConfig);
         }
         return Promise.resolve();
     });

package/lib/bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAAqE;AACrE,mEAAuE;AAEvE,oEAAsD;AACtD,oDAA0D;AAC1D,0CAA6C;AAC7C,kDAAmE;AAqBnE,SAAsB,SAAS,CAC7B,KAAoB,EACpB,SAAoB,EACpB,UAA4B;;QAE5B,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAe,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEjE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAC1C,UAAU,CAAC,EAAE,EACb,UAAU,CAAC,QAAQ,CACpB,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,IAAA,yCAA6B,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAE5D,MAAM,aAAa,GAAG,IAAA,8BAAiB,EACrC,gBAAgB,EAChB;YACE,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CACF,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,4BAAO,EAAE,CAAC;QAEhC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,MAAM,IAAA,mBAAW,EAAC,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;SACzD;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CAAA;AAhCD,8BAgCC"}
+{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAAqE;AACrE,mEAAuE;AAEvE,oDAA0D;AAC1D,0CAA6C;AAC7C,kDAAmE;AAqBnE,SAAsB,SAAS,CAC7B,KAAoB,EACpB,SAAoB,EACpB,UAA4B;;QAE5B,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAe,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEjE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAC1C,UAAU,CAAC,EAAE,EACb,UAAU,CAAC,QAAQ,CACpB,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,IAAA,yCAA6B,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAE5D,MAAM,aAAa,GAAG,IAAA,8BAAiB,EACrC,gBAAgB,EAChB;YACE,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CACF,CAAC;QAEF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,MAAM,IAAA,mBAAW,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;SAC9C;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CAAA;AA9BD,8BA8BC"}

package/lib/metro-config.d.ts

@@ -1,15 +1,15 @@
 import { PluginOptions as CyclicDetectorOptions } from "@rnx-kit/metro-plugin-cyclic-dependencies-detector";
 import { Options as DuplicateDetectorOptions } from "@rnx-kit/metro-plugin-duplicates-checker";
+import type { TypeScriptValidationOptions } from "./types";
 import type { InputConfigT } from "metro-config";
-import type { TSProjectInfo } from "./types";
 /**
  * Customize the Metro configuration.
  *
  * @param metroConfigReadonly Metro configuration
  * @param detectCyclicDependencies When true, cyclic dependency checking is enabled with a default set of options. Otherwise the object allows for fine-grained control over the detection process.
  * @param detectDuplicateDependencies When true, duplicate dependency checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the detection process.
- * @param tsprojectInfo When set, TypeScript validation is enabled during bundling and serving.
+ * @param typescriptValidation When true, TypeScript type-checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the type-checking process.
  * @param experimental_treeShake When true, experimental tree-shaking is enabled.
  */
-export declare function customizeMetroConfig(metroConfigReadonly: InputConfigT, detectCyclicDependencies: boolean | CyclicDetectorOptions, detectDuplicateDependencies: boolean | DuplicateDetectorOptions, tsprojectInfo: TSProjectInfo | undefined, experimental_treeShake: boolean): void;
+export declare function customizeMetroConfig(metroConfigReadonly: InputConfigT, detectCyclicDependencies: boolean | CyclicDetectorOptions, detectDuplicateDependencies: boolean | DuplicateDetectorOptions, typescriptValidation: boolean | TypeScriptValidationOptions, experimental_treeShake: boolean): void;
 //# sourceMappingURL=metro-config.d.ts.map

package/lib/metro-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.d.ts","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,IAAI,qBAAqB,EACvC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAEL,OAAO,IAAI,wBAAwB,EACpC,MAAM,0CAA0C,CAAC;AAclD,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AAGpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAuF7C;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,wBAAwB,EAAE,OAAO,GAAG,qBAAqB,EACzD,2BAA2B,EAAE,OAAO,GAAG,wBAAwB,EAC/D,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,sBAAsB,EAAE,OAAO,GAC9B,IAAI,CAyCN"}
+{"version":3,"file":"metro-config.d.ts","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,IAAI,qBAAqB,EACvC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAEL,OAAO,IAAI,wBAAwB,EACpC,MAAM,0CAA0C,CAAC;AAUlD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAG3D,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AA+EpE;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,wBAAwB,EAAE,OAAO,GAAG,qBAAqB,EACzD,2BAA2B,EAAE,OAAO,GAAG,wBAAwB,EAC/D,oBAAoB,EAAE,OAAO,GAAG,2BAA2B,EAC3D,sBAAsB,EAAE,OAAO,GAC9B,IAAI,CA6CN"}

package/lib/metro-config.js

@@ -5,74 +5,58 @@ const metro_plugin_cyclic_dependencies_detector_1 = require("@rnx-kit/metro-plug
 const metro_plugin_duplicates_checker_1 = require("@rnx-kit/metro-plugin-duplicates-checker");
 const metro_serializer_1 = require("@rnx-kit/metro-serializer");
 const metro_serializer_esbuild_1 = require("@rnx-kit/metro-serializer-esbuild");
-const typescript_react_native_resolver_1 = require("@rnx-kit/typescript-react-native-resolver");
-const typescript_service_1 = require("@rnx-kit/typescript-service");
-function createSerializerHook({ service, configFileName }) {
-    const tsprojectByPlatform = new Map();
-    function resetProject(platform) {
-        const tsproject = tsprojectByPlatform.get(platform);
-        if (tsproject) {
-            tsproject.dispose();
-            tsprojectByPlatform.delete(platform);
-        }
-    }
-    function getProject(platform) {
-        let tsproject = tsprojectByPlatform.get(platform);
-        if (!tsproject) {
-            // start with an empty project, ignoring the file graph provided by tsconfig.json
-            const cmdLine = (0, typescript_service_1.readConfigFile)(configFileName);
-            if (!cmdLine) {
-                throw new Error(`Failed to load '${configFileName}'`);
-            }
-            else if (cmdLine.errors.length > 0) {
-                const writer = (0, typescript_service_1.createDiagnosticWriter)();
-                cmdLine.errors.forEach((e) => writer.print(e));
-                throw new Error(`Failed to load '${configFileName}'`);
-            }
-            const enhanceLanguageServiceHost = (host) => {
-                const platformExtensionNames = platform === "windows" || platform === "win32"
-                    ? ["win", "native"]
-                    : ["native"];
-                const disableReactNativePackageSubstitution = true;
-                const traceReactNativeModuleResolutionErrors = false;
-                const traceResolutionLog = undefined;
-                (0, typescript_react_native_resolver_1.changeHostToUseReactNativeResolver)({
-                    host,
-                    options: cmdLine.options,
-                    platform,
-                    platformExtensionNames,
-                    disableReactNativePackageSubstitution,
-                    traceReactNativeModuleResolutionErrors,
-                    traceResolutionLog,
-                });
-            };
-            tsproject = service.openProject(cmdLine, enhanceLanguageServiceHost);
-            tsproject.removeAllFiles();
-            tsprojectByPlatform.set(platform, tsproject);
-        }
-        return tsproject;
-    }
+const project_cache_1 = require("./typescript/project-cache");
+/**
+ * Create a hook function to be registered with Metro during serialization.
+ * Each serialization pass runs the hook which type-checks each added/updated
+ * source file.
+ *
+ * Source file in node_modules (external packages) are ignored.
+ *
+ * @param options TypeScript validation options
+ * @returns Hook function
+ */
+function createSerializerHook(options) {
+    const projectCache = (0, project_cache_1.createProjectCache)(options.print);
+    const patternNodeModules = /[/\\]node_modules[/\\]/;
+    const excludeNodeModules = (p) => !patternNodeModules.test(p);
     const hook = (graph, delta) => {
         const platform = graph.transformOptions.platform;
         if (platform) {
             if (delta.reset) {
-                resetProject(platform);
-            }
-            const tsproject = getProject(platform);
-            //  Apply delta change changes to the TypeScript project. New files are
-            //  added to the project file list. Updated files have their cached
-            //  snapshot cleared, causing the file to be reloaded. Deleted files
-            //  are removed from the project file list.
-            for (const module of delta.added.values()) {
-                tsproject.setFile(module.path);
+                //  Metro is signaling that all cached data for this Graph should be
+                //  thrown out. Each Graph is scoped to one platform, so discard all
+                //  of that platform's projects.
+                projectCache.clearPlatform(platform);
             }
-            for (const module of delta.modified.values()) {
-                tsproject.setFile(module.path);
+            //  Filter adds, updates, and deletes coming from Metro. Do not look at
+            //  anything in an external package (e.g. under node_modules).
+            const adds = Array.from(delta.added.values(), (module) => module.path).filter(excludeNodeModules);
+            const updates = Array.from(delta.modified.values(), (module) => module.path).filter(excludeNodeModules);
+            const deletes = Array.from(delta.deleted.values()).filter(excludeNodeModules);
+            //  Map each file to a TypeScript project, and apply its delta operation.
+            const tsprojectsToValidate = new Set();
+            adds.concat(updates).forEach((sourceFile) => {
+                const tsproject = projectCache.getProject(sourceFile, platform);
+                tsproject.setFile(sourceFile);
+                tsprojectsToValidate.add(tsproject);
+            });
+            deletes.forEach((sourceFile) => {
+                const tsproject = projectCache.getProject(sourceFile, platform);
+                tsproject.removeFile(sourceFile);
+                tsprojectsToValidate.add(tsproject);
+            });
+            //  Validate all projects which changed, printing all type errors.
+            let isValid = true;
+            tsprojectsToValidate.forEach((p) => {
+                if (!p.validate()) {
+                    isValid = false;
+                }
+            });
+            if (!isValid && options.throwOnError) {
+                // Type-checking failed. Fail the Metro operation (bundling or serving).
+                throw new Error("Type validation failed");
             }
-            for (const module of delta.deleted.values()) {
-                tsproject.removeFile(module);
-            }
-            tsproject.validate();
         }
     };
     return hook;
@@ -86,10 +70,10 @@ const emptySerializerHook = (_graph, _delta) => {
  * @param metroConfigReadonly Metro configuration
  * @param detectCyclicDependencies When true, cyclic dependency checking is enabled with a default set of options. Otherwise the object allows for fine-grained control over the detection process.
  * @param detectDuplicateDependencies When true, duplicate dependency checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the detection process.
- * @param tsprojectInfo When set, TypeScript validation is enabled during bundling and serving.
+ * @param typescriptValidation When true, TypeScript type-checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the type-checking process.
  * @param experimental_treeShake When true, experimental tree-shaking is enabled.
  */
-function customizeMetroConfig(metroConfigReadonly, detectCyclicDependencies, detectDuplicateDependencies, tsprojectInfo, experimental_treeShake) {
+function customizeMetroConfig(metroConfigReadonly, detectCyclicDependencies, detectDuplicateDependencies, typescriptValidation, experimental_treeShake) {
     //  We will be making changes to the Metro configuration. Coerce from a
     //  type with readonly props to a type where the props are writeable.
     const metroConfig = metroConfigReadonly;
@@ -126,9 +110,14 @@ function customizeMetroConfig(metroConfigReadonly, detectCyclicDependencies, det
     else {
         delete metroConfig.serializer.customSerializer;
     }
-    metroConfig.serializer.experimentalSerializerHook = tsprojectInfo
-        ? createSerializerHook(tsprojectInfo)
-        : emptySerializerHook;
+    let hook = emptySerializerHook;
+    if (typeof typescriptValidation === "object") {
+        hook = createSerializerHook(typescriptValidation);
+    }
+    else if (typescriptValidation !== false) {
+        hook = createSerializerHook({});
+    }
+    metroConfig.serializer.experimentalSerializerHook = hook;
 }
 exports.customizeMetroConfig = customizeMetroConfig;
 //# sourceMappingURL=metro-config.js.map