@atproto/lex-schema 0.0.14 → 0.0.15

package/src/core/validation-issue.ts

@@ -1,5 +1,4 @@
 import { ifCid, isLegacyBlobRef, isPlainObject } from '@atproto/lex-data'
-import { PropertyKey } from './property-key.js'
 
 /**
  * Abstract base class for all validation issues.
@@ -9,10 +8,13 @@ import { PropertyKey } from './property-key.js'
  * - The path to the invalid value in the data structure
  * - The actual input value that failed validation
  *
- * Subclasses add specific properties relevant to each issue type and
- * implement the {@link toString} method for human-readable error messages.
+ * Subclasses add specific properties relevant to each issue type and implement
+ * the {@link message} property for human-readable error messages (that don't
+ * contain the error path)
  */
 export abstract class Issue {
+  abstract readonly message: string
+
   constructor(
     readonly code: string,
     readonly path: readonly PropertyKey[],
@@ -22,7 +24,9 @@ export abstract class Issue {
   /**
    * Returns a human-readable description of the validation issue.
    */
-  abstract toString(): string
+  toString() {
+    return `${this.message}${stringifyPath(this.path)}`
+  }
 
   /**
    * Converts the issue to a JSON-serializable object.
@@ -33,7 +37,7 @@ export abstract class Issue {
     return {
       code: this.code,
       path: this.path,
-      message: this.toString(),
+      message: this.message,
     }
   }
 }
@@ -51,10 +55,6 @@ export class IssueCustom extends Issue {
   ) {
     super('custom', path, input)
   }
-
-  toString() {
-    return `${this.message}${stringifyPath(this.path)}`
-  }
 }
 
 /**
@@ -67,20 +67,13 @@ export class IssueInvalidFormat extends Issue {
     path: readonly PropertyKey[],
     input: unknown,
     readonly format: string,
-    readonly message?: string,
+    readonly detail?: string,
   ) {
     super('invalid_format', path, input)
   }
 
-  toString() {
-    return `Invalid ${this.formatDescription}${this.message ? ` (${this.message})` : ''}${stringifyPath(this.path)} (got ${stringifyValue(this.input)})`
-  }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      format: this.format,
-    }
+  override get message(): string {
+    return `Invalid ${this.formatDescription}${this.detail ? ` (${this.detail}, ` : ' ('}got ${stringifyValue(this.input)})`
   }
 
   /** Returns a human-readable description of the expected format. */
@@ -102,6 +95,13 @@ export class IssueInvalidFormat extends Issue {
         return this.format
     }
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      format: this.format,
+    }
+  }
 }
 
 /**
@@ -119,8 +119,8 @@ export class IssueInvalidType extends Issue {
     super('invalid_type', path, input)
   }
 
-  toString() {
-    return `Expected ${oneOf(this.expected.map(stringifyExpectedType))} value type${stringifyPath(this.path)} (got ${stringifyType(this.input)})`
+  override get message(): string {
+    return `Expected ${oneOf(this.expected.map(stringifyExpectedType))} value type (got ${stringifyType(this.input)})`
   }
 
   toJSON() {
@@ -146,8 +146,8 @@ export class IssueInvalidValue extends Issue {
     super('invalid_value', path, input)
   }
 
-  toString() {
-    return `Expected ${oneOf(this.values.map(stringifyValue))}${stringifyPath(this.path)} (got ${stringifyValue(this.input)})`
+  override get message(): string {
+    return `Expected ${oneOf(this.values.map(stringifyValue))} (got ${stringifyValue(this.input)})`
   }
 
   toJSON() {
@@ -170,8 +170,8 @@ export class IssueRequiredKey extends Issue {
     super('required_key', path, input)
   }
 
-  toString() {
-    return `Missing required key "${String(this.key)}"${stringifyPath(this.path)}`
+  override get message(): string {
+    return `Missing required key "${String(this.key)}"`
   }
 
   toJSON() {
@@ -214,8 +214,8 @@ export class IssueTooBig extends Issue {
     super('too_big', path, input)
   }
 
-  toString() {
-    return `${this.type} too big (maximum ${this.maximum})${stringifyPath(this.path)} (got ${this.actual})`
+  override get message(): string {
+    return `${this.type} too big (maximum ${this.maximum}, got ${this.actual})`
   }
 
   toJSON() {
@@ -241,8 +241,8 @@ export class IssueTooSmall extends Issue {
     super('too_small', path, input)
   }
 
-  toString() {
-    return `${this.type} too small (minimum ${this.minimum})${stringifyPath(this.path)} (got ${this.actual})`
+  override get message(): string {
+    return `${this.type} too small (minimum ${this.minimum}, got ${this.actual})`
   }
 
   toJSON() {
@@ -274,9 +274,9 @@ function buildJsonPath(path: readonly PropertyKey[]): string {
 }
 
 function toJsonPathSegment(segment: PropertyKey): string {
-  if (typeof segment === 'number') {
-    return `[${segment}]`
-  } else if (/^[a-zA-Z_$][a-zA-Z0-9_]*$/.test(segment as string)) {
+  if (typeof segment === 'number' || typeof segment === 'symbol') {
+    return `[${String(segment)}]`
+  } else if (/^[a-zA-Z_$][a-zA-Z0-9_]*$/.test(segment)) {
     return `.${segment}`
   } else {
     return `[${JSON.stringify(segment)}]`

package/src/core/validator.ts

@@ -1,5 +1,5 @@
-import { PropertyKey } from './property-key.js'
-import { ResultFailure, ResultSuccess, failure, success } from './result.js'
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { ResultFailure, ResultSuccess, success } from './result.js'
 import { LexValidationError } from './validation-error.js'
 import {
   Issue,
@@ -21,8 +21,12 @@ export type ValidationSuccess<Value = unknown> = ResultSuccess<Value>
 
 /**
  * Represents a failed validation result containing a {@link LexValidationError}.
+ *
+ * @extends ResultFailure<LexValidationError>
+ * @see {@link ResultFailure}
+ * @see {@link LexValidationError}
  */
-export type ValidationFailure = ResultFailure<LexValidationError>
+export type ValidationFailure = LexValidationError
 
 /**
  * Discriminated union representing the outcome of a validation operation.
@@ -326,7 +330,7 @@ export class ValidationContext {
       if (this.issues.length > 0) {
         // Validator returned a success but issues were added via the context.
         // This means the overall validation failed.
-        return failure(new LexValidationError(Array.from(this.issues)))
+        return new LexValidationError(Array.from(this.issues))
       }
 
       if (this.options.mode !== 'parse' && !Object.is(result.value, input)) {
@@ -426,7 +430,7 @@ export class ValidationContext {
    * @returns A failed validation result
    */
   failure(reason: LexValidationError): ValidationFailure {
-    return failure(reason)
+    return reason
   }
 
   /**

package/src/core.ts

@@ -1,5 +1,4 @@
 export * from './core/$type.js'
-export * from './core/property-key.js'
 export * from './core/record-key.js'
 export * from './core/result.js'
 export * from './core/schema.js'

package/src/schema/array.test.ts

@@ -77,11 +77,11 @@ describe('ArraySchema', () => {
     it('rejects single values', () => {
       const schema = array(string())
       const result = schema.safeValidate(3)
-      expect(result).toEqual({
+      expect(result).toMatchObject({
         success: false,
         reason: expect.objectContaining({
           message: expect.stringContaining(
-            'Expected array value type at $ (got integer)',
+            'Expected array value type (got integer) at $',
           ),
         }),
       })

package/src/schema/custom.ts

@@ -1,10 +1,4 @@
-import {
-  Issue,
-  IssueCustom,
-  PropertyKey,
-  Schema,
-  ValidationContext,
-} from '../core.js'
+import { Issue, IssueCustom, Schema, ValidationContext } from '../core.js'
 
 /**
  * Context object provided to custom assertion functions.

package/src/schema/params.test.ts

@@ -419,7 +419,7 @@ describe('ParamsSchema', () => {
           ['name', 'Alice'],
           ['bools', 'notabool'],
         ]),
-      ).toThrow('Expected boolean value type at $.bools (got string)')
+      ).toThrow('Expected boolean value type (got string) at $.bools')
 
       expect(() =>
         schema.fromURLSearchParams(
@@ -431,7 +431,7 @@ describe('ParamsSchema', () => {
             path: ['foo', 'bar'],
           },
         ),
-      ).toThrow('Expected boolean value type at $.foo.bar.bools (got string)')
+      ).toThrow('Expected boolean value type (got string) at $.foo.bar.bools')
     })
 
     it('ignores empty string values', () => {

package/src/schema/ref.ts

@@ -32,11 +32,7 @@ export type RefSchemaGetter<out TValidator extends Validator> = () => TValidator
  * ```
  */
 export class RefSchema<const TValidator extends Validator>
-  extends Schema<
-    InferInput<TValidator>,
-    InferOutput<TValidator>,
-    TValidator['__lex']
-  >
+  extends Schema<InferInput<TValidator>, InferOutput<TValidator>>
   implements WrappedValidator<TValidator>
 {
   readonly type = 'ref' as const

package/src/schema/refine.ts

@@ -1,7 +1,6 @@
 import {
   InferInput,
   IssueCustom,
-  PropertyKey,
   ValidationContext,
   ValidationResult,
   Validator,

package/dist/core/property-key.d.ts

@@ -1,2 +0,0 @@
-export type PropertyKey = string | number;
-//# sourceMappingURL=property-key.d.ts.map

package/dist/core/property-key.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"property-key.d.ts","sourceRoot":"","sources":["../../src/core/property-key.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA"}

package/dist/core/property-key.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=property-key.js.map

package/dist/core/property-key.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"property-key.js","sourceRoot":"","sources":["../../src/core/property-key.ts"],"names":[],"mappings":"","sourcesContent":["export type PropertyKey = string | number\n"]}

package/src/core/property-key.ts

@@ -1 +0,0 @@
-export type PropertyKey = string | number