Merge branch 'main' into best/aisdk-provider-upgrades

The-Best-Codes · web-flow · commit 166e6e14bd25 · 2025-11-21T10:22:45.000-06:00
diff --git a/.changeset/plenty-lemons-remain.md b/.changeset/plenty-lemons-remain.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/demo/adonisjs/CHANGELOG.md b/demo/adonisjs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # adonis
 
+## 0.0.38
+
+### Patch Changes
+
+- Updated dependencies [[`3dd04bd`](https://github.com/lingodotdev/lingo.dev/commit/3dd04bd937828c16862b2b1459576931028bb01a)]:
+  - lingo.dev@0.116.4
+
 ## 0.0.37
 
 ### Patch Changes
diff --git a/demo/adonisjs/package.json b/demo/adonisjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adonis",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "private": true,
   "type": "module",
   "license": "UNLICENSED",
diff --git a/demo/next-app/CHANGELOG.md b/demo/next-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # next-app
 
+## 0.2.90
+
+### Patch Changes
+
+- Updated dependencies [[`3dd04bd`](https://github.com/lingodotdev/lingo.dev/commit/3dd04bd937828c16862b2b1459576931028bb01a)]:
+  - lingo.dev@0.116.4
+
 ## 0.2.89
 
 ### Patch Changes
diff --git a/demo/next-app/package.json b/demo/next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-app",
-  "version": "0.2.89",
+  "version": "0.2.90",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # lingo.dev
 
+## 0.116.4
+
+### Patch Changes
+
+- [#1622](https://github.com/lingodotdev/lingo.dev/pull/1622) [`3dd04bd`](https://github.com/lingodotdev/lingo.dev/commit/3dd04bd937828c16862b2b1459576931028bb01a) Thanks [@vrcprl](https://github.com/vrcprl)! - Fix ICU input
+
 ## 0.116.3
 
 ### Patch Changes
diff --git a/packages/cli/demo/xcode-xcstrings-v2/example.xcstrings b/packages/cli/demo/xcode-xcstrings-v2/example.xcstrings
@@ -126,22 +126,22 @@
             }
           }
         }
-      },
-      "welcome_message" : {
-        "comment" : "Welcome message shown on the app's home screen",
-        "extractionState" : "manual",
-        "localizations" : {
-          "en" : {
-            "stringUnit" : {
-              "state" : "translated",
-              "value" : "Hello, world!"
-            }
-          },
-          "es" : {
-            "stringUnit" : {
-              "state" : "translated",
-              "value" : "¡Hola, mundo!"
-            }
+      }
+    },
+    "welcome_message" : {
+      "comment" : "Welcome message shown on the app's home screen",
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Hello, world!"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "¡Hola, mundo!"
           }
         }
       }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.116.3",
+  "version": "0.116.4",
   "description": "Lingo.dev CLI",
   "private": false,
   "publishConfig": {
diff --git a/packages/cli/src/cli/cmd/i18n.ts b/packages/cli/src/cli/cmd/i18n.ts
@@ -36,7 +36,6 @@ import createProcessor from "../processor";
 import { withExponentialBackoff } from "../utils/exp-backoff";
 import trackEvent from "../utils/observability";
 import { createDeltaProcessor } from "../utils/delta";
-import { isICUPluralObject } from "../loaders/xcode-xcstrings-icu";
 
 export default new Command()
   .command("i18n")
@@ -492,18 +491,11 @@ export default new Command()
                   .omitBy((value, key) => {
                     const targetValue = targetData[key];
 
-                    // For ICU plural objects, use deep equality (excluding Symbol)
-                    if (
-                      isICUPluralObject(value) &&
-                      isICUPluralObject(targetValue)
-                    ) {
-                      return _.isEqual(
-                        { icu: value.icu, _meta: value._meta },
-                        { icu: targetValue.icu, _meta: targetValue._meta },
-                      );
+                    // For objects (like plural variations), use deep equality
+                    // For primitives (strings, numbers), use strict equality
+                    if (typeof value === "object" && value !== null) {
+                      return _.isEqual(value, targetValue);
                     }
-
-                    // Default strict equality for other values
                     return value === targetValue;
                   })
                   .size()
diff --git a/packages/cli/src/cli/loaders/_types.ts b/packages/cli/src/cli/loaders/_types.ts
@@ -23,5 +23,5 @@ export interface ILoader<I, O, C = void> extends ILoaderDefinition<I, O, C> {
   init(): Promise<C>;
   pull(locale: string, input: I): Promise<O>;
   push(locale: string, data: O): Promise<I>;
-  pullHints(originalInput: I): Promise<O | undefined>;
+  pullHints(originalInput?: I): Promise<O | undefined>;
 }
diff --git a/packages/cli/src/cli/loaders/_utils.ts b/packages/cli/src/cli/loaders/_utils.ts
@@ -29,7 +29,7 @@ export function composeLoaders(
       }
       return result;
     },
-    pullHints: async (originalInput) => {
+    pullHints: async (originalInput?) => {
       let result: any = originalInput;
       for (let i = 0; i < loaders.length; i++) {
         const subResult = await loaders[i].pullHints?.(result);
@@ -67,8 +67,8 @@ export function createLoader<I, O, C>(
       state.defaultLocale = locale;
       return this;
     },
-    async pullHints() {
-      return lDefinition.pullHints?.(state.originalInput!);
+    async pullHints(originalInput?: I) {
+      return lDefinition.pullHints?.(originalInput || state.originalInput!);
     },
     async pull(locale, input) {
       if (!state.defaultLocale) {
diff --git a/packages/cli/src/cli/loaders/icu-safety.spec.ts b/packages/cli/src/cli/loaders/icu-safety.spec.ts
diff --git a/packages/cli/src/cli/loaders/xcode-xcstrings-icu.spec.ts b/packages/cli/src/cli/loaders/xcode-xcstrings-icu.spec.ts
diff --git a/packages/cli/src/cli/loaders/xcode-xcstrings-icu.ts b/packages/cli/src/cli/loaders/xcode-xcstrings-icu.ts
diff --git a/packages/cli/src/cli/loaders/xcode-xcstrings-v2.spec.ts b/packages/cli/src/cli/loaders/xcode-xcstrings-v2.spec.ts
diff --git a/packages/cli/src/cli/loaders/xcode-xcstrings-v2.ts b/packages/cli/src/cli/loaders/xcode-xcstrings-v2.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "adonis",`
`3`		`- "version": "0.0.37",`
	`3`	`+ "version": "0.0.38",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"license": "UNLICENSED",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "next-app",`
`3`		`- "version": "0.2.89",`
	`3`	`+ "version": "0.2.90",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "next dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lingo.dev",`
`3`		`- "version": "0.116.3",`
	`3`	`+ "version": "0.116.4",`
`4`	`4`	`"description": "Lingo.dev CLI",`
`5`	`5`	`"private": false,`
`6`	`6`	`"publishConfig": {`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ export interface ILoader<I, O, C = void> extends ILoaderDefinition<I, O, C> {`
`23`	`23`	`init(): Promise<C>;`
`24`	`24`	`pull(locale: string, input: I): Promise<O>;`
`25`	`25`	`push(locale: string, data: O): Promise<I>;`
`26`		`- pullHints(originalInput: I): Promise<O \| undefined>;`
	`26`	`+ pullHints(originalInput?: I): Promise<O \| undefined>;`
`27`	`27`	`}`