YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: update validators with ref and typing

Browse source
This commit is contained in:
axolotle 2024-07-25 16:38:53 +02:00
parent ea6cf5e3cf
commit be782c7bc9
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/helpers/validators/customValidators.ts
View file

@ -1,4 +1,8 @@
import { helpers } from '@vuelidate/validators' import { helpers } from '@vuelidate/validators'
import { toValue, type MaybeRef } from 'vue'
// FIXME no typing, but the lib is currently not actively maintained
// so it's propably better not to spend time on it.
// Unicode ranges are taken from https://stackoverflow.com/a/37668315 // Unicode ranges are taken from https://stackoverflow.com/a/37668315
const nonAsciiWordCharacters = const nonAsciiWordCharacters =
@ -20,7 +24,7 @@ const emailLocalPart = helpers.regex(/^[\w.-]+$/)
const emailForwardLocalPart = helpers.regex(/^[\w+.-]+$/) const emailForwardLocalPart = helpers.regex(/^[\w+.-]+$/)
const email = (value) => { const email = (value: string) => {
const [localPart, domainPart] = value.split('@') const [localPart, domainPart] = value.split('@')
if (!domainPart) return !helpers.req(value) || false if (!domainPart) return !helpers.req(value) || false
return ( return (
@ -29,7 +33,7 @@ const email = (value) => {
} }
// Same as email but with `+` allowed. // Same as email but with `+` allowed.
const emailForward = (value) => { const emailForward = (value: string) => {
const [localPart, domainPart] = value.split('@') const [localPart, domainPart] = value.split('@')
if (!domainPart) return !helpers.req(value) || false if (!domainPart) return !helpers.req(value) || false
return ( return (
@ -42,20 +46,15 @@ const appRepoUrl = helpers.regex(
/^https:\/\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_./~]+\/[a-zA-Z0-9-_.]+_ynh(\/?(-\/)?tree\/[a-zA-Z0-9-_.]+)?(\.git)?\/?$/, /^https:\/\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_./~]+\/[a-zA-Z0-9-_.]+_ynh(\/?(-\/)?tree\/[a-zA-Z0-9-_.]+)?(\.git)?\/?$/,
) )
const includes = (items) =>
helpers.withParams(
{ type: 'includes' },
(item) => !helpers.req(item) || (items ? items.includes(item) : false),
)
const name = helpers.regex( const name = helpers.regex(
new RegExp(`^(?:[A-Za-z${nonAsciiWordCharacters}]{1,30}[ ,.'-]{0,3})+$`), new RegExp(`^(?:[A-Za-z${nonAsciiWordCharacters}]{1,30}[ ,.'-]{0,3})+$`),
) )
const unique = (items) => const unique = (items: MaybeRef<any[]>) =>
helpers.withParams({ type: 'unique', arg: items }, (item) => helpers.withParams({ type: 'unique', arg: toValue(items) }, (item) => {
items ? !helpers.req(item) || !items.includes(item) : true, const items_ = toValue(items)
) return items_ ? !helpers.req(item) || !items_.includes(item) : true
})
export { export {
alphalownumdot_, alphalownumdot_,
@ -66,7 +65,6 @@ export {
emailForwardLocalPart, emailForwardLocalPart,
emailLocalPart, emailLocalPart,
appRepoUrl, appRepoUrl,
includes,
name, name,
unique, unique,
} }