fix: used by

Author: 0xHericles

Diff for: engine/decofile/fsFolder.ts

@@ -79,35 +79,45 @@ const inferMetadata = (
  * @param currentPath - The current path of the object being processed.
  * @param isRoot - Indicates whether the current object is the root object.
  */
+/**
+ * Recursively maps block references in an object and updates the `usedBy` property of the corresponding blocks.
+ *
+ * @param obj - The object to inspect for block references.
+ * @param blockMetadata - A map of block paths to block metadata.
+ * @param blockPathByName - A map of block names to their corresponding file paths.
+ * @param currentPath - The path of the current block being processed.
+ * @param isRoot - Indicates whether the current object is the root object.
+ */
 const mapBlockReferences = (
   obj: unknown,
-  blocks: Map<string, Metadata>,
+  blockMetadata: Map<string, Metadata>,
+  blockPathByName: Map<string, string>,
   currentPath: string,
-  isRoot = true,
+  isRoot = true
 ): void => {
-  if (typeof obj !== "object" || obj === null) return;
+  if (typeof obj !== 'object' || obj === null) return;
 
   if (Array.isArray(obj)) {
-    obj.forEach((item) => mapBlockReferences(item, blocks, currentPath, false));
-  } else {
-    for (const [key, value] of Object.entries(obj)) {
-      if (key === "__resolveType" && typeof value === "string" && !isRoot) {
-        const blockName = value.split("/").pop();
-        if (blockName) {
-          const blockPath = Array.from(blocks.keys()).find((path) =>
-            decodeURIComponent(path.split("/").pop() ?? "") ===
-              `${blockName}.json`
-          );
-          if (blockPath && blockPath !== currentPath) {
-            const block = blocks.get(blockPath);
-            if (block && !block.usedBy.includes(currentPath)) {
-              block.usedBy.push(currentPath);
-            }
+    for (const item of obj) {
+      mapBlockReferences(item, blockMetadata, blockPathByName, currentPath, false);
+    }
+    return;
+  }
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (key === '__resolveType' && !isRoot) {
+      const blockName = value.split('/').pop();
+      if (blockName) {
+        const referencedBlockPath = blockPathByName.get(blockName);
+        if (referencedBlockPath && referencedBlockPath !== currentPath) {
+          const blockMeta = blockMetadata.get(referencedBlockPath);
+          if (blockMeta && !blockMeta.usedBy.includes(currentPath)) {
+            blockMeta.usedBy.push(currentPath);
           }
         }
-      } else if (typeof value === "object" && value !== null) {
-        mapBlockReferences(value, blocks, currentPath, false);
       }
+    } else if (typeof value === 'object' && value !== null) {
+      mapBlockReferences(value, blockMetadata, blockPathByName, currentPath, false);
     }
   }
 };
@@ -116,7 +126,7 @@ const mapBlockReferences = (
 export const genMetadata = async () => {
   try {
     const knownBlockTypes = new Set(getBlocks().map((x) => x.type));
-    const paths: string[] = [];
+    const blockPaths: string[] = [];
 
     const walker = walk(join(DECO_FOLDER, BLOCKS_FOLDER), {
       includeDirs: false,
@@ -125,34 +135,39 @@ export const genMetadata = async () => {
     });
 
     for await (const entry of walker) {
-      paths.push(entry.path);
+      blockPaths.push(entry.path);
     }
 
-    const entries = await Promise.all(
-      paths.map(async (path) =>
+    const blockEntries = await Promise.all(
+      blockPaths.map(async (path) =>
         [
           `/${path.replaceAll("\\", "/")}`,
           JSON.parse(await Deno.readTextFile(path)),
         ] as [string, unknown]
       ),
     );
 
-    const metadata = new Map(
-      entries.map(([path, content]) => [
-        path,
-        inferMetadata(content, knownBlockTypes),
-      ]).filter(([, meta]) => meta !== null) as [string, Metadata][],
-    );
+    const blockMetadata: Map<string, Metadata> = new Map();
+    const blockPathByName = new Map<string, string>();
+
+    for (const [path, content] of blockEntries) {
+      const meta = inferMetadata(content, knownBlockTypes);
+      if (meta !== null) {
+        blockMetadata.set(path, meta);
+        const blockName = parseBlockId(basename(path));
+        blockPathByName.set(blockName, path);
+      }
+    }
 
-    for (const [path, content] of entries) {
-      mapBlockReferences(content, metadata, path);
+    for (const [path, content] of blockEntries) {
+      mapBlockReferences(content, blockMetadata, blockPathByName, path);
     }
 
-    const pathname = join(Deno.cwd(), METADATA_PATH);
-    await ensureFile(pathname);
+    const metadataPath = join(Deno.cwd(), METADATA_PATH);
+    await ensureFile(metadataPath);
     await Deno.writeTextFile(
-      pathname,
-      JSON.stringify(Object.fromEntries(metadata)),
+      metadataPath,
+      JSON.stringify(Object.fromEntries(blockMetadata)),
     );
   } catch (error) {
     console.error("Error while auto-generating blocks.json", error);