fix: keepFulfilled triggering, close #581

Author: antfu

examples/by-features/100-locales/.vscode/settings.json

@@ -6,8 +6,9 @@
   "i18n-ally.keystyle": "nested",
   "i18n-ally.translate.engines": ["google-cn"],
   "i18n-ally.translate.parallels": 5,
-  "i18n-ally.editor.preferEditor": true,
+  // "i18n-ally.editor.preferEditor": true,
   "i18n-ally.review.removeCommentOnResolved": true,
   "i18n-ally.readonly": false,
-  "i18n-ally.enabledFrameworks": "vue"
+  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.keepFulfilled": true,
 }

examples/by-frameworks/ui5/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ui5CliTest",
+  "name": "ui5-cli-test",
   "description": "",
   "devDependencies": {
     "@ui5/cli": "^2.10.4"

src/commands/manipulations/fulfillKeys.ts

@@ -29,7 +29,7 @@ export async function FulfillMissingKeysForProgress(item: ProgressSubmenuItem) {
   return pendings
 }
 
-export async function FulfillAllMissingKeys(prompt = true) {
+export async function FulfillAllMissingKeys(prompt = true, extraKeys?: string[]) {
   if (prompt) {
     const Yes = i18n.t('prompt.button_yes')
     const result = await window.showWarningMessage(
@@ -44,7 +44,15 @@ export async function FulfillAllMissingKeys(prompt = true) {
   let pendings: PendingWrite[] = []
   const loader = CurrentFile.loader
   for (const locale of Global.visibleLocales) {
-    const cov = loader.getCoverage(locale)
+    const keys = loader.keys
+    if (extraKeys?.length) {
+      extraKeys.forEach((i) => {
+        if (!keys.includes(i))
+          keys.push(i)
+      })
+    }
+
+    const cov = loader.getCoverage(locale, keys)
     if (!cov)
       continue
 

src/core/loaders/ComposedLoader.ts

@@ -1,5 +1,6 @@
 import { Disposable } from 'vscode'
 import _ from 'lodash'
+import { uniq } from '@antfu/utils'
 import { PendingWrite } from '../types'
 import { Translator } from '../Translator'
 import { Config } from '../Config'
@@ -115,8 +116,12 @@ export class ComposedLoader extends Loader {
     if (!Array.isArray(pendings))
       pendings = [pendings]
 
-    if (Config.keepFulfilled && triggerFullfilled)
-      pendings = [...await FulfillAllMissingKeys(false) || [], ...pendings]
+    if (Config.keepFulfilled && triggerFullfilled) {
+      pendings = [
+        ...await FulfillAllMissingKeys(false, uniq(pendings.map(i => i.keypath))) || [],
+        ...pendings,
+      ]
+    }
 
     pendings = pendings.filter(i => i)
 

src/utils/flat.ts

@@ -36,7 +36,7 @@ export function flatten(data: any) {
 export function unflatten(data: any) {
   const output: any = {}
 
-  Object.keys(data)
+  Object.keys(data || {})
     .sort((a, b) => b.length - a.length)
     .forEach((key) => {
       const original = key