gt 2.13.1 → 2.13.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # gtx-cli
 
+## 2.13.2
+
+### Patch Changes
+
+- [#1147](https://github.com/generaltranslation/gt/pull/1147) [`d7d9b99`](https://github.com/generaltranslation/gt/commit/d7d9b9952f3a96dde2b89f206d47c491d503727f) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - chore: add support for multiple format types
+
+- Updated dependencies [[`d7d9b99`](https://github.com/generaltranslation/gt/commit/d7d9b9952f3a96dde2b89f206d47c491d503727f)]:
+  - generaltranslation@8.1.23
+  - @generaltranslation/python-extractor@0.2.3
+
 ## 2.13.1
 
 ### Patch Changes

package/dist/console/index.d.ts

@@ -7,6 +7,7 @@ export declare const warnFailedToConstructJsxTreeSync: (file: string, code: stri
 export declare const warnNestedTComponent: (file: string, location?: string) => string;
 export declare const warnNonStaticExpressionSync: (file: string, attrName: string, value: string, location?: string) => string;
 export declare const warnInvalidMaxCharsSync: (file: string, value: string, location?: string) => string;
+export declare const warnInvalidFormatSync: (file: string, value: string, location?: string) => string;
 export declare const warnInvalidIcuSync: (file: string, value: string, error: string, location?: string) => string;
 export declare const warnTemplateLiteralSync: (file: string, value: string, location?: string) => string;
 export declare const warnNonStringSync: (file: string, value: string, location?: string) => string;

package/dist/console/index.js

@@ -16,6 +16,7 @@ export const warnFailedToConstructJsxTreeSync = (file, code, location) => withLo
 export const warnNestedTComponent = (file, location) => withLocation(file, `Found nested <T> component. <T> components cannot be directly nested.`, location);
 export const warnNonStaticExpressionSync = (file, attrName, value, location) => withLocation(file, `Found non-static expression for attribute ${colorizeIdString(attrName)}: ${colorizeContent(value)}. Change "${colorizeIdString(attrName)}" to ensure this content is translated.`, location);
 export const warnInvalidMaxCharsSync = (file, value, location) => withLocation(file, `Found invalid maxChars value: ${colorizeContent(value)}. Change the value to a valid number to ensure this content is translated.`, location);
+export const warnInvalidFormatSync = (file, value, location) => withLocation(file, `Found invalid $format value: ${colorizeContent(value)}. Must be one of: 'ICU', 'STRING', 'I18NEXT'.`, location);
 export const warnInvalidIcuSync = (file, value, error, location) => withWillErrorInNextVersion(withLocation(file, `Found invalid ICU string: ${colorizeContent(value)}. Change the value to a valid ICU to ensure this content is translated. Error message: ${error}.`, location));
 export const warnTemplateLiteralSync = (file, value, location) => withLocation(file, `Found template literal with quasis (${colorizeContent(value)}). Change the template literal to a string to ensure this content is translated.`, location);
 export const warnNonStringSync = (file, value, location) => withLocation(file, `Found non-string literal (${colorizeContent(value)}). Change the value to a string literal to ensure this content is translated.`, location);

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.13.1";
+export declare const PACKAGE_VERSION = "2.13.2";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.13.1';
+export const PACKAGE_VERSION = '2.13.2';

package/dist/react/jsx/utils/constants.d.ts

@@ -22,7 +22,7 @@ export declare const GT_TRANSLATION_FUNCS: string[];
 export declare const STRING_REGISTRATION_FUNCS: readonly ["msg", "t"];
 export declare const GT_DERIVE_STRING_FUNCTIONS: string[];
 export declare const VARIABLE_COMPONENTS: string[];
-export declare const GT_ATTRIBUTES_WITH_SUGAR: readonly ["$id", "$context", "$maxChars"];
-export declare const GT_ATTRIBUTES: readonly ["id", "context", "maxChars", "$id", "$context", "$maxChars"];
+export declare const GT_ATTRIBUTES_WITH_SUGAR: readonly ["$id", "$context", "$maxChars", "$format"];
+export declare const GT_ATTRIBUTES: readonly ["id", "context", "maxChars", "$id", "$context", "$maxChars", "$format"];
 export declare const DATA_ATTR_PREFIX: "data-";
 export declare const T_GLOBAL_REGISTRATION_FUNCTION_MARKER = "_gt_internal_t_global_registration_marker";

package/dist/react/jsx/utils/constants.js

@@ -62,6 +62,7 @@ export const GT_ATTRIBUTES_WITH_SUGAR = [
     '$id',
     '$context',
     '$maxChars',
+    '$format',
 ];
 export const GT_ATTRIBUTES = [
     'id',

package/dist/react/jsx/utils/mapAttributeName.d.ts

@@ -1,7 +1,7 @@
 /**
  * Type logic implementation
  */
-type MapAttributeName<T extends string> = T extends '$id' ? 'id' : T extends '$context' ? 'context' : T extends '$maxChars' ? 'maxChars' : T;
+type MapAttributeName<T extends string> = T extends '$id' ? 'id' : T extends '$context' ? 'context' : T extends '$maxChars' ? 'maxChars' : T extends '$format' ? 'format' : T;
 /**
  * Map the attribute name to the corresponding attribute name in the metadata
  * @param attrName - The attribute name to map

package/dist/react/jsx/utils/mapAttributeName.js

@@ -6,6 +6,8 @@ export function mapAttributeName(attrName) {
             return 'context';
         case '$maxChars':
             return 'maxChars';
+        case '$format':
+            return 'format';
         default:
             return attrName;
     }

package/dist/react/jsx/utils/stringParsing/derivation/index.js

@@ -52,7 +52,7 @@ export function deriveExpression({ tPath, expr, metadata, config, output, index,
     const temporaryDeriveId = `derive-temp-id-${randomUUID()}`;
     for (const string of strings) {
         output.updates.push({
-            dataFormat: 'ICU',
+            dataFormat: (metadata.format || 'ICU'),
             source: string,
             metadata: {
                 ...metadata,

package/dist/react/jsx/utils/stringParsing/processTranslationCall/extractStringEntryMetadata.d.ts

@@ -10,6 +10,7 @@ export type InlineMetadata = {
     context?: string;
     id?: string;
     hash?: string;
+    format?: string;
     filePaths?: string[];
     sourceCode?: Record<string, SourceCode[]>;
 };

package/dist/react/jsx/utils/stringParsing/processTranslationCall/extractStringEntryMetadata.js

@@ -1,6 +1,7 @@
 import * as t from '@babel/types';
 import { isStaticExpression } from '../../../evaluateJsx.js';
 import { warnInvalidMaxCharsSync } from '../../../../../console/index.js';
+import { warnInvalidFormatSync } from '../../../../../console/index.js';
 import { warnNonStaticExpressionSync } from '../../../../../console/index.js';
 import { GT_ATTRIBUTES_WITH_SUGAR } from '../../constants.js';
 import generateModule from '@babel/generator';
@@ -85,6 +86,17 @@ function extractInlineMetadata({ options, output, config, }) {
                                 metadata[mappedKey] = Math.abs(Number(result.value));
                             }
                         }
+                        else if (mappedKey === 'format') {
+                            // Handle format attribute - validate allowed values
+                            const validFormats = ['ICU', 'STRING', 'I18NEXT'];
+                            if (typeof result.value === 'string' &&
+                                validFormats.includes(result.value)) {
+                                metadata[mappedKey] = result.value;
+                            }
+                            else {
+                                output.warnings.add(warnInvalidFormatSync(config.file, String(result.value), `${prop.loc?.start?.line}:${prop.loc?.start?.column}`));
+                            }
+                        }
                         else {
                             // Add the $context or $id or other attributes value to the metadata
                             // TODO: why are we including everything? arent we only interested in relevant inline metadata?

package/dist/react/jsx/utils/stringParsing/processTranslationCall/handleLiteralTranslationCall.js

@@ -11,8 +11,9 @@ import { warnInvalidIcuSync } from '../../../../../console/index.js';
 export function handleLiteralTranslationCall({ arg, metadata, config, output, index, }) {
     // ignore dynamic content flag is triggered, check strings are valid ICU
     const source = arg.type === 'StringLiteral' ? arg.value : arg.quasis[0].value.raw;
-    // Validate is ICU
-    if (!config.ignoreInvalidIcu) {
+    // Validate is ICU — skip for non-ICU formats
+    if (!config.ignoreInvalidIcu &&
+        (!metadata.format || metadata.format === 'ICU')) {
         const { isValid, error } = isValidIcu(source);
         if (!isValid) {
             output.warnings.add(warnInvalidIcuSync(config.file, source, error ?? 'Unknown error', `${arg.loc?.start?.line}:${arg.loc?.start?.column}`));
@@ -20,7 +21,7 @@ export function handleLiteralTranslationCall({ arg, metadata, config, output, in
         }
     }
     output.updates.push({
-        dataFormat: 'ICU',
+        dataFormat: (metadata.format || 'ICU'),
         source,
         metadata: {
             ...metadata,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -110,8 +110,8 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
-    "@generaltranslation/python-extractor": "0.2.2",
-    "generaltranslation": "8.1.22",
+    "@generaltranslation/python-extractor": "0.2.3",
+    "generaltranslation": "8.1.23",
     "gt-remark": "1.0.6"
   },
   "devDependencies": {