@atlaspack/core 2.16.2-canary.181 → 2.16.2-canary.183

package/lib/requests/WriteBundlesRequest.js

@@ -12,6 +12,7 @@ function _featureFlags() {
   return data;
 }
 var _RequestTracker = require("../RequestTracker");
+var _types = require("../types");
 var _ReporterRunner = require("../ReporterRunner");
 var _constants = require("../constants");
 var _projectPath = require("../projectPath");
@@ -55,8 +56,6 @@ function createWriteBundlesRequest(input) {
     input
   };
 }
-
-// @ts-expect-error TS7031
 async function run({
   input,
   api,
@@ -82,11 +81,7 @@ async function run({
   const allBundles = bundleGraph.getBundles({
     includeInline: (0, _featureFlags().getFeatureFlag)('inlineBundlesSourceMapFixes')
   });
-  const bundles = allBundles.filter(
-  // @ts-expect-error TS7006
-  bundle => bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inline-isolated')
-  // @ts-expect-error TS7006
-  .filter(bundle => {
+  const bundles = allBundles.filter(bundle => bundle.bundleBehavior !== _types.BundleBehavior.inline && bundle.bundleBehavior !== _types.BundleBehavior.inlineIsolated).filter(bundle => {
     // Do not package and write placeholder bundles to disk. We just
     // need to update the name so other bundles can reference it.
     if (bundle.isPlaceholder) {
@@ -107,9 +102,7 @@ async function run({
     }
     return true;
   });
-  let cachedBundles = new Set(
-  // @ts-expect-error TS7006
-  bundles.filter(b => api.canSkipSubrequest(bundleGraph.getHash(b))));
+  let cachedBundles = new Set(bundles.filter(b => api.canSkipSubrequest(bundleGraph.getHash(b))));
 
   // Package on the main thread if there is only one bundle to package.
   // This avoids the cost of serializing the bundle graph for single file change builds.
@@ -117,9 +110,7 @@ async function run({
   try {
     let completeBundles = cachedBundles.size;
     reportPackagingProgress(completeBundles, bundles.length);
-    await Promise.all(
-    // @ts-expect-error TS7006
-    bundles.map(async bundle => {
+    await Promise.all(bundles.map(async bundle => {
       let request = (0, _PackageRequest.createPackageRequest)({
         bundle,
         bundleGraph,
@@ -159,17 +150,13 @@ async function run({
       }
     }));
     assignComplexNameHashes(hashRefToNameHash, bundles, bundleInfoMap, options);
-    await Promise.all(
-    // @ts-expect-error TS7006
-    bundles.map(bundle => {
+    await Promise.all(bundles.map(bundle => {
       let promise = writeEarlyPromises[bundle.id] ?? api.runRequest((0, _WriteBundleRequest.default)({
         bundle,
         info: bundleInfoMap[bundle.id],
         hashRefToNameHash,
         bundleGraph
       }));
-
-      // @ts-expect-error TS7006
       return promise.then(r => res.set(bundle.id, r));
     }));
     api.storeResult(res);
@@ -178,18 +165,12 @@ async function run({
     await dispose();
   }
 }
-function assignComplexNameHashes(hashRefToNameHash,
-// @ts-expect-error TS2304
-bundles, bundleInfoMap,
-// @ts-expect-error TS2304
-options) {
+function assignComplexNameHashes(hashRefToNameHash, bundles, bundleInfoMap, options) {
   for (let bundle of bundles) {
     if (hashRefToNameHash.get(bundle.hashReference) != null) {
       continue;
     }
-    hashRefToNameHash.set(bundle.hashReference, options.shouldContentHash ? (0, _rust().hashString)([...getBundlesIncludedInHash(bundle.id, bundleInfoMap)]
-    // @ts-expect-error TS2538
-    .map(bundleId => bundleInfoMap[bundleId].hash).join(':')).slice(-8) : bundle.id.slice(-8));
+    hashRefToNameHash.set(bundle.hashReference, options.shouldContentHash ? (0, _rust().hashString)([...getBundlesIncludedInHash(bundle.id, bundleInfoMap)].map(bundleId => bundleInfoMap[bundleId].hash).join(':')).slice(-8) : bundle.id.slice(-8));
   }
 }
 function getBundlesIncludedInHash(bundleId, bundleInfoMap, included = new Set()) {

package/lib/types/requests/WriteBundlesRequest.d.ts

@@ -3,7 +3,7 @@ import type { Async } from '@atlaspack/types';
 import type { SharedReference } from '@atlaspack/workers';
 import type { StaticRunOpts } from '../RequestTracker';
 import { requestTypes } from '../RequestTracker';
-import type { PackagedBundleInfo } from '../types';
+import { type PackagedBundleInfo } from '../types';
 import type BundleGraph from '../BundleGraph';
 type WriteBundlesRequestInput = {
     bundleGraph: BundleGraph;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.181+0211c6986",
+  "version": "2.16.2-canary.183+8604d2a49",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -11,7 +11,7 @@
   },
   "main": "./lib/index.js",
   "source": "./src/index.ts",
-  "types": "./lib/types/index.d.ts",
+  "types": "./lib/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -23,21 +23,21 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.249+0211c6986",
-    "@atlaspack/cache": "3.1.1-canary.181+0211c6986",
-    "@atlaspack/diagnostic": "2.14.1-canary.249+0211c6986",
-    "@atlaspack/events": "2.14.1-canary.249+0211c6986",
-    "@atlaspack/feature-flags": "2.14.1-canary.249+0211c6986",
-    "@atlaspack/fs": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/graph": "3.4.1-canary.249+0211c6986",
-    "@atlaspack/logger": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/package-manager": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/plugin": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/profiler": "2.14.1-canary.249+0211c6986",
-    "@atlaspack/rust": "3.2.1-canary.181+0211c6986",
-    "@atlaspack/types": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/utils": "2.14.5-canary.181+0211c6986",
-    "@atlaspack/workers": "2.14.5-canary.181+0211c6986",
+    "@atlaspack/build-cache": "2.13.3-canary.251+8604d2a49",
+    "@atlaspack/cache": "3.1.1-canary.183+8604d2a49",
+    "@atlaspack/diagnostic": "2.14.1-canary.251+8604d2a49",
+    "@atlaspack/events": "2.14.1-canary.251+8604d2a49",
+    "@atlaspack/feature-flags": "2.14.1-canary.251+8604d2a49",
+    "@atlaspack/fs": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/graph": "3.4.1-canary.251+8604d2a49",
+    "@atlaspack/logger": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/package-manager": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/plugin": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/profiler": "2.14.1-canary.251+8604d2a49",
+    "@atlaspack/rust": "3.2.1-canary.183+8604d2a49",
+    "@atlaspack/types": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/utils": "2.14.5-canary.183+8604d2a49",
+    "@atlaspack/workers": "2.14.5-canary.183+8604d2a49",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -62,5 +62,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "0211c698666b6e8282aff005d286b29ad00fd31f"
-}
+  "gitHead": "8604d2a49ace5e9194ec4f76e71f06b93610f6b4"
+}

package/src/requests/WriteBundlesRequest.ts

@@ -4,7 +4,12 @@ import {getFeatureFlag} from '@atlaspack/feature-flags';
 import type {SharedReference} from '@atlaspack/workers';
 import type {StaticRunOpts} from '../RequestTracker';
 import {requestTypes} from '../RequestTracker';
-import type {PackagedBundleInfo} from '../types';
+import {
+  BundleBehavior,
+  type PackagedBundleInfo,
+  type Bundle,
+  type AtlaspackOptions,
+} from '../types';
 import type BundleGraph from '../BundleGraph';
 import type {BundleInfo} from '../PackagerRunner';
 import {report} from '../ReporterRunner';
@@ -66,8 +71,12 @@ export default function createWriteBundlesRequest(
   };
 }
 
-// @ts-expect-error TS7031
-async function run({input, api, farm, options}) {
+async function run({
+  input,
+  api,
+  farm,
+  options,
+}: RunInput<WriteBundlesRequestResult>) {
   let {bundleGraph, optionsRef} = input;
   let {ref, dispose} = await farm.createSharedReference(bundleGraph);
 
@@ -77,7 +86,7 @@ async function run({input, api, farm, options}) {
   let bundleInfoMap: {
     [key: string]: BundleInfo;
   } = {};
-  let writeEarlyPromises: Record<string, any> = {};
+  let writeEarlyPromises: Record<string, Promise<PackagedBundleInfo>> = {};
   let hashRefToNameHash = new Map();
 
   // Include inline bundles so that non-inline bundles referenced from inline bundles are written to
@@ -87,12 +96,10 @@ async function run({input, api, farm, options}) {
   });
   const bundles = allBundles
     .filter(
-      // @ts-expect-error TS7006
       (bundle) =>
-        bundle.bundleBehavior !== 'inline' &&
-        bundle.bundleBehavior !== 'inline-isolated',
+        bundle.bundleBehavior !== BundleBehavior.inline &&
+        bundle.bundleBehavior !== BundleBehavior.inlineIsolated,
     )
-    // @ts-expect-error TS7006
     .filter((bundle) => {
       // Do not package and write placeholder bundles to disk. We just
       // need to update the name so other bundles can reference it.
@@ -119,7 +126,6 @@ async function run({input, api, farm, options}) {
     });
 
   let cachedBundles = new Set(
-    // @ts-expect-error TS7006
     bundles.filter((b) => api.canSkipSubrequest(bundleGraph.getHash(b))),
   );
 
@@ -133,7 +139,6 @@ async function run({input, api, farm, options}) {
     reportPackagingProgress(completeBundles, bundles.length);
 
     await Promise.all(
-      // @ts-expect-error TS7006
       bundles.map(async (bundle) => {
         let request = createPackageRequest({
           bundle,
@@ -185,7 +190,6 @@ async function run({input, api, farm, options}) {
     );
     assignComplexNameHashes(hashRefToNameHash, bundles, bundleInfoMap, options);
     await Promise.all(
-      // @ts-expect-error TS7006
       bundles.map((bundle) => {
         let promise =
           writeEarlyPromises[bundle.id] ??
@@ -198,7 +202,6 @@ async function run({input, api, farm, options}) {
             }),
           );
 
-        // @ts-expect-error TS7006
         return promise.then((r) => res.set(bundle.id, r));
       }),
     );
@@ -212,12 +215,10 @@ async function run({input, api, farm, options}) {
 
 function assignComplexNameHashes(
   hashRefToNameHash: Map<string, string>,
-  // @ts-expect-error TS2304
   bundles: Array<Bundle>,
   bundleInfoMap: {
     [key: string]: BundleInfo;
   },
-  // @ts-expect-error TS2304
   options: AtlaspackOptions,
 ) {
   for (let bundle of bundles) {
@@ -229,7 +230,6 @@ function assignComplexNameHashes(
       options.shouldContentHash
         ? hashString(
             [...getBundlesIncludedInHash(bundle.id, bundleInfoMap)]
-              // @ts-expect-error TS2538
               .map((bundleId) => bundleInfoMap[bundleId].hash)
               .join(':'),
           ).slice(-8)
@@ -243,7 +243,7 @@ function getBundlesIncludedInHash(
   bundleInfoMap: {
     [key: string]: BundleInfo;
   },
-  included = new Set(),
+  included = new Set<string>(),
 ) {
   included.add(bundleId);
   for (let hashRef of bundleInfoMap[bundleId]?.hashReferences ?? []) {