Oops

alineacms · Feb 20, 2024 · ce1e5b0 · ce1e5b0
1 parent a2f597d
commit ce1e5b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/backend/Database.ts b/src/backend/Database.ts
@@ -644,15 +644,15 @@ export class Database implements Syncable {
               )
             }
           }
+          await query(
+            EntryRow({entryId: entry.entryId, phase: entry.phase}).delete()
+          )
           seenSeeds.add(key)
           seenVersions.push(
             await query(
               EntryRow().insert(withHash).returning(EntryRow.versionId)
             )
           )
-          await query(
-            EntryRow({entryId: entry.entryId, phase: entry.phase}).delete()
-          )
           inserted.push(`${entry.entryId}.${entry.phase}`)
         } catch (e: any) {
           console.log(`> skipped ${file.filePath} — ${e.message}`)

diff --git a/src/core/EntryRecord.ts b/src/core/EntryRecord.ts
@@ -43,14 +43,15 @@ export interface RequiredEntryFields extends Partial<EntryRow> {
 }
 
 export function parseRecord(record: EntryRecord) {
+  const oldest = record.alinea as any
   const {
     [META_KEY]: old,
     [EntryRecord.id]: entryId = old?.entryId! ?? record.id,
     [EntryRecord.type]: type = old?.type! ?? record.type,
-    [EntryRecord.index]: index = old?.index! ?? record.index,
-    [EntryRecord.i18nId]: i18nId = old?.i18nId! ?? record.i18nId,
-    [EntryRecord.root]: root = old?.root! ?? record.root,
-    [EntryRecord.seeded]: seeded = (old?.seeded as string) ?? record.seeded,
+    [EntryRecord.index]: index = old?.index! ?? oldest?.index,
+    [EntryRecord.i18nId]: i18nId = old?.i18nId! ?? oldest?.i18nId,
+    [EntryRecord.root]: root = old?.root! ?? oldest?.root,
+    [EntryRecord.seeded]: seeded = (old?.seeded as string) ?? oldest?.seeded,
     ...data
   } = record
   return {