@chesterbrains/translify-cli 0.5.0 → 0.6.1

package/README.md

@@ -128,7 +128,9 @@ server converts both ways:
 { "files": [{ "pattern": "src/locale/messages.{locale}.xlf", "format": "xliff", "namespace": "web", "xliffDialect": "angular" }] }
 ```
 
-Give every template string `i18n="@@<key>"` so the unit ids are your keys. What `pull` writes:
+Give every template string `i18n="@@<key>"` so the unit ids are your keys. A translation file's `trgLang` must be the
+Translify locale code: with `"locales": { "it": "it-IT" }` the file is still `messages.it.xlf`, but it declares
+`trgLang="it-IT"`, or `push` is refused with `File targets it but it-IT was requested`. What `pull` writes:
 
 | Translify value | Angular unit |
 |---|---|
@@ -157,6 +159,49 @@ i18next rather than ICU. Give
 such a key its own element so the ICU is the whole message, or move it to a JSON rule. A complete example is the
 Angular app in [translify-examples](https://github.com/chesterbrains/translify-examples).
 
+## Xcode (XLIFF)
+
+Xcode exports and imports **XLIFF 1.2** (`<trans-unit>`), keeps printf placeholders (`%@`, `%lld`) literal, and spreads one
+String Catalog entry over several units for plurals and substitutions. Set `xliffDialect: "xcode"` and `xliffOriginal` on the
+rule and the server converts both ways; Translify keeps ICU, so the same catalog serves React, Flutter, Angular and iOS, and
+iOS translations get placeholder validation (Xcode's own import accepts a target that lost its `%@` without a word).
+
+```json
+{ "files": [{ "pattern": "Localization/{locale}.xliff", "format": "xliff", "namespace": "ios",
+              "xliffDialect": "xcode", "xliffOriginal": "Sources/App/Localizable.xcstrings" }] }
+```
+
+Workflow:
+
+1. Seed once: `xcodebuild -exportLocalizations -localizationPath out -exportLanguage en`, copy
+   `out/en.xcloc/Localized Contents/en.xliff` to `Localization/en.xliff`, `translify push`.
+2. Translate in Translify, then `translify pull`.
+3. `xcodebuild -importLocalizations -localizationPath Localization/it.xliff` (a bare `.xliff` works; `<file original>`
+   comes from `xliffOriginal`).
+
+What `pull` writes (arguments are positional, numbered by first appearance in the source, so a reordered translation keeps
+its meaning; the printf type comes from the push that created the key, else `%@` for text, `%lld` for a plural's count, `%f`
+for a fraction):
+
+| Translify value | Units |
+|---|---|
+| `Hello, {name}` | `key` → `Hello, %1$@` |
+| `{count, plural, one {# item} other {# items}}` | `key\|==\|plural.one` → `%1$lld item`, `key\|==\|plural.other` → `%1$lld items` |
+| `You have {count, plural, one {# item} other {# items}} in your cart, {name}` | `key` → `You have %1$#@count@ in your cart, %2$@`, plus `key\|==\|substitutions.count.plural.one` / `.other` |
+| untranslated | the unit has a `<source>` and no `<target>`, which Xcode shows as untranslated |
+
+What `push` reads: `%@` / `%1$@` → `{arg1}` (renamed to the key's own argument when the key already exists), `%lld` →
+`{arg2}` or `#` inside a plural, `%.2f` → `{arg, number}`, `%%` → `%`; `|==|plural.*` units → one ICU plural named `count`;
+a `%#@name@` substitution → the plural inside the sentence. The printf types are kept in the key's metadata for the next
+pull. Device variations (`|==|device.*`), unknown unit kinds and legacy `.strings`/`.stringsdict` exports are reported as
+`unsupportedVariation` and skipped.
+
+Not supported in this version (the pull is refused with `XLIFF_DIALECT_UNSUPPORTED`): `select` and `selectordinal`, exact
+matches (`=0`) and `offset`, two plurals in one message, nested plurals, number formats without a known printf type (e.g.
+currency), a translation whose shape differs from the source (plain text for a plural), and keys whose
+placeholders are printf or i18next rather than ICU. A complete example is `examples/ios-xcstrings` in
+[translify-examples](https://github.com/chesterbrains/translify-examples).
+
 ## `translify.json` reference
 
 `translify.json` lives in the repository root; every command reads it from the current directory. The
@@ -172,8 +217,9 @@ fields are refused, and so is any field whose name contains `key`, `secret` or `
 | `files[].format` | `json` \| `xliff` \| `arb` | yes | File format: i18next JSON, XLIFF or Flutter ARB. |
 | `files[].namespace` | string | when the pattern has no `{namespace}`, and always for `arb` | Fixed namespace for every file the rule matches. Lowercase kebab-case, at most 64 characters. |
 | `files[].jsonStyle` | `nested` \| `flat` | no | Only for `json`. `nested` (the default) writes `{ "a": { "b": "…" } }`, `flat` writes `{ "a.b": "…" }`. |
-| `files[].xliffDialect` | `angular` | no | Only for `xliff`. Writes `@angular/localize` placeholders on pull (`<ph equiv="INTERPOLATION"/>`, `{VAR_PLURAL, …}`) and reads `ng extract-i18n` output on push. See [Angular (XLIFF)](#angular-xliff). |
-| `locales` | object | no | Maps a locale name on disk to a Translify locale code, e.g. `{ "en_US": "en-US" }`. Unmapped names pass through unchanged. Two names may not map to the same code, and a target may not itself be a mapped name. |
+| `files[].xliffDialect` | `angular` \| `xcode` | no | Only for `xliff`. `angular` writes `@angular/localize` placeholders on pull and reads `ng extract-i18n` output on push ([Angular (XLIFF)](#angular-xliff)); `xcode` writes XLIFF 1.2 for String Catalogs and reads `xcodebuild -exportLocalizations` output ([Xcode (XLIFF)](#xcode-xliff)). |
+| `files[].xliffOriginal` | string | with `xliffDialect: "xcode"` | The String Catalog path Xcode knows, e.g. `Sources/App/Localizable.xcstrings`; written to `<file original>`. Xcode imports nothing when it does not match the project. Only with `xcode`. |
+| `locales` | object | no | Maps a locale name on disk to a Translify locale code, e.g. `{ "en_US": "en-US" }`. Unmapped names pass through unchanged. Two names may not map to the same code, and a target may not itself be a mapped name. The map renames files only: an XLIFF's `trgLang` (2.0) or `target-language` (1.2), when present, must be the Translify code itself, or `push` is refused with `File targets it but it-IT was requested`. |
 
 Each file must be matched by one rule only, and each (locale, namespace) pair must come from one file only;
 otherwise the CLI stops before sending anything and names the files involved.
@@ -358,7 +404,7 @@ The server's error `code` decides the exit code first; the HTTP status is only u
 | `REVIEW_DISABLED` | 1 | `push --status draft` or `--status needs-review` on a project without review. Turn on **Require review** in the project settings, or drop `--status`. Nothing was written. |
 | `APPROVED_ONLY_REQUIRES_WORKING` | 1 | `--only-approved` was combined with `--from env:<slug>`. Pull an environment without it; it already holds only what its gate allowed. |
 | `INVALID_CELLS` | 6 | `publish` refused: translations that would go live have placeholder errors. Nothing was published; the output lists them like `lint` does. Fix them in Translify, or re-run with `--allow-errors` to publish anyway (recorded in the activity log). |
-| `XLIFF_DIALECT_UNSUPPORTED` | 6 | `pull` refused: a translation cannot be written as Angular XLIFF (text beside a plural, nested plurals, number/date formats, printf keys). Nothing was written; the output lists the cells and why. Split the text, or move the key to a JSON rule. See [Angular (XLIFF)](#angular-xliff). |
+| `XLIFF_DIALECT_UNSUPPORTED` | 6 | `pull` refused: a translation cannot be written in the rule's XLIFF dialect (Angular: text beside a plural, nested plurals, number/date formats; Xcode: `select`, `=0`/`offset`, a translation of a different shape; both: printf/i18next keys). Nothing was written; the output lists the cells and why. Split the text, or move the key to a JSON rule. See [Angular (XLIFF)](#angular-xliff) and [Xcode (XLIFF)](#xcode-xliff). |
 | `TRANSACTION_CONFLICT` | 4 | Another write collided with yours. Retry. |
 | `RATE_LIMITED` | 4 | The CLI already retried 3 times, honouring `Retry-After`. Wait a moment and retry. |
 | `INTERNAL_ERROR` / `DATABASE_ERROR` / 5xx | 4 | A server problem. Retry shortly; if it persists, re-run with `--debug` and report it. |

package/dist/commands/pull.js

@@ -7,10 +7,10 @@ const readOrUndefined = async (path) => readFile(path, 'utf8').catch(() => undef
 const NESTED_CONFLICT = /nested JSON cannot hold both/;
 const isDialectUnsupported = (details) => typeof details === 'object' && details !== null && details.code === 'XLIFF_DIALECT_UNSUPPORTED';
 /** The server's one-line refusal, the cells grouped like `lint`, and the way out. */
-const dialectRefusal = (body, config) => {
+const dialectRefusal = (body, config, dialect) => {
     const cells = Array.isArray(body.cells) ? body.cells : [];
     const lines = [
-        `Pull refused: ${body.total} translation(s) cannot be written as Angular XLIFF. Nothing was written.`,
+        `Pull refused: ${body.total} translation(s) cannot be written as XLIFF for ${dialect}. Nothing was written.`,
         ...renderReasonCells(cells, config),
     ];
     if (body.total > cells.length)
@@ -67,6 +67,8 @@ export async function runPull(opts, deps) {
             query.jsonStyle = rule.jsonStyle;
         if (rule.format === 'xliff' && rule.xliffDialect !== undefined)
             query.dialect = rule.xliffDialect;
+        if (rule.format === 'xliff' && rule.xliffOriginal !== undefined)
+            query.original = rule.xliffOriginal;
         if (opts.from !== undefined)
             query.from = opts.from;
         if (opts.onlyApproved)
@@ -77,8 +79,9 @@ export async function runPull(opts, deps) {
         if (namespace !== undefined)
             query.namespaces = namespace;
         const res = await deps.api.get('/cli/v1/pull', query).catch((error) => {
-            if (error instanceof CliError && isDialectUnsupported(error.details))
-                throw dialectRefusal(error.details, deps.config);
+            if (error instanceof CliError && isDialectUnsupported(error.details)) {
+                throw dialectRefusal(error.details, deps.config, rule.xliffDialect ?? 'angular');
+            }
             throw error;
         });
         responses.push(res);

package/dist/commands/push.js

@@ -21,6 +21,7 @@ const buildForm = (uploads, opts, dryRun, prune, pruneDigest) => {
         locale: match.locale,
         namespace: match.namespace,
         ...(match.rule.format === 'xliff' && match.rule.xliffDialect !== undefined ? { dialect: match.rule.xliffDialect } : {}),
+        ...(match.rule.format === 'xliff' && match.rule.xliffOriginal !== undefined ? { original: match.rule.xliffOriginal } : {}),
     }))));
     form.set('dryRun', String(dryRun));
     form.set('overwriteTargets', String(opts.overwriteTargets === true));
@@ -74,6 +75,9 @@ export async function runPush(opts, deps) {
         bytes: new Uint8Array(await readFile(join(deps.cwd, match.path))),
     })));
     const show = (res, preview) => {
+        if (opts.json !== true)
+            for (const warning of res.warnings ?? [])
+                deps.out(`warning: ${warning}`);
         deps.out(opts.json === true
             ? JSON.stringify({ preview, response: res, summary: summarizePush(res) })
             : renderPush(res, { prune: opts.prune === true }));

package/dist/config.js

@@ -17,7 +17,8 @@ const fileRule = z
     format: z.enum(['json', 'xliff', 'arb']),
     namespace: z.string().regex(NAMESPACE, 'must be lowercase kebab-case').max(64).optional(),
     jsonStyle: z.enum(['nested', 'flat']).optional(),
-    xliffDialect: z.enum(['angular']).optional(),
+    xliffDialect: z.enum(['angular', 'xcode']).optional(),
+    xliffOriginal: z.string().min(1).max(512).optional(),
 })
     .strict()
     .superRefine((rule, ctx) => {
@@ -34,6 +35,12 @@ const fileRule = z
     if (rule.xliffDialect !== undefined && rule.format !== 'xliff') {
         ctx.addIssue({ code: 'custom', path: ['xliffDialect'], message: 'only applies to format "xliff"' });
     }
+    if (rule.xliffOriginal !== undefined && rule.xliffDialect !== 'xcode') {
+        ctx.addIssue({ code: 'custom', path: ['xliffOriginal'], message: 'only applies to xliffDialect "xcode"' });
+    }
+    if (rule.xliffDialect === 'xcode' && rule.xliffOriginal === undefined) {
+        ctx.addIssue({ code: 'custom', path: ['xliffOriginal'], message: 'required with xliffDialect "xcode"' });
+    }
 })
     .transform((rule) => (rule.format === 'json' ? { ...rule, jsonStyle: rule.jsonStyle ?? 'nested' } : rule));
 const configSchema = z

package/dist/credentials.js

@@ -10,6 +10,7 @@ export function credentialsPath(env = process.env) {
         return join(appData, 'translify', 'credentials');
     return join(absolute(env.XDG_CONFIG_HOME) ?? join(homedir(), '.config'), 'translify', 'credentials');
 }
+const SECRET_KEY_SHAPE = /^sk_[A-Za-z0-9_-]+$/;
 // Messages never echo the value: a mistyped key is still a secret.
 export const assertSecret = (key) => {
     if (key.startsWith('pk_')) {
@@ -17,6 +18,11 @@ export const assertSecret = (key) => {
     }
     if (!key.startsWith('sk_'))
         throw new CliError(EXIT.auth, 'Not a Translify secret key (expected sk_...).');
+    // A key is `sk_` plus base64url. Anything else (a pasted `…`, a space, a `/`) is caught here: fetch
+    // would refuse it as a header value, which reads as a connection error (TRLIFY-128).
+    if (!SECRET_KEY_SHAPE.test(key)) {
+        throw new CliError(EXIT.auth, 'The key has characters a secret key never has (only letters, digits, - and _ after sk_). Check TRANSLIFY_SECRET_KEY.');
+    }
     return key;
 };
 export async function resolveKey(env = process.env) {

package/dist/render.js

@@ -143,6 +143,9 @@ const REASON_TEXT = {
     formattedArg: 'a number, date or time format has no Angular placeholder',
     literalBrace: "a quoted literal brace ('{') cannot be loaded by Angular",
     syntax: 'the key uses printf or i18next placeholders, not ICU',
+    exactMatch: 'an exact match (=0, =1) or offset has no Xcode plural category',
+    shapeMismatch: 'the translation is not the same shape as the source (plural vs plain text, or a different plural argument)',
+    unsupportedVariation: 'a device variation or an unknown |==| unit (not supported)',
 };
 /** Like renderIssueCells: namespace, key, then one line per cell with the locale as named on disk. */
 export function renderReasonCells(cells, config) {

package/dist/version.js

@@ -1,3 +1,3 @@
 // Must equal package.json "version"; src/version.test.ts fails when they drift.
-export const VERSION = '0.5.0';
+export const VERSION = '0.6.1';
 export const USER_AGENT = `translify-cli/${VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chesterbrains/translify-cli",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Push, pull and publish Translify translations from your repository",
   "license": "MIT",
   "repository": {

package/schema/translify.schema.json

@@ -30,8 +30,14 @@
           },
           "jsonStyle": { "enum": ["nested", "flat"], "description": "Only for format json. Defaults to nested." },
           "xliffDialect": {
-            "enum": ["angular"],
-            "description": "Only for format xliff. angular writes @angular/localize placeholders (<ph equiv=\"INTERPOLATION\"/>, VAR_PLURAL) on pull and reads ng extract-i18n output on push."
+            "enum": ["angular", "xcode"],
+            "description": "Only for format xliff. angular writes @angular/localize placeholders (<ph equiv=\"INTERPOLATION\"/>, VAR_PLURAL) on pull and reads ng extract-i18n output on push. xcode writes XLIFF 1.2 for String Catalogs (positional printf, |==| plural and substitution units) and reads xcodebuild -exportLocalizations output."
+          },
+          "xliffOriginal": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 512,
+            "description": "Only with xliffDialect xcode, and required with it: the String Catalog path Xcode knows (e.g. Sources/App/Localizable.xcstrings), written to <file original>. Xcode imports nothing when it does not match."
           }
         },
         "allOf": [
@@ -50,6 +56,11 @@
           {
             "if": { "properties": { "format": { "enum": ["json", "arb"] } }, "required": ["format"] },
             "then": { "not": { "required": ["xliffDialect"] } }
+          },
+          {
+            "if": { "properties": { "xliffDialect": { "const": "xcode" } }, "required": ["xliffDialect"] },
+            "then": { "required": ["xliffOriginal"] },
+            "else": { "not": { "required": ["xliffOriginal"] } }
           }
         ]
       }