@rnx-kit/cli 0.15.0 → 0.15.2

package/src/metro-config.ts

@@ -1,112 +1,14 @@
-import type {
-  BundlerPlugins,
-  TypeScriptValidationOptions,
-} from "@rnx-kit/config";
+import type { BundlerPlugins } from "@rnx-kit/config";
 import { CyclicDependencies } from "@rnx-kit/metro-plugin-cyclic-dependencies-detector";
 import { DuplicateDependencies } from "@rnx-kit/metro-plugin-duplicates-checker";
+import { TypeScriptPlugin } from "@rnx-kit/metro-plugin-typescript";
 import type { MetroPlugin } from "@rnx-kit/metro-serializer";
 import { MetroSerializer } from "@rnx-kit/metro-serializer";
 import {
   esbuildTransformerConfig,
   MetroSerializer as MetroSerializerEsbuild,
 } from "@rnx-kit/metro-serializer-esbuild";
-import type { AllPlatforms } from "@rnx-kit/tools-react-native/platform";
-import type { Project } from "@rnx-kit/typescript-service";
-import type { DeltaResult, Graph } from "metro";
 import type { InputConfigT, SerializerConfigT } from "metro-config";
-import { createProjectCache } from "./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
- * @param print Optional function to use when printing status messages to the Metro console
- * @returns Hook function
- */
-function createSerializerHook(
-  options: TypeScriptValidationOptions,
-  print?: (message: string) => void
-) {
-  const projectCache = createProjectCache(print);
-
-  const patternNodeModules = /[/\\]node_modules[/\\]/;
-  const excludeNodeModules = (p: string) => !patternNodeModules.test(p);
-
-  const hook = (graph: Graph, delta: DeltaResult): void => {
-    const platform = graph.transformOptions.platform as AllPlatforms;
-    if (platform) {
-      if (delta.reset) {
-        //  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);
-      }
-
-      //  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
-      );
-
-      //  Try to map each file to a TypeScript project, and apply its delta operation.
-      //  Some projects may not actually be TypeScript projects (ignore those).
-      const tsprojectsToValidate: Set<Project> = new Set();
-      adds.concat(updates).forEach((sourceFile) => {
-        const projectInfo = projectCache.getProjectInfo(sourceFile, platform);
-        if (projectInfo) {
-          // This is a TypeScript project. Validate it.
-          const { tsproject, tssourceFiles } = projectInfo;
-          if (tssourceFiles.has(sourceFile)) {
-            tsproject.setFile(sourceFile);
-            tsprojectsToValidate.add(tsproject);
-          }
-        }
-      });
-      deletes.forEach((sourceFile) => {
-        const projectInfo = projectCache.getProjectInfo(sourceFile, platform);
-        if (projectInfo) {
-          // This is a TypeScript project. Validate it.
-          const { tsproject } = projectInfo;
-          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");
-      }
-    }
-  };
-
-  return hook;
-}
-
-const emptySerializerHook = (_graph: Graph, _delta: DeltaResult): void => {
-  // nop
-};
 
 /**
  * Customize the Metro configuration.
@@ -162,11 +64,6 @@ export function customizeMetroConfig(
     delete metroConfig.serializer.customSerializer;
   }
 
-  let hook = emptySerializerHook;
-  if (typeof typescriptValidation === "object") {
-    hook = createSerializerHook(typescriptValidation, print);
-  } else if (typescriptValidation !== false) {
-    hook = createSerializerHook({}, print);
-  }
+  const hook = TypeScriptPlugin(typescriptValidation, print);
   metroConfig.serializer.experimentalSerializerHook = hook;
 }

package/test/metro-config.test.ts

@@ -154,9 +154,7 @@ describe("cli/metro-config/customizeMetroConfig", () => {
         experimentalSerializerHook: expect.anything(),
       },
       transformer: expect.objectContaining({
-        minifierPath: expect.stringContaining(
-          "@rnx-kit/metro-serializer-esbuild"
-        ),
+        minifierPath: expect.stringContaining("metro-serializer-esbuild"),
       }),
     });
     expect(typeof inputConfig.serializer.customSerializer).toBe("function");

package/coverage/lcov-report/src/typescript/index.html

@@ -1,116 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for src/typescript</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> src/typescript</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">7.84% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>4/51</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>0/18</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">10% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>1/10</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">8.16% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>4/49</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
-        </p>
-        <template id="filterTemplate">
-            <div class="quiet">
-                Filter:
-                <input oninput="onInput()" type="search" id="fileSearch">
-            </div>
-        </template>
-    </div>
-    <div class='status-line low'></div>
-    <div class="pad1">
-<table class="coverage-summary">
-<thead>
-<tr>
-   <th data-col="file" data-fmt="html" data-html="true" class="file">File</th>
-   <th data-col="pic" data-type="number" data-fmt="html" data-html="true" class="pic"></th>
-   <th data-col="statements" data-type="number" data-fmt="pct" class="pct">Statements</th>
-   <th data-col="statements_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="branches" data-type="number" data-fmt="pct" class="pct">Branches</th>
-   <th data-col="branches_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="functions" data-type="number" data-fmt="pct" class="pct">Functions</th>
-   <th data-col="functions_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="lines" data-type="number" data-fmt="pct" class="pct">Lines</th>
-   <th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
-</tr>
-</thead>
-<tbody><tr>
-	<td class="file low" data-value="project-cache.ts"><a href="project-cache.ts.html">project-cache.ts</a></td>
-	<td data-value="7.84" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 7%"></div><div class="cover-empty" style="width: 93%"></div></div>
-	</td>
-	<td data-value="7.84" class="pct low">7.84%</td>
-	<td data-value="51" class="abs low">4/51</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="18" class="abs low">0/18</td>
-	<td data-value="10" class="pct low">10%</td>
-	<td data-value="10" class="abs low">1/10</td>
-	<td data-value="8.16" class="pct low">8.16%</td>
-	<td data-value="49" class="abs low">4/49</td>
-	</tr>
-
-</tbody>
-</table>
-</div>
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Nov 11 2022 09:03:36 GMT+0000 (Coordinated Universal Time)
-            </div>
-        <script src="../../prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
-    </body>
-</html>
-