@dereekb/dbx-form 12.4.3 → 12.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -81,11 +81,11 @@ export function usernameLoginField(username) {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
if (usernameFieldConfig.email) {
|
|
84
|
-
usernameField = emailField({ ...usernameFieldConfig.
|
|
84
|
+
usernameField = emailField({ ...usernameFieldConfig.email, ...defaultUsernameFieldConfig });
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
87
|
usernameField = textField({ ...usernameFieldConfig.username, ...defaultUsernameFieldConfig });
|
|
88
88
|
}
|
|
89
89
|
return usernameField;
|
|
90
90
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../../../../packages/dbx-form/src/lib/formly/template/login.ts"],"names":[],"mappings":"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","sourcesContent":["import { TextFieldConfig, textField } from '../field/value/text/text.field';\nimport { EmailFieldConfig, emailField } from '../field/value/text/text.additional.field';\nimport { fieldValuesAreEqualValidator } from '../../validator/field';\nimport { FormlyFieldConfig } from '@ngx-formly/core';\nimport { capitalizeFirstLetter, type Maybe } from '@dereekb/util';\n\n/**\n * Convenience interface for the password parameters configuration for a TextPasswordField.\n */\nexport type TextPasswordFieldPasswordParameters = Partial<Pick<TextFieldConfig, 'maxLength' | 'minLength' | 'pattern'>>;\n\n/**\n * textPasswordField() configuration.\n */\nexport interface TextPasswordFieldConfig extends Omit<TextFieldConfig, 'inputType' | 'key'>, Partial<Pick<TextFieldConfig, 'key' | 'materialFormField'>> {}\n\n/**\n * Configured simple text password field.\n *\n * @param config\n * @returns\n */\nexport function textPasswordField(config?: TextPasswordFieldConfig): FormlyFieldConfig {\n  return textField({\n    key: 'password',\n    ...config,\n    label: config?.label ?? 'Password',\n    inputType: 'password',\n    required: true\n  });\n}\n\n/**\n * Configured verify field for a password.\n * @param config\n * @returns\n */\nexport function textVerifyPasswordField(config?: TextPasswordFieldConfig): FormlyFieldConfig {\n  return textPasswordField({\n    key: 'verifyPassword',\n    label: 'Verify Password',\n    ...config,\n    required: true\n  });\n}\n\nexport interface TextPasswordWithVerifyFieldConfig {\n  readonly password?: TextPasswordFieldConfig;\n  readonly verifyPassword?: TextPasswordFieldConfig;\n}\n\nexport function textPasswordWithVerifyFieldGroup(config: TextPasswordWithVerifyFieldConfig): FormlyFieldConfig {\n  const passwordFieldConfig = textPasswordField(config.password);\n  const verifyPasswordFieldKey = config.verifyPassword?.key ?? `verify${capitalizeFirstLetter(String(passwordFieldConfig.key))}`;\n  const verifyPasswordField = textVerifyPasswordField({\n    ...config.password,\n    ...config.verifyPassword,\n    label: config.verifyPassword?.label ?? `Verify ${passwordFieldConfig.props?.label}`,\n    key: verifyPasswordFieldKey\n  });\n\n  const validators = {\n    validation: [\n      {\n        errorPath: verifyPasswordFieldKey,\n        expression: fieldValuesAreEqualValidator({ keysFilter: [passwordFieldConfig.key, verifyPasswordField.key] as string[], message: 'The passwords do not match.' })\n      }\n    ]\n  };\n\n  const groupFieldConfig: FormlyFieldConfig = {\n    validators,\n    fieldGroup: [passwordFieldConfig, verifyPasswordField]\n  };\n\n  return groupFieldConfig;\n}\n\nexport interface UsernameLoginFieldUsernameConfig {\n  readonly email?: Omit<EmailFieldConfig, 'key'>;\n  readonly username?: Omit<TextFieldConfig, 'key'>;\n}\n\nexport type UsernameLoginFieldUsernameConfigInput = 'email' | 'username' | UsernameLoginFieldUsernameConfig;\n\n/**\n * usernamePasswordLoginFields() configuration.\n */\nexport interface UsernameLoginFieldsConfig {\n  readonly username: UsernameLoginFieldUsernameConfigInput;\n  readonly password?: TextPasswordFieldConfig;\n  readonly verifyPassword?: Maybe<boolean | TextPasswordFieldConfig>;\n}\n\n/**\n * Value type exported by usernameLoginFields()\n */\nexport interface DefaultUsernameLoginFieldsValue extends DefaultUsernameLoginFieldValue {\n  readonly password: string;\n  readonly verifyPassword?: string;\n}\n\n/**\n * Template for login field that takes in a username and password.\n *\n * @param param0\n * @returns\n */\nexport function usernamePasswordLoginFields({ username, password, verifyPassword }: UsernameLoginFieldsConfig): FormlyFieldConfig[] {\n  const usernameField = usernameLoginField(username);\n  const passwordField = verifyPassword ? textPasswordWithVerifyFieldGroup({ password, verifyPassword: verifyPassword === true ? undefined : verifyPassword }) : textPasswordField(password);\n\n  return [usernameField, passwordField];\n}\n\n/**\n * Value type exported by usernameLoginField()\n */\nexport interface DefaultUsernameLoginFieldValue {\n  readonly username: string;\n}\n\nexport function usernameLoginField(username: UsernameLoginFieldUsernameConfigInput): FormlyFieldConfig {\n  let usernameField: FormlyFieldConfig;\n  let usernameFieldConfig: UsernameLoginFieldUsernameConfig = username as UsernameLoginFieldUsernameConfig;\n\n  const defaultUsernameFieldConfig = { key: 'username', required: true };\n\n  if (typeof username === 'string') {\n    if (username === 'email') {\n      usernameFieldConfig = {\n        email: defaultUsernameFieldConfig\n      };\n    } else {\n      usernameFieldConfig = {\n        username: defaultUsernameFieldConfig\n      };\n    }\n  }\n\n  if (usernameFieldConfig.email) {\n    usernameField = emailField({ ...usernameFieldConfig.username, ...defaultUsernameFieldConfig });\n  } else {\n    usernameField = textField({ ...usernameFieldConfig.username, ...defaultUsernameFieldConfig });\n  }\n\n  return usernameField;\n}\n"]}
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../../../../packages/dbx-form/src/lib/formly/template/login.ts"],"names":[],"mappings":"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","sourcesContent":["import { TextFieldConfig, textField } from '../field/value/text/text.field';\nimport { EmailFieldConfig, emailField } from '../field/value/text/text.additional.field';\nimport { fieldValuesAreEqualValidator } from '../../validator/field';\nimport { FormlyFieldConfig } from '@ngx-formly/core';\nimport { capitalizeFirstLetter, type Maybe } from '@dereekb/util';\n\n/**\n * Convenience interface for the password parameters configuration for a TextPasswordField.\n */\nexport type TextPasswordFieldPasswordParameters = Partial<Pick<TextFieldConfig, 'maxLength' | 'minLength' | 'pattern'>>;\n\n/**\n * textPasswordField() configuration.\n */\nexport interface TextPasswordFieldConfig extends Omit<TextFieldConfig, 'inputType' | 'key'>, Partial<Pick<TextFieldConfig, 'key' | 'materialFormField'>> {}\n\n/**\n * Configured simple text password field.\n *\n * @param config\n * @returns\n */\nexport function textPasswordField(config?: TextPasswordFieldConfig): FormlyFieldConfig {\n  return textField({\n    key: 'password',\n    ...config,\n    label: config?.label ?? 'Password',\n    inputType: 'password',\n    required: true\n  });\n}\n\n/**\n * Configured verify field for a password.\n * @param config\n * @returns\n */\nexport function textVerifyPasswordField(config?: TextPasswordFieldConfig): FormlyFieldConfig {\n  return textPasswordField({\n    key: 'verifyPassword',\n    label: 'Verify Password',\n    ...config,\n    required: true\n  });\n}\n\nexport interface TextPasswordWithVerifyFieldConfig {\n  readonly password?: TextPasswordFieldConfig;\n  readonly verifyPassword?: TextPasswordFieldConfig;\n}\n\nexport function textPasswordWithVerifyFieldGroup(config: TextPasswordWithVerifyFieldConfig): FormlyFieldConfig {\n  const passwordFieldConfig = textPasswordField(config.password);\n  const verifyPasswordFieldKey = config.verifyPassword?.key ?? `verify${capitalizeFirstLetter(String(passwordFieldConfig.key))}`;\n  const verifyPasswordField = textVerifyPasswordField({\n    ...config.password,\n    ...config.verifyPassword,\n    label: config.verifyPassword?.label ?? `Verify ${passwordFieldConfig.props?.label}`,\n    key: verifyPasswordFieldKey\n  });\n\n  const validators = {\n    validation: [\n      {\n        errorPath: verifyPasswordFieldKey,\n        expression: fieldValuesAreEqualValidator({ keysFilter: [passwordFieldConfig.key, verifyPasswordField.key] as string[], message: 'The passwords do not match.' })\n      }\n    ]\n  };\n\n  const groupFieldConfig: FormlyFieldConfig = {\n    validators,\n    fieldGroup: [passwordFieldConfig, verifyPasswordField]\n  };\n\n  return groupFieldConfig;\n}\n\nexport interface UsernameLoginFieldUsernameConfig {\n  readonly email?: Omit<EmailFieldConfig, 'key'>;\n  readonly username?: Omit<TextFieldConfig, 'key'>;\n}\n\nexport type UsernameLoginFieldUsernameConfigInput = 'email' | 'username' | UsernameLoginFieldUsernameConfig;\n\n/**\n * usernamePasswordLoginFields() configuration.\n */\nexport interface UsernameLoginFieldsConfig {\n  readonly username: UsernameLoginFieldUsernameConfigInput;\n  readonly password?: TextPasswordFieldConfig;\n  readonly verifyPassword?: Maybe<boolean | TextPasswordFieldConfig>;\n}\n\n/**\n * Value type exported by usernameLoginFields()\n */\nexport interface DefaultUsernameLoginFieldsValue extends DefaultUsernameLoginFieldValue {\n  readonly password: string;\n  readonly verifyPassword?: string;\n}\n\n/**\n * Template for login field that takes in a username and password.\n *\n * @param param0\n * @returns\n */\nexport function usernamePasswordLoginFields({ username, password, verifyPassword }: UsernameLoginFieldsConfig): FormlyFieldConfig[] {\n  const usernameField = usernameLoginField(username);\n  const passwordField = verifyPassword ? textPasswordWithVerifyFieldGroup({ password, verifyPassword: verifyPassword === true ? undefined : verifyPassword }) : textPasswordField(password);\n\n  return [usernameField, passwordField];\n}\n\n/**\n * Value type exported by usernameLoginField()\n */\nexport interface DefaultUsernameLoginFieldValue {\n  readonly username: string;\n}\n\nexport function usernameLoginField(username: UsernameLoginFieldUsernameConfigInput): FormlyFieldConfig {\n  let usernameField: FormlyFieldConfig;\n  let usernameFieldConfig: UsernameLoginFieldUsernameConfig = username as UsernameLoginFieldUsernameConfig;\n\n  const defaultUsernameFieldConfig = { key: 'username', required: true };\n\n  if (typeof username === 'string') {\n    if (username === 'email') {\n      usernameFieldConfig = {\n        email: defaultUsernameFieldConfig\n      };\n    } else {\n      usernameFieldConfig = {\n        username: defaultUsernameFieldConfig\n      };\n    }\n  }\n\n  if (usernameFieldConfig.email) {\n    usernameField = emailField({ ...usernameFieldConfig.email, ...defaultUsernameFieldConfig });\n  } else {\n    usernameField = textField({ ...usernameFieldConfig.username, ...defaultUsernameFieldConfig });\n  }\n\n  return usernameField;\n}\n"]}
|
|
@@ -6422,7 +6422,7 @@ function usernameLoginField(username) {
|
|
|
6422
6422
|
}
|
|
6423
6423
|
}
|
|
6424
6424
|
if (usernameFieldConfig.email) {
|
|
6425
|
-
usernameField = emailField({ ...usernameFieldConfig.
|
|
6425
|
+
usernameField = emailField({ ...usernameFieldConfig.email, ...defaultUsernameFieldConfig });
|
|
6426
6426
|
}
|
|
6427
6427
|
else {
|
|
6428
6428
|
usernameField = textField({ ...usernameFieldConfig.username, ...defaultUsernameFieldConfig });
|