@rnx-kit/cli 0.15.1 → 0.15.3

package/coverage/lcov.info

@@ -290,121 +290,44 @@ BRH:45
 end_of_record
 TN:
 SF:src/metro-config.ts
-FN:30,createSerializerHook
-FN:37,(anonymous_1)
-FN:39,(anonymous_2)
-FN:53,(anonymous_3)
-FN:58,(anonymous_4)
-FN:68,(anonymous_5)
-FN:79,(anonymous_6)
-FN:91,(anonymous_7)
-FN:107,(anonymous_8)
-FN:118,customizeMetroConfig
-FNF:10
-FNH:2
-FNDA:9,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)
+FN:20,customizeMetroConfig
+FNF:1
+FNH:1
 FNDA:10,customizeMetroConfig
-DA:34,9
-DA:36,9
+DA:32,10
+DA:34,10
+DA:35,10
+DA:36,1
 DA:37,9
-DA:39,9
-DA:40,0
-DA:41,0
-DA:42,0
-DA:46,0
-DA:51,0
-DA:53,0
-DA:56,0
-DA:58,0
-DA:61,0
-DA:67,0
-DA:68,0
-DA:69,0
-DA:70,0
-DA:72,0
-DA:73,0
-DA:74,0
-DA:75,0
-DA:79,0
-DA:80,0
-DA:81,0
-DA:83,0
-DA:84,0
-DA:85,0
-DA:90,0
-DA:91,0
-DA:92,0
-DA:93,0
-DA:97,0
-DA:99,0
-DA:104,9
-DA:107,2
-DA:130,10
-DA:132,10
-DA:133,10
-DA:134,1
-DA:135,9
-DA:136,5
-DA:138,10
-DA:139,1
-DA:140,9
-DA:141,5
-DA:144,10
-DA:145,4
-DA:146,4
-DA:147,6
-DA:158,4
-DA:162,2
-DA:165,10
-DA:166,10
-DA:167,0
-DA:168,10
-DA:169,9
-DA:171,10
-LF:57
-LH:27
-BRDA:41,0,0,0
-BRDA:41,0,1,0
-BRDA:42,1,0,0
-BRDA:42,1,1,0
-BRDA:70,2,0,0
-BRDA:70,2,1,0
-BRDA:73,3,0,0
-BRDA:73,3,1,0
-BRDA:81,4,0,0
-BRDA:81,4,1,0
-BRDA:92,5,0,0
-BRDA:92,5,1,0
-BRDA:97,6,0,0
-BRDA:97,6,1,0
-BRDA:97,7,0,0
-BRDA:97,7,1,0
-BRDA:133,8,0,1
-BRDA:133,8,1,9
-BRDA:135,9,0,5
-BRDA:135,9,1,4
-BRDA:138,10,0,1
-BRDA:138,10,1,9
-BRDA:140,11,0,5
-BRDA:140,11,1,4
-BRDA:144,12,0,4
-BRDA:144,12,1,6
-BRDA:147,13,0,4
-BRDA:147,13,1,2
-BRDA:166,14,0,0
-BRDA:166,14,1,10
-BRDA:168,15,0,9
-BRDA:168,15,1,1
-BRF:32
-BRH:15
+DA:38,5
+DA:40,10
+DA:41,1
+DA:42,9
+DA:43,5
+DA:46,10
+DA:47,4
+DA:48,4
+DA:49,6
+DA:60,4
+DA:64,2
+DA:67,10
+DA:68,10
+LF:18
+LH:18
+BRDA:35,0,0,1
+BRDA:35,0,1,9
+BRDA:37,1,0,5
+BRDA:37,1,1,4
+BRDA:40,2,0,1
+BRDA:40,2,1,9
+BRDA:42,3,0,5
+BRDA:42,3,1,4
+BRDA:46,4,0,4
+BRDA:46,4,1,6
+BRDA:49,5,0,4
+BRDA:49,5,1,2
+BRF:12
+BRH:12
 end_of_record
 TN:
 SF:src/bundle/defaultPlugins.ts
@@ -504,97 +427,3 @@ BRDA:45,0,1,1
 BRF:2
 BRH:2
 end_of_record
-TN:
-SF:src/typescript/project-cache.ts
-FN:60,createProjectCache
-FN:72,findProjectRoot
-FN:91,readTSConfig
-FN:110,(anonymous_3)
-FN:117,createProjectInfo
-FN:138,(anonymous_5)
-FN:142,(anonymous_6)
-FN:166,getProjectInfo
-FN:189,clearPlatform
-FN:190,(anonymous_9)
-FNF:10
-FNH:1
-FNDA:9,createProjectCache
-FNDA:0,findProjectRoot
-FNDA:0,readTSConfig
-FNDA:0,(anonymous_3)
-FNDA:0,createProjectInfo
-FNDA:0,(anonymous_5)
-FNDA:0,(anonymous_6)
-FNDA:0,getProjectInfo
-FNDA:0,clearPlatform
-FNDA:0,(anonymous_9)
-DA:63,9
-DA:64,9
-DA:70,9
-DA:74,0
-DA:75,0
-DA:76,0
-DA:81,0
-DA:82,0
-DA:83,0
-DA:88,0
-DA:92,0
-DA:93,0
-DA:102,0
-DA:105,0
-DA:106,0
-DA:107,0
-DA:108,0
-DA:109,0
-DA:110,0
-DA:111,0
-DA:114,0
-DA:122,0
-DA:123,0
-DA:125,0
-DA:137,0
-DA:138,0
-DA:142,0
-DA:143,0
-DA:144,0
-DA:145,0
-DA:153,0
-DA:160,0
-DA:170,0
-DA:171,0
-DA:173,0
-DA:177,0
-DA:178,0
-DA:184,0
-DA:185,0
-DA:186,0
-DA:190,0
-DA:191,0
-DA:192,0
-DA:193,0
-DA:194,0
-DA:196,0
-DA:201,9
-LF:47
-LH:4
-BRDA:75,0,0,0
-BRDA:75,0,1,0
-BRDA:82,1,0,0
-BRDA:82,1,1,0
-BRDA:93,2,0,0
-BRDA:93,2,1,0
-BRDA:106,3,0,0
-BRDA:106,3,1,0
-BRDA:108,4,0,0
-BRDA:108,4,1,0
-BRDA:123,5,0,0
-BRDA:123,5,1,0
-BRDA:177,6,0,0
-BRDA:177,6,1,0
-BRDA:192,7,0,0
-BRDA:192,7,1,0
-BRDA:193,8,0,0
-BRDA:193,8,1,0
-BRF:18
-BRH:0
-end_of_record

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,KAAK,EACV,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAYzB,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AA+FpE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,EACE,wBAAwB,EACxB,2BAA2B,EAC3B,SAAS,EACT,oBAAoB,GACrB,EAAE,cAAc,EACjB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,IAAI,CA6CN"}
+{"version":3,"file":"metro-config.d.ts","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAUtD,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AAEpE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,EACE,wBAAwB,EACxB,2BAA2B,EAC3B,SAAS,EACT,oBAAoB,GACrB,EAAE,cAAc,EACjB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,IAAI,CAwCN"}

package/lib/metro-config.js

@@ -3,79 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.customizeMetroConfig = void 0;
 const metro_plugin_cyclic_dependencies_detector_1 = require("@rnx-kit/metro-plugin-cyclic-dependencies-detector");
 const metro_plugin_duplicates_checker_1 = require("@rnx-kit/metro-plugin-duplicates-checker");
+const metro_plugin_typescript_1 = require("@rnx-kit/metro-plugin-typescript");
 const metro_serializer_1 = require("@rnx-kit/metro-serializer");
 const metro_serializer_esbuild_1 = require("@rnx-kit/metro-serializer-esbuild");
-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
- * @param print Optional function to use when printing status messages to the Metro console
- * @returns Hook function
- */
-function createSerializerHook(options, print) {
-    const projectCache = (0, project_cache_1.createProjectCache)(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) {
-                //  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 = 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, _delta) => {
-    // nop
-};
 /**
  * Customize the Metro configuration.
  *
@@ -120,13 +50,7 @@ function customizeMetroConfig(metroConfigReadonly, { detectCyclicDependencies, d
     else {
         delete metroConfig.serializer.customSerializer;
     }
-    let hook = emptySerializerHook;
-    if (typeof typescriptValidation === "object") {
-        hook = createSerializerHook(typescriptValidation, print);
-    }
-    else if (typescriptValidation !== false) {
-        hook = createSerializerHook({}, print);
-    }
+    const hook = (0, metro_plugin_typescript_1.TypeScriptPlugin)(typescriptValidation, print);
     metroConfig.serializer.experimentalSerializerHook = hook;
 }
 exports.customizeMetroConfig = customizeMetroConfig;

package/lib/metro-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":";;;AACA,kHAAwF;AACxF,8FAAiF;AACjF,8EAAoE;AAEpE,gEAA4D;AAC5D,gFAG2C;AAG3C;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,mBAAiC,EACjC,EACE,wBAAwB,EACxB,2BAA2B,EAC3B,SAAS,EACT,oBAAoB,GACL,EACjB,KAAiC;IAEjC,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,WAAW,GAAG,mBAAmC,CAAC;IAExD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE;QACnD,OAAO,CAAC,IAAI,CAAC,IAAA,uDAAqB,EAAC,2BAA2B,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,2BAA2B,KAAK,KAAK,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,IAAA,uDAAqB,GAAE,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,wBAAwB,KAAK,QAAQ,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,IAAA,8DAAkB,EAAC,wBAAwB,CAAC,CAAC,CAAC;KAC5D;SAAM,IAAI,wBAAwB,KAAK,KAAK,EAAE;QAC7C,OAAO,CAAC,IAAI,CAAC,IAAA,8DAAkB,GAAE,CAAC,CAAC;KACpC;IAED,IAAI,SAAS,EAAE;QACb,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,mDAAwB,CAAC,CAAC;KAClE;SAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,qEAAqE;QACrE,oEAAoE;QACpE,gDAAgD;QAChD,EAAE;QACF,kEAAkE;QAClE,sEAAsE;QACtE,mCAAmC;QACnC,EAAE;QACF,kEAAkE;QAClE,wCAAwC;QACxC,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAA,kCAAe,EACvD,OAAO,CACiC,CAAC;KAC5C;SAAM;QACL,OAAO,WAAW,CAAC,UAAU,CAAC,gBAAgB,CAAC;KAChD;IAED,MAAM,IAAI,GAAG,IAAA,0CAAgB,EAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC3D,WAAW,CAAC,UAAU,CAAC,0BAA0B,GAAG,IAAI,CAAC;AAC3D,CAAC;AAjDD,oDAiDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Command-line interface for working with kit packages in your repo",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli",
   "license": "MIT",
@@ -24,15 +24,14 @@
     "@rnx-kit/console": "^1.0.11",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.0.21",
     "@rnx-kit/metro-plugin-duplicates-checker": "^2.0.0",
+    "@rnx-kit/metro-plugin-typescript": "^0.2.0",
     "@rnx-kit/metro-serializer": "^1.0.11",
     "@rnx-kit/metro-serializer-esbuild": "^0.1.0",
     "@rnx-kit/metro-service": "^3.0.2",
     "@rnx-kit/third-party-notices": "^1.2.13",
     "@rnx-kit/tools-language": "^1.4.1",
-    "@rnx-kit/tools-node": "^1.2.7",
-    "@rnx-kit/tools-react-native": "^1.2.0",
-    "@rnx-kit/typescript-react-native-resolver": "^0.3.0",
-    "@rnx-kit/typescript-service": "^1.5.3",
+    "@rnx-kit/tools-node": "^1.3.1",
+    "@rnx-kit/tools-react-native": "^1.2.3",
     "chalk": "^4.1.0",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -62,8 +61,7 @@
     "jest": "^27.0.0",
     "jest-extended": "^2.0.0",
     "memfs": "^3.4.1",
-    "metro-config": "^0.67.0",
-    "typescript": "^4.0.0"
+    "metro-config": "^0.67.0"
   },
   "depcheck": {
     "ignoreMatches": [

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/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">8.16% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>4/49</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.51% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>4/47</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="8.16" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 8%"></div><div class="cover-empty" style="width: 92%"></div></div>
-	</td>
-	<td data-value="8.16" class="pct low">8.16%</td>
-	<td data-value="49" class="abs low">4/49</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.51" class="pct low">8.51%</td>
-	<td data-value="47" class="abs low">4/47</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 Mon Dec 05 2022 16:15:26 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>
-