glotto 2.8.0 → 2.9.0

package/script/src/providers/gemini.js

@@ -80,14 +80,19 @@ class Gemini {
                     logger_js_1.logger.error(`${chunkLabel} Empty response from Gemini AI`);
                     continue;
                 }
-                const tempJsonFileName = `${this.to}_chunk_${chunk.index + 1}.json`;
-                await (0, file_js_1.writeTemp)(tempJsonFileName, text);
-                if (!(0, utilites_js_1.isValidJson)(text)) {
+                const cleanedText = (0, utilites_js_1.stripJsonMarkdown)(text);
+                const tempJsonFileName = `chunk_${chunk.index + 1}.json`;
+                await (0, file_js_1.writeTemp)(this.to, tempJsonFileName, cleanedText);
+                if (!(0, utilites_js_1.isValidJson)(cleanedText)) {
+                    if (attempt === contants_js_1.MAX_RETRIES) {
+                        logger_js_1.logger.error(`${chunkLabel} Failed after ${contants_js_1.MAX_RETRIES + 1} attempts: Invalid JSON response`);
+                        return null;
+                    }
                     logger_js_1.logger.error(`${chunkLabel} Invalid JSON response, saved to ${tempJsonFileName}`);
                     continue;
                 }
                 logger_js_1.logger.info(`${chunkLabel} Translated successfully (${(0, utilites_js_1.formatBytes)(chunk.byteSize)}, ${chunk.keyCount} keys)`);
-                return text;
+                return cleanedText;
             }
             catch (error) {
                 const isLastAttempt = attempt === contants_js_1.MAX_RETRIES;

package/script/src/providers/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAc,YAAY,EAAE,MAAM,aAAa,CAAC;AAQvE,cAAM,WAAY,YAAW,YAAY;IACvC,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;gBAEF,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;YAW9F,cAAc;IA4DtB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;CAqCnC;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAc,YAAY,EAAE,MAAM,aAAa,CAAC;AAQvE,cAAM,WAAY,YAAW,YAAY;IACvC,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;gBAEF,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;YAW9F,cAAc;IAkEtB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;CAqCnC;AAED,eAAe,WAAW,CAAC"}

package/script/src/providers/openai.js

@@ -79,14 +79,19 @@ class OpenAIModel {
                     logger_js_1.logger.error(`${chunkLabel} Empty response from OpenAI`);
                     continue;
                 }
-                const tempJsonFileName = `${this.to}_chunk_${chunk.index + 1}.json`;
-                await (0, file_js_1.writeTemp)(tempJsonFileName, text);
-                if (!(0, utilites_js_1.isValidJson)(text)) {
+                const cleanedText = (0, utilites_js_1.stripJsonMarkdown)(text);
+                const tempJsonFileName = `chunk_${chunk.index + 1}.json`;
+                await (0, file_js_1.writeTemp)(this.to, tempJsonFileName, cleanedText);
+                if (!(0, utilites_js_1.isValidJson)(cleanedText)) {
+                    if (attempt === contants_js_1.MAX_RETRIES) {
+                        logger_js_1.logger.error(`${chunkLabel} Failed after ${contants_js_1.MAX_RETRIES + 1} attempts: Invalid JSON response`);
+                        return null;
+                    }
                     logger_js_1.logger.error(`${chunkLabel} Invalid JSON response, saved to ${tempJsonFileName}`);
                     continue;
                 }
                 logger_js_1.logger.info(`${chunkLabel} Translated successfully (${(0, utilites_js_1.formatBytes)(chunk.byteSize)}, ${chunk.keyCount} keys)`);
-                return text;
+                return cleanedText;
             }
             catch (error) {
                 const isLastAttempt = attempt === contants_js_1.MAX_RETRIES;

package/script/src/utilites.d.ts

@@ -1,10 +1,11 @@
 import type { TranslateArgs, ValidatedTranslateArgs } from './types.js';
-import type { Args } from '../deps/jsr.io/@std/cli/1.0.27/mod.js';
+import type { Args } from '../deps/jsr.io/@std/cli/1.0.29/mod.js';
 export declare const validateArgs: (args: Args<TranslateArgs>) => ValidatedTranslateArgs;
 export declare const generatePrompts: (from: string, to: string) => {
     systemPrompt: string;
     userPrompt: string;
 };
+export declare const stripJsonMarkdown: (text: string) => string;
 export declare const isValidJson: (value: string) => boolean;
 export declare const formatBytes: (bytes: number) => string;
 export declare const delay: (ms: number) => Promise<void>;

package/script/src/utilites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilites.d.ts","sourceRoot":"","sources":["../../src/src/utilites.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,aAAa,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAElE,eAAO,MAAM,YAAY,GAAI,MAAM,IAAI,CAAC,aAAa,CAAC,KAAG,sBAmCxD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM;;;CA2DvD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,OAO3C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAI3C,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAE9C,CAAC"}
+{"version":3,"file":"utilites.d.ts","sourceRoot":"","sources":["../../src/src/utilites.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,aAAa,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAElE,eAAO,MAAM,YAAY,GAAI,MAAM,IAAI,CAAC,aAAa,CAAC,KAAG,sBAmCxD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM;;;CA2DvD,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAyDhD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,OAO3C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAI3C,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAE9C,CAAC"}

package/script/src/utilites.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delay = exports.formatBytes = exports.isValidJson = exports.generatePrompts = exports.validateArgs = void 0;
+exports.delay = exports.formatBytes = exports.isValidJson = exports.stripJsonMarkdown = exports.generatePrompts = exports.validateArgs = void 0;
 const validateArgs = (args) => {
     if (!args.key) {
         throw new Error('AI Key is required');
@@ -90,6 +90,62 @@ const generatePrompts = (from, to) => {
     return { systemPrompt, userPrompt };
 };
 exports.generatePrompts = generatePrompts;
+const stripJsonMarkdown = (text) => {
+    const trimmed = text.trim();
+    // Extract from code fence if present (handles surrounding text too)
+    const fenceMatch = trimmed.match(/```(?:\w+)?\s*\n?([\s\S]*?)\n?```/);
+    if (fenceMatch) {
+        const candidate = fenceMatch[1].trim();
+        if (candidate.startsWith('{') || candidate.startsWith('[')) {
+            return candidate;
+        }
+    }
+    // Find outermost JSON structure by tracking bracket depth,
+    // correctly ignoring brackets inside strings and escape sequences
+    const firstBrace = trimmed.indexOf('{');
+    const firstBracket = trimmed.indexOf('[');
+    if (firstBrace === -1 && firstBracket === -1)
+        return trimmed;
+    let startIndex;
+    let openChar;
+    let closeChar;
+    if (firstBrace === -1 || (firstBracket !== -1 && firstBracket < firstBrace)) {
+        startIndex = firstBracket;
+        openChar = '[';
+        closeChar = ']';
+    }
+    else {
+        startIndex = firstBrace;
+        openChar = '{';
+        closeChar = '}';
+    }
+    let depth = 0;
+    let inString = false;
+    let escaped = false;
+    for (let i = startIndex; i < trimmed.length; i++) {
+        const char = trimmed[i];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (char === '\\' && inString) {
+            escaped = true;
+            continue;
+        }
+        if (char === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (char === openChar)
+            depth++;
+        else if (char === closeChar && --depth === 0)
+            return trimmed.slice(startIndex, i + 1);
+    }
+    return trimmed;
+};
+exports.stripJsonMarkdown = stripJsonMarkdown;
 const isValidJson = (value) => {
     try {
         JSON.parse(value);

package/esm/deps/jsr.io/@std/cli/1.0.27/_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_data.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/cli/1.0.27/_data.js"],"names":[],"mappings":""}

package/esm/deps/jsr.io/@std/internal/1.0.12/_os.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_os.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/internal/1.0.12/_os.ts"],"names":[],"mappings":"AAIA,wBAAgB,YAAY,IAAI,OAAO,CAUtC"}

package/script/deps/jsr.io/@std/cli/1.0.27/_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_data.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/cli/1.0.27/_data.js"],"names":[],"mappings":""}

package/script/deps/jsr.io/@std/internal/1.0.12/_os.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_os.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/internal/1.0.12/_os.ts"],"names":[],"mappings":"AAIA,wBAAgB,YAAY,IAAI,OAAO,CAUtC"}