schema-dsl 2.0.0 → 2.0.1

package/src/plugins/custom-validator.ts

@@ -1,140 +1,138 @@
-import type { KeywordDefinition } from 'ajv'
-import type { Plugin } from '../types/plugin.js'
-import type { Validator } from '../core/Validator.js'
-
-function getValidator(core: unknown): Validator {
-  const coreRecord = core as { getDefaultValidator?: () => Validator }
-  const validator = coreRecord.getDefaultValidator?.()
-  if (!validator) {
-    throw new Error('getDefaultValidator() is not available. Please provide schema-dsl core object.')
-  }
-  return validator
-}
-
-function getPluginBucket(): Record<string, unknown> {
-  const globalRecord = globalThis as typeof globalThis & {
-    __schemaDsl_plugins?: Record<string, unknown>
-  }
-  if (!globalRecord.__schemaDsl_plugins) {
-    globalRecord.__schemaDsl_plugins = {}
-  }
-  return globalRecord.__schemaDsl_plugins
-}
-
-export const customValidatorPlugin: Plugin & {
-  addCustomKeywords: (validator: Validator) => void
-  _validateIdCardChecksum: (idCard: string) => boolean
-} = {
-  name: 'custom-validator',
-  version: '1.0.0',
-  description: 'Custom validator plugin — adds business-specific validation rules',
-  install(core, _options = {}, _context) {
-    const validator = getValidator(core)
-    this.addCustomKeywords(validator)
-    getPluginBucket()['custom-validator'] = this
-    console.log('[Plugin] custom-validator installed')
-  },
-  uninstall() {
-    delete getPluginBucket()['custom-validator']
-    console.log('[Plugin] custom-validator uninstalled')
-  },
-  addCustomKeywords(validator) {
-    const ajv = validator.getAjv() as {
-      getKeyword?: (name: string) => unknown
-    }
-
-    if (!ajv.getKeyword?.('unique')) {
-      validator.addKeyword('unique', {
-        async: true,
-        type: 'string',
-        validate: async function validateUnique(schema: unknown) {
-          if (!schema) return true
-          const { table, field } = schema as { table?: string; field?: string }
-          const exists = false
-          if (exists) {
-            ;(validateUnique as typeof validateUnique & { errors?: unknown[] }).errors = [{
-              keyword: 'unique',
-              message: `${field} already exists in ${table}`,
-              params: { table, field },
-            }]
-            return false
-          }
-          return true
-        },
-      } as unknown as KeywordDefinition)
-    }
-
-    if (!ajv.getKeyword?.('passwordStrength')) {
-      validator.addKeyword('passwordStrength', {
-        type: 'string',
-        validate: function validatePasswordStrength(schema: unknown, data: unknown) {
-          if (!schema) return true
-
-          const strength = String(schema)
-          const value = String(data ?? '')
-          const rules: Record<string, RegExp> = {
-            weak: /^.{6,}$/,
-            medium: /^(?=.*[a-z])(?=.*[A-Z]).{8,}$/,
-            strong: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$/,
-          }
-
-          const pattern = rules[strength]
-          if (!pattern) return true
-
-          if (!pattern.test(value)) {
-            ;(validatePasswordStrength as typeof validatePasswordStrength & { errors?: unknown[] }).errors = [{
-              keyword: 'passwordStrength',
-              message: `Password does not meet ${strength} strength requirements`,
-              params: { strength },
-            }]
-            return false
-          }
-
-          return true
-        },
-      } as unknown as KeywordDefinition)
-    }
-
-    if (!ajv.getKeyword?.('idCard')) {
-      validator.addKeyword('idCard', {
-        type: 'string',
-        validate: (schema: unknown, data: unknown) => {
-          if (!schema) return true
-
-          const value = String(data ?? '')
-          const pattern = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
-
-          if (!pattern.test(value)) {
-            return false
-          }
-
-          return customValidatorPlugin._validateIdCardChecksum(value)
-        },
-      } as unknown as KeywordDefinition)
-    }
-  },
-  _validateIdCardChecksum(idCard: string) {
-    const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
-    const checksums = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']
-
-    let sum = 0
-    for (let i = 0; i < 17; i += 1) {
-      sum += Number.parseInt(idCard[i], 10) * weights[i]
-    }
-
-    const checksum = checksums[sum % 11]
-    return idCard[17].toUpperCase() === checksum
-  },
-  hooks: {
-    onBeforeValidate() {},
-    onAfterValidate() {},
-    onError(error) {
-      console.error('[custom-validator] Error:', (error as Error).message)
-    },
-  },
-}
-
-export default customValidatorPlugin
-
-
-
+import type { KeywordDefinition } from 'ajv'
+import type { Plugin } from '../types/plugin.js'
+import type { Validator } from '../core/Validator.js'
+
+function getValidator(core: unknown): Validator {
+  const coreRecord = core as { getDefaultValidator?: () => Validator }
+  const validator = coreRecord.getDefaultValidator?.()
+  if (!validator) {
+    throw new Error('getDefaultValidator() is not available. Please provide schema-dsl core object.')
+  }
+  return validator
+}
+
+function getPluginBucket(): Record<string, unknown> {
+  const globalRecord = globalThis as typeof globalThis & {
+    __schemaDsl_plugins?: Record<string, unknown>
+  }
+  if (!globalRecord.__schemaDsl_plugins) {
+    globalRecord.__schemaDsl_plugins = {}
+  }
+  return globalRecord.__schemaDsl_plugins
+}
+
+export const customValidatorPlugin: Plugin & {
+  addCustomKeywords: (validator: Validator) => void
+  _validateIdCardChecksum: (idCard: string) => boolean
+} = {
+  name: 'custom-validator',
+  version: '1.0.0',
+  description: 'Custom validator plugin — adds business-specific validation rules',
+  install(core, _options = {}, _context) {
+    const validator = getValidator(core)
+    this.addCustomKeywords(validator)
+    getPluginBucket()['custom-validator'] = this
+  },
+  uninstall() {
+    delete getPluginBucket()['custom-validator']
+  },
+  addCustomKeywords(validator) {
+    const ajv = validator.getAjv() as {
+      getKeyword?: (name: string) => unknown
+    }
+
+    if (!ajv.getKeyword?.('unique')) {
+      validator.addKeyword('unique', {
+        async: true,
+        type: 'string',
+        validate: async function validateUnique(schema: unknown) {
+          if (!schema) return true
+          const { table, field } = schema as { table?: string; field?: string }
+          const exists = false
+          if (exists) {
+            ;(validateUnique as typeof validateUnique & { errors?: unknown[] }).errors = [{
+              keyword: 'unique',
+              message: `${field} already exists in ${table}`,
+              params: { table, field },
+            }]
+            return false
+          }
+          return true
+        },
+      } as unknown as KeywordDefinition)
+    }
+
+    if (!ajv.getKeyword?.('passwordStrength')) {
+      validator.addKeyword('passwordStrength', {
+        type: 'string',
+        validate: function validatePasswordStrength(schema: unknown, data: unknown) {
+          if (!schema) return true
+
+          const strength = String(schema)
+          const value = String(data ?? '')
+          const rules: Record<string, RegExp> = {
+            weak: /^.{6,}$/,
+            medium: /^(?=.*[a-z])(?=.*[A-Z]).{8,}$/,
+            strong: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$/,
+          }
+
+          const pattern = rules[strength]
+          if (!pattern) return true
+
+          if (!pattern.test(value)) {
+            ;(validatePasswordStrength as typeof validatePasswordStrength & { errors?: unknown[] }).errors = [{
+              keyword: 'passwordStrength',
+              message: `Password does not meet ${strength} strength requirements`,
+              params: { strength },
+            }]
+            return false
+          }
+
+          return true
+        },
+      } as unknown as KeywordDefinition)
+    }
+
+    if (!ajv.getKeyword?.('idCard')) {
+      validator.addKeyword('idCard', {
+        type: 'string',
+        validate: (schema: unknown, data: unknown) => {
+          if (!schema) return true
+
+          const value = String(data ?? '')
+          const pattern = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
+
+          if (!pattern.test(value)) {
+            return false
+          }
+
+          return customValidatorPlugin._validateIdCardChecksum(value)
+        },
+      } as unknown as KeywordDefinition)
+    }
+  },
+  _validateIdCardChecksum(idCard: string) {
+    const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+    const checksums = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']
+
+    let sum = 0
+    for (let i = 0; i < 17; i += 1) {
+      sum += Number.parseInt(idCard[i], 10) * weights[i]
+    }
+
+    const checksum = checksums[sum % 11]
+    return idCard[17].toUpperCase() === checksum
+  },
+  hooks: {
+    onBeforeValidate() {},
+    onAfterValidate() {},
+    onError(error) {
+      console.error('[custom-validator] Error:', (error as Error).message)
+    },
+  },
+}
+
+export default customValidatorPlugin
+
+
+

package/src/types/conditional.ts

@@ -1,28 +1,28 @@
-/**
- * IConditionalBuilder interface (shape definition).
- * Implementation class is in src/core/ConditionalBuilder.ts (Phase 8).
- */
-import type { JSONSchema } from './schema.js'
-import type { ValidationResult } from './validate.js'
-
-export interface IConditionalBuilder {
-  and(condition: (data: unknown) => boolean): this
-  or(condition: (data: unknown) => boolean): this
-  /** then/else accept string DSL, JSONSchema, or null (no-op). */
-  then(schema: string | JSONSchema | null): this
-  else(schema: string | JSONSchema | null): this
-  elseIf(condition: (data: unknown) => boolean): this
-  message(msg: string): this
-  /** Serialise to a JSON Schema object (internal conditional marker). */
-  toSchema(): JSONSchema
-  /** Alias for toSchema(). */
-  build(): JSONSchema
-  /** Synchronous assertion; throws ValidationError on failure. */
-  assert(data: unknown, options?: Record<string, unknown>): unknown
-  /** Synchronous validation; returns ValidationResult. */
-  validate(data: unknown, options?: Record<string, unknown>): ValidationResult<unknown>
-  /** Async validation; returns Promise<ValidationResult>. */
-  validateAsync(data: unknown, options?: Record<string, unknown>): Promise<ValidationResult<unknown>>
-  /** Quick boolean check (no error details). */
-  check(data: unknown): boolean
-}
+/**
+ * IConditionalBuilder interface (shape definition).
+ * Implementation class is in src/core/ConditionalBuilder.ts (Phase 8).
+ */
+import type { JSONSchema } from './schema.js'
+import type { ValidationResult } from './validate.js'
+
+export interface IConditionalBuilder {
+  and(condition: (data: unknown) => boolean): this
+  or(condition: (data: unknown) => boolean): this
+  /** then/else accept string DSL, JSONSchema, or null (no-op). */
+  then(schema: string | JSONSchema | null): this
+  else(schema: string | JSONSchema | null): this
+  elseIf(condition: (data: unknown) => boolean): this
+  message(msg: string): this
+  /** Serialise to a JSON Schema object (internal conditional marker). */
+  toSchema(): JSONSchema
+  /** Alias for toSchema(). */
+  build(): JSONSchema
+  /** Synchronous assertion; throws ValidationError on failure. */
+  assert(data: unknown, options?: Record<string, unknown>): unknown
+  /** Synchronous validation; returns ValidationResult. */
+  validate(data: unknown, options?: Record<string, unknown>): ValidationResult<unknown>
+  /** Async validation; returns Promise<ValidationResult>. */
+  validateAsync(data: unknown, options?: Record<string, unknown>): Promise<ValidationResult<unknown>>
+  /** Quick boolean check (no error details). */
+  check(data: unknown): boolean
+}

package/src/types/config.ts

@@ -1,59 +1,59 @@
-import type { ErrorMessages } from './error.js'
-
-/**
- * Cache configuration options.
- * @alias CacheConfig — v1 BC alias exported from index
- */
-export interface CacheOptions {
-  /** Maximum number of cache entries (default 5000). */
-  maxSize?: number
-  /** Cache TTL in milliseconds (0 = no expiry). */
-  ttl?: number
-  /** Whether caching is enabled. */
-  enabled?: boolean
-  /** Whether statistics are enabled (default true). */
-  statsEnabled?: boolean
-}
-
-/**
- * I18n configuration type.
- */
-export type I18nConfig =
-  | string                          // Path to locale directory (Node >=18: .js/.cjs/.json/.jsonc/.json5)
-  | Record<string, ErrorMessages>   // Inline locale bundle
-  | { localesPath: string }         // Locale directory — object form (Node >=18: .js/.cjs/.json/.jsonc/.json5)
-  | { locales: Record<string, ErrorMessages> } // v1/doc-compatible wrapper
-
-/**
- * dsl.config() options.
- */
-export interface DslConfigOptions {
-  /** Internationalisation config. */
-  i18n?: I18nConfig
-  /** Cache config. */
-  cache?: CacheOptions
-  /** Custom validation rule extensions. */
-  patterns?: {
-    phone?: Record<string, RegExp>
-    idCard?: Record<string, RegExp>
-    creditCard?: Record<string, RegExp>
-    [key: string]: Record<string, RegExp> | undefined
-  }
-  /** Default locale (default 'en-US'). */
-  defaultLocale?: string
-  /** Strict type resolution: throw on unknown types instead of warn + fallback to string. */
-  strict?: boolean
-}
-
-/**
- * ValidatorOptions (Validator class constructor parameters).
- */
-export interface ValidatorOptions {
-  allErrors?: boolean
-  verbose?: boolean
-  strict?: boolean
-  coerceTypes?: boolean | 'array'
-  removeAdditional?: boolean | 'all' | 'failing'
-  useDefaults?: boolean
-  cache?: boolean | CacheOptions
-}
+import type { ErrorMessages } from './error.js'
+
+/**
+ * Cache configuration options.
+ * @alias CacheConfig — v1 BC alias exported from index
+ */
+export interface CacheOptions {
+  /** Maximum number of cache entries (default 5000). */
+  maxSize?: number
+  /** Cache TTL in milliseconds (0 = no expiry). */
+  ttl?: number
+  /** Whether caching is enabled. */
+  enabled?: boolean
+  /** Whether statistics are enabled (default true). */
+  statsEnabled?: boolean
+}
+
+/**
+ * I18n configuration type.
+ */
+export type I18nConfig =
+  | string                          // Path to locale directory (Node >=18: .js/.cjs/.json/.jsonc/.json5)
+  | Record<string, ErrorMessages>   // Inline locale bundle
+  | { localesPath: string }         // Locale directory — object form (Node >=18: .js/.cjs/.json/.jsonc/.json5)
+  | { locales: Record<string, ErrorMessages> } // v1/doc-compatible wrapper
+
+/**
+ * dsl.config() options.
+ */
+export interface DslConfigOptions {
+  /** Internationalisation config. */
+  i18n?: I18nConfig
+  /** Cache config. */
+  cache?: CacheOptions
+  /** Custom validation rule extensions. */
+  patterns?: {
+    phone?: Record<string, RegExp>
+    idCard?: Record<string, RegExp>
+    creditCard?: Record<string, RegExp>
+    [key: string]: Record<string, RegExp> | undefined
+  }
+  /** Default locale (default 'en-US'). */
+  defaultLocale?: string
+  /** Strict type resolution: throw on unknown types instead of warn + fallback to string. */
+  strict?: boolean
+}
+
+/**
+ * ValidatorOptions (Validator class constructor parameters).
+ */
+export interface ValidatorOptions {
+  allErrors?: boolean
+  verbose?: boolean
+  strict?: boolean
+  coerceTypes?: boolean | 'array'
+  removeAdditional?: boolean | 'all' | 'failing'
+  useDefaults?: boolean
+  cache?: boolean | CacheOptions
+}