@zodic/shared 0.0.309 → 0.0.311

package/app/services/ArchetypeService.ts

@@ -963,77 +963,54 @@ export class ArchetypeService {
     return compositions;
   }
 
-  private parseArchetypeNameBlocks(block: string): {
-    english: { name: string; essenceLine: string }[];
-    portuguese: { masc: string; fem: string; essenceLine: string }[];
+  parseArchetypeNameBlocks(block: string): {
+    english: any[];
+    portuguese: any[];
   } {
-    const result = {
-      english: [] as { name: string; essenceLine: string }[],
-      portuguese: [] as { masc: string; fem: string; essenceLine: string }[],
-    };
-
-    try {
-      // Normalize the block by replacing multiple spaces with a single space and ensuring newlines
-      const normalizedBlock = block
-        .replace(/\s+/g, ' ')
-        .replace(/-EN\s*/, '-EN\n')
-        .replace(/-PT\s*/, '\n-PT\n')
-        .trim();
-
-      // Split into EN and PT sections
-      const sections = normalizedBlock.split(/\n?-PT\n/);
-      const enSection = sections[0]?.replace(/-EN\n/, '').trim() ?? '';
-      const ptSection = sections[1]?.trim() ?? '';
-
-      // Parse English entries
-      result.english = enSection
-        .split(/\n?\d+\.\s*\n?/)
-        .filter(Boolean)
-        .map((entry, i) => {
-          const nameMatch = entry.match(/• Name:\s*([^•]+)/);
-          const essenceMatch = entry.match(/• Essence:\s*([^•]+)/);
-          const name = nameMatch?.[1]?.trim() ?? '';
-          const essenceLine = essenceMatch?.[1]?.trim() ?? '';
-          if (!name || !essenceLine) {
-            console.warn(
-              `⚠️ [Parse] Incomplete English entry ${i + 1}:`,
-              entry
-            );
-          }
-          return { name, essenceLine };
-        });
-
-      // Parse Portuguese entries
-      result.portuguese = ptSection
-        .split(/\n?\d+\.\s*\n?/)
-        .filter(Boolean)
-        .map((entry, i) => {
-          const mascMatch = entry.match(/• Masculino:\s*([^•]+)/);
-          const femMatch = entry.match(/• Feminino:\s*([^•]+)/);
-          const essenceMatch = entry.match(/• Essência:\s*([^•]+)/);
-          const masc = mascMatch?.[1]?.trim() ?? '';
-          const fem = femMatch?.[1]?.trim() ?? '';
-          const essenceLine = essenceMatch?.[1]?.trim() ?? '';
-          if (!masc || !fem || !essenceLine) {
-            console.warn(
-              `⚠️ [Parse] Incomplete Portuguese entry ${i + 1}:`,
-              entry
-            );
-          }
-          // Validate gender consistency
-          if (masc.startsWith('A ') && fem.startsWith('O ')) {
-            console.warn(
-              `⚠️ [Parse] Gender mismatch in Portuguese entry ${i + 1}:`,
-              entry
-            );
-            return { masc: fem, fem: masc, essenceLine }; // Swap to correct the mismatch
-          }
-          return { masc, fem, essenceLine };
-        });
-    } catch (error) {
-      console.error('❌ [Parse] Failed to parse block:', error);
+    const sections = block.split(/^-EN|^-PT/m).filter((s) => s.trim());
+    const english: any[] = [];
+    const portuguese: any[] = [];
+
+    for (const section of sections) {
+      if (section.startsWith('EN')) {
+        const lines = section.split('\n').filter((l) => l.trim());
+        const nameMatch = lines
+          .find((l) => l.includes('• Name:'))
+          ?.split('• Name:')[1]
+          ?.trim();
+        const essenceMatch = lines
+          .find((l) => l.includes('• Essence:'))
+          ?.split('• Essence:')[1]
+          ?.trim();
+
+        if (nameMatch && essenceMatch) {
+          english.push({ name: nameMatch, essenceLine: essenceMatch });
+        }
+      } else if (section.startsWith('PT')) {
+        const lines = section.split('\n').filter((l) => l.trim());
+        const mascMatch = lines
+          .find((l) => l.includes('• Masculino:'))
+          ?.split('• Masculino:')[1]
+          ?.trim();
+        const femMatch = lines
+          .find((l) => l.includes('• Feminino:'))
+          ?.split('• Feminino:')[1]
+          ?.trim();
+        const essenceMatch = lines
+          .find((l) => l.includes('• Essência:'))
+          ?.split('• Essência:')[1]
+          ?.trim();
+
+        if (mascMatch && femMatch && essenceMatch) {
+          portuguese.push({
+            masc: mascMatch,
+            fem: femMatch,
+            essenceLine: essenceMatch,
+          });
+        }
+      }
     }
 
-    return result;
+    return { english, portuguese };
   }
 }

package/package.json

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

package/utils/index.ts

@@ -1,5 +1,6 @@
 import { jwtVerify } from 'jose';
 import { AuthCtx, JWKS, Provider, ProviderInfo } from '../types';
+export { eq } from 'drizzle-orm';
 
 const base64UrlDecode = (input: string) => {
   const base64 = input.replace(/-/g, '+').replace(/_/g, '/');