schema-dsl 2.0.0 → 2.0.1

package/src/core/JSONSchemaCore.ts

@@ -1,65 +1,65 @@
-import type { JSONSchema } from '../types/schema.js'
-import { Validator } from './Validator.js'
-
-/**
- * JSONSchemaCore — v1 compatibility facade.
- *
- * The v2 internals have been split into DslParser / SchemaCompiler / Validator; this class
- * restores the commonly-used chainable entry points from the v1 public API so that users
- * who import from the main entry point do not encounter errors.
- */
-export class JSONSchemaCore {
-  schema: JSONSchema
-
-  constructor(schema: JSONSchema = {}) {
-    this.schema = { ...schema }
-  }
-
-  type(typeName: string): this {
-    this.schema.type = typeName
-    return this
-  }
-
-  property(name: string, schema: JSONSchema): this {
-    if (!this.schema.properties) this.schema.properties = {}
-    this.schema.properties[name] = schema
-    return this
-  }
-
-  properties(properties: Record<string, JSONSchema>): this {
-    this.schema.properties = { ...(this.schema.properties ?? {}), ...properties }
-    return this
-  }
-
-  required(fields: string[] | string): this {
-    this.schema.required = Array.isArray(fields) ? fields : [fields]
-    return this
-  }
-
-  format(formatName: string): this {
-    this.schema.format = formatName
-    return this
-  }
-
-  pattern(pattern: RegExp | string): this {
-    this.schema.pattern = pattern instanceof RegExp ? pattern.source : pattern
-    return this
-  }
-
-  items(schema: JSONSchema): this {
-    this.schema.items = schema
-    return this
-  }
-
-  toSchema(): JSONSchema {
-    return this.schema
-  }
-
-  getSchema(): JSONSchema {
-    return this.toSchema()
-  }
-
-  validate(data: unknown): ReturnType<Validator['validate']> {
-    return new Validator().validate(this.schema, data)
-  }
-}
+import type { JSONSchema } from '../types/schema.js'
+import { Validator } from './Validator.js'
+
+/**
+ * JSONSchemaCore — v1 compatibility facade.
+ *
+ * The v2 internals have been split into DslParser / SchemaCompiler / Validator; this class
+ * restores the commonly-used chainable entry points from the v1 public API so that users
+ * who import from the main entry point do not encounter errors.
+ */
+export class JSONSchemaCore {
+  schema: JSONSchema
+
+  constructor(schema: JSONSchema = {}) {
+    this.schema = { ...schema }
+  }
+
+  type(typeName: string): this {
+    this.schema.type = typeName
+    return this
+  }
+
+  property(name: string, schema: JSONSchema): this {
+    if (!this.schema.properties) this.schema.properties = {}
+    this.schema.properties[name] = schema
+    return this
+  }
+
+  properties(properties: Record<string, JSONSchema>): this {
+    this.schema.properties = { ...(this.schema.properties ?? {}), ...properties }
+    return this
+  }
+
+  required(fields: string[] | string): this {
+    this.schema.required = Array.isArray(fields) ? fields : [fields]
+    return this
+  }
+
+  format(formatName: string): this {
+    this.schema.format = formatName
+    return this
+  }
+
+  pattern(pattern: RegExp | string): this {
+    this.schema.pattern = pattern instanceof RegExp ? pattern.source : pattern
+    return this
+  }
+
+  items(schema: JSONSchema): this {
+    this.schema.items = schema
+    return this
+  }
+
+  toSchema(): JSONSchema {
+    return this.schema
+  }
+
+  getSchema(): JSONSchema {
+    return this.toSchema()
+  }
+
+  validate(data: unknown): ReturnType<Validator['validate']> {
+    return new Validator().validate(this.schema, data)
+  }
+}

package/src/core/Locale.ts

@@ -1,187 +1,187 @@
-import type { LocaleKey, LocaleMessage } from '../locales/types.js'
-import { getMessage, getMessages, isSupportedLocale, getSupportedLocales } from '../locales/index.js'
-
-export interface LocaleResolvedMessage {
-  code: string | number
-  message: string
-}
-
-/**
- * Locale — global locale manager (static class).
- *
- * v1 compatibility semantics:
- *   - getMessage() → returns { code, message } for every resolved message
- *   - getMessageText() → always returns final message text (used internally by v2)
- *   - getMessageConfig() → returns raw LocaleMessage (may contain code object; used by I18nError)
- */
-export const DEFAULT_LOCALE = 'en-US'
-
-export class Locale {
-  private static _currentLocale: string = DEFAULT_LOCALE
-  private static _customMessages: Record<string, LocaleMessage> = {}
-
-  /** v1 compat: expose custom messages */
-  static get customMessages(): Record<string, LocaleMessage> {
-    return this._customMessages
-  }
-
-  /** v1 compat: expose all locales as { locale: messages } map */
-  static get locales(): Record<string, Record<string, LocaleMessage>> {
-    const result: Record<string, Record<string, LocaleMessage>> = {}
-    // Built-in locales
-    for (const locale of getSupportedLocales()) {
-      result[locale] = getMessages(locale) as Record<string, LocaleMessage>
-    }
-    // Custom locales added via addLocale
-    for (const key of Object.keys(this._customMessages)) {
-      if (key.includes(':')) {
-        const colonIdx = key.indexOf(':')
-        const locale = key.substring(0, colonIdx)
-        const msgKey = key.substring(colonIdx + 1)
-        if (!result[locale]) result[locale] = {}
-        result[locale][msgKey] = this._customMessages[key]
-      }
-    }
-    return result
-  }
-
-  // ─── Locale Switching ─────────────────────────────────────────────────────
-
-  static setLocale(locale: string): void {
-    this._currentLocale = locale
-  }
-
-  static getLocale(): string {
-    return this._currentLocale
-  }
-
-  // ─── Custom Messages (global override) ───────────────────────────────────
-
-  static setMessages(messages: Record<string, LocaleMessage>): void {
-    this._customMessages = { ...this._customMessages, ...messages }
-  }
-
-  static addLocale(locale: string, messages: Record<string, LocaleMessage>): void {
-    // Dynamically add a locale pack at runtime (merged into existing entries).
-    // Records into customMessages and takes priority during lookup.
-    for (const [k, v] of Object.entries(messages)) {
-      this._customMessages[`${locale}:${k}`] = v
-    }
-  }
-
-  static getAvailableLocales(): string[] {
-    return getSupportedLocales()
-  }
-
-  static isSupportedLocale(locale: string): boolean {
-    return isSupportedLocale(locale)
-  }
-
-  // ─── Core Query Methods ───────────────────────────────────────────────────
-
-  /**
-   * Get a resolved message (v1 compat: returns { code, message } on hit).
-   *
-   * Priority: custom messages > locale pack > key itself.
-   */
-  static getMessage(
-    type: string,
-    customMessages: Record<string, LocaleMessage> = {},
-    locale: string | null = null
-  ): LocaleResolvedMessage | string {
-    const resolved = this._resolveMessage(type, customMessages, locale)
-    if (!resolved) return type
-    return this._normalizeResolvedMessage(type, resolved)
-  }
-
-  /**
-   * Get the final message text (used internally by v2 to avoid "[object Object]" in message field).
-   */
-  static getMessageText(
-    type: string,
-    customMessages: Record<string, LocaleMessage> = {},
-    locale: string | null = null
-  ): string {
-    const resolved = this.getMessage(type, customMessages, locale)
-    return typeof resolved === 'string' ? resolved : resolved.message
-  }
-
-  /**
-   * Get raw message config (used by I18nError; may include a numeric code).
-   */
-  static getMessageConfig(
-    type: string,
-    customMessages: Record<string, LocaleMessage> = {},
-    locale: string | null = null
-  ): LocaleMessage {
-    return this._resolveMessage(type, customMessages, locale) ?? { code: type, message: type }
-  }
-
-  /**
-   * Get the full message table for the given locale (built-in + custom).
-   */
-  static getMessages(locale?: string): Record<string, LocaleMessage> {
-    const targetLocale = locale ?? this._currentLocale
-    const builtinMessages = getMessages(targetLocale) as Record<string, LocaleMessage>
-    // Merge custom messages added via addLocale/setMessages for this locale
-    const customForLocale: Record<string, LocaleMessage> = {}
-    for (const [k, v] of Object.entries(this._customMessages)) {
-      if (k.startsWith(`${targetLocale}:`)) {
-        customForLocale[k.slice(targetLocale.length + 1)] = v
-      } else if (!k.includes(':')) {
-        // Global custom messages (no locale prefix)
-        customForLocale[k] = v
-      }
-    }
-    return { ...builtinMessages, ...customForLocale }
-  }
-
-  /**
-   * Reset to defaults (for testing).
-   */
-  static reset(): void {
-    this._currentLocale = DEFAULT_LOCALE
-    this._customMessages = {}
-  }
-
-  // ─── Private Helpers ──────────────────────────────────────────────────────
-
-  private static _normalizeResolvedMessage(type: string, msg: LocaleMessage): LocaleResolvedMessage {
-    if (typeof msg === 'string') {
-      return { code: type, message: msg }
-    }
-    return {
-      code: msg.code ?? type,
-      message: msg.message,
-    }
-  }
-
-  private static _resolveMessage(
-    type: string,
-    customMessages: Record<string, LocaleMessage>,
-    locale: string | null
-  ): LocaleMessage | null {
-    const targetLocale = locale ?? this._currentLocale
-
-    const callerMsg = customMessages[type]
-    if (callerMsg !== undefined) return callerMsg
-
-    const globalMsg = this._customMessages[type]
-    if (globalMsg !== undefined) return globalMsg
-
-    const globalLocaleMsg = this._customMessages[`${targetLocale}:${type}`]
-    if (globalLocaleMsg !== undefined) return globalLocaleMsg
-
-    if (this._isLocaleKey(type)) {
-      return getMessage(type as LocaleKey, targetLocale)
-    }
-
-    return null
-  }
-
-  private static _isLocaleKey(key: string): boolean {
-    // All predefined locale keys are defined in language pack files
-    const msgs = getMessages()
-    return key in msgs
-  }
-}
+import type { LocaleKey, LocaleMessage } from '../locales/types.js'
+import { getMessage, getMessages, isSupportedLocale, getSupportedLocales } from '../locales/index.js'
+
+export interface LocaleResolvedMessage {
+  code: string | number
+  message: string
+}
+
+/**
+ * Locale — global locale manager (static class).
+ *
+ * v1 compatibility semantics:
+ *   - getMessage() → returns { code, message } for every resolved message
+ *   - getMessageText() → always returns final message text (used internally by v2)
+ *   - getMessageConfig() → returns raw LocaleMessage (may contain code object; used by I18nError)
+ */
+export const DEFAULT_LOCALE = 'en-US'
+
+export class Locale {
+  private static _currentLocale: string = DEFAULT_LOCALE
+  private static _customMessages: Record<string, LocaleMessage> = {}
+
+  /** v1 compat: expose custom messages */
+  static get customMessages(): Record<string, LocaleMessage> {
+    return this._customMessages
+  }
+
+  /** v1 compat: expose all locales as { locale: messages } map */
+  static get locales(): Record<string, Record<string, LocaleMessage>> {
+    const result: Record<string, Record<string, LocaleMessage>> = {}
+    // Built-in locales
+    for (const locale of getSupportedLocales()) {
+      result[locale] = getMessages(locale) as Record<string, LocaleMessage>
+    }
+    // Custom locales added via addLocale
+    for (const key of Object.keys(this._customMessages)) {
+      if (key.includes(':')) {
+        const colonIdx = key.indexOf(':')
+        const locale = key.substring(0, colonIdx)
+        const msgKey = key.substring(colonIdx + 1)
+        if (!result[locale]) result[locale] = {}
+        result[locale][msgKey] = this._customMessages[key]
+      }
+    }
+    return result
+  }
+
+  // ─── Locale Switching ─────────────────────────────────────────────────────
+
+  static setLocale(locale: string): void {
+    this._currentLocale = locale
+  }
+
+  static getLocale(): string {
+    return this._currentLocale
+  }
+
+  // ─── Custom Messages (global override) ───────────────────────────────────
+
+  static setMessages(messages: Record<string, LocaleMessage>): void {
+    this._customMessages = { ...this._customMessages, ...messages }
+  }
+
+  static addLocale(locale: string, messages: Record<string, LocaleMessage>): void {
+    // Dynamically add a locale pack at runtime (merged into existing entries).
+    // Records into customMessages and takes priority during lookup.
+    for (const [k, v] of Object.entries(messages)) {
+      this._customMessages[`${locale}:${k}`] = v
+    }
+  }
+
+  static getAvailableLocales(): string[] {
+    return getSupportedLocales()
+  }
+
+  static isSupportedLocale(locale: string): boolean {
+    return isSupportedLocale(locale)
+  }
+
+  // ─── Core Query Methods ───────────────────────────────────────────────────
+
+  /**
+   * Get a resolved message (v1 compat: returns { code, message } on hit).
+   *
+   * Priority: custom messages > locale pack > key itself.
+   */
+  static getMessage(
+    type: string,
+    customMessages: Record<string, LocaleMessage> = {},
+    locale: string | null = null
+  ): LocaleResolvedMessage | string {
+    const resolved = this._resolveMessage(type, customMessages, locale)
+    if (!resolved) return type
+    return this._normalizeResolvedMessage(type, resolved)
+  }
+
+  /**
+   * Get the final message text (used internally by v2 to avoid "[object Object]" in message field).
+   */
+  static getMessageText(
+    type: string,
+    customMessages: Record<string, LocaleMessage> = {},
+    locale: string | null = null
+  ): string {
+    const resolved = this.getMessage(type, customMessages, locale)
+    return typeof resolved === 'string' ? resolved : resolved.message
+  }
+
+  /**
+   * Get raw message config (used by I18nError; may include a numeric code).
+   */
+  static getMessageConfig(
+    type: string,
+    customMessages: Record<string, LocaleMessage> = {},
+    locale: string | null = null
+  ): LocaleMessage {
+    return this._resolveMessage(type, customMessages, locale) ?? { code: type, message: type }
+  }
+
+  /**
+   * Get the full message table for the given locale (built-in + custom).
+   */
+  static getMessages(locale?: string): Record<string, LocaleMessage> {
+    const targetLocale = locale ?? this._currentLocale
+    const builtinMessages = getMessages(targetLocale) as Record<string, LocaleMessage>
+    // Merge custom messages added via addLocale/setMessages for this locale
+    const customForLocale: Record<string, LocaleMessage> = {}
+    for (const [k, v] of Object.entries(this._customMessages)) {
+      if (k.startsWith(`${targetLocale}:`)) {
+        customForLocale[k.slice(targetLocale.length + 1)] = v
+      } else if (!k.includes(':')) {
+        // Global custom messages (no locale prefix)
+        customForLocale[k] = v
+      }
+    }
+    return { ...builtinMessages, ...customForLocale }
+  }
+
+  /**
+   * Reset to defaults (for testing).
+   */
+  static reset(): void {
+    this._currentLocale = DEFAULT_LOCALE
+    this._customMessages = {}
+  }
+
+  // ─── Private Helpers ──────────────────────────────────────────────────────
+
+  private static _normalizeResolvedMessage(type: string, msg: LocaleMessage): LocaleResolvedMessage {
+    if (typeof msg === 'string') {
+      return { code: type, message: msg }
+    }
+    return {
+      code: msg.code ?? type,
+      message: msg.message,
+    }
+  }
+
+  private static _resolveMessage(
+    type: string,
+    customMessages: Record<string, LocaleMessage>,
+    locale: string | null
+  ): LocaleMessage | null {
+    const targetLocale = locale ?? this._currentLocale
+
+    const callerMsg = customMessages[type]
+    if (callerMsg !== undefined) return callerMsg
+
+    const globalMsg = this._customMessages[type]
+    if (globalMsg !== undefined) return globalMsg
+
+    const globalLocaleMsg = this._customMessages[`${targetLocale}:${type}`]
+    if (globalLocaleMsg !== undefined) return globalLocaleMsg
+
+    if (this._isLocaleKey(type)) {
+      return getMessage(type as LocaleKey, targetLocale)
+    }
+
+    return null
+  }
+
+  private static _isLocaleKey(key: string): boolean {
+    // All predefined locale keys are defined in language pack files
+    const msgs = getMessages()
+    return key in msgs
+  }
+}

package/src/core/MessageTemplate.ts

@@ -1,42 +1,42 @@
-import { renderTemplate } from './TemplateEngine.js'
-
-/**
- * MessageTemplate — wraps a template string for rendering.
- * Delegates to TemplateEngine.renderTemplate() (fix CORE-03).
- * Maintains full v1 API compatibility (constructor + render + static render + static renderBatch).
- */
-export class MessageTemplate {
-  private readonly template: string
-
-  constructor(template: string) {
-    this.template = template
-  }
-
-  /**
-   * Render the template with the given context.
-   */
-  render(context: Record<string, unknown> = {}): string {
-    return renderTemplate(this.template, context)
-  }
-
-  /**
-   * Statically render a template string with the given context.
-   */
-  static render(template: string, context: Record<string, unknown> = {}): string {
-    return renderTemplate(template, context)
-  }
-
-  /**
-   * Statically render multiple templates in batch.
-   */
-  static renderBatch(
-    templates: Record<string, string>,
-    context: Record<string, unknown> = {}
-  ): Record<string, string> {
-    const result: Record<string, string> = {}
-    for (const [key, tmpl] of Object.entries(templates)) {
-      result[key] = renderTemplate(tmpl, context)
-    }
-    return result
-  }
-}
+import { renderTemplate } from './TemplateEngine.js'
+
+/**
+ * MessageTemplate — wraps a template string for rendering.
+ * Delegates to TemplateEngine.renderTemplate() (fix CORE-03).
+ * Maintains full v1 API compatibility (constructor + render + static render + static renderBatch).
+ */
+export class MessageTemplate {
+  private readonly template: string
+
+  constructor(template: string) {
+    this.template = template
+  }
+
+  /**
+   * Render the template with the given context.
+   */
+  render(context: Record<string, unknown> = {}): string {
+    return renderTemplate(this.template, context)
+  }
+
+  /**
+   * Statically render a template string with the given context.
+   */
+  static render(template: string, context: Record<string, unknown> = {}): string {
+    return renderTemplate(template, context)
+  }
+
+  /**
+   * Statically render multiple templates in batch.
+   */
+  static renderBatch(
+    templates: Record<string, string>,
+    context: Record<string, unknown> = {}
+  ): Record<string, string> {
+    const result: Record<string, string> = {}
+    for (const [key, tmpl] of Object.entries(templates)) {
+      result[key] = renderTemplate(tmpl, context)
+    }
+    return result
+  }
+}