@zodic/shared 0.0.305 → 0.0.307

package/app/services/ArchetypeService.ts

@@ -1,3 +1,4 @@
+
 import { and, eq, sql } from 'drizzle-orm';
 import { inject, injectable } from 'inversify';
 import { ChatMessages, Composition, schema } from '../..';
@@ -312,44 +313,7 @@ export class ArchetypeService {
       return;
     }
 
-    let blocks: string[] = [];
-    let ptBlocks: string[] = [];
-
-    try {
-      blocks = response
-        .split('-EN')[1]
-        .split('-PT')[0]
-        .trim()
-        .split(/\n\d\.\s*\n?/)
-        .filter(Boolean);
-
-      ptBlocks = response
-        .split('-PT')[1]
-        .trim()
-        .split(/\n\d\.\s*\n?/)
-        .filter(Boolean);
-    } catch (err) {
-      console.error(`❌ [Single] Parsing failed for ${combination}`, err);
-      await db.insert(schema.archetypeNameDumps).values({
-        id: combination,
-        combination,
-        rawText: response,
-        parsedSuccessfully: 0,
-        createdAt: Date.now(),
-      });
-      return;
-    }
-
-    const englishNames = blocks.map((block) => ({
-      name: block.match(/• Name:\s*(.+)/)?.[1]?.trim() || '',
-      essenceLine: block.match(/• Essence:\s*(.+)/)?.[1]?.trim() || '',
-    }));
-
-    const portugueseVariants = ptBlocks.map((block) => ({
-      masc: block.match(/• Masculino:\s*(.+)/)?.[1]?.trim() || '',
-      fem: block.match(/• Feminino:\s*(.+)/)?.[1]?.trim() || '',
-      essenceLine: block.match(/• Essência:\s*(.+)/)?.[1]?.trim() || '',
-    }));
+    const { english: englishNames, portuguese: portugueseVariants } = this.parseArchetypeNameBlocks(response);
 
     async function isEnglishNameDuplicate(name: string): Promise<boolean> {
       const result = await db
@@ -483,39 +447,7 @@ export class ArchetypeService {
       const block = blocks[i];
       console.log(`📦 [Batch] Processing: ${combination}`);
 
-      let en = '';
-      let pt = '';
-      try {
-        en = block.split('-EN')[1].split('-PT')[0].trim();
-        pt = block.split('-PT')[1].trim();
-      } catch (err) {
-        console.error(`❌ [Batch] Parsing failed for: ${combination}`, err);
-        await db.insert(schema.archetypeNameDumps).values({
-          id: combination,
-          combination,
-          rawText: block,
-          parsedSuccessfully: 0,
-          createdAt: Date.now(),
-        });
-        continue;
-      }
-
-      const english = en
-        .split(/\n\d\.\s*\n?/)
-        .filter(Boolean)
-        .map((line) => ({
-          name: line.match(/• Name:\s*(.+)/)?.[1]?.trim() || '',
-          essenceLine: line.match(/• Essence:\s*(.+)/)?.[1]?.trim() || '',
-        }));
-
-      const portuguese = pt
-        .split(/\n\d\.\s*\n?/)
-        .filter(Boolean)
-        .map((line) => ({
-          masc: line.match(/• Masculino:\s*(.+)/)?.[1]?.trim() || '',
-          fem: line.match(/• Feminino:\s*(.+)/)?.[1]?.trim() || '',
-          essenceLine: line.match(/• Essência:\s*(.+)/)?.[1]?.trim() || '',
-        }));
+      const { english, portuguese } = this.parseArchetypeNameBlocks(block);
 
       for (let j = 0; j < 3; j++) {
         const index = (j + 1).toString();
@@ -729,6 +661,17 @@ export class ArchetypeService {
         }));
 
       for (const index of indexes) {
+        if (!english[index - 1] || !portuguese[index - 1]) {
+          await this.context.drizzle().insert(schema.archetypeNameDumps).values({
+            id: `${combination}:${index}:${Date.now()}`,
+            combination,
+            rawText: block,
+            parsedSuccessfully: 0,
+            createdAt: Date.now(),
+          });
+          console.warn(`⚠️ [Batch] Skipping index ${index} for ${combination} due to missing parsed block`);
+          continue;
+        }
         const englishEntry = english[index - 1];
         const ptEntry = portuguese[index - 1];
 
@@ -842,4 +785,52 @@ export class ArchetypeService {
  
     return compositions;
   }
+
+  private parseArchetypeNameBlocks(block: string): {
+    english: { name: string; essenceLine: string }[];
+    portuguese: { masc: string; fem: string; essenceLine: string }[];
+  } {
+    const result = {
+      english: [] as { name: string; essenceLine: string }[],
+      portuguese: [] as { masc: string; fem: string; essenceLine: string }[],
+    };
+  
+    try {
+      const enMatch = block.match(/-EN[\s\S]*?-PT/);
+      const ptMatch = block.match(/-PT[\s\S]*/);
+  
+      const enBlock = enMatch?.[0].replace(/-EN/, '').replace(/-PT/, '').trim() ?? '';
+      const ptBlock = ptMatch?.[0].replace(/-PT/, '').trim() ?? '';
+  
+      result.english = enBlock
+        .split(/\n\d\.\s*\n?/)
+        .filter(Boolean)
+        .map((entry, i) => {
+          const name = entry.match(/• Name:\s*(.+)/)?.[1]?.trim() ?? '';
+          const essenceLine = entry.match(/• Essence:\s*(.+)/)?.[1]?.trim() ?? '';
+          if (!name || !essenceLine) {
+            console.warn(`⚠️ [Parse] Incomplete English entry ${i + 1}:`, entry);
+          }
+          return { name, essenceLine };
+        });
+  
+      result.portuguese = ptBlock
+        .split(/\n\d\.\s*\n?/)
+        .filter(Boolean)
+        .map((entry, i) => {
+          const masc = entry.match(/• Masculino:\s*(.+)/)?.[1]?.trim() ?? '';
+          const fem = entry.match(/• Feminino:\s*(.+)/)?.[1]?.trim() ?? '';
+          const essenceLine = entry.match(/• Essência:\s*(.+)/)?.[1]?.trim() ?? '';
+          if (!masc || !fem || !essenceLine) {
+            console.warn(`⚠️ [Parse] Incomplete Portuguese entry ${i + 1}:`, entry);
+          }
+          return { masc, fem, essenceLine };
+        });
+  
+    } catch (error) {
+      console.error('❌ [Parse] Failed to parse block:', error);
+    }
+  
+    return result;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.305",
+  "version": "0.0.307",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/utils/archetypeNamesMessages.ts

@@ -211,7 +211,7 @@ For every composition, return:
 Avoid names that sound like objects, titles, or abstract forces (e.g., The Lantern, The Eclipse, The Veil).
 Instead, use names that suggest a personified being or living archetype, such as The Masked Oracle, The Starborn Seeker, or The Dancer of the Falling Sky.
 
-Do not include any commentary or explanations outside the defined output structure. Only return the output block for each composition.`;
+Do not include any commentary or explanations outside the defined output structure. Only return the output block for each composition, exactly as described:`;
 
   const compositionBlocks = compositions.map((comp, i) => {
     const sun = influenceMap.sun[comp.sun];