@atlaspack/query 2.14.5-canary.14 → 2.14.5-canary.141

package/CHANGELOG.md

@@ -1,5 +1,155 @@
 # @atlaspack/query
 
+## 2.14.22
+
+### Patch Changes
+
+- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
+  - @atlaspack/core@2.20.0
+  - @atlaspack/cache@3.2.16
+  - @atlaspack/graph@3.5.10
+
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies [[`a0b959f`](https://github.com/atlassian-labs/atlaspack/commit/a0b959fbf61fc3f820ff03c7e8988945fe40a91a)]:
+  - @atlaspack/core@2.19.2
+  - @atlaspack/cache@3.2.15
+  - @atlaspack/graph@3.5.9
+
+## 2.14.20
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.14
+  - @atlaspack/core@2.19.1
+  - @atlaspack/graph@3.5.8
+
+## 2.14.19
+
+### Patch Changes
+
+- Updated dependencies [[`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d), [`c4415a4`](https://github.com/atlassian-labs/atlaspack/commit/c4415a455543d984ca28452c2cb87a794d22497c), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5), [`c9631af`](https://github.com/atlassian-labs/atlaspack/commit/c9631aff284b2c1c27e8a52f9da392ce65d666e8), [`18a57cf`](https://github.com/atlassian-labs/atlaspack/commit/18a57cf8a4789b2de5ad8e2676f317a26cc91417), [`3ba1aee`](https://github.com/atlassian-labs/atlaspack/commit/3ba1aee6a794a26b2f0255aaf6d003981532d0ae)]:
+  - @atlaspack/core@2.19.0
+  - @atlaspack/cache@3.2.13
+  - @atlaspack/graph@3.5.7
+
+## 2.14.18
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.12
+  - @atlaspack/core@2.18.8
+
+## 2.14.17
+
+### Patch Changes
+
+- Updated dependencies [[`1ff31f1`](https://github.com/atlassian-labs/atlaspack/commit/1ff31f10391c48780c9fcfc243b4e828a1b285e0), [`e8a60ff`](https://github.com/atlassian-labs/atlaspack/commit/e8a60ffbea41caef265786bbf73349771760081c)]:
+  - @atlaspack/core@2.18.7
+  - @atlaspack/cache@3.2.11
+  - @atlaspack/graph@3.5.6
+
+## 2.14.16
+
+### Patch Changes
+
+- Updated dependencies [[`5ded263`](https://github.com/atlassian-labs/atlaspack/commit/5ded263c7f11b866e8885b81c73e20dd060b25be), [`74fd942`](https://github.com/atlassian-labs/atlaspack/commit/74fd94236ac697207082c4b755b079e56f5564fb)]:
+  - @atlaspack/core@2.18.6
+  - @atlaspack/cache@3.2.10
+  - @atlaspack/graph@3.5.5
+
+## 2.14.15
+
+### Patch Changes
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/core@2.18.5
+  - @atlaspack/cache@3.2.9
+  - @atlaspack/graph@3.5.4
+
+## 2.14.14
+
+### Patch Changes
+
+- Updated dependencies [[`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb), [`6b1f5ff`](https://github.com/atlassian-labs/atlaspack/commit/6b1f5fff68d7131fae075e14f4d2c02606dc6058), [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`c8f7df4`](https://github.com/atlassian-labs/atlaspack/commit/c8f7df4eadfc4718040fceb065dae6e96a4051e7), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
+  - @atlaspack/core@2.18.4
+  - @atlaspack/cache@3.2.8
+  - @atlaspack/graph@3.5.3
+
+## 2.14.13
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.7
+  - @atlaspack/core@2.18.3
+  - @atlaspack/graph@3.5.2
+
+## 2.14.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.6
+  - @atlaspack/core@2.18.2
+  - @atlaspack/graph@3.5.1
+
+## 2.14.11
+
+### Patch Changes
+
+- Updated dependencies [[`1b52b99`](https://github.com/atlassian-labs/atlaspack/commit/1b52b99db4298b04c1a6eb0f97994d75a2d436f9)]:
+  - @atlaspack/graph@3.5.0
+  - @atlaspack/core@2.18.1
+
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies [[`51aba5f`](https://github.com/atlassian-labs/atlaspack/commit/51aba5fc0e49235ee06bbc3c376f48c3e7da5c4b), [`1e32d4e`](https://github.com/atlassian-labs/atlaspack/commit/1e32d4eae6b3af3968e8a0ef97d35b4347fd4196), [`0b2f6f5`](https://github.com/atlassian-labs/atlaspack/commit/0b2f6f55794d3ff6e2f5a41f963e7e5dd8ad9f8d), [`6dd4ccb`](https://github.com/atlassian-labs/atlaspack/commit/6dd4ccb753541de32322d881f973d571dd57e4ca)]:
+  - @atlaspack/core@2.18.0
+  - @atlaspack/cache@3.2.5
+
+## 2.14.9
+
+### Patch Changes
+
+- Updated dependencies [[`1940859`](https://github.com/atlassian-labs/atlaspack/commit/194085942f0e86532e9d039fc3f8039badce4594), [`15b6155`](https://github.com/atlassian-labs/atlaspack/commit/15b61556e9114203ebbc9de94b864118ca764598), [`124b7ff`](https://github.com/atlassian-labs/atlaspack/commit/124b7fff44f71aac9fbad289a9a9509b3dfc9aaa), [`209692f`](https://github.com/atlassian-labs/atlaspack/commit/209692ffb11eae103a0d65c5e1118a5aa1625818), [`d04de26`](https://github.com/atlassian-labs/atlaspack/commit/d04de26af684d7abfba5091fbe3df16a12cd0ebc)]:
+  - @atlaspack/core@2.17.4
+  - @atlaspack/cache@3.2.4
+  - @atlaspack/graph@3.4.7
+
+## 2.14.8
+
+### Patch Changes
+
+- Updated dependencies [[`30f6017`](https://github.com/atlassian-labs/atlaspack/commit/30f60175ba4d272c5fc193973c63bc298584775b), [`3a3e8e7`](https://github.com/atlassian-labs/atlaspack/commit/3a3e8e7be9e2dffd7304436d792f0f595d59665a), [`15c1e3c`](https://github.com/atlassian-labs/atlaspack/commit/15c1e3c0628bae4c768d76cf3afc53d6d0d7ce7c)]:
+  - @atlaspack/core@2.17.3
+  - @atlaspack/cache@3.2.3
+  - @atlaspack/graph@3.4.6
+
+## 2.14.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.2
+  - @atlaspack/core@2.17.2
+  - @atlaspack/graph@3.4.5
+
+## 2.14.6
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/cache@3.2.1
+  - @atlaspack/core@2.17.1
+  - @atlaspack/graph@3.4.4
+
 ## 2.14.5
 
 ### Patch Changes

package/lib/bin.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 'use strict';
 
+if (process.env.ATLASPACK_SOURCES === 'true' || process.env.ATLASPACK_BUILD_ENV === 'test' || process.env.ATLASPACK_SELF_BUILD) {
+  require('@atlaspack/babel-register');
+}
 const run = require('./cli').run;
 require('v8-compile-cache');
 run(process.argv.slice(2));

package/lib/cli.js

@@ -63,7 +63,7 @@ function _table() {
 var _index = require("./index");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-console, monorepo/no-internal-import */
-// $FlowFixMe
+
 const {
   BundleGraph: {
     bundleGraphEdgeTypes: bundleGraphEdgeTypes
@@ -488,6 +488,8 @@ async function run(input) {
     let bundleId = (0, _nullthrows().default)(parseBundleLocator(v), 'Bundle not found');
     let node = (0, _nullthrows().default)(bundleGraph._graph.getNodeByContentKey(bundleId), 'Bundle not found');
     (0, _assert().default)(node.type === 'bundle', 'Node is not a bundle, but a ' + node.type);
+
+    // @ts-expect-error TS7006
     bundleGraph.traverseAssets(node.value, asset => {
       console.log(asset.id, asset.filePath);
     });
@@ -500,6 +502,8 @@ async function run(input) {
     let bundleId = (0, _nullthrows().default)(parseBundleLocator(v), 'Bundle not found');
     let node = (0, _nullthrows().default)(bundleGraph._graph.getNodeByContentKey(bundleId), 'Bundle not found');
     (0, _assert().default)(node.type === 'bundle', 'Node is not a bundle, but a ' + node.type);
+
+    // @ts-expect-error TS7006
     bundleGraph.traverseBundle(node.value, node => {
       if (node.type === 'asset') {
         console.log(node.id, node.value.filePath);
@@ -546,23 +550,34 @@ async function run(input) {
     console.log('# Incoming dependencies contained in referencing bundles (using this bundle as a shared bundle)');
     let referencingBundles = bundleGraph.getReferencingBundles(bundleNode.value);
     for (let incoming of bundleGraph._graph.getNodeIdsConnectedTo(assetNodeId)) {
-      if (referencingBundles.some(ref => bundleGraph._graph.hasEdge(bundleGraph._graph.getNodeIdByContentKey(ref.id), incoming, bundleGraphEdgeTypes.contains))) {
+      if (
+      // @ts-expect-error TS7006
+      referencingBundles.some(ref => bundleGraph._graph.hasEdge(bundleGraph._graph.getNodeIdByContentKey(ref.id), incoming, bundleGraphEdgeTypes.contains))) {
         console.log(bundleGraph._graph.getNode(incoming));
       }
     }
   }
-  function _getIncomingNodeOfType(bundleGraph, node, type) {
+  function _getIncomingNodeOfType(
+  // @ts-expect-error TS2304
+  bundleGraph,
+  // @ts-expect-error TS7006
+  node, type) {
     if (!hasBundleGraph()) {
       return;
     }
     (0, _assert().default)(bundleGraph != null);
     const bundleGraphNodeId = bundleGraph._graph.getNodeIdByContentKey(node.id);
-    return bundleGraph._graph.getNodeIdsConnectedTo(bundleGraphNodeId, -1).map(id => (0, _nullthrows().default)(bundleGraph._graph.getNode(id))).find(node => node.type == type);
+    return bundleGraph._graph.getNodeIdsConnectedTo(bundleGraphNodeId, -1)
+    // @ts-expect-error TS7006
+    .map(id => (0, _nullthrows().default)(bundleGraph._graph.getNode(id)))
+    // @ts-expect-error TS7006
+    .find(node => node.type == type);
   }
 
   // We find the priority of a Bundle or BundleGroup by looking at its incoming dependencies.
   // If a Bundle does not have an incoming dependency, we look for an incoming BundleGroup and its dependency
   // e.g. Dep(priority = 1) -> BundleGroup -> Bundle means that the Bundle has priority 1.
+  // @ts-expect-error TS2304
   function _getBundlePriority(bundleGraph, bundle) {
     if (!hasBundleGraph()) {
       return;
@@ -578,13 +593,19 @@ async function run(input) {
     (0, _assert().default)(node.type === 'dependency', 'Not a dependency');
     return node.value.priority;
   }
+
+  // @ts-expect-error TS2304
   function _findEntryBundle(bundleGraph, node) {
     if (!hasBundleGraph()) {
       return;
     }
     (0, _assert().default)(bundleGraph != null);
     const bundleGraphNodeId = bundleGraph._graph.getNodeIdByContentKey(node.id);
-    const entryBundleGroup = bundleGraph._graph.getNodeIdsConnectedTo(bundleGraphNodeId, -1).map(id => (0, _nullthrows().default)(bundleGraph._graph.getNode(id))).find(node => node.type === 'bundle_group' && bundleGraph.isEntryBundleGroup(node.value));
+    const entryBundleGroup = bundleGraph._graph.getNodeIdsConnectedTo(bundleGraphNodeId, -1)
+    // @ts-expect-error TS7006
+    .map(id => (0, _nullthrows().default)(bundleGraph._graph.getNode(id))).find(
+    // @ts-expect-error TS7006
+    node => node.type === 'bundle_group' && bundleGraph.isEntryBundleGroup(node.value));
     return entryBundleGroup;
   }
   // eslint-disable-next-line no-unused-vars
@@ -612,12 +633,16 @@ async function run(input) {
       let column = t.map(r => r[col]);
       column.shift();
       (0, _assert().default)(column != null);
-      return column.reduce((accumulator, currentValue) => accumulator + currentValue, initialValue);
+      return column.reduce(
+      // @ts-expect-error TS2365
+      (accumulator, currentValue) => accumulator + currentValue, initialValue);
     }
     table.push(['Totals', getColumnSum(table, 1), getColumnSum(table, 2), getColumnSum(table, 3)]);
     _printStatsTable('Cache Info', table);
   }
-  function timeSerialize(graph) {
+  function timeSerialize(
+  // @ts-expect-error TS2304
+  graph) {
     let date = Date.now();
     (0, _v().serialize)(graph);
     date = Date.now() - date;
@@ -647,7 +672,7 @@ async function run(input) {
       (0, _assert().default)(assetGraph != null);
       for (let n of assetGraph.nodes) {
         if (n && n.type in ag) {
-          // $FlowFixMe
+          // @ts-expect-error TS7053
           ag[n.type]++;
         }
       }
@@ -678,11 +703,7 @@ async function run(input) {
         bg.bundle_group++;
       } else if ((n === null || n === void 0 ? void 0 : n.type) === 'bundle') {
         bg.bundle++;
-
-        // $FlowFixMe
         b_ext[n.value.type] = (b_ext[n.value.type] || 0) + 1;
-
-        // $FlowFixMe
         const entry_group = _findEntryBundle(bundleGraph, n);
         if (entry_group != null && !entries.has(entry_group.id)) {
           b_type.entry++;
@@ -701,9 +722,7 @@ async function run(input) {
           }
         }
       } else if ((n === null || n === void 0 ? void 0 : n.type) === 'asset') {
-        if (
-        // $FlowFixMe
-        fromProjectPathRelative(n.value.filePath).includes('node_modules')) {
+        if (fromProjectPathRelative(n.value.filePath).includes('node_modules')) {
           bg.asset_node_modules++;
         } else {
           bg.asset_source++;
@@ -724,6 +743,7 @@ async function run(input) {
     }
     let sum_b_type = 0;
     for (let k in b_type) {
+      // @ts-expect-error TS7053
       sum_b_type += b_type[k];
     }
     (0, _assert().default)(bg.bundle == sum_b_type, `Bundles by type ${sum_b_type} does not equal total ${bg.bundle}`);
@@ -747,16 +767,10 @@ async function run(input) {
       useColors: true,
       useGlobal: true
     });
-    // $FlowFixMe[prop-missing]
     server.setupHistory(_path().default.join(_os().default.homedir(), '.parcel_query_history'), () => {});
-
-    // $FlowFixMe[prop-missing]
     server.context.bundleGraph = bundleGraph;
-    // $FlowFixMe[prop-missing]
     server.context.assetGraph = assetGraph;
-    // $FlowFixMe[prop-missing]
     server.context.requestTracker = requestTracker;
-    // $FlowFixMe[prop-missing]
     server.context.cacheInfo = cacheInfo;
     for (let [name, cmd] of new Map([['getAsset', {
       help: 'args: <id | public id | filepath>',
@@ -808,6 +822,7 @@ async function run(input) {
       action: getBundle
     }], ['findBundleReason', {
       help: 'args: <bundle> <asset>. Why is the asset in the bundle',
+      // @ts-expect-error TS2556
       action: v => findBundleReason(...v.split(' '))
     }], ['getBundles', {
       help: 'List all bundles',
@@ -828,16 +843,11 @@ async function run(input) {
       help: 'args: <local>. Get the asset that defines the symbol with the given local name',
       action: findAssetWithSymbol
     }]])) {
-      // $FlowFixMe
       server.context[name] = cmd.action;
-      // $FlowFixMe
       server.defineCommand(name, {
-        // $FlowFixMe
         help: '📦 ' + cmd.help,
         action: v => {
-          // $FlowFixMe
           server.clearBufferedCommand();
-          // $FlowFixMe
           try {
             cmd.action(v);
           } finally {

package/lib/deep-imports.js

@@ -1,19 +1,21 @@
 "use strict";
 
 /* eslint-disable monorepo/no-internal-import */
-const v = {
+
+const v = process.env.ATLASPACK_BUILD_ENV === 'production' || process.env.ATLASPACK_REGISTER_USE_SRC !== 'true' ? {
   // Split up require specifier to outsmart packages/dev/babel-register/babel-plugin-module-translate.js
-  // $FlowFixMe(unsupported-syntax)
   AssetGraph: require('@atlaspack/core' + '/lib/AssetGraph').default,
-  // $FlowFixMe(unsupported-syntax)
   BundleGraph: require('@atlaspack/core' + '/lib/BundleGraph'),
-  // $FlowFixMe(unsupported-syntax)
   RequestTracker: require('@atlaspack/core' + '/lib/RequestTracker'),
-  // $FlowFixMe(unsupported-syntax)
   LMDBLiteCache: require('@atlaspack/cache' + '/lib/LMDBLiteCache').LMDBLiteCache,
-  // $FlowFixMe(unsupported-syntax)
   Priority: require('@atlaspack/core' + '/lib/types').Priority,
-  // $FlowFixMe(unsupported-syntax)
   fromProjectPathRelative: require('@atlaspack/core' + '/lib/projectPath').fromProjectPathRelative
+} : {
+  AssetGraph: require('@atlaspack/core/src/AssetGraph').default,
+  BundleGraph: require('@atlaspack/core/src/BundleGraph'),
+  RequestTracker: require('@atlaspack/core/src/RequestTracker'),
+  LMDBLiteCache: require('@atlaspack/cache/src/LMDBLiteCache').LMDBLiteCache,
+  Priority: require('@atlaspack/core/src/types').Priority,
+  fromProjectPathRelative: require('@atlaspack/core/src/projectPath').fromProjectPathRelative
 };
 module.exports = v;

package/lib/index.js

@@ -4,20 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadGraphs = loadGraphs;
-function _fs() {
-  const data = _interopRequireDefault(require("fs"));
-  _fs = function () {
-    return data;
-  };
-  return data;
-}
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _v() {
   const data = _interopRequireDefault(require("v8"));
   _v = function () {
@@ -41,6 +27,7 @@ function _assert() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-console, monorepo/no-internal-import */
+
 const {
   AssetGraph,
   BundleGraph: {
@@ -52,75 +39,70 @@ const {
     requestGraphEdgeTypes
   },
   LMDBLiteCache
-} = require('./deep-imports.js');
+} = process.env.ATLASPACK_REGISTER_USE_SRC === 'true' ? require('./deep-imports.js') : require('./deep-imports.ts');
 async function loadGraphs(cacheDir) {
   let cacheInfo = new Map();
-  let {
+  const cache = new LMDBLiteCache(cacheDir);
+  let requestGraphBlob;
+  let requestGraphKey;
+  let bundleGraphBlob;
+  let assetGraphBlob;
+  for (let key of cache.keys()) {
+    if (key.startsWith('Asset/')) {
+      continue;
+    } else if (key.startsWith('PackagerRunner/')) {
+      continue;
+    }
+    if (key.startsWith('RequestTracker/') && key.endsWith('/RequestGraph')) {
+      requestGraphBlob = key;
+      requestGraphKey = key.split('/').slice(0, -1).join('/');
+    }
+    if (key.startsWith('BundleGraph/')) {
+      bundleGraphBlob = key;
+    }
+    if (key.startsWith('AssetGraph/')) {
+      assetGraphBlob = key;
+    }
+  }
+  console.log({
     requestGraphBlob,
     bundleGraphBlob,
     assetGraphBlob
-  } = function getMostRecentCacheBlobs() {
-    let files = _fs().default.readdirSync(cacheDir);
-    let result = {};
-    let blobsToFind = [{
-      name: 'requestGraphBlob',
-      check: basename => basename.startsWith('requestGraph-') && !basename.startsWith('requestGraph-nodes')
-    }, {
-      name: 'bundleGraphBlob',
-      check: basename => basename.endsWith('BundleGraph-0')
-    }, {
-      name: 'assetGraphBlob',
-      check: basename => basename.endsWith('AssetGraph-0')
-    }];
-    for (let file of files) {
-      let basename = _path().default.basename(file);
-      let match = blobsToFind.find(({
-        check
-      }) => check(basename));
-      if (match) {
-        let stat = _fs().default.statSync(_path().default.join(cacheDir, file));
-        if (!match.mtime || stat.mtime > match.mtime) {
-          match.mtime = stat.mtime;
-          result[match.name] = file;
-        }
-      }
-    }
-    return result;
-  }();
-  const cache = new LMDBLiteCache(cacheDir);
+  });
 
   // Get requestTracker
+  // @ts-expect-error TS7034
   let requestTracker;
-  if (requestGraphBlob) {
+  if (requestGraphBlob != null && requestGraphKey != null) {
     try {
       var _cacheInfo$get;
-      let requestGraphKey = requestGraphBlob.slice(0, -'-0'.length);
       let date = Date.now();
+      const buffer = await cache.getBlob(requestGraphBlob);
+      const deserializer = new (_v().default.Deserializer)(buffer);
+      console.log('Wire format version stored', deserializer.getWireFormatVersion());
       let {
         requestGraph,
         bufferLength
-      } = await readAndDeserializeRequestGraph(cache, requestGraphKey, requestGraphKey.replace('requestGraph-', ''));
+      } = await readAndDeserializeRequestGraph(cache, requestGraphBlob, requestGraphKey);
       requestTracker = new RequestTracker({
         graph: requestGraph,
-        // $FlowFixMe
         farm: null,
-        // $FlowFixMe
         options: null
       });
       let timeToDeserialize = Date.now() - date;
       cacheInfo.set('RequestGraph', [bufferLength]);
       (_cacheInfo$get = cacheInfo.get('RequestGraph')) === null || _cacheInfo$get === void 0 || _cacheInfo$get.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Request Graph\n', e);
+      console.error('Error loading Request Graph\n', e);
     }
   }
 
   // Get bundleGraph
   let bundleGraph;
-  if (bundleGraphBlob) {
+  if (bundleGraphBlob != null) {
     try {
       var _cacheInfo$get2;
-      let file = await cache.getLargeBlob(_path().default.basename(bundleGraphBlob).slice(0, -'-0'.length));
+      let file = await cache.getBlob(bundleGraphBlob);
       let timeToDeserialize = Date.now();
       let obj = _v().default.deserialize(file);
       (0, _assert().default)(obj.bundleGraph != null);
@@ -129,17 +111,17 @@ async function loadGraphs(cacheDir) {
       cacheInfo.set('BundleGraph', [Buffer.byteLength(file)]);
       (_cacheInfo$get2 = cacheInfo.get('BundleGraph')) === null || _cacheInfo$get2 === void 0 || _cacheInfo$get2.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Bundle Graph\n', e);
+      console.error('Error loading Bundle Graph\n', e);
     }
   }
 
   // Get assetGraph
   let assetGraph;
-  if (assetGraphBlob) {
+  if (assetGraphBlob != null) {
     try {
       var _cacheInfo$get3;
       // TODO: this should be reviewed when `cachePerformanceImprovements` flag is removed, as we'll be writing files to LMDB cache instead of large blobs
-      let file = await cache.getLargeBlob(_path().default.basename(assetGraphBlob).slice(0, -'-0'.length));
+      let file = await cache.getBlob(assetGraphBlob);
       let timeToDeserialize = Date.now();
       let obj = _v().default.deserialize(file);
       (0, _assert().default)(obj.assetGraph != null);
@@ -148,11 +130,16 @@ async function loadGraphs(cacheDir) {
       cacheInfo.set('AssetGraph', [Buffer.byteLength(file)]);
       (_cacheInfo$get3 = cacheInfo.get('AssetGraph')) === null || _cacheInfo$get3 === void 0 || _cacheInfo$get3.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Asset Graph\n', e);
+      console.error('Error loading Asset Graph\n', e);
     }
   }
   function getSubRequests(id) {
-    return requestTracker.graph.getNodeIdsConnectedFrom(id, requestGraphEdgeTypes.subrequest).map(n => (0, _nullthrows().default)(requestTracker.graph.getNode(n)));
+    return (
+      // @ts-expect-error TS7005
+      requestTracker.graph.getNodeIdsConnectedFrom(id, requestGraphEdgeTypes.subrequest)
+      // @ts-expect-error TS7006
+      .map(n => (0, _nullthrows().default)(requestTracker.graph.getNode(n)))
+    );
   }
 
   // Load graphs by finding the main subrequests and loading their results
@@ -163,14 +150,15 @@ async function loadGraphs(cacheDir) {
     let buildRequestNode = (0, _nullthrows().default)(requestTracker.graph.getNode(buildRequestId));
     (0, _assert().default)(buildRequestNode.type === 1 && buildRequestNode.requestType === 1);
     let buildRequestSubRequests = getSubRequests(buildRequestId);
-    let writeBundlesRequest = buildRequestSubRequests.find(n => n.type === 1 && n.requestType === 11);
+    let writeBundlesRequest = buildRequestSubRequests.find(
+    // @ts-expect-error TS7006
+    n => n.type === 1 && n.requestType === 11);
     if (writeBundlesRequest != null) {
       (0, _assert().default)(writeBundlesRequest.type === 1);
-      // $FlowFixMe[incompatible-cast]
       bundleInfo = (0, _nullthrows().default)(writeBundlesRequest.result);
     }
   } catch (e) {
-    console.log('Error loading bundleInfo\n', e);
+    console.error('Error loading bundleInfo\n', e);
   }
   return {
     assetGraph,

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@atlaspack/query",
-  "version": "2.14.5-canary.14+267b0d591",
+  "version": "2.14.5-canary.141+2f29297bd",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "prepack": "./ensure-no-dev-lib.sh",
     "dev:prepare": "rimraf ./lib/ && mkdir -p lib && cp ./bin/dev-bin.js ./lib/bin.js"
   },
   "repository": {
@@ -18,9 +17,9 @@
   },
   "main": "src/index.js",
   "dependencies": {
-    "@atlaspack/cache": "3.1.1-canary.14+267b0d591",
-    "@atlaspack/core": "2.16.2-canary.14+267b0d591",
-    "@atlaspack/graph": "3.4.1-canary.82+267b0d591",
+    "@atlaspack/cache": "3.1.1-canary.141+2f29297bd",
+    "@atlaspack/core": "2.16.2-canary.141+2f29297bd",
+    "@atlaspack/graph": "3.4.1-canary.209+2f29297bd",
     "nullthrows": "^1.1.1",
     "table": "^6.8.1",
     "v8-compile-cache": "^2.0.0"
@@ -31,5 +30,5 @@
     "rimraf": "^5.0.5"
   },
   "type": "commonjs",
-  "gitHead": "267b0d59131c00e4cd1526bbf87aa84b9c8fd411"
+  "gitHead": "2f29297bd550840c9840871559349ef773bcbf6d"
 }

package/src/bin.js

@@ -3,7 +3,8 @@
 'use strict';
 
 if (
-  process.env.ATLASPACK_BUILD_ENV !== 'production' ||
+  process.env.ATLASPACK_SOURCES === 'true' ||
+  process.env.ATLASPACK_BUILD_ENV === 'test' ||
   process.env.ATLASPACK_SELF_BUILD
 ) {
   require('@atlaspack/babel-register');

package/src/{cli.js → cli.ts}

@@ -1,4 +1,3 @@
-// @flow strict-local
 /* eslint-disable no-console, monorepo/no-internal-import */
 import type {ContentGraph, ContentKey, NodeId} from '@atlaspack/graph';
 import type {BundleGraphEdgeType} from '@atlaspack/core/src/BundleGraph';
@@ -11,7 +10,6 @@ import os from 'os';
 import nullthrows from 'nullthrows';
 import invariant from 'assert';
 import {serialize} from 'v8';
-// $FlowFixMe
 import {table} from 'table';
 
 import {loadGraphs} from './index';
@@ -33,7 +31,7 @@ export async function run(input: string[]) {
 
   try {
     fs.accessSync(cacheDir);
-  } catch (e) {
+  } catch (e: any) {
     console.error("Can't find cache dir", cacheDir);
     process.exit(1);
   }
@@ -85,7 +83,7 @@ export async function run(input: string[]) {
   }
 
   function parseAssetLocator(v: string) {
-    let id: ?string = null;
+    let id: string | null | undefined = null;
     if (v.length === 16) {
       id = v;
     } else {
@@ -138,7 +136,7 @@ export async function run(input: string[]) {
   }
 
   function getAsset(v: string) {
-    let id: ?string = parseAssetLocator(v);
+    let id: string | null | undefined = parseAssetLocator(v);
 
     if (id == null) {
       console.log(null);
@@ -151,7 +149,7 @@ export async function run(input: string[]) {
         let asset = bundleGraph.getAssetById(id);
         console.log('Public id', bundleGraph.getAssetPublicId(asset));
         console.log(asset);
-      } catch (e) {
+      } catch (e: any) {
         if (!hasAssetGraph()) {
           return;
         }
@@ -192,7 +190,7 @@ export async function run(input: string[]) {
             bundleGraph.getAssetById(node.id),
           )} ${fromProjectPathRelative(node.value.filePath)}`,
         );
-      } catch (e) {
+      } catch (e: any) {
         console.log(fromProjectPathRelative(node.value.filePath));
       }
     }
@@ -246,7 +244,7 @@ export async function run(input: string[]) {
           bundleGraph.getAssetById(asset.id),
         )} ${fromProjectPathRelative(asset.value.filePath)}`,
       );
-    } catch (e) {
+    } catch (e: any) {
       console.log(fromProjectPathRelative(asset.value.filePath));
     }
     if (binding === 'export' && asset.value.symbols) {
@@ -262,7 +260,7 @@ export async function run(input: string[]) {
                     bundleGraph.getAssetById(locAsset.id),
                   )} ${fromProjectPathRelative(locAsset.value.filePath)}`,
                 );
-              } catch (e) {
+              } catch (e: any) {
                 console.log(
                   `imported as ${symbolName} from ${fromProjectPathRelative(
                     locAsset.value.filePath,
@@ -311,12 +309,12 @@ export async function run(input: string[]) {
       this.label = label;
       this.suffix = suffix;
     }
-    add(v: T, label: string | void, suffix: string | void): Paths<T> {
+    add(v: T, label?: string, suffix?: string): Paths<T> {
       let next = new Paths(v, label, suffix);
       this.children.push(next);
       return next;
     }
-    print(format: (T) => string, prefix = '') {
+    print(format: (arg1: T) => string, prefix = '') {
       console.log(
         `${prefix}${this.label} ${format(this.value)} ${this.suffix}`,
       );
@@ -335,7 +333,14 @@ export async function run(input: string[]) {
     let asset = nullthrows(parseAssetLocator(v), 'Asset not found');
 
     let paths = new Paths<NodeId>(graph.getNodeIdByContentKey(asset), ' ');
-    let cb = (id, ctx, revisiting) => {
+    let cb = (
+      id: NodeId,
+      ctx: {
+        lazyOutgoing: boolean;
+        paths: Paths<NodeId>;
+      },
+      revisiting: boolean,
+    ) => {
       let {paths, lazyOutgoing} = ctx;
       let node = nullthrows(graph.getNode(id));
       if (node.id === asset) return ctx;
@@ -356,7 +361,13 @@ export async function run(input: string[]) {
 
     // like graph.dfs, but revisiting nodes and skipping its children
     let seen = new Set();
-    function walk(id, ctx) {
+    function walk(
+      id: NodeId,
+      ctx: {
+        lazyOutgoing: boolean;
+        paths: Paths<NodeId>;
+      },
+    ) {
       let revisiting = seen.has(id);
       let newCtx = cb(id, ctx, revisiting);
       if (revisiting) return;
@@ -434,7 +445,7 @@ export async function run(input: string[]) {
   }
 
   // eslint-disable-next-line no-unused-vars
-  function getBundles(_) {
+  function getBundles(_: any) {
     if (!hasBundleGraph()) {
       return;
     }
@@ -549,6 +560,7 @@ export async function run(input: string[]) {
       'Node is not a bundle, but a ' + node.type,
     );
 
+    // @ts-expect-error TS7006
     bundleGraph.traverseAssets(node.value, (asset) => {
       console.log(asset.id, asset.filePath);
     });
@@ -568,6 +580,7 @@ export async function run(input: string[]) {
       'Node is not a bundle, but a ' + node.type,
     );
 
+    // @ts-expect-error TS7006
     bundleGraph.traverseBundle(node.value, (node) => {
       if (node.type === 'asset') {
         console.log(node.id, node.value.filePath);
@@ -667,6 +680,7 @@ export async function run(input: string[]) {
       assetNodeId,
     )) {
       if (
+        // @ts-expect-error TS7006
         referencingBundles.some((ref) =>
           bundleGraph._graph.hasEdge(
             bundleGraph._graph.getNodeIdByContentKey(ref.id),
@@ -680,22 +694,33 @@ export async function run(input: string[]) {
     }
   }
 
-  function _getIncomingNodeOfType(bundleGraph, node, type: string) {
+  function _getIncomingNodeOfType(
+    // @ts-expect-error TS2304
+    bundleGraph: BundleGraph,
+    // @ts-expect-error TS7006
+    node,
+    type: string,
+  ) {
     if (!hasBundleGraph()) {
       return;
     }
     invariant(bundleGraph != null);
     const bundleGraphNodeId = bundleGraph._graph.getNodeIdByContentKey(node.id);
-    return bundleGraph._graph
-      .getNodeIdsConnectedTo(bundleGraphNodeId, -1)
-      .map((id) => nullthrows(bundleGraph._graph.getNode(id)))
-      .find((node) => node.type == type);
+    return (
+      bundleGraph._graph
+        .getNodeIdsConnectedTo(bundleGraphNodeId, -1)
+        // @ts-expect-error TS7006
+        .map((id) => nullthrows(bundleGraph._graph.getNode(id)))
+        // @ts-expect-error TS7006
+        .find((node) => node.type == type)
+    );
   }
 
   // We find the priority of a Bundle or BundleGroup by looking at its incoming dependencies.
   // If a Bundle does not have an incoming dependency, we look for an incoming BundleGroup and its dependency
   // e.g. Dep(priority = 1) -> BundleGroup -> Bundle means that the Bundle has priority 1.
-  function _getBundlePriority(bundleGraph, bundle) {
+  // @ts-expect-error TS2304
+  function _getBundlePriority(bundleGraph: BundleGraph, bundle: BundleNode) {
     if (!hasBundleGraph()) {
       return;
     }
@@ -715,7 +740,8 @@ export async function run(input: string[]) {
     return node.value.priority;
   }
 
-  function _findEntryBundle(bundleGraph, node) {
+  // @ts-expect-error TS2304
+  function _findEntryBundle(bundleGraph: BundleGraph, node: BundleNode) {
     if (!hasBundleGraph()) {
       return;
     }
@@ -723,8 +749,10 @@ export async function run(input: string[]) {
     const bundleGraphNodeId = bundleGraph._graph.getNodeIdByContentKey(node.id);
     const entryBundleGroup = bundleGraph._graph
       .getNodeIdsConnectedTo(bundleGraphNodeId, -1)
+      // @ts-expect-error TS7006
       .map((id) => nullthrows(bundleGraph._graph.getNode(id)))
       .find(
+        // @ts-expect-error TS7006
         (node) =>
           node.type === 'bundle_group' &&
           bundleGraph.isEntryBundleGroup(node.value),
@@ -733,7 +761,7 @@ export async function run(input: string[]) {
     return entryBundleGroup;
   }
   // eslint-disable-next-line no-unused-vars
-  function inspectCache(_) {
+  function inspectCache(_: any) {
     // displays sizing of various entries of the cache
     let table: Array<Array<string | number>> = [];
     table.push([
@@ -767,6 +795,7 @@ export async function run(input: string[]) {
       column.shift();
       invariant(column != null);
       return column.reduce(
+        // @ts-expect-error TS2365
         (accumulator, currentValue) => accumulator + currentValue,
         initialValue,
       );
@@ -780,13 +809,19 @@ export async function run(input: string[]) {
     _printStatsTable('Cache Info', table);
   }
 
-  function timeSerialize(graph) {
+  function timeSerialize(
+    // @ts-expect-error TS2304
+    graph: AssetGraph | null | undefined | BundleGraph | RequestTracker,
+  ) {
     let date = Date.now();
     serialize(graph);
     date = Date.now() - date;
     return date;
   }
-  function _printStatsTable(header, data) {
+  function _printStatsTable(
+    header: string,
+    data: Array<Array<string | number>> | Array<[string, unknown]>,
+  ) {
     const config = {
       columnDefault: {
         width: 18,
@@ -795,13 +830,13 @@ export async function run(input: string[]) {
         alignment: 'center',
         content: header,
       },
-    };
+    } as const;
 
     console.log(table(data, config));
   }
 
   // eslint-disable-next-line no-unused-vars
-  function stats(_) {
+  function stats(_: any) {
     let ag = {
       asset: 0,
       dependency: 0,
@@ -812,7 +847,7 @@ export async function run(input: string[]) {
       invariant(assetGraph != null);
       for (let n of assetGraph.nodes) {
         if (n && n.type in ag) {
-          // $FlowFixMe
+          // @ts-expect-error TS7053
           ag[n.type]++;
         }
       }
@@ -839,7 +874,7 @@ export async function run(input: string[]) {
       sync: 0,
     };
 
-    let b_ext = {};
+    let b_ext: Record<string, any> = {};
 
     const entries = new Set();
 
@@ -849,10 +884,8 @@ export async function run(input: string[]) {
       } else if (n?.type === 'bundle') {
         bg.bundle++;
 
-        // $FlowFixMe
         b_ext[n.value.type] = (b_ext[n.value.type] || 0) + 1;
 
-        // $FlowFixMe
         const entry_group = _findEntryBundle(bundleGraph, n);
 
         if (entry_group != null && !entries.has(entry_group.id)) {
@@ -874,7 +907,6 @@ export async function run(input: string[]) {
         }
       } else if (n?.type === 'asset') {
         if (
-          // $FlowFixMe
           fromProjectPathRelative(n.value.filePath).includes('node_modules')
         ) {
           bg.asset_node_modules++;
@@ -899,6 +931,7 @@ export async function run(input: string[]) {
 
     let sum_b_type = 0;
     for (let k in b_type) {
+      // @ts-expect-error TS7053
       sum_b_type += b_type[k];
     }
 
@@ -929,19 +962,14 @@ export async function run(input: string[]) {
     });
 
     const server = repl.start({useColors: true, useGlobal: true});
-    // $FlowFixMe[prop-missing]
     server.setupHistory(
       path.join(os.homedir(), '.parcel_query_history'),
       () => {},
     );
 
-    // $FlowFixMe[prop-missing]
     server.context.bundleGraph = bundleGraph;
-    // $FlowFixMe[prop-missing]
     server.context.assetGraph = assetGraph;
-    // $FlowFixMe[prop-missing]
     server.context.requestTracker = requestTracker;
-    // $FlowFixMe[prop-missing]
     server.context.cacheInfo = cacheInfo;
     for (let [name, cmd] of new Map([
       [
@@ -1060,6 +1088,7 @@ export async function run(input: string[]) {
         'findBundleReason',
         {
           help: 'args: <bundle> <asset>. Why is the asset in the bundle',
+          // @ts-expect-error TS2556
           action: (v) => findBundleReason(...v.split(' ')),
         },
       ],
@@ -1106,16 +1135,11 @@ export async function run(input: string[]) {
         },
       ],
     ])) {
-      // $FlowFixMe
       server.context[name] = cmd.action;
-      // $FlowFixMe
       server.defineCommand(name, {
-        // $FlowFixMe
         help: '📦 ' + cmd.help,
         action: (v) => {
-          // $FlowFixMe
           server.clearBufferedCommand();
-          // $FlowFixMe
           try {
             cmd.action(v);
           } finally {

package/src/{deep-imports.js → deep-imports.ts}

@@ -1,34 +1,28 @@
-// @flow
 /* eslint-disable monorepo/no-internal-import */
-import typeof AssetGraph from '@atlaspack/core/src/AssetGraph';
-import typeof BundleGraph, {
+import AssetGraph from '@atlaspack/core/src/AssetGraph';
+import BundleGraph, {
   bundleGraphEdgeTypes,
 } from '@atlaspack/core/src/BundleGraph';
-import typeof RequestTracker, {
+import RequestTracker, {
   RequestGraph,
   readAndDeserializeRequestGraph,
 } from '@atlaspack/core/src/RequestTracker';
-import typeof {requestGraphEdgeTypes} from '@atlaspack/core/src/RequestTracker';
-import typeof {LMDBLiteCache} from '@atlaspack/cache/src/LMDBLiteCache';
-import typeof {Priority} from '@atlaspack/core/src/types';
-import typeof {fromProjectPathRelative} from '@atlaspack/core/src/projectPath';
+import {requestGraphEdgeTypes} from '@atlaspack/core/src/RequestTracker';
+import {LMDBLiteCache} from '@atlaspack/cache/src/LMDBLiteCache';
+import {Priority} from '@atlaspack/core/src/types';
+import {fromProjectPathRelative} from '@atlaspack/core/src/projectPath';
 
 const v =
-  process.env.ATLASPACK_BUILD_ENV === 'production'
+  process.env.ATLASPACK_BUILD_ENV === 'production' ||
+  process.env.ATLASPACK_REGISTER_USE_SRC !== 'true'
     ? {
         // Split up require specifier to outsmart packages/dev/babel-register/babel-plugin-module-translate.js
-        // $FlowFixMe(unsupported-syntax)
         AssetGraph: require('@atlaspack/core' + '/lib/AssetGraph').default,
-        // $FlowFixMe(unsupported-syntax)
         BundleGraph: require('@atlaspack/core' + '/lib/BundleGraph'),
-        // $FlowFixMe(unsupported-syntax)
         RequestTracker: require('@atlaspack/core' + '/lib/RequestTracker'),
-        // $FlowFixMe(unsupported-syntax)
         LMDBLiteCache: require('@atlaspack/cache' + '/lib/LMDBLiteCache')
           .LMDBLiteCache,
-        // $FlowFixMe(unsupported-syntax)
         Priority: require('@atlaspack/core' + '/lib/types').Priority,
-        // $FlowFixMe(unsupported-syntax)
         fromProjectPathRelative: require('@atlaspack/core' + '/lib/projectPath')
           .fromProjectPathRelative,
       }
@@ -43,21 +37,24 @@ const v =
           .fromProjectPathRelative,
       };
 
-module.exports = (v: {|
-  AssetGraph: AssetGraph,
+module.exports = v as {
+  AssetGraph: AssetGraph;
   BundleGraph: {
-    default: BundleGraph,
-    bundleGraphEdgeTypes: bundleGraphEdgeTypes,
-    ...
-  },
+    default: BundleGraph;
+    // @ts-expect-error TS2749
+    bundleGraphEdgeTypes: bundleGraphEdgeTypes;
+  };
   RequestTracker: {
-    default: RequestTracker,
-    readAndDeserializeRequestGraph: readAndDeserializeRequestGraph,
-    RequestGraph: RequestGraph,
-    requestGraphEdgeTypes: requestGraphEdgeTypes,
-    ...
-  },
-  LMDBLiteCache: LMDBLiteCache,
-  Priority: Priority,
-  fromProjectPathRelative: fromProjectPathRelative,
-|});
+    default: RequestTracker;
+    // @ts-expect-error TS2749
+    readAndDeserializeRequestGraph: readAndDeserializeRequestGraph;
+    RequestGraph: RequestGraph;
+    // @ts-expect-error TS2749
+    requestGraphEdgeTypes: requestGraphEdgeTypes;
+  };
+  LMDBLiteCache: LMDBLiteCache;
+  // @ts-expect-error TS2749
+  Priority: Priority;
+  // @ts-expect-error TS2749
+  fromProjectPathRelative: fromProjectPathRelative;
+};

package/src/{index.js → index.ts}

@@ -1,10 +1,7 @@
-// @flow strict-local
 /* eslint-disable no-console, monorepo/no-internal-import */
 import type {ContentKey, NodeId} from '@atlaspack/graph';
 import type {PackagedBundleInfo} from '@atlaspack/core/src/types';
 
-import fs from 'fs';
-import path from 'path';
 import v8 from 'v8';
 import nullthrows from 'nullthrows';
 import invariant from 'assert';
@@ -18,98 +15,86 @@ const {
     requestGraphEdgeTypes,
   },
   LMDBLiteCache,
-} = require('./deep-imports.js');
-
-export async function loadGraphs(cacheDir: string): Promise<{|
-  assetGraph: ?AssetGraph,
-  bundleGraph: ?BundleGraph,
-  requestTracker: ?RequestTracker,
-  bundleInfo: ?Map<ContentKey, PackagedBundleInfo>,
-  cacheInfo: ?Map<string, Array<string | number>>,
-|}> {
-  function getMostRecentCacheBlobs() {
-    let files = fs.readdirSync(cacheDir);
-
-    let result = {};
-
-    let blobsToFind: Array<{|
-      name: string,
-      check: (v: string) => boolean,
-      mtime?: Date,
-    |}> = [
-      {
-        name: 'requestGraphBlob',
-        check: (basename) =>
-          basename.startsWith('requestGraph-') &&
-          !basename.startsWith('requestGraph-nodes'),
-      },
-      {
-        name: 'bundleGraphBlob',
-        check: (basename) => basename.endsWith('BundleGraph-0'),
-      },
-      {
-        name: 'assetGraphBlob',
-        check: (basename) => basename.endsWith('AssetGraph-0'),
-      },
-    ];
-
-    for (let file of files) {
-      let basename = path.basename(file);
-      let match = blobsToFind.find(({check}) => check(basename));
-
-      if (match) {
-        let stat = fs.statSync(path.join(cacheDir, file));
-
-        if (!match.mtime || stat.mtime > match.mtime) {
-          match.mtime = stat.mtime;
-          result[match.name] = file;
-        }
-      }
+} = process.env.ATLASPACK_REGISTER_USE_SRC === 'true'
+  ? require('./deep-imports.js')
+  : require('./deep-imports.ts');
+
+export async function loadGraphs(cacheDir: string): Promise<{
+  // @ts-expect-error TS2749
+  assetGraph: AssetGraph | null | undefined;
+  // @ts-expect-error TS2749
+  bundleGraph: BundleGraph | null | undefined;
+  // @ts-expect-error TS2749
+  requestTracker: RequestTracker | null | undefined;
+  bundleInfo: Map<ContentKey, PackagedBundleInfo> | null | undefined;
+  cacheInfo: Map<string, Array<string | number>> | null | undefined;
+}> {
+  let cacheInfo: Map<string, Array<string | number>> = new Map();
+  const cache = new LMDBLiteCache(cacheDir);
+
+  let requestGraphBlob;
+  let requestGraphKey;
+  let bundleGraphBlob;
+  let assetGraphBlob;
+  for (let key of cache.keys()) {
+    if (key.startsWith('Asset/')) {
+      continue;
+    } else if (key.startsWith('PackagerRunner/')) {
+      continue;
     }
 
-    return result;
+    if (key.startsWith('RequestTracker/') && key.endsWith('/RequestGraph')) {
+      requestGraphBlob = key;
+      requestGraphKey = key.split('/').slice(0, -1).join('/');
+    }
+    if (key.startsWith('BundleGraph/')) {
+      bundleGraphBlob = key;
+    }
+    if (key.startsWith('AssetGraph/')) {
+      assetGraphBlob = key;
+    }
   }
 
-  let cacheInfo: Map<string, Array<string | number>> = new Map();
-
-  let {requestGraphBlob, bundleGraphBlob, assetGraphBlob} =
-    getMostRecentCacheBlobs();
-  const cache = new LMDBLiteCache(cacheDir);
+  console.log({requestGraphBlob, bundleGraphBlob, assetGraphBlob});
 
   // Get requestTracker
+  // @ts-expect-error TS7034
   let requestTracker;
-  if (requestGraphBlob) {
+  if (requestGraphBlob != null && requestGraphKey != null) {
     try {
-      let requestGraphKey = requestGraphBlob.slice(0, -'-0'.length);
       let date = Date.now();
+
+      const buffer = await cache.getBlob(requestGraphBlob);
+      const deserializer = new v8.Deserializer(buffer);
+      console.log(
+        'Wire format version stored',
+        deserializer.getWireFormatVersion(),
+      );
+
       let {requestGraph, bufferLength} = await readAndDeserializeRequestGraph(
         cache,
+        requestGraphBlob,
         requestGraphKey,
-        requestGraphKey.replace('requestGraph-', ''),
       );
 
       requestTracker = new RequestTracker({
         graph: requestGraph,
-        // $FlowFixMe
         farm: null,
-        // $FlowFixMe
         options: null,
       });
       let timeToDeserialize = Date.now() - date;
       cacheInfo.set('RequestGraph', [bufferLength]);
       cacheInfo.get('RequestGraph')?.push(timeToDeserialize);
-    } catch (e) {
-      console.log('Error loading Request Graph\n', e);
+    } catch (e: any) {
+      console.error('Error loading Request Graph\n', e);
     }
   }
 
   // Get bundleGraph
   let bundleGraph;
-  if (bundleGraphBlob) {
+  if (bundleGraphBlob != null) {
     try {
-      let file = await cache.getLargeBlob(
-        path.basename(bundleGraphBlob).slice(0, -'-0'.length),
-      );
+      let file = await cache.getBlob(bundleGraphBlob);
 
       let timeToDeserialize = Date.now();
       let obj = v8.deserialize(file);
@@ -119,19 +104,17 @@ export async function loadGraphs(cacheDir: string): Promise<{|
 
       cacheInfo.set('BundleGraph', [Buffer.byteLength(file)]);
       cacheInfo.get('BundleGraph')?.push(timeToDeserialize);
-    } catch (e) {
-      console.log('Error loading Bundle Graph\n', e);
+    } catch (e: any) {
+      console.error('Error loading Bundle Graph\n', e);
     }
   }
 
   // Get assetGraph
   let assetGraph;
-  if (assetGraphBlob) {
+  if (assetGraphBlob != null) {
     try {
       // TODO: this should be reviewed when `cachePerformanceImprovements` flag is removed, as we'll be writing files to LMDB cache instead of large blobs
-      let file = await cache.getLargeBlob(
-        path.basename(assetGraphBlob).slice(0, -'-0'.length),
-      );
+      let file = await cache.getBlob(assetGraphBlob);
 
       let timeToDeserialize = Date.now();
       let obj = v8.deserialize(file);
@@ -141,15 +124,19 @@ export async function loadGraphs(cacheDir: string): Promise<{|
 
       cacheInfo.set('AssetGraph', [Buffer.byteLength(file)]);
       cacheInfo.get('AssetGraph')?.push(timeToDeserialize);
-    } catch (e) {
-      console.log('Error loading Asset Graph\n', e);
+    } catch (e: any) {
+      console.error('Error loading Asset Graph\n', e);
     }
   }
 
   function getSubRequests(id: NodeId) {
-    return requestTracker.graph
-      .getNodeIdsConnectedFrom(id, requestGraphEdgeTypes.subrequest)
-      .map((n) => nullthrows(requestTracker.graph.getNode(n)));
+    return (
+      // @ts-expect-error TS7005
+      requestTracker.graph
+        .getNodeIdsConnectedFrom(id, requestGraphEdgeTypes.subrequest)
+        // @ts-expect-error TS7006
+        .map((n) => nullthrows(requestTracker.graph.getNode(n)))
+    );
   }
 
   // Load graphs by finding the main subrequests and loading their results
@@ -168,18 +155,18 @@ export async function loadGraphs(cacheDir: string): Promise<{|
     let buildRequestSubRequests = getSubRequests(buildRequestId);
 
     let writeBundlesRequest = buildRequestSubRequests.find(
+      // @ts-expect-error TS7006
       (n) => n.type === 1 && n.requestType === 11,
     );
     if (writeBundlesRequest != null) {
       invariant(writeBundlesRequest.type === 1);
-      // $FlowFixMe[incompatible-cast]
-      bundleInfo = (nullthrows(writeBundlesRequest.result): Map<
+      bundleInfo = nullthrows(writeBundlesRequest.result) as Map<
         ContentKey,
-        PackagedBundleInfo,
-      >);
+        PackagedBundleInfo
+      >;
     }
-  } catch (e) {
-    console.log('Error loading bundleInfo\n', e);
+  } catch (e: any) {
+    console.error('Error loading bundleInfo\n', e);
   }
 
   return {assetGraph, bundleGraph, requestTracker, bundleInfo, cacheInfo};

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}