schema-dsl 2.0.0 → 2.0.1

package/src/core/StringExtensions.ts

@@ -1,140 +1,140 @@
-/**
- * StringExtensions — opt-in String.prototype chainable DSL extensions.
- *
- * v2 fixes:
- *   S-01/S-02: array-driven symmetric install/uninstall (v1 uninstall was missing `format` and
- *              `phoneNumber`). All method names are now maintained in the EXTENSION_METHODS
- *              array so both operations are guaranteed to be in sync.
- *
- * @example
- * import { installStringExtensions } from 'schema-dsl'
- * installStringExtensions(dsl)
- * // Then you can use:
- * 'email!'.label('Email address').messages({ format: 'Invalid format' })
- * 'string:3-32!'.username('medium')
- */
-
-import type { DslBuilder } from './DslBuilder.js'
-
-// S-01/S-02 fix: all extension method names are managed here so install/uninstall stay symmetric
-const EXTENSION_METHODS = [
-  'pattern',
-  'label',
-  'messages',
-  'error',
-  'description',
-  'format',
-  'custom',
-  'default',
-  'toSchema',
-  'toJsonSchema',
-  'username',
-  'password',
-  'phone',
-  'phoneNumber',
-  'idCard',
-  'creditCard',
-  'licensePlate',
-  'postalCode',
-  'passport',
-  'slug',
-  'domain',
-  'ip',
-  'base64',
-  'jwt',
-  'dateGreater',
-  'dateLess',
-  'after',
-  'before',
-  'dateFormat',
-  'min',
-  'max',
-  'alphanum',
-  'lowercase',
-  'uppercase',
-  'json',
-  'precision',
-  'multiple',
-  'port',
-  'requireAll',
-  'strict',
-  'noSparse',
-  'includesRequired',
-  'required',
-  'optional',
-  'enum',
-  '_dslExtensionsInstalled',
-] as const
-
-type DslFn = (dslStr: string) => DslBuilder
-
-// Track which dslFunction the extensions were installed with
-let _installedDslFn: DslFn | null = null
-
-/**
- * Install String.prototype extensions.
- * @param dslFunction - dsl() function (converts a string to a DslBuilder instance)
- */
-export function installStringExtensions(dslFunction: DslFn): void {
-  // Idempotent: skip only if installed with the same dslFunction reference
-  if (_installedDslFn === dslFunction) return
-  // If installed with a different function, uninstall first then reinstall
-  if (_installedDslFn !== null) {
-    uninstallStringExtensions()
-  }
-
-  const proto = String.prototype as unknown as Record<string, unknown>
-
-  function extend(name: string, fn: (...args: unknown[]) => unknown): void {
-    proto[name] = fn
-  }
-
-  // Proxy all listed methods transparently to the DslBuilder instance
-  const delegatedMethods: string[] = [
-    'pattern', 'label', 'messages', 'error', 'description', 'format', 'custom',
-    'default', 'username', 'password', 'phone', 'phoneNumber', 'idCard', 'creditCard',
-    'licensePlate', 'postalCode', 'passport', 'slug', 'domain', 'ip', 'base64', 'jwt',
-    'dateGreater', 'dateLess', 'after', 'before', 'dateFormat',
-    'min', 'max', 'alphanum', 'lowercase', 'uppercase', 'json',
-    'precision', 'multiple', 'port', 'requireAll', 'strict',
-    'noSparse', 'includesRequired', 'required', 'optional',
-  ]
-
-  for (const method of delegatedMethods) {
-    extend(method, function (this: string, ...args: unknown[]): DslBuilder {
-      const builder = dslFunction(String(this))
-      return (builder as unknown as Record<string, (...args: unknown[]) => DslBuilder>)[method](...args)
-    })
-  }
-
-  // enum method accepts rest parameters
-  extend('enum', function (this: string, ...values: unknown[]): DslBuilder {
-    return dslFunction(String(this)).enum(...values)
-  })
-
-  // toSchema / toJsonSchema return JSONSchema (not DslBuilder)
-  extend('toSchema', function (this: string) {
-    return dslFunction(String(this)).toSchema()
-  })
-  extend('toJsonSchema', function (this: string) {
-    return dslFunction(String(this)).toJsonSchema()
-  })
-
-  // Installation marker (v1 BC)
-  proto['_dslExtensionsInstalled'] = true
-  _installedDslFn = dslFunction
-}
-
-/**
- * Uninstall String.prototype extensions (useful for tests or clean-up).
- * S-01/S-02 fix: uses EXTENSION_METHODS array to guarantee perfect symmetry with install.
- */
-export function uninstallStringExtensions(): void {
-  if (!(String.prototype as unknown as Record<string, unknown>)['_dslExtensionsInstalled']) return
-
-  const proto = String.prototype as unknown as Record<string, unknown>
-  for (const method of EXTENSION_METHODS) {
-    delete proto[method]
-  }
-  _installedDslFn = null
-}
+/**
+ * StringExtensions — opt-in String.prototype chainable DSL extensions.
+ *
+ * v2 fixes:
+ *   S-01/S-02: array-driven symmetric install/uninstall (v1 uninstall was missing `format` and
+ *              `phoneNumber`). All method names are now maintained in the EXTENSION_METHODS
+ *              array so both operations are guaranteed to be in sync.
+ *
+ * @example
+ * import { installStringExtensions } from 'schema-dsl'
+ * installStringExtensions(dsl)
+ * // Then you can use:
+ * 'email!'.label('Email address').messages({ format: 'Invalid format' })
+ * 'string:3-32!'.username('medium')
+ */
+
+import type { DslBuilder } from './DslBuilder.js'
+
+// S-01/S-02 fix: all extension method names are managed here so install/uninstall stay symmetric
+const EXTENSION_METHODS = [
+  'pattern',
+  'label',
+  'messages',
+  'error',
+  'description',
+  'format',
+  'custom',
+  'default',
+  'toSchema',
+  'toJsonSchema',
+  'username',
+  'password',
+  'phone',
+  'phoneNumber',
+  'idCard',
+  'creditCard',
+  'licensePlate',
+  'postalCode',
+  'passport',
+  'slug',
+  'domain',
+  'ip',
+  'base64',
+  'jwt',
+  'dateGreater',
+  'dateLess',
+  'after',
+  'before',
+  'dateFormat',
+  'min',
+  'max',
+  'alphanum',
+  'lowercase',
+  'uppercase',
+  'json',
+  'precision',
+  'multiple',
+  'port',
+  'requireAll',
+  'strict',
+  'noSparse',
+  'includesRequired',
+  'required',
+  'optional',
+  'enum',
+  '_dslExtensionsInstalled',
+] as const
+
+type DslFn = (dslStr: string) => DslBuilder
+
+// Track which dslFunction the extensions were installed with
+let _installedDslFn: DslFn | null = null
+
+/**
+ * Install String.prototype extensions.
+ * @param dslFunction - dsl() function (converts a string to a DslBuilder instance)
+ */
+export function installStringExtensions(dslFunction: DslFn): void {
+  // Idempotent: skip only if installed with the same dslFunction reference
+  if (_installedDslFn === dslFunction) return
+  // If installed with a different function, uninstall first then reinstall
+  if (_installedDslFn !== null) {
+    uninstallStringExtensions()
+  }
+
+  const proto = String.prototype as unknown as Record<string, unknown>
+
+  function extend(name: string, fn: (...args: unknown[]) => unknown): void {
+    proto[name] = fn
+  }
+
+  // Proxy all listed methods transparently to the DslBuilder instance
+  const delegatedMethods: string[] = [
+    'pattern', 'label', 'messages', 'error', 'description', 'format', 'custom',
+    'default', 'username', 'password', 'phone', 'phoneNumber', 'idCard', 'creditCard',
+    'licensePlate', 'postalCode', 'passport', 'slug', 'domain', 'ip', 'base64', 'jwt',
+    'dateGreater', 'dateLess', 'after', 'before', 'dateFormat',
+    'min', 'max', 'alphanum', 'lowercase', 'uppercase', 'json',
+    'precision', 'multiple', 'port', 'requireAll', 'strict',
+    'noSparse', 'includesRequired', 'required', 'optional',
+  ]
+
+  for (const method of delegatedMethods) {
+    extend(method, function (this: string, ...args: unknown[]): DslBuilder {
+      const builder = dslFunction(String(this))
+      return (builder as unknown as Record<string, (...args: unknown[]) => DslBuilder>)[method](...args)
+    })
+  }
+
+  // enum method accepts rest parameters
+  extend('enum', function (this: string, ...values: unknown[]): DslBuilder {
+    return dslFunction(String(this)).enum(...values)
+  })
+
+  // toSchema / toJsonSchema return JSONSchema (not DslBuilder)
+  extend('toSchema', function (this: string) {
+    return dslFunction(String(this)).toSchema()
+  })
+  extend('toJsonSchema', function (this: string) {
+    return dslFunction(String(this)).toJsonSchema()
+  })
+
+  // Installation marker (v1 BC)
+  proto['_dslExtensionsInstalled'] = true
+  _installedDslFn = dslFunction
+}
+
+/**
+ * Uninstall String.prototype extensions (useful for tests or clean-up).
+ * S-01/S-02 fix: uses EXTENSION_METHODS array to guarantee perfect symmetry with install.
+ */
+export function uninstallStringExtensions(): void {
+  if (!(String.prototype as unknown as Record<string, unknown>)['_dslExtensionsInstalled']) return
+
+  const proto = String.prototype as unknown as Record<string, unknown>
+  for (const method of EXTENSION_METHODS) {
+    delete proto[method]
+  }
+  _installedDslFn = null
+}

package/src/core/TemplateEngine.ts

@@ -1,44 +1,44 @@
-/**
- * Unified template engine.
- *
- * Merges the two rendering implementations from v1 — MessageTemplate.render() and
- * ErrorFormatter._interpolate() — into a single pipeline.
- * Fixes the CORE-03 template injection vulnerability (single-pass replacement so that
- * substituted values are never expanded a second time).
- *
- * Supports two placeholder formats:
- *   {{#key}}  ← all v1 locale files use this format (must remain compatible)
- *   {key}     ← recommended format for v2 message templates
- */
-
-/**
- * Render a template string by replacing placeholders with corresponding values from params.
- *
- * @param template - Template string, e.g. "{{#label}} must be at least {{#min}} characters"
- * @param params   - Substitution parameter object
- * @returns          Rendered string; placeholders with no matching key are kept as-is (aids debugging)
- *
- * @example
- * renderTemplate('{{#label}} is required', { label: 'Email' })
- * // → 'Email is required'
- *
- * renderTemplate('{field} must be {min}~{max}', { field: 'age', min: 18, max: 65 })
- * // → 'age must be 18~65'
- */
-export function renderTemplate(template: string, params: Record<string, unknown>): string {
-  // Single-pass replace — prevents substituted values from being expanded again (CORE-03 fix)
-  // Regex matches both formats: {{#key}} and {key}
-  return template.replace(/\{\{#([^}]+)\}\}|\{([^}]+)\}/g, (match, k1: string | undefined, k2: string | undefined) => {
-    const key = k1 ?? k2
-    if (key !== undefined && key in params) {
-      const val = params[key]
-      if (val === null) return 'null'
-      if (val === undefined) return match
-      if (Array.isArray(val)) return val.join(', ')
-      if (val instanceof RegExp) return val.toString()
-      if (val instanceof Date) return val.toISOString()
-      return String(val)
-    }
-    return match // No matching key — keep placeholder as-is
-  })
-}
+/**
+ * Unified template engine.
+ *
+ * Merges the two rendering implementations from v1 — MessageTemplate.render() and
+ * ErrorFormatter._interpolate() — into a single pipeline.
+ * Fixes the CORE-03 template injection vulnerability (single-pass replacement so that
+ * substituted values are never expanded a second time).
+ *
+ * Supports two placeholder formats:
+ *   {{#key}}  ← all v1 locale files use this format (must remain compatible)
+ *   {key}     ← recommended format for v2 message templates
+ */
+
+/**
+ * Render a template string by replacing placeholders with corresponding values from params.
+ *
+ * @param template - Template string, e.g. "{{#label}} must be at least {{#min}} characters"
+ * @param params   - Substitution parameter object
+ * @returns          Rendered string; placeholders with no matching key are kept as-is (aids debugging)
+ *
+ * @example
+ * renderTemplate('{{#label}} is required', { label: 'Email' })
+ * // → 'Email is required'
+ *
+ * renderTemplate('{field} must be {min}~{max}', { field: 'age', min: 18, max: 65 })
+ * // → 'age must be 18~65'
+ */
+export function renderTemplate(template: string, params: Record<string, unknown>): string {
+  // Single-pass replace — prevents substituted values from being expanded again (CORE-03 fix)
+  // Regex matches both formats: {{#key}} and {key}
+  return template.replace(/\{\{#([^}]+)\}\}|\{([^}]+)\}/g, (match, k1: string | undefined, k2: string | undefined) => {
+    const key = k1 ?? k2
+    if (key !== undefined && key in params) {
+      const val = params[key]
+      if (val === null) return 'null'
+      if (val === undefined) return match
+      if (Array.isArray(val)) return val.join(', ')
+      if (val instanceof RegExp) return val.toString()
+      if (val instanceof Date) return val.toISOString()
+      return String(val)
+    }
+    return match // No matching key — keep placeholder as-is
+  })
+}