fix artifact position

formatters.py

@@ -109,31 +109,29 @@ def render_entry(type_: str, fields: dict) -> str:
     return "\n".join(lines)
 
 
-def insert_entry(file_content: str, type_: str, entry_block: str, org_id: str | None) -> str:
-    """Insert entry_block into file_content, grouped near org_id's other
-    entries when found, otherwise right after the array's opening line."""
+def insert_entry(file_content: str, type_: str, entry_block: str) -> str:
+    """Insert entry_block at the end of the array, right before its closing
+    `];` line."""
     _, array_name, _ = TARGETS[type_]
     lines = file_content.split("\n")
     opening = f"export const {array_name} = ["
+    closing = "];"
+
+    opening_at = None
+    for i, line in enumerate(lines):
+        if line.strip() == opening:
+            opening_at = i
+            break
+    if opening_at is None:
+        raise ValueError(f"Could not find `{opening}` in target file")
 
     insert_at = None
-    if org_id:
-        for i, line in enumerate(lines):
-            if f'orgId: "{org_id}"' in line:
-                # walk forward to this object's closing "  },"
-                for j in range(i + 1, len(lines)):
-                    if lines[j] == "  },":
-                        insert_at = j + 1
-                        break
-                # keep scanning in case a later group is a better (last) match
-    if insert_at is None:
-        for i, line in enumerate(lines):
-            if line.strip() == opening:
-                insert_at = i + 1
-                break
-
+    for j in range(opening_at + 1, len(lines)):
+        if lines[j].strip() == closing:
+            insert_at = j
+            break
     if insert_at is None:
-        raise ValueError(f"Could not find `{opening}` in target file")
+        raise ValueError(f"Could not find closing `{closing}` for `{opening}` in target file")
 
     new_lines = lines[:insert_at] + entry_block.split("\n") + lines[insert_at:]
     return "\n".join(new_lines)

github_pr.py

@@ -92,7 +92,6 @@ def open_pr_for_submission(submission: dict, fields: dict) -> str:
     type_ = submission["type"]
     file_path = formatters.target_file(type_)
     entry_block = formatters.render_entry(type_, fields)
-    org_id = fields.get("orgId")
 
     base = _default_branch()
     base_sha = _branch_sha(base)
@@ -102,7 +101,7 @@ def open_pr_for_submission(submission: dict, fields: dict) -> str:
     _create_branch(branch, base_sha)
 
     content, sha = _get_file(file_path, branch)
-    new_content = formatters.insert_entry(content, type_, entry_block, org_id)
+    new_content = formatters.insert_entry(content, type_, entry_block)
     _update_file(
         file_path, branch, new_content, sha,
         message=f"Add {type_}: {fields.get('name') or fields.get('title') or slug}",