chore(deps): Support for yup v1 <https://github.com/pocka/yup-locale-ja/issues/16> Upgraded yup to v1. Thanks to its optional locale structure, I could keep support for v0.x. I removed translation for `number.notEqual` due to it already being removed at v0.24. It's listed in neither CHANGELOG nor migration guide, and no type definition for that so keeping that leads to type errors. I believe it's not a breaking change. See <https://github.com/jquense/yup/pull/705> for more details on removal of `number.notEqual`.

Changes

5 changed files (+43/-108)

• package.json
  • @@ -27,17 +27,16 @@ "es5",
    "README_ja.md" ], "peerDependencies": { - "yup": "0.x" + "yup": "0.x || 1.x" }, "devDependencies": { - "@types/yup": "^0.29.3", "husky": "^4.2.5", "lint-staged": "^10.2.11", "prettier": "^2.0.5", "typescript": "^5.0.2", "vite": "^4.2.1", "vitest": "^0.29.7", - "yup": "^0.29.2" + "yup": "^1.0.2" }, "scripts": { "build:esm": "tsc --outDir esm",
• src/descriptive.ts
  • @@ -2,10 +2,7 @@ import type * as yup from "yup";
    // NOTE: `notType` is omitted because it's too hard to users to understand the // concept and what's happening. Write your own if you need that one. - // NOTE: @types/yup currently missing `mixed.defined` field definition. - export const mixed: yup.MixedLocale & { - defined: yup.MixedLocale["default"]; - } = { + export const mixed: yup.LocaleObject["mixed"] = { default: ({ label }) => (label ? label + "の" : "") + "値が不正です", required: ({ label }) => (label ? label + "は" : "") + "必須です", oneOf: ({ label, values }) =>
  • @@ -16,8 +13,7 @@ // From user's perspective, defined and default is essentially same.
    defined: ({ label }) => (label ? label + "は" : "") + "必須です", }; - // NOTE: @types/yup currently missing `string.uuid` field definition. - export const string: yup.StringLocale & { uuid: yup.StringLocale["email"] } = { + export const string: yup.LocaleObject["string"] = { length: ({ label, length }) => (label ? label + "は" : "") + `${length}文字である必要があります`, min: ({ label, min }) =>
  • @@ -38,10 +34,7 @@ uppercase: ({ label }) =>
    (label ? label + "には" : "") + "大文字のみ入力できます", }; - // NOTE: @types/yup currently missing `string.notEqual` field definition. - export const number: yup.NumberLocale & { - notEqual(ctx: { notEqual: number } & Partial<yup.TestMessageParams>): any; - } = { + export const number: yup.LocaleObject["number"] = { min: ({ label, min }) => (label ? label + "には" : "") + `${min}以上の数のみ入力可能です`, max: ({ label, max }) =>
  • @@ -50,8 +43,6 @@ lessThan: ({ label, less }) =>
    (label ? label + "には" : "") + `${less}未満の数のみ入力可能です`, moreThan: ({ label, more }) => (label ? label + "には" : "") + `${more}より大きい数のみ入力可能です`, - notEqual: ({ label, notEqual }) => - (label ? label + "は" : "") + `${notEqual}以外の数である必要があります`, positive: ({ label }) => (label ? label + "には" : "") + "正の数のみ入力できます", negative: ({ label }) =>
  • @@ -61,24 +52,21 @@ (label ? label + "には" : "") + "整数のみ入力可能です",
    }; // To format date, use the second argument of yup.date().min/max. - export const date: yup.DateLocale = { + export const date: yup.LocaleObject["date"] = { min: ({ label, min }) => (label ? label + "には" : "") + `${min}以降の日付のみ入力可能です`, max: ({ label, max }) => (label ? label + "には" : "") + `${max}以前の日付のみ入力可能です`, }; - export const object: yup.ObjectLocale = { - noUnknown: ({ - label, - unknown, - }: { unknown?: string } & Partial<yup.TestMessageParams>) => + export const object: yup.LocaleObject["object"] = { + noUnknown: ({ label, unknown }: { label?: string; unknown?: string }) => (label ? label + "には" : "") + "登録されていないキーは入力できません" + (unknown ? ": " + unknown : ""), }; - export const array: yup.ArrayLocale = { + export const array: yup.LocaleObject["array"] = { min: ({ label, min }) => (label ? label + "は" : "") + `${min}つ以上必要です`, max: ({ label, max }) => (label ? label + "は" : "") + `${max}つまで入力できます`,
• src/suggestive.ts
  • @@ -2,10 +2,7 @@ import type * as yup from "yup";
    // NOTE: `notType` is omitted because it's too hard to users to understand the // concept and what's happening. Write your own if you need that one. - // NOTE: @types/yup currently missing `mixed.defined` field definition. - export const mixed: yup.MixedLocale & { - defined: yup.MixedLocale["default"]; - } = { + export const mixed: yup.LocaleObject["mixed"] = { default: ({ label }) => (label ? label + "には" : "") + "正しい値を入力してください", required: ({ label }) =>
  • @@ -19,8 +16,7 @@ defined: ({ label }) =>
    (label ? label + "には" : "") + "値を入力してください", }; - // NOTE: @types/yup currently missing `string.uuid` field definition. - export const string: yup.StringLocale & { uuid: yup.StringLocale["email"] } = { + export const string: yup.LocaleObject["string"] = { length: ({ label, length }) => (label ? label + "は" : "") + `${length}文字で入力してください`, min: ({ label, min }) =>
  • @@ -43,10 +39,7 @@ uppercase: ({ label }) =>
    (label ? label + "には" : "") + "大文字のみ入力してください", }; - // NOTE: @types/yup currently missing `string.notEqual` field definition. - export const number: yup.NumberLocale & { - notEqual(ctx: { notEqual: number } & Partial<yup.TestMessageParams>): any; - } = { + export const number: yup.LocaleObject["number"] = { min: ({ label, min }) => (label ? label + "は" : "") + `${min}以上にしてください`, max: ({ label, max }) =>
  • @@ -55,8 +48,6 @@ lessThan: ({ label, less }) =>
    (label ? label + "は" : "") + `${less}未満にしてください`, moreThan: ({ label, more }) => (label ? label + "は" : "") + `${more}より大きい数にしてください`, - notEqual: ({ label, notEqual }) => - (label ? label + "は" : "") + `${notEqual}以外の数にしてください`, positive: ({ label }) => (label ? label + "は" : "") + "正の数にしてください", negative: ({ label }) => (label ? label + "は" : "") + "負の数にしてください", integer: ({ label }) =>
  • @@ -64,25 +55,22 @@ (label ? label + "には" : "") + "整数を入力してください",
    }; // To format date, use the second argument of yup.date().min/max. - export const date: yup.DateLocale = { + export const date: yup.LocaleObject["date"] = { min: ({ label, min }) => (label ? label + "には" : "") + `${min}以降の日付を入力してください`, max: ({ label, max }) => (label ? label + "には" : "") + `${max}以前の日付を入力してください`, }; - export const object: yup.ObjectLocale = { + export const object: yup.LocaleObject["object"] = { // There is no way to describe `noUnknown` message in suggestive way, right? - noUnknown: ({ - label, - unknown, - }: { unknown?: string } & Partial<yup.TestMessageParams>) => + noUnknown: ({ label, unknown }: { label?: string; unknown?: string }) => (label ? label + "には" : "") + "登録されていないキーは入力できません" + (unknown ? ": " + unknown : ""), }; - export const array: yup.ArrayLocale = { + export const array: yup.LocaleObject["array"] = { min: ({ label, min }) => (label ? label + "は" : "") + `${min}つ以上入力してください`, max: ({ label, max }) =>
• tsconfig.json
  • @@ -2,6 +2,7 @@ {
    "compilerOptions": { "strict": true, "module": "ESNext", + "moduleResolution": "Node", "target": "ES2015", "skipDefaultLibCheck": true, "skipLibCheck": true,
• yarn.lock
  • @@ -32,15 +32,6 @@ checksum: 1adf2222eab396a8cf9838d31fb4347b0ff344ca20631f304ec8b45a144863bcd9f59ff90786787b2b2bf2ca2b7d65ae25008f628f9a959f46e7dc4f7503af0a
    languageName: node linkType: hard - "@babel/runtime@npm:^7.10.5": - version: 7.12.13 - resolution: "@babel/runtime@npm:7.12.13" - dependencies: - regenerator-runtime: ^0.13.4 - checksum: 31ae174af24ba776abd03ea4859fa45f96ca31972afeb8dc6fb3bb178fa3ca89d3fd2a58edf9ffaeec64f855b549dd5eece196b8ee85af3a86b490aad881a486 - languageName: node - linkType: hard - "@esbuild/android-arm64@npm:0.17.12": version: 0.17.12 resolution: "@esbuild/android-arm64@npm:0.17.12"
  • @@ -256,13 +247,6 @@ "@types/parse-json@npm:^4.0.0":
    version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" checksum: fd6bce2b674b6efc3db4c7c3d336bd70c90838e8439de639b909ce22f3720d21344f52427f1d9e57b265fcb7f6c018699b99e5e0c208a1a4823014269a6bf35b - languageName: node - linkType: hard - - "@types/yup@npm:^0.29.3": - version: 0.29.11 - resolution: "@types/yup@npm:0.29.11" - checksum: 703fa2075231a831ee09087128c5ca3c45670a3854d9564d037c46e1f51247d3e00e468d73efb4b4e8ba3df880ddf8494c4cefcd96adddb8fcca06add70e192c languageName: node linkType: hard
  • @@ -986,13 +970,6 @@ checksum: 2b4c749dc33e3fa73a457ca4df616ac13b4b32c53f6297bc862b0814d402a6cfec93a0d308d5502eeb47f2c125906e0f861bf01b756f08395640892186357711
    languageName: node linkType: hard - "fn-name@npm:~3.0.0": - version: 3.0.0 - resolution: "fn-name@npm:3.0.0" - checksum: 3cfe9bfadb65af582624fb17f8d491eac3d122ff8ecf9debb5994cb243131697b88903a737563cbc7d8a919716bd5f53ed8cb87bdfe124744a0d8a690531b4c2 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0"
  • @@ -1427,20 +1404,6 @@ checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
    languageName: node linkType: hard - "lodash-es@npm:^4.17.11": - version: 4.17.21 - resolution: "lodash-es@npm:4.17.21" - checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2 - languageName: node - linkType: hard - - "lodash@npm:^4.17.15": - version: 4.17.21 - resolution: "lodash@npm:4.17.21" - checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 - languageName: node - linkType: hard - "log-symbols@npm:^4.0.0": version: 4.0.0 resolution: "log-symbols@npm:4.0.0"
  • @@ -1964,10 +1927,10 @@ checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429
    languageName: node linkType: hard - "property-expr@npm:^2.0.2": - version: 2.0.4 - resolution: "property-expr@npm:2.0.4" - checksum: 7ac142e189f0feef685f327f582efe13bfbc24a0b6e2328afdb38520bc140caa5f91dfa9529f2539b4468d85dc83a593e1ef0e0f7401b525368bb634b323bf54 + "property-expr@npm:^2.0.5": + version: 2.0.5 + resolution: "property-expr@npm:2.0.5" + checksum: 4ebe82ce45aaf1527e96e2ab84d75d25217167ec3ff6378cf83a84fb4abc746e7c65768a79d275881602ae82f168f9a6dfaa7f5e331d0fcc83d692770bcce5f1 languageName: node linkType: hard
  • @@ -1999,13 +1962,6 @@ checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
    languageName: node linkType: hard - "regenerator-runtime@npm:^0.13.4": - version: 0.13.7 - resolution: "regenerator-runtime@npm:0.13.7" - checksum: 52b66e6669152c0b1bccd95c8e11aabbfe67bb97bdf00e223bdf723b0f0052d4da5c02001d4c4bef576bdc5bcdc38a20496d1b5363b65c950c8434ed5071d9e0 - languageName: node - linkType: hard - "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0"
  • @@ -2405,13 +2361,6 @@ checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
    languageName: node linkType: hard - "synchronous-promise@npm:^2.0.13": - version: 2.0.15 - resolution: "synchronous-promise@npm:2.0.15" - checksum: 6079a6acd37d02eb76f250dc7ce09009151744901b320a8cfbba056b015c3d7cbf4e7467458f2d27c6393634f68521b241ea9e35fd9640f8fb59342740550472 - languageName: node - linkType: hard - "tar@npm:^6.1.11, tar@npm:^6.1.2": version: 6.1.13 resolution: "tar@npm:6.1.13"
  • @@ -2430,6 +2379,13 @@ "through@npm:^2.3.8":
    version: 2.3.8 resolution: "through@npm:2.3.8" checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd + languageName: node + linkType: hard + + "tiny-case@npm:^1.0.3": + version: 1.0.3 + resolution: "tiny-case@npm:1.0.3" + checksum: 3f7a30c39d5b0e1bc097b0b271bec14eb5b836093db034f35a0de26c14422380b50dc12bfd37498cf35b192f5df06f28a710712c87ead68872a9e37ad6f6049d languageName: node linkType: hard
  • @@ -2488,6 +2444,13 @@ "type-fest@npm:^0.11.0":
    version: 0.11.0 resolution: "type-fest@npm:0.11.0" checksum: 8e7589e1eb5ced6c8e1d3051553b59b9f525c41e58baa898229915781c7bf55db8cb2f74e56d8031f6af5af2eecc7cb8da9ca3af7e5b80b49d8ca5a81891f3f9 + languageName: node + linkType: hard + + "type-fest@npm:^2.19.0": + version: 2.19.0 + resolution: "type-fest@npm:2.19.0" + checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278 languageName: node linkType: hard
  • @@ -2752,30 +2715,26 @@ "yup-locale-ja@workspace:.":
    version: 0.0.0-use.local resolution: "yup-locale-ja@workspace:." dependencies: - "@types/yup": ^0.29.3 husky: ^4.2.5 lint-staged: ^10.2.11 prettier: ^2.0.5 typescript: ^5.0.2 vite: ^4.2.1 vitest: ^0.29.7 - yup: ^0.29.2 + yup: ^1.0.2 peerDependencies: yup: 0.x languageName: unknown linkType: soft - "yup@npm:^0.29.2": - version: 0.29.3 - resolution: "yup@npm:0.29.3" + "yup@npm:^1.0.2": + version: 1.0.2 + resolution: "yup@npm:1.0.2" dependencies: - "@babel/runtime": ^7.10.5 - fn-name: ~3.0.0 - lodash: ^4.17.15 - lodash-es: ^4.17.11 - property-expr: ^2.0.2 - synchronous-promise: ^2.0.13 + property-expr: ^2.0.5 + tiny-case: ^1.0.3 toposort: ^2.0.2 - checksum: ec7297457ed8a8ccbd7751c4f312a6e651fa5eeb62338d59c6c972f2e6f91d0ce9c7c4026c654afd7bf9fb5b3b651759d5ff5e6621562383390b366048edb5be + type-fest: ^2.19.0 + checksum: 1cb9c490853739aa0c576c87a81008dd3612985dd2da5ff6127b77640465fa906bb47ed30a7c97824b4a3f525010b2d7f614ebbd442b02e16433675c4d66f0b8 languageName: node linkType: hard