gtx-cli 2.3.2 → 2.3.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # gtx-cli
 
+## 2.3.4
+
+### Patch Changes
+
+- [#671](https://github.com/generaltranslation/gt/pull/671) [`b8c19d1`](https://github.com/generaltranslation/gt/commit/b8c19d13c0ab18a3f9376ebb940d9985cee6d961) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Fixing --force command in gtx-cli
+
+## 2.3.3
+
+### Patch Changes
+
+- [#665](https://github.com/generaltranslation/gt/pull/665) [`814cb12`](https://github.com/generaltranslation/gt/commit/814cb122e68a51ea1a513e9f6e51249af345db64) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Migrating CLI to gt-remark plugin, updating plugin
+
+- Updated dependencies [[`814cb12`](https://github.com/generaltranslation/gt/commit/814cb122e68a51ea1a513e9f6e51249af345db64)]:
+  - gt-remark@1.0.1
+
 ## 2.3.2
 
 ### Patch Changes

package/dist/api/checkFileTranslations.d.ts

@@ -20,4 +20,4 @@ export declare function checkFileTranslations(data: {
         versionId: string;
         fileName: string;
     };
-}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string | null, options: Settings): Promise<boolean>;
+}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string | null, options: Settings, forceRetranslation?: boolean): Promise<boolean>;

package/dist/api/checkFileTranslations.js

@@ -14,11 +14,14 @@ import { TEMPLATE_FILE_NAME } from '../cli/commands/stage.js';
  * @param timeoutDuration - The timeout duration for the wait in seconds
  * @returns True if all translations are deployed, false otherwise
  */
-export async function checkFileTranslations(data, locales, timeoutDuration, resolveOutputPath, options) {
+export async function checkFileTranslations(data, locales, timeoutDuration, resolveOutputPath, options, forceRetranslation) {
     const startTime = Date.now();
     console.log();
     const spinner = await createOraSpinner();
-    spinner.start('Waiting for translation...');
+    const spinnerMessage = forceRetranslation
+        ? 'Waiting for retranslation...'
+        : 'Waiting for translation...';
+    spinner.start(spinnerMessage);
     // Initialize the query data
     const fileQueryData = prepareFileQueryData(data, locales);
     const downloadStatus = {
@@ -26,11 +29,13 @@ export async function checkFileTranslations(data, locales, timeoutDuration, reso
         failed: new Set(),
         skipped: new Set(),
     };
-    // Do first check immediately
-    const initialCheck = await checkTranslationDeployment(fileQueryData, downloadStatus, spinner, resolveOutputPath, options);
-    if (initialCheck) {
-        spinner.succeed(chalk.green('Files translated!'));
-        return true;
+    // Do first check immediately, but skip if force retranslation is enabled
+    if (!forceRetranslation) {
+        const initialCheck = await checkTranslationDeployment(fileQueryData, downloadStatus, spinner, resolveOutputPath, options);
+        if (initialCheck) {
+            spinner.succeed(chalk.green('Files translated!'));
+            return true;
+        }
     }
     // Calculate time until next 5-second interval since startTime
     const msUntilNextInterval = Math.max(0, 5000 - ((Date.now() - startTime) % 5000));

package/dist/cli/commands/translate.js

@@ -15,7 +15,7 @@ export async function handleTranslate(options, settings, filesTranslationRespons
         const fileMapping = createFileMapping(resolvedPaths, placeholderPaths, transformPaths, settings.locales, settings.defaultLocale);
         const { data } = filesTranslationResponse;
         // Check for remaining translations
-        await checkFileTranslations(data, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings);
+        await checkFileTranslations(data, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings, options.force);
     }
 }
 // Downloads translations that were originally staged
@@ -33,7 +33,8 @@ export async function handleDownload(options, settings) {
     const fileMapping = createFileMapping(resolvedPaths, placeholderPaths, transformPaths, settings.locales, settings.defaultLocale);
     const stagedVersionData = await getStagedVersions(settings.configDirectory);
     // Check for remaining translations
-    await checkFileTranslations(stagedVersionData, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings);
+    await checkFileTranslations(stagedVersionData, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings, false // force is not applicable for downloading staged translations
+    );
 }
 export async function postProcessTranslations(settings) {
     // Localize static urls (/docs -> /[locale]/docs) and preserve anchor IDs for non-default locales

package/dist/utils/addExplicitAnchorIds.js

@@ -5,7 +5,7 @@ import remarkFrontmatter from 'remark-frontmatter';
 import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
 import { logWarning } from '../console/logging.js';
-import { escapeHtmlInTextNodes } from './escapeHtml.js';
+import escapeHtmlInTextNodes from 'gt-remark';
 /**
  * Generates a slug from heading text
  */

package/dist/utils/localizeStaticUrls.js

@@ -7,7 +7,7 @@ import remarkMdx from 'remark-mdx';
 import remarkFrontmatter from 'remark-frontmatter';
 import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
-import { escapeHtmlInTextNodes } from './escapeHtml.js';
+import escapeHtmlInTextNodes from 'gt-remark';
 const { isMatch } = micromatch;
 /**
  * Localizes static urls in content files.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -88,6 +88,7 @@
     "fast-glob": "^3.3.3",
     "form-data": "^4.0.4",
     "generaltranslation": "^7.6.2",
+    "gt-remark": "^1.0.1",
     "json-pointer": "^0.6.2",
     "jsonpath-plus": "^10.3.0",
     "jsonpointer": "^5.0.1",

package/dist/utils/escapeHtml.d.ts

@@ -1,8 +0,0 @@
-import type { Plugin } from 'unified';
-import type { Root } from 'mdast';
-/**
- * Escape HTML-sensitive characters ('{', '}', `&`, `<`, `>`, `"`, `'`) in text nodes,
- * leaving code, math, MDX expressions, and front-matter untouched.
- * Ensures literals render safely without altering already-escaped entities.
- */
-export declare const escapeHtmlInTextNodes: Plugin<[], Root>;

package/dist/utils/escapeHtml.js

@@ -1,34 +0,0 @@
-import { findAndReplace } from 'mdast-util-find-and-replace';
-const IGNORE_PARENTS = [
-    'code',
-    'inlineCode',
-    'mdxFlowExpression',
-    'mdxTextExpression',
-    'mdxjsEsm',
-    'heading',
-    'yaml',
-    'toml',
-    'math',
-    'inlineMath',
-];
-// & that is NOT already an entity: &word;  {  ᨫ
-const AMP_NOT_ENTITY = /&(?![a-zA-Z][a-zA-Z0-9]*;|#\d+;|#x[0-9A-Fa-f]+;)/g;
-/**
- * Escape HTML-sensitive characters ('{', '}', `&`, `<`, `>`, `"`, `'`) in text nodes,
- * leaving code, math, MDX expressions, and front-matter untouched.
- * Ensures literals render safely without altering already-escaped entities.
- */
-export const escapeHtmlInTextNodes = function () {
-    return (tree) => {
-        findAndReplace(tree, [
-            // Order matters: & first (idempotency), then the rest
-            [AMP_NOT_ENTITY, '&amp;'],
-            [/\{/g, '&#123;'],
-            [/\}/g, '&#125;'],
-            [/</g, '&lt;'],
-            [/>/g, '&gt;'],
-            [/"/g, '&quot;'],
-            [/'/g, '&#39;'],
-        ], { ignore: IGNORE_PARENTS });
-    };
-};