@zodic/shared 0.0.379 → 0.0.381

package/app/services/ArchetypeService.ts

@@ -858,25 +858,29 @@ export class ArchetypeService {
           rawResponse: ptResponse,
         });
   
-        await this.log('debug', `Parsing PT content response for archetype ${index}`);
-        const ptContent = this.parseContentResponse(ptResponse, 'PT');
-        await this.log('info', `Parsed PT content for archetype ${index}`, { ptContent });
+        await this.log('debug', `Parsing PT-M content response for archetype ${index}`);
+        const ptMaleContentParsed = this.parseContentResponse(ptResponse, 'PT', 'male');
+        await this.log('info', `Parsed PT-M content for archetype ${index}`, { ptMaleContentParsed });
+  
+        await this.log('debug', `Parsing PT-F content response for archetype ${index}`);
+        const ptFemaleContentParsed = this.parseContentResponse(ptResponse, 'PT', 'female');
+        await this.log('info', `Parsed PT-F content for archetype ${index}`, { ptFemaleContentParsed });
   
         const ptMaleContent = [
-          { section: 'voiceOfTheSoul', text: ptContent.voiceOfTheSoul },
-          { section: 'giftsYouBear', text: ptContent.giftsYouBear },
-          { section: 'shadowsYouFace', text: ptContent.shadowsYouFace },
-          { section: 'rhythmOfYourDays', text: ptContent.rhythmOfYourDays },
-          { section: 'tiesThatBind', text: ptContent.tiesThatBind },
-          { section: 'lightWithin', text: ptContent.lightWithin },
+          { section: 'voiceOfTheSoul', text: ptMaleContentParsed.voiceOfTheSoul },
+          { section: 'giftsYouBear', text: ptMaleContentParsed.giftsYouBear },
+          { section: 'shadowsYouFace', text: ptMaleContentParsed.shadowsYouFace },
+          { section: 'rhythmOfYourDays', text: ptMaleContentParsed.rhythmOfYourDays },
+          { section: 'tiesThatBind', text: ptMaleContentParsed.tiesThatBind },
+          { section: 'lightWithin', text: ptMaleContentParsed.lightWithin },
         ];
         const ptFemaleContent = [
-          { section: 'voiceOfTheSoul', text: ptContent.voiceOfTheSoul.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
-          { section: 'giftsYouBear', text: ptContent.giftsYouBear.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
-          { section: 'shadowsYouFace', text: ptContent.shadowsYouFace.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
-          { section: 'rhythmOfYourDays', text: ptContent.rhythmOfYourDays.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
-          { section: 'tiesThatBind', text: ptContent.tiesThatBind.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
-          { section: 'lightWithin', text: ptContent.lightWithin.replace(/ele/g, 'ela').replace(/seu/g, 'sua') },
+          { section: 'voiceOfTheSoul', text: ptFemaleContentParsed.voiceOfTheSoul },
+          { section: 'giftsYouBear', text: ptFemaleContentParsed.giftsYouBear },
+          { section: 'shadowsYouFace', text: ptFemaleContentParsed.shadowsYouFace },
+          { section: 'rhythmOfYourDays', text: ptFemaleContentParsed.rhythmOfYourDays },
+          { section: 'tiesThatBind', text: ptFemaleContentParsed.tiesThatBind },
+          { section: 'lightWithin', text: ptFemaleContentParsed.lightWithin },
         ];
   
         await this.log('debug', `Updating PT-M content for ${ptIds.male}`, { content: ptMaleContent });
@@ -921,13 +925,13 @@ export class ArchetypeService {
     return contentResults;
   }
 
-  private parseContentResponse(response: string, section: string) {
-    this.log('debug', 'Starting parseContentResponse', { responseLength: response.length, section });
+  private parseContentResponse(response: string, section: string, gender: Gender | null = null) {
+    this.log('debug', 'Starting parseContentResponse', { responseLength: response.length, section, gender });
   
-    const lines = response.split('\n').map(line => line.trim()); // Trim each line
+    const lines = response.split('\n').map(line => line.trim());
     this.log('debug', 'Split response into lines', { linesCount: lines.length, lines });
   
-    // Skip initial --- and any empty lines
+    // Skip initial --- and empty lines
     let startIndex = 0;
     while (startIndex < lines.length && (lines[startIndex] === '---' || lines[startIndex] === '')) {
       startIndex++;
@@ -938,65 +942,99 @@ export class ArchetypeService {
       throw new Error(`No content found after skipping delimiters for ${section}`);
     }
   
-    const expectedHeader = `${section}:`;
-    const actualHeader = lines[startIndex];
-    if (!actualHeader.startsWith(expectedHeader)) {
-      this.log('error', `Invalid language header for ${section}`, {
-        expected: expectedHeader,
-        found: actualHeader,
-      });
-      throw new Error(`Invalid language header for ${section}: expected ${expectedHeader}, got ${actualHeader}`);
-    }
-  
-    const content: Record<string, string> = {};
+    const content: Record<string, Record<string, string>> = { 'PT-M:': {}, 'PT-F:': {}, 'EN:': {} };
+    let currentSectionHeader = '';
     let currentSection = '';
     let currentText: string[] = [];
+    let currentLang = '';
+  
+    for (let i = startIndex; i < lines.length; i++) {
+      const line = lines[i];
+  
+      if (line === '---') {
+        if (currentSection && currentText.length > 0) {
+          const key = currentSection.toLowerCase().replace(/\s+/g, '').replace(/([A-Z])/g, (match) => match.toLowerCase());
+          content[currentLang][key] = currentText.join(' ').trim();
+          this.log('debug', `Extracted section ${currentSection} for ${currentLang}`, { key, text: content[currentLang][key] });
+        }
+        currentSection = '';
+        currentText = [];
+        // Look for the next header
+        while (i + 1 < lines.length && (lines[i + 1] === '' || lines[i + 1] === '---')) {
+          i++;
+        }
+        if (i + 1 < lines.length && (lines[i + 1] === 'PT-M:' || lines[i + 1] === 'PT-F:' || lines[i + 1] === 'EN:')) {
+          i++;
+          currentLang = lines[i];
+          this.log('debug', `Found new language section: ${currentLang}`);
+        }
+        continue;
+      }
+  
+      if (line === 'PT-M:' || line === 'PT-F:' || line === 'EN:') {
+        currentLang = line;
+        this.log('debug', `Starting language section: ${currentLang}`);
+        continue;
+      }
   
-    for (const line of lines.slice(startIndex + 1)) {
       if (line.startsWith('#')) {
         if (currentSection && currentText.length > 0) {
           const key = currentSection.toLowerCase().replace(/\s+/g, '').replace(/([A-Z])/g, (match) => match.toLowerCase());
-          content[key] = currentText.join(' ').trim();
-          this.log('debug', `Extracted section ${currentSection} for ${section}`, {
-            key,
-            text: content[key],
-          });
+          content[currentLang][key] = currentText.join(' ').trim();
+          this.log('debug', `Extracted section ${currentSection} for ${currentLang}`, { key, text: content[currentLang][key] });
         }
         currentSection = line.replace('# ', '');
+        currentSectionHeader = currentSection.toLowerCase();
         currentText = [];
-        this.log('debug', `Starting new section ${currentSection} for ${section}`);
-      } else if (line) { // Ignore empty lines
+        this.log('debug', `Starting new section ${currentSection} for ${currentLang}`);
+      } else if (line) {
         currentText.push(line);
+        this.log('debug', `Adding line to ${currentSection} for ${currentLang}`, { line });
       }
     }
   
+    // Handle the last section
     if (currentSection && currentText.length > 0) {
       const key = currentSection.toLowerCase().replace(/\s+/g, '').replace(/([A-Z])/g, (match) => match.toLowerCase());
-      content[key] = currentText.join(' ').trim();
-      this.log('debug', `Extracted final section ${currentSection} for ${section}`, {
-        key,
-        text: content[key],
-      });
+      content[currentLang][key] = currentText.join(' ').trim();
+      this.log('debug', `Extracted final section ${currentSection} for ${currentLang}`, { key, text: content[currentLang][key] });
+    }
+  
+    // Log the full content object for debugging
+    this.log('debug', `Full parsed content before selection`, { content });
+  
+    // Determine which content to return based on section and gender
+    let targetLang = section;
+    if (section === 'PT') {
+      targetLang = gender === 'male' ? 'PT-M:' : 'PT-F:';
+    } else {
+      targetLang = `${section}:`;
+    }
+  
+    const targetContent = content[targetLang];
+    if (!targetContent) {
+      this.log('error', `No content found for target ${targetLang}`, { response, section, gender });
+      throw new Error(`No content found for target ${targetLang}`);
     }
   
     const parsedContent = {
-      voiceOfTheSoul: content['thevoiceofthesoul'] || content['avozdaalma'] || '',
-      giftsYouBear: content['thegiftsyoubear'] || content['osdonsquevocêcarrega'] || '',
-      shadowsYouFace: content['theshadowsyouface'] || content['assombrasqueenfrenta'] || '',
-      rhythmOfYourDays: content['therhythmofyourdays'] || content['oritmodosseusdias'] || '',
-      tiesThatBind: content['thetiesthatbind'] || content['oslaçosqueteconectam'] || '',
-      lightWithin: content['thelightwithin'] || content['aluzinterior'] || '',
+      voiceOfTheSoul: targetContent['thevoiceofthesoul'] || targetContent['avozdaalma'] || '',
+      giftsYouBear: targetContent['thegiftsyoubear'] || targetContent['osdonsquevocêcarrega'] || '',
+      shadowsYouFace: targetContent['theshadowsyouface'] || targetContent['assombrasqueenfrenta'] || '',
+      rhythmOfYourDays: targetContent['therhythmofyourdays'] || targetContent['oritmodosseusdias'] || '',
+      tiesThatBind: targetContent['thetiesthatbind'] || targetContent['oslaçosqueteconectam'] || '',
+      lightWithin: targetContent['thelightwithin'] || targetContent['aluzinterior'] || '',
     };
   
+    // Log the parsed content before validation
+    this.log('debug', `Parsed content before validation for ${targetLang}`, { parsedContent });
+  
     if (Object.values(parsedContent).some((value) => !value)) {
-      this.log('error', `Malformed content response for ${section}`, {
-        parsedContent,
-        response,
-      });
-      throw new Error(`Malformed content response for ${section}`);
+      this.log('error', `Malformed content response for ${targetLang}`, { parsedContent, response });
+      throw new Error(`Malformed content response for ${targetLang}`);
     }
   
-    this.log('info', 'Completed parseContentResponse', { parsedContent, section });
+    this.log('info', 'Completed parseContentResponse', { parsedContent, section, gender });
     return parsedContent;
   }
 

package/package.json

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