add getChunkPath method (vercel/turborepo#4600)

### Description follow up changes from vercel/turborepo#4488
vercel · Apr 19, 2023 · 679a139 · 679a139
1 parent e60ce2e
commit 679a139
Show file tree

Hide file tree

Showing 36 changed files with 380 additions and 292 deletions.
diff --git a/crates/turbopack-dev/js/src/runtime.dom.js b/crates/turbopack-dev/js/src/runtime.dom.js
@@ -17,10 +17,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/crates/turbopack-dev/js/src/runtime.js b/crates/turbopack-dev/js/src/runtime.js
@@ -1335,6 +1335,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1347,11 +1357,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);

diff --git a/crates/turbopack-dev/js/src/runtime.nodejs.js b/crates/turbopack-dev/js/src/runtime.nodejs.js
@@ -14,15 +14,10 @@ let BACKEND;
 
       if (params.runtimeModuleIds.length > 0) {
         for (const otherChunkData of params.otherChunks) {
-          loadChunk(
-            typeof otherChunkData === "string"
-              ? otherChunkData
-              : otherChunkData.path,
-            {
-              type: SourceTypeRuntime,
-              chunkPath,
-            }
-          );
+          loadChunk(getChunkPath(otherChunkData), {
+            type: SourceTypeRuntime,
+            chunkPath,
+          });
         }
 
         for (const moduleId of params.runtimeModuleIds) {

diff --git a/crates/turbopack-dev/js/src/runtime.none.js b/crates/turbopack-dev/js/src/runtime.none.js
@@ -68,10 +68,7 @@ let BACKEND;
     };
 
     for (const otherChunkData of otherChunks) {
-      const otherChunkPath =
-        typeof otherChunkData === "string"
-          ? otherChunkData
-          : otherChunkData.path;
+      const otherChunkPath = getChunkPath(otherChunkData);
       if (registeredChunks.has(otherChunkPath)) {
         continue;
       }

diff --git a/crates/turbopack-dev/js/types/backend.d.ts b/crates/turbopack-dev/js/types/backend.d.ts
@@ -12,6 +12,7 @@ declare global {
   declare const RUNTIME_PARAMS: DevRuntimeParams;
   declare const getFirstModuleChunk: GetFirstModuleChunk;
   declare const getOrInstantiateRuntimeModule: GetOrInstantiateRuntimeModule;
+  declare const getChunkPath: GetChunkPath;
   declare const loadChunk: InternalLoadChunk;
   declare const SourceTypeRuntime: SourceType.Runtime;
   declare const SourceTypeParent: SourceType.Parent;

diff --git a/crates/turbopack-dev/js/types/index.d.ts b/crates/turbopack-dev/js/types/index.d.ts
@@ -157,6 +157,8 @@ export interface TurbopackGlobals {
   TURBOPACK_CHUNK_LISTS?: ChunkList[];
 }
 
+export type GetChunkPath = (chunkData: ChunkData) => ChunkPath;
+
 export type GetFirstModuleChunk = (moduleId: ModuleId) => ChunkPath | null;
 export type GetOrInstantiateRuntimeModule = (
   moduleId: ModuleId,

diff --git a/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_0d348e.js b/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_0d348e.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/.../chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e77e9f.js b/.../chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e77e9f.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/.../shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_b1f0c2.js b/.../shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_b1f0c2.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/...define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_6b0d2b.js b/...define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_6b0d2b.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/...utput/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_fa9a30.js b/...utput/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_fa9a30.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/...apshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_37a138.js b/...apshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_37a138.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.

diff --git a/...motion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_b080c4.js b/...motion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_b080c4.js
@@ -1344,6 +1344,16 @@ function getOrInstantiateRuntimeModule(moduleId, chunkPath) {
   return instantiateModule(moduleId, { type: SourceTypeRuntime, chunkPath });
 }
 
+/**
+ * Returns the path of a chunk defined by its data.
+ *
+ * @param {ChunkData} chunkData
+ * @returns {ChunkPath} the chunk path
+ */
+function getChunkPath(chunkData) {
+  return typeof chunkData === "string" ? chunkData : chunkData.path;
+}
+
 /**
  * Subscribes to chunk list updates from the update server and applies them.
  *
@@ -1356,11 +1366,7 @@ function registerChunkList(chunkList) {
   ]);
 
   // Adding chunks to chunk lists and vice versa.
-  const chunks = new Set(
-    chunkList.chunks.map((chunkData) =>
-      typeof chunkData === "string" ? chunkData : chunkData.path
-    )
-  );
+  const chunks = new Set(chunkList.chunks.map(getChunkPath));
   chunkListChunksMap.set(chunkList.path, chunks);
   for (const chunkPath of chunks) {
     let chunkChunkLists = chunkChunkListsMap.get(chunkPath);
@@ -1436,10 +1442,7 @@ let BACKEND;
       }
 
       for (const otherChunkData of params.otherChunks) {
-        const otherChunkPath =
-          typeof otherChunkData === "string"
-            ? otherChunkData
-            : otherChunkData.path;
+        const otherChunkPath = getChunkPath(otherChunkData);
         if (otherChunkPath.endsWith(".css")) {
           // Mark all CSS chunks within the same chunk group as this chunk as loaded.
           // They are just injected as <link> tag and have to way to communicate completion.