schema-dsl 2.0.0 → 2.0.1

package/src/errors/I18nError.ts

@@ -1,159 +1,159 @@
-import { renderTemplate } from '../core/TemplateEngine.js'
-import { Locale } from '../core/Locale.js'
-
-// V8/Node.js extension
-type ErrorWithCaptureStackTrace = typeof Error & {
-  captureStackTrace?: (target: object, ctor: unknown) => void
-}
-const ErrorCtor = Error as ErrorWithCaptureStackTrace
-
-type ParamsOrLocale = Record<string, unknown> | string | null | undefined
-
-function normalizeParams(
-  paramsOrLocale: ParamsOrLocale,
-  statusCode?: unknown,
-  locale?: unknown
-): { params: Record<string, unknown>; statusCode: number; locale: string | null } {
-  let params: Record<string, unknown> = {}
-  let actualStatusCode = 400
-  let actualLocale: string | null = null
-
-  if (typeof paramsOrLocale === 'string') {
-    actualLocale = paramsOrLocale
-    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
-  } else if (paramsOrLocale && typeof paramsOrLocale === 'object' && !Array.isArray(paramsOrLocale)) {
-    params = paramsOrLocale
-    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
-    actualLocale = typeof locale === 'string' ? locale : null
-  } else {
-    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
-    actualLocale = typeof locale === 'string' ? locale : null
-  }
-
-  return { params, statusCode: actualStatusCode, locale: actualLocale }
-}
-
-/**
- * Internationalised error class.
- * Maintains full v1 API compatibility: create / throw / assert / is / toJSON / toString
- */
-export class I18nError extends Error {
-  readonly name = 'I18nError' as const
-  readonly originalKey: string
-  readonly code: string | number
-  readonly params: Record<string, unknown>
-  readonly statusCode: number
-  readonly locale: string | null
-
-  constructor(
-    key: string,
-    params: Record<string, unknown> = {},
-    statusCode = 400,
-    locale: string | null = null,
-    /** Internal: pre-resolved message template, bypasses Locale lookup (used to decouple init ordering). */
-    _resolvedTemplate?: string,
-    _resolvedCode?: string | number
-  ) {
-    const targetLocale = locale ?? Locale.getLocale()
-    const normalizedParams: Record<string, unknown> = (params !== null && params !== undefined) ? params : {}
-
-    // Look up locale message config if not pre-resolved
-    let template: string
-    let resolvedCode: string | number
-    if (_resolvedTemplate !== undefined) {
-      template = _resolvedTemplate
-      resolvedCode = _resolvedCode ?? key
-    } else {
-      const msgConfig = Locale.getMessageConfig(key, {}, targetLocale)
-      if (typeof msgConfig === 'object' && msgConfig !== null && 'message' in msgConfig) {
-        template = (msgConfig as { message: string }).message
-        resolvedCode = (msgConfig as { code?: string | number }).code ?? key
-      } else if (typeof msgConfig === 'string') {
-        template = msgConfig
-        resolvedCode = key
-      } else {
-        template = key
-        resolvedCode = key
-      }
-    }
-
-    const message = renderTemplate(template, normalizedParams)
-
-    super(message)
-
-    this.originalKey = key
-    this.code = resolvedCode
-    this.params = normalizedParams
-    this.statusCode = statusCode
-    this.locale = targetLocale
-
-    if (ErrorCtor.captureStackTrace) {
-      ErrorCtor.captureStackTrace(this, I18nError)
-    }
-  }
-
-  /** Factory method — create an error instance. */
-  static create(
-    code: string,
-    paramsOrLocale?: ParamsOrLocale,
-    statusCode?: number,
-    locale?: string
-  ): I18nError {
-    const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
-    return new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
-  }
-
-  /** Factory method — create and throw an error. */
-  static throw(
-    code: string,
-    paramsOrLocale?: ParamsOrLocale,
-    statusCode?: number,
-    locale?: string
-  ): never {
-    const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
-    throw new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
-  }
-
-  /** Assert — throw when condition is falsy. */
-  static assert(
-    condition: unknown,
-    code: string,
-    paramsOrLocale?: ParamsOrLocale,
-    statusCode?: number,
-    locale?: string
-  ): asserts condition {
-    if (!condition) {
-      const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
-      throw new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
-    }
-  }
-
-  /** Check whether the error matches the given code or original key. */
-  is(codeOrKey: string | number): boolean {
-    return this.code === codeOrKey || this.originalKey === codeOrKey
-  }
-
-  toJSON(): {
-    error: string
-    originalKey: string
-    code: string | number
-    message: string
-    params: Record<string, unknown>
-    statusCode: number
-    locale: string | null
-  } {
-    return {
-      error: this.name,
-      originalKey: this.originalKey,
-      code: this.code,
-      message: this.message,
-      params: this.params,
-      statusCode: this.statusCode,
-      locale: this.locale,
-    }
-  }
-
-  toString(): string {
-    return `${this.name} [${this.code}]: ${this.message}`
-  }
-}
+import { renderTemplate } from '../core/TemplateEngine.js'
+import { Locale } from '../core/Locale.js'
+
+// V8/Node.js extension
+type ErrorWithCaptureStackTrace = typeof Error & {
+  captureStackTrace?: (target: object, ctor: unknown) => void
+}
+const ErrorCtor = Error as ErrorWithCaptureStackTrace
+
+type ParamsOrLocale = Record<string, unknown> | string | null | undefined
+
+function normalizeParams(
+  paramsOrLocale: ParamsOrLocale,
+  statusCode?: unknown,
+  locale?: unknown
+): { params: Record<string, unknown>; statusCode: number; locale: string | null } {
+  let params: Record<string, unknown> = {}
+  let actualStatusCode = 400
+  let actualLocale: string | null = null
+
+  if (typeof paramsOrLocale === 'string') {
+    actualLocale = paramsOrLocale
+    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
+  } else if (paramsOrLocale && typeof paramsOrLocale === 'object' && !Array.isArray(paramsOrLocale)) {
+    params = paramsOrLocale
+    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
+    actualLocale = typeof locale === 'string' ? locale : null
+  } else {
+    actualStatusCode = typeof statusCode === 'number' ? statusCode : 400
+    actualLocale = typeof locale === 'string' ? locale : null
+  }
+
+  return { params, statusCode: actualStatusCode, locale: actualLocale }
+}
+
+/**
+ * Internationalised error class.
+ * Maintains full v1 API compatibility: create / throw / assert / is / toJSON / toString
+ */
+export class I18nError extends Error {
+  readonly name = 'I18nError' as const
+  readonly originalKey: string
+  readonly code: string | number
+  readonly params: Record<string, unknown>
+  readonly statusCode: number
+  readonly locale: string | null
+
+  constructor(
+    key: string,
+    params: Record<string, unknown> = {},
+    statusCode = 400,
+    locale: string | null = null,
+    /** Internal: pre-resolved message template, bypasses Locale lookup (used to decouple init ordering). */
+    _resolvedTemplate?: string,
+    _resolvedCode?: string | number
+  ) {
+    const targetLocale = locale ?? Locale.getLocale()
+    const normalizedParams: Record<string, unknown> = (params !== null && params !== undefined) ? params : {}
+
+    // Look up locale message config if not pre-resolved
+    let template: string
+    let resolvedCode: string | number
+    if (_resolvedTemplate !== undefined) {
+      template = _resolvedTemplate
+      resolvedCode = _resolvedCode ?? key
+    } else {
+      const msgConfig = Locale.getMessageConfig(key, {}, targetLocale)
+      if (typeof msgConfig === 'object' && msgConfig !== null && 'message' in msgConfig) {
+        template = (msgConfig as { message: string }).message
+        resolvedCode = (msgConfig as { code?: string | number }).code ?? key
+      } else if (typeof msgConfig === 'string') {
+        template = msgConfig
+        resolvedCode = key
+      } else {
+        template = key
+        resolvedCode = key
+      }
+    }
+
+    const message = renderTemplate(template, normalizedParams)
+
+    super(message)
+
+    this.originalKey = key
+    this.code = resolvedCode
+    this.params = normalizedParams
+    this.statusCode = statusCode
+    this.locale = targetLocale
+
+    if (ErrorCtor.captureStackTrace) {
+      ErrorCtor.captureStackTrace(this, I18nError)
+    }
+  }
+
+  /** Factory method — create an error instance. */
+  static create(
+    code: string,
+    paramsOrLocale?: ParamsOrLocale,
+    statusCode?: number,
+    locale?: string
+  ): I18nError {
+    const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
+    return new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
+  }
+
+  /** Factory method — create and throw an error. */
+  static throw(
+    code: string,
+    paramsOrLocale?: ParamsOrLocale,
+    statusCode?: number,
+    locale?: string
+  ): never {
+    const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
+    throw new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
+  }
+
+  /** Assert — throw when condition is falsy. */
+  static assert(
+    condition: unknown,
+    code: string,
+    paramsOrLocale?: ParamsOrLocale,
+    statusCode?: number,
+    locale?: string
+  ): asserts condition {
+    if (!condition) {
+      const normalized = normalizeParams(paramsOrLocale, statusCode, locale)
+      throw new I18nError(code, normalized.params, normalized.statusCode, normalized.locale)
+    }
+  }
+
+  /** Check whether the error matches the given code or original key. */
+  is(codeOrKey: string | number): boolean {
+    return this.code === codeOrKey || this.originalKey === codeOrKey
+  }
+
+  toJSON(): {
+    error: string
+    originalKey: string
+    code: string | number
+    message: string
+    params: Record<string, unknown>
+    statusCode: number
+    locale: string | null
+  } {
+    return {
+      error: this.name,
+      originalKey: this.originalKey,
+      code: this.code,
+      message: this.message,
+      params: this.params,
+      statusCode: this.statusCode,
+      locale: this.locale,
+    }
+  }
+
+  toString(): string {
+    return `${this.name} [${this.code}]: ${this.message}`
+  }
+}

package/src/errors/ValidationError.ts

@@ -1,105 +1,105 @@
-// V8/Node.js extension (not in ES2022 lib; declared explicitly)
-type ErrorWithCaptureStackTrace = typeof Error & {
-  captureStackTrace?: (target: object, ctor: unknown) => void
-}
-const ErrorCtor = Error as ErrorWithCaptureStackTrace
-
-import type { ValidationErrorItem } from '../types/validate.js'
-
-/**
- * ValidationError — error class thrown when validateAsync() fails.
- * Fixes v1 bug: malformed message format when errors array is empty.
- */
-export class ValidationError extends Error {
-  readonly name = 'ValidationError' as const
-  readonly errors: ValidationErrorItem[]
-  readonly data: unknown
-  readonly statusCode: number
-
-  constructor(errors: ValidationErrorItem[], data?: unknown, statusCode = 400) {
-    // Fix: provide friendly message when errors array is empty (v1 bug)
-    const messages =
-      errors.length === 0
-        ? 'Validation failed'
-        : errors
-          .map(e => {
-            if (e.path) {
-              const field = e.path.replace(/^\//, '')
-              return field ? `${field}: ${e.message}` : e.message
-            }
-            return e.message
-          })
-          .join('; ')
-
-    // v1 compat: use " - " separator when no path, ": " otherwise
-    // v1 compat: single conditional error uses message string directly (no prefix)
-    const hasNoPath = errors.every(e => e.path === undefined || e.path === null || e.path === '')
-    const isSingleConditional = errors.length === 1 && errors[0].keyword === 'conditional' && hasNoPath
-    if (isSingleConditional) {
-      super(messages)
-    } else {
-      super(hasNoPath ? `Validation failed - ${messages}` : `Validation failed: ${messages}`)
-    }
-
-    this.errors = errors
-    this.data = data
-    this.statusCode = statusCode
-
-    if (ErrorCtor.captureStackTrace) {
-      ErrorCtor.captureStackTrace(this, ValidationError)
-    }
-  }
-
-  toJSON(): {
-    error: string
-    message: string
-    statusCode: number
-    details: Array<{
-      field: string | null
-      message: string
-      keyword: string
-      params?: Record<string, unknown>
-    }>
-  } {
-    return {
-      error: this.name,
-      message: this.message,
-      statusCode: this.statusCode,
-      details: this.errors.map(e => ({
-        field: e.path ? e.path.replace(/^\//, '') : null,
-        message: e.message,
-        keyword: e.keyword,
-        ...(e.params !== undefined ? { params: e.params } : {}),
-      })),
-    }
-  }
-
-  getFieldError(field: string): ValidationErrorItem | null {
-    const normalized = field.replace(/^\//, '')
-    return (
-      this.errors.find(e => {
-        if (!e.path) return false
-        return e.path.replace(/^\//, '') === normalized
-      }) ?? null
-    )
-  }
-
-  getFieldErrors(): Record<string, string> {
-    const result: Record<string, string> = {}
-    for (const e of this.errors) {
-      if (e.path) {
-        const field = e.path.replace(/^\//, '')
-        if (field) result[field] = e.message
-      }
-    }
-    return result
-  }
-
-  hasFieldError(field: string): boolean {
-    return this.getFieldError(field) !== null
-  }
-
-  getErrorCount(): number {
-    return this.errors.length
-  }
-}
+// V8/Node.js extension (not in ES2022 lib; declared explicitly)
+type ErrorWithCaptureStackTrace = typeof Error & {
+  captureStackTrace?: (target: object, ctor: unknown) => void
+}
+const ErrorCtor = Error as ErrorWithCaptureStackTrace
+
+import type { ValidationErrorItem } from '../types/validate.js'
+
+/**
+ * ValidationError — error class thrown when validateAsync() fails.
+ * Fixes v1 bug: malformed message format when errors array is empty.
+ */
+export class ValidationError extends Error {
+  readonly name = 'ValidationError' as const
+  readonly errors: ValidationErrorItem[]
+  readonly data: unknown
+  readonly statusCode: number
+
+  constructor(errors: ValidationErrorItem[], data?: unknown, statusCode = 400) {
+    // Fix: provide friendly message when errors array is empty (v1 bug)
+    const messages =
+      errors.length === 0
+        ? 'Validation failed'
+        : errors
+          .map(e => {
+            if (e.path) {
+              const field = e.path.replace(/^\//, '')
+              return field ? `${field}: ${e.message}` : e.message
+            }
+            return e.message
+          })
+          .join('; ')
+
+    // v1 compat: use " - " separator when no path, ": " otherwise
+    // v1 compat: single conditional error uses message string directly (no prefix)
+    const hasNoPath = errors.every(e => e.path === undefined || e.path === null || e.path === '')
+    const isSingleConditional = errors.length === 1 && errors[0].keyword === 'conditional' && hasNoPath
+    if (isSingleConditional) {
+      super(messages)
+    } else {
+      super(hasNoPath ? `Validation failed - ${messages}` : `Validation failed: ${messages}`)
+    }
+
+    this.errors = errors
+    this.data = data
+    this.statusCode = statusCode
+
+    if (ErrorCtor.captureStackTrace) {
+      ErrorCtor.captureStackTrace(this, ValidationError)
+    }
+  }
+
+  toJSON(): {
+    error: string
+    message: string
+    statusCode: number
+    details: Array<{
+      field: string | null
+      message: string
+      keyword: string
+      params?: Record<string, unknown>
+    }>
+  } {
+    return {
+      error: this.name,
+      message: this.message,
+      statusCode: this.statusCode,
+      details: this.errors.map(e => ({
+        field: e.path ? e.path.replace(/^\//, '') : null,
+        message: e.message,
+        keyword: e.keyword,
+        ...(e.params !== undefined ? { params: e.params } : {}),
+      })),
+    }
+  }
+
+  getFieldError(field: string): ValidationErrorItem | null {
+    const normalized = field.replace(/^\//, '')
+    return (
+      this.errors.find(e => {
+        if (!e.path) return false
+        return e.path.replace(/^\//, '') === normalized
+      }) ?? null
+    )
+  }
+
+  getFieldErrors(): Record<string, string> {
+    const result: Record<string, string> = {}
+    for (const e of this.errors) {
+      if (e.path) {
+        const field = e.path.replace(/^\//, '')
+        if (field) result[field] = e.message
+      }
+    }
+    return result
+  }
+
+  hasFieldError(field: string): boolean {
+    return this.getFieldError(field) !== null
+  }
+
+  getErrorCount(): number {
+    return this.errors.length
+  }
+}

package/src/exporters/BaseExporter.ts

@@ -1,60 +1,60 @@
-/**
- * BaseExporter — Base interface and abstract class for all exporters.
- *
- * Provides a unified abstract export() method signature; each exporter subclass implements it.
- */
-
-import type { JSONSchema } from '../types/schema.js'
-
-// ==================== Common options type ====================
-
-export interface ExporterOptions {
-  [key: string]: unknown
-}
-
-// ==================== BaseExporter ====================
-
-export abstract class BaseExporter<TOptions extends ExporterOptions = ExporterOptions> {
-  protected options: TOptions
-
-  constructor(options: Partial<TOptions> = {}) {
-    this.options = options as TOptions
-  }
-
-  /**
-   * Export a JSON Schema to the target format.
-   * Each subclass must implement this method.
-   */
-  abstract export(...args: unknown[]): unknown
-
-  /**
-   * Assert that the input JSON Schema is a valid object-type schema.
-   * @throws Error if invalid.
-   */
-  protected _assertObjectSchema(jsonSchema: unknown, label = 'JSON Schema'): asserts jsonSchema is JSONSchema & { type: 'object' } {
-    if (!jsonSchema || typeof jsonSchema !== 'object') {
-      throw new Error(`[schema-dsl] ${label} must be an object`)
-    }
-    const s = jsonSchema as JSONSchema
-    if (s.type !== 'object') {
-      throw new Error(`[schema-dsl] ${label} must be an object type (got "${String(s.type)}")`)
-    }
-  }
-
-  /**
-   * Escape SQL single quotes (generic utility).
-   */
-  protected _escapeString(str: string): string {
-    return str.replace(/'/g, "''")
-  }
-
-  /**
-   * Detect the primary key column name in a schema (id / _id preferred).
-   */
-  protected _detectPrimaryKey(schema: JSONSchema): string | null {
-    if (!schema.properties) return null
-    if (schema.properties['id']) return 'id'
-    if (schema.properties['_id']) return '_id'
-    return null
-  }
-}
+/**
+ * BaseExporter — Base interface and abstract class for all exporters.
+ *
+ * Provides a unified abstract export() method signature; each exporter subclass implements it.
+ */
+
+import type { JSONSchema } from '../types/schema.js'
+
+// ==================== Common options type ====================
+
+export interface ExporterOptions {
+  [key: string]: unknown
+}
+
+// ==================== BaseExporter ====================
+
+export abstract class BaseExporter<TOptions extends ExporterOptions = ExporterOptions> {
+  protected options: TOptions
+
+  constructor(options: Partial<TOptions> = {}) {
+    this.options = options as TOptions
+  }
+
+  /**
+   * Export a JSON Schema to the target format.
+   * Each subclass must implement this method.
+   */
+  abstract export(...args: unknown[]): unknown
+
+  /**
+   * Assert that the input JSON Schema is a valid object-type schema.
+   * @throws Error if invalid.
+   */
+  protected _assertObjectSchema(jsonSchema: unknown, label = 'JSON Schema'): asserts jsonSchema is JSONSchema & { type: 'object' } {
+    if (!jsonSchema || typeof jsonSchema !== 'object') {
+      throw new Error(`[schema-dsl] ${label} must be an object`)
+    }
+    const s = jsonSchema as JSONSchema
+    if (s.type !== 'object') {
+      throw new Error(`[schema-dsl] ${label} must be an object type (got "${String(s.type)}")`)
+    }
+  }
+
+  /**
+   * Escape SQL single quotes (generic utility).
+   */
+  protected _escapeString(str: string): string {
+    return str.replace(/'/g, "''")
+  }
+
+  /**
+   * Detect the primary key column name in a schema (id / _id preferred).
+   */
+  protected _detectPrimaryKey(schema: JSONSchema): string | null {
+    if (!schema.properties) return null
+    if (schema.properties['id']) return 'id'
+    if (schema.properties['_id']) return '_id'
+    return null
+  }
+}