pointed out by Devin: port processed correction from Obsidian back to roam. Also destructure

Author: maparent

apps/obsidian/src/utils/conceptConversion.ts

@@ -277,12 +277,17 @@ export const relatedConcepts = (concept: LocalConceptDataInput): string[] => {
  * schema_represented_by_local_id or local_reference_content — so that id
  * must equal some concept's source_local_id or it is reported as "missing".
  */
-const orderConceptsRec = (
-  ordered: LocalConceptDataInput[],
-  concept: LocalConceptDataInput,
-  remainder: { [key: string]: LocalConceptDataInput },
-  processed: Set<string>,
-): Set<string> => {
+const orderConceptsRec = ({
+  ordered,
+  concept,
+  remainder,
+  processed,
+}: {
+  ordered: LocalConceptDataInput[];
+  concept: LocalConceptDataInput;
+  remainder: { [key: string]: LocalConceptDataInput };
+  processed: Set<string>;
+}): Set<string> => {
   const relatedConceptIds = relatedConcepts(concept);
   let missing: Set<string> = new Set();
   while (relatedConceptIds.length > 0) {
@@ -294,7 +299,12 @@ const orderConceptsRec = (
     } else {
       missing = new Set([
         ...missing,
-        ...orderConceptsRec(ordered, relatedConcept, remainder, processed),
+        ...orderConceptsRec({
+          ordered,
+          concept: relatedConcept,
+          remainder,
+          processed,
+        }),
       ]);
       delete remainder[relatedConceptId];
     }
@@ -330,7 +340,12 @@ export const orderConceptsByDependency = (
     if (!first) break;
     missing = new Set([
       ...missing,
-      ...orderConceptsRec(ordered, first, conceptById, processed),
+      ...orderConceptsRec({
+        ordered,
+        concept: first,
+        remainder: conceptById,
+        processed,
+      }),
     ]);
     if (missing.size > 0) console.error(`missing: ${[...missing].join(", ")}`);
   }

apps/roam/src/utils/conceptConversion.ts

@@ -226,27 +226,40 @@ export const relatedConcepts = (concept: LocalConceptDataInput): string[] => {
   return [...new Set(relations)];
 };
 
-const orderConceptsRec = (
-  ordered: LocalConceptDataInput[],
-  concept: LocalConceptDataInput,
-  remainder: { [key: string]: LocalConceptDataInput },
-): Set<string> => {
+const orderConceptsRec = ({
+  ordered,
+  concept,
+  remainder,
+  processed,
+}: {
+  ordered: LocalConceptDataInput[];
+  concept: LocalConceptDataInput;
+  remainder: { [key: string]: LocalConceptDataInput };
+  processed: Set<string>;
+}): Set<string> => {
   const relatedConceptIds = relatedConcepts(concept);
   let missing: Set<string> = new Set();
   while (relatedConceptIds.length > 0) {
     const relatedConceptId = relatedConceptIds.shift()!;
+    if (processed.has(relatedConceptId)) continue;
     const relatedConcept = remainder[relatedConceptId];
     if (relatedConcept === undefined) {
       missing.add(relatedConceptId);
     } else {
       missing = new Set([
         ...missing,
-        ...orderConceptsRec(ordered, relatedConcept, remainder),
+        ...orderConceptsRec({
+          ordered,
+          concept: relatedConcept,
+          remainder,
+          processed,
+        }),
       ]);
       delete remainder[relatedConceptId];
     }
   }
   ordered.push(concept);
+  processed.add(concept.source_local_id!);
   delete remainder[concept.source_local_id!];
   return missing;
 };
@@ -273,11 +286,17 @@ export const orderConceptsByDependency = (
   ) as { [key: string]: LocalConceptDataInput };
   const ordered: LocalConceptDataInput[] = [];
   let missing: Set<string> = new Set();
+  const processed: Set<string> = new Set();
   while (Object.keys(conceptById).length > 0) {
     const first = Object.values(conceptById)[0];
     missing = new Set([
       ...missing,
-      ...orderConceptsRec(ordered, first, conceptById),
+      ...orderConceptsRec({
+        ordered,
+        concept: first,
+        remainder: conceptById,
+        processed,
+      }),
     ]);
   }
   return { ordered, missing: [...missing] };