Skip to content

Commit 32712be

Browse files
TPORLTPORL
authored
fix: petite-vue-i18n type errors (#1945)
* fix: petite-vue-i18n type errors * fix: petite-vue-i18n $t types
1 parent 8b13c36 commit 32712be

File tree

2 files changed

+30
-31
lines changed

2 files changed

+30
-31
lines changed

‎packages/petite-vue-i18n/src/vue.d.ts

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import type { Path, NamedValue } from '@intlify/core-base'
1+
import type { NamedValue, JsonPaths } from '@intlify/core-base'
22
import type {
33
TranslateOptions,
44
IsNever,
5-
IsEmptyObject,
6-
PickupPaths
5+
IsEmptyObject
76
} from '@intlify/core-base'
87
import type { CustomBlocks } from '../../vue-i18n-core/src/composer'
98
import type {
@@ -80,13 +79,13 @@ declare module 'vue' {
8079
DefinedLocaleMessage extends
8180
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
8281
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
83-
? PickupPaths<{
82+
? JsonPaths<{
8483
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
8584
}>
8685
: never,
8786
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
8887
>(
89-
key: Key | ResourceKeys | Path
88+
key: Key | ResourceKeys
9089
): TranslateResult
9190
/**
9291
* Locale message translation
@@ -104,13 +103,13 @@ declare module 'vue' {
104103
DefinedLocaleMessage extends
105104
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
106105
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
107-
? PickupPaths<{
106+
? JsonPaths<{
108107
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
109108
}>
110109
: never,
111110
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
112111
>(
113-
key: Key | ResourceKeys | Path,
112+
key: Key | ResourceKeys,
114113
plural: number
115114
): TranslateResult
116115
/**
@@ -130,13 +129,13 @@ declare module 'vue' {
130129
DefinedLocaleMessage extends
131130
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
132131
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
133-
? PickupPaths<{
132+
? JsonPaths<{
134133
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
135134
}>
136135
: never,
137136
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
138137
>(
139-
key: Key | ResourceKeys | Path,
138+
key: Key | ResourceKeys,
140139
plural: number,
141140
options: TranslateOptions
142141
): TranslateResult
@@ -156,13 +155,13 @@ declare module 'vue' {
156155
DefinedLocaleMessage extends
157156
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
158157
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
159-
? PickupPaths<{
158+
? JsonPaths<{
160159
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
161160
}>
162161
: never,
163162
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
164163
>(
165-
key: Key | ResourceKeys | Path,
164+
key: Key | ResourceKeys,
166165
defaultMsg: string
167166
): TranslateResult
168167
/**
@@ -182,13 +181,13 @@ declare module 'vue' {
182181
DefinedLocaleMessage extends
183182
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
184183
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
185-
? PickupPaths<{
184+
? JsonPaths<{
186185
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
187186
}>
188187
: never,
189188
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
190189
>(
191-
key: Key | ResourceKeys | Path,
190+
key: Key | ResourceKeys,
192191
defaultMsg: string,
193192
options: TranslateOptions
194193
): TranslateResult
@@ -208,13 +207,13 @@ declare module 'vue' {
208207
DefinedLocaleMessage extends
209208
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
210209
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
211-
? PickupPaths<{
210+
? JsonPaths<{
212211
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
213212
}>
214213
: never,
215214
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
216215
>(
217-
key: Key | ResourceKeys | Path,
216+
key: Key | ResourceKeys,
218217
list: unknown[]
219218
): TranslateResult
220219
/**
@@ -234,13 +233,13 @@ declare module 'vue' {
234233
DefinedLocaleMessage extends
235234
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
236235
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
237-
? PickupPaths<{
236+
? JsonPaths<{
238237
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
239238
}>
240239
: never,
241240
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
242241
>(
243-
key: Key | ResourceKeys | Path,
242+
key: Key | ResourceKeys,
244243
list: unknown[],
245244
plural: number
246245
): TranslateResult
@@ -261,16 +260,16 @@ declare module 'vue' {
261260
DefinedLocaleMessage extends
262261
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
263262
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
264-
? PickupPaths<{
263+
? JsonPaths<{
265264
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
266265
}>
267266
: never,
268267
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
269268
>(
270-
key: Key | ResourceKeys | Path,
269+
key: Key | ResourceKeys,
271270
list: unknown[],
272271
defaultMsg: string
273-
): string
272+
): TranslateResult
274273
/**
275274
* Locale message translation
276275
*
@@ -288,13 +287,13 @@ declare module 'vue' {
288287
DefinedLocaleMessage extends
289288
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
290289
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
291-
? PickupPaths<{
290+
? JsonPaths<{
292291
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
293292
}>
294293
: never,
295294
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
296295
>(
297-
key: Key | ResourceKeys | Path,
296+
key: Key | ResourceKeys,
298297
list: unknown[],
299298
options: TranslateOptions
300299
): TranslateResult
@@ -314,13 +313,13 @@ declare module 'vue' {
314313
DefinedLocaleMessage extends
315314
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
316315
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
317-
? PickupPaths<{
316+
? JsonPaths<{
318317
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
319318
}>
320319
: never,
321320
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
322321
>(
323-
key: Key | ResourceKeys | Path,
322+
key: Key | ResourceKeys,
324323
named: NamedValue
325324
): TranslateResult
326325
/**
@@ -340,13 +339,13 @@ declare module 'vue' {
340339
DefinedLocaleMessage extends
341340
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
342341
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
343-
? PickupPaths<{
342+
? JsonPaths<{
344343
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
345344
}>
346345
: never,
347346
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
348347
>(
349-
key: Key | ResourceKeys | Path,
348+
key: Key | ResourceKeys,
350349
named: NamedValue,
351350
plural: number
352351
): TranslateResult
@@ -367,13 +366,13 @@ declare module 'vue' {
367366
DefinedLocaleMessage extends
368367
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
369368
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
370-
? PickupPaths<{
369+
? JsonPaths<{
371370
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
372371
}>
373372
: never,
374373
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
375374
>(
376-
key: Key | ResourceKeys | Path,
375+
key: Key | ResourceKeys,
377376
named: NamedValue,
378377
defaultMsg: string
379378
): TranslateResult
@@ -394,13 +393,13 @@ declare module 'vue' {
394393
DefinedLocaleMessage extends
395394
RemovedIndexResources<DefineLocaleMessage> = RemovedIndexResources<DefineLocaleMessage>,
396395
Keys = IsEmptyObject<DefinedLocaleMessage> extends false
397-
? PickupPaths<{
396+
? JsonPaths<{
398397
[K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]
399398
}>
400399
: never,
401400
ResourceKeys extends Keys = IsNever<Keys> extends false ? Keys : never
402401
>(
403-
key: Key | ResourceKeys | Path,
402+
key: Key | ResourceKeys,
404403
named: NamedValue,
405404
options: TranslateOptions
406405
): TranslateResult

‎scripts/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ async function main() {
176176
process.exitCode = 1
177177
}
178178

179-
if (['vue-i18n', 'pretite-vue-i18n'].includes(target)) {
179+
if (['vue-i18n', 'petite-vue-i18n'].includes(target)) {
180180
console.log()
181181
console.log(
182182
pc.bold(pc.yellow(`Appending Vue type definitions for ${target}...`))

0 commit comments

Comments
 (0)