Skip to content

Commit 555384d

Browse files
committed
revert(cli): ignoredKeys in typescript being ignored (#1065)
This reverts commit c0486ca.
1 parent e72c4c2 commit 555384d

8 files changed

Lines changed: 17 additions & 472 deletions

File tree

.changeset/tender-masks-agree.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"lingo.dev": patch
3+
---
4+
5+
revert

packages/cli/src/cli/cmd/run/_types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export type CmdRunTask = {
2828
injectLocale: string[];
2929
lockedKeys: string[];
3030
lockedPatterns: string[];
31-
ignoredKeys: string[];
3231
onlyKeys: string[];
3332
};
3433

packages/cli/src/cli/cmd/run/execute.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ function createLoaderForTask(assignedTask: CmdRunTask) {
127127
},
128128
assignedTask.lockedKeys,
129129
assignedTask.lockedPatterns,
130-
assignedTask.ignoredKeys,
131130
);
132131
bucketLoader.setDefaultLocale(assignedTask.sourceLocale);
133132

packages/cli/src/cli/cmd/run/plan.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ export default async function plan(
132132
injectLocale: bucket.injectLocale || [],
133133
lockedKeys: bucket.lockedKeys || [],
134134
lockedPatterns: bucket.lockedPatterns || [],
135-
ignoredKeys: bucket.ignoredKeys || [],
136135
onlyKeys: input.flags.key || [],
137136
});
138137
}

packages/cli/src/cli/loaders/ignored-keys.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ describe("ignored-keys loader", () => {
7979
// The loader should have re-inserted the ignored keys from the pull input.
8080
expect(pushResult).toEqual({
8181
greeting: "hola",
82+
meta: "meta es",
83+
todo: "todo es",
8284
});
8385
});
8486

@@ -168,15 +170,13 @@ describe("ignored-keys loader", () => {
168170
const pushResult = await loader.push(targetLocale, dataToPush);
169171
expect(pushResult).toEqual({
170172
greeting: "hola",
173+
meta: "meta es",
174+
"pages/0/title": "Título 0",
171175
"pages/0/content": "Contenido Nuveo",
176+
"pages/foo/title": "Título Foo",
172177
"pages/foo/content": "Contenido Nuevo Foo",
173178
"pages/bar/notitle": "No Título",
174179
"pages/bar/content": "Contenido Nuevo Bar",
175180
});
176-
expect(pushResult).not.toEqual({
177-
meta: "meta es",
178-
"pages/0/title": "Título 0",
179-
"pages/foo/title": "Título Foo",
180-
});
181181
});
182182
});

packages/cli/src/cli/loaders/ignored-keys.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ export default function createIgnoredKeysLoader(
1414
return result;
1515
},
1616
push: async (locale, data, originalInput, originalLocale, pullInput) => {
17-
// Ignored keys loader should remove ignored keys from push data too
18-
const result = _.omitBy(data, (value, key) =>
17+
const ignoredSubObject = _.pickBy(pullInput, (value, key) =>
1918
_isIgnoredKey(key, ignoredKeys),
2019
);
21-
20+
const result = _.merge({}, data, ignoredSubObject);
2221
return result;
2322
},
2423
});

0 commit comments

Comments
 (0)