@distilled.cloud/cloudflare 0.25.2 → 0.26.0

package/lib/traits.d.ts

@@ -13,13 +13,29 @@ export interface ErrorMatcher {
     };
 }
 /**
- * Apply error matchers directly to a class's AST annotations.
- * Used for TaggedErrorClass where .pipe() on a class returns a schema
- * (not a class), breaking `extends ... .pipe(...)`.
+ * Apply error matchers to a class's AST annotations, returning the class so it
+ * can be used directly in an `extends` clause:
+ *
+ * ```ts
+ * export class Foo extends T.applyErrorMatchers(
+ *   Schema.TaggedErrorClass<Foo>()("Foo", { ... }),
+ *   [{ code: 1234 }],
+ * ) {}
+ * ```
+ *
+ * Mutating the base class's annotations propagates to the subclass — Effect's
+ * Class API reuses the same AST reference — so matchers stay readable via
+ * `getErrorMatchers(Foo.ast)`. Returning the class (instead of running as a
+ * void top-level statement) keeps the module free of bare side-effect
+ * statements, so the bundler can tree-shake unused error classes out of Worker
+ * bundles.
+ *
+ * `.pipe()` is deliberately not used: piping a class returns a schema (not a
+ * class), which can't appear in an `extends` clause.
  */
-export declare const applyErrorMatchers: (cls: {
+export declare const applyErrorMatchers: <C extends {
     ast: AST.AST;
-}, matchers: ErrorMatcher[]) => void;
+}>(cls: C, matchers: ErrorMatcher[]) => C;
 export declare const getErrorMatchers: (ast: AST.AST) => ErrorMatcher[] | undefined;
 /** Symbol for content type override (e.g., multipart) */
 export declare const contentTypeSymbol: unique symbol;

package/lib/traits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,8BAA8B,CAAC;AAG7C,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AAMxC,kEAAkE;AAClE,eAAO,MAAM,mBAAmB,eAE/B,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACzC;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QACxB;IAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAA;CAAE,YACX,YAAY,EAAE,KACvB,IAGF,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,GAAG,CAAC,GAAG,+BACY,CAAC;AAE1D,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,eAAiD,CAAC;AAEhF,eAAO,MAAM,WAAW,SAAU,MAAM,sDACC,CAAC;AAE1C,eAAO,MAAM,cAAc,QAAS,GAAG,CAAC,GAAG,uBACI,CAAC"}
+{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,8BAA8B,CAAC;AAG7C,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AAMxC,kEAAkE;AAClE,eAAO,MAAM,mBAAmB,eAE/B,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS;IAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAA;CAAE,OACtD,CAAC,YACI,YAAY,EAAE,KACvB,CAIF,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,GAAG,CAAC,GAAG,+BACY,CAAC;AAE1D,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,eAAiD,CAAC;AAEhF,eAAO,MAAM,WAAW,SAAU,MAAM,sDACC,CAAC;AAE1C,eAAO,MAAM,cAAc,QAAS,GAAG,CAAC,GAAG,uBACI,CAAC"}

package/lib/traits.js

@@ -10,13 +10,30 @@ import * as AST from "effect/SchemaAST";
 /** Symbol for error matchers (code + message pattern matching) */
 export const errorMatchersSymbol = Symbol.for("@distilled.cloud/cf/error-matchers");
 /**
- * Apply error matchers directly to a class's AST annotations.
- * Used for TaggedErrorClass where .pipe() on a class returns a schema
- * (not a class), breaking `extends ... .pipe(...)`.
+ * Apply error matchers to a class's AST annotations, returning the class so it
+ * can be used directly in an `extends` clause:
+ *
+ * ```ts
+ * export class Foo extends T.applyErrorMatchers(
+ *   Schema.TaggedErrorClass<Foo>()("Foo", { ... }),
+ *   [{ code: 1234 }],
+ * ) {}
+ * ```
+ *
+ * Mutating the base class's annotations propagates to the subclass — Effect's
+ * Class API reuses the same AST reference — so matchers stay readable via
+ * `getErrorMatchers(Foo.ast)`. Returning the class (instead of running as a
+ * void top-level statement) keeps the module free of bare side-effect
+ * statements, so the bundler can tree-shake unused error classes out of Worker
+ * bundles.
+ *
+ * `.pipe()` is deliberately not used: piping a class returns a schema (not a
+ * class), which can't appear in an `extends` clause.
  */
 export const applyErrorMatchers = (cls, matchers) => {
     const annotations = cls.ast.annotations;
     annotations[errorMatchersSymbol] = matchers;
+    return cls;
 };
 export const getErrorMatchers = (ast) => getAnnotation(ast, errorMatchersSymbol);
 /** Symbol for content type override (e.g., multipart) */

package/lib/traits.js.map

@@ -1 +1 @@
-{"version":3,"file":"traits.js","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,8BAA8B,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AAExC,gFAAgF;AAChF,6BAA6B;AAC7B,gFAAgF;AAEhF,kEAAkE;AAClE,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAC3C,oCAAoC,CACrC,CAAC;AAQF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,GAAqB,EACrB,QAAwB,EAClB,EAAE;IACR,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,WAAsC,CAAC;IACnE,WAAW,CAAC,mBAAmB,CAAC,GAAG,QAAQ,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAY,EAAE,EAAE,CAC/C,aAAa,CAAiB,GAAG,EAAE,mBAAmB,CAAC,CAAC;AAE1D,yDAAyD;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAC1C,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE,CAC7C,aAAa,CAAS,GAAG,EAAE,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"traits.js","sourceRoot":"","sources":["../src/traits.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,8BAA8B,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AAExC,gFAAgF;AAChF,6BAA6B;AAC7B,gFAAgF;AAEhF,kEAAkE;AAClE,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAC3C,oCAAoC,CACrC,CAAC;AAQF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,GAAM,EACN,QAAwB,EACrB,EAAE;IACL,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,WAAsC,CAAC;IACnE,WAAW,CAAC,mBAAmB,CAAC,GAAG,QAAQ,CAAC;IAC5C,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAY,EAAE,EAAE,CAC/C,aAAa,CAAiB,GAAG,EAAE,mBAAmB,CAAC,CAAC;AAE1D,yDAAyD;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAC1C,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE,CAC7C,aAAa,CAAS,GAAG,EAAE,iBAAiB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare",
-  "version": "0.25.2",
+  "version": "0.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -64,7 +64,7 @@
     "specs:update": "git -C specs/cloudflare-typescript fetch && git -C specs/cloudflare-typescript checkout main && git -C specs/cloudflare-typescript pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.25.2"
+    "@distilled.cloud/core": "0.26.0"
   },
   "devDependencies": {
     "@effect/platform-node": ">=4.0.0-beta.66 || >=4.0.0",

package/src/services/abuse-reports.ts

@@ -16,23 +16,29 @@ import { type DefaultErrors } from "../errors.ts";
 // Errors
 // =============================================================================
 
-export class AbuseReportNotFound extends Schema.TaggedErrorClass<AbuseReportNotFound>()(
-  "AbuseReportNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class AbuseReportNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<AbuseReportNotFound>()("AbuseReportNotFound", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 0 }],
 ) {}
-T.applyErrorMatchers(AbuseReportNotFound, [{ code: 0 }]);
 
-export class InvalidAccountId extends Schema.TaggedErrorClass<InvalidAccountId>()(
-  "InvalidAccountId",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidAccountId extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidAccountId>()("InvalidAccountId", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 7003 }],
 ) {}
-T.applyErrorMatchers(InvalidAccountId, [{ code: 7003 }]);
 
-export class InvalidRequest extends Schema.TaggedErrorClass<InvalidRequest>()(
-  "InvalidRequest",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidRequest extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidRequest>()("InvalidRequest", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 7003 }],
 ) {}
-T.applyErrorMatchers(InvalidRequest, [{ code: 7003 }]);
 
 // =============================================================================
 // AbuseReport

package/src/services/accounts.ts

@@ -16,123 +16,141 @@ import { type DefaultErrors } from "../errors.ts";
 // Errors
 // =============================================================================
 
-export class AccountCreationForbidden extends Schema.TaggedErrorClass<AccountCreationForbidden>()(
-  "AccountCreationForbidden",
-  { code: Schema.Number, message: Schema.String },
+export class AccountCreationForbidden extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<AccountCreationForbidden>()(
+    "AccountCreationForbidden",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 1002 }],
 ) {}
-T.applyErrorMatchers(AccountCreationForbidden, [{ code: 1002 }]);
 
-export class AccountMemberAlreadyExists extends Schema.TaggedErrorClass<AccountMemberAlreadyExists>()(
-  "AccountMemberAlreadyExists",
-  { code: Schema.Number, message: Schema.String },
+export class AccountMemberAlreadyExists extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<AccountMemberAlreadyExists>()(
+    "AccountMemberAlreadyExists",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ status: 400, message: { includes: "already exists" } }],
 ) {}
-T.applyErrorMatchers(AccountMemberAlreadyExists, [
-  { status: 400, message: { includes: "already exists" } },
-]);
 
-export class AccountNameTooLong extends Schema.TaggedErrorClass<AccountNameTooLong>()(
-  "AccountNameTooLong",
-  { code: Schema.Number, message: Schema.String },
+export class AccountNameTooLong extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<AccountNameTooLong>()("AccountNameTooLong", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1001, message: { includes: "too long" } }],
 ) {}
-T.applyErrorMatchers(AccountNameTooLong, [
-  { code: 1001, message: { includes: "too long" } },
-]);
 
-export class BadRequest extends Schema.TaggedErrorClass<BadRequest>()(
-  "BadRequest",
-  { code: Schema.Number, message: Schema.String },
+export class BadRequest extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<BadRequest>()("BadRequest", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 400 }],
 ) {}
-T.applyErrorMatchers(BadRequest, [{ code: 400 }]);
 
-export class EndpointNotFound extends Schema.TaggedErrorClass<EndpointNotFound>()(
-  "EndpointNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class EndpointNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<EndpointNotFound>()("EndpointNotFound", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1199 }],
 ) {}
-T.applyErrorMatchers(EndpointNotFound, [{ code: 1199 }]);
 
-export class InvalidAccountName extends Schema.TaggedErrorClass<InvalidAccountName>()(
-  "InvalidAccountName",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidAccountName extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidAccountName>()("InvalidAccountName", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1001, message: { includes: "invalid character" } }],
 ) {}
-T.applyErrorMatchers(InvalidAccountName, [
-  { code: 1001, message: { includes: "invalid character" } },
-]);
 
-export class InvalidRoute extends Schema.TaggedErrorClass<InvalidRoute>()(
-  "InvalidRoute",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidRoute extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidRoute>()("InvalidRoute", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 7003 }],
 ) {}
-T.applyErrorMatchers(InvalidRoute, [{ code: 7003 }]);
 
-export class InvalidTokenName extends Schema.TaggedErrorClass<InvalidTokenName>()(
-  "InvalidTokenName",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidTokenName extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidTokenName>()("InvalidTokenName", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 400, message: { includes: "name must have a length" } }],
 ) {}
-T.applyErrorMatchers(InvalidTokenName, [
-  { code: 400, message: { includes: "name must have a length" } },
-]);
 
-export class JsonDecodeFailure extends Schema.TaggedErrorClass<JsonDecodeFailure>()(
-  "JsonDecodeFailure",
-  { code: Schema.Number, message: Schema.String },
+export class JsonDecodeFailure extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<JsonDecodeFailure>()("JsonDecodeFailure", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1198 }],
 ) {}
-T.applyErrorMatchers(JsonDecodeFailure, [{ code: 1198 }]);
 
-export class MemberNotFound extends Schema.TaggedErrorClass<MemberNotFound>()(
-  "MemberNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class MemberNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<MemberNotFound>()("MemberNotFound", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1003 }],
 ) {}
-T.applyErrorMatchers(MemberNotFound, [{ code: 1003 }]);
 
-export class MethodNotAllowed extends Schema.TaggedErrorClass<MethodNotAllowed>()(
-  "MethodNotAllowed",
-  { code: Schema.Number, message: Schema.String },
+export class MethodNotAllowed extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<MethodNotAllowed>()("MethodNotAllowed", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 7001 }, { code: 10000 }, { code: 10405 }],
 ) {}
-T.applyErrorMatchers(MethodNotAllowed, [
-  { code: 7001 },
-  { code: 10000 },
-  { code: 10405 },
-]);
-
-export class MissingAuthenticationToken extends Schema.TaggedErrorClass<MissingAuthenticationToken>()(
-  "MissingAuthenticationToken",
-  { code: Schema.Number, message: Schema.String },
+
+export class MissingAuthenticationToken extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<MissingAuthenticationToken>()(
+    "MissingAuthenticationToken",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 1001 }],
 ) {}
-T.applyErrorMatchers(MissingAuthenticationToken, [{ code: 1001 }]);
 
-export class MissingName extends Schema.TaggedErrorClass<MissingName>()(
-  "MissingName",
-  { code: Schema.Number, message: Schema.String },
+export class MissingName extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<MissingName>()("MissingName", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1001 }],
 ) {}
-T.applyErrorMatchers(MissingName, [{ code: 1001 }]);
 
-export class PermissionGroupNotFound extends Schema.TaggedErrorClass<PermissionGroupNotFound>()(
-  "PermissionGroupNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class PermissionGroupNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<PermissionGroupNotFound>()(
+    "PermissionGroupNotFound",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 1001, message: { includes: "Permission group" } }],
 ) {}
-T.applyErrorMatchers(PermissionGroupNotFound, [
-  { code: 1001, message: { includes: "Permission group" } },
-]);
 
-export class TokenNotFound extends Schema.TaggedErrorClass<TokenNotFound>()(
-  "TokenNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class TokenNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<TokenNotFound>()("TokenNotFound", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1003 }],
 ) {}
-T.applyErrorMatchers(TokenNotFound, [{ code: 1003 }]);
 
-export class UpdateAccountTypeNotSupported extends Schema.TaggedErrorClass<UpdateAccountTypeNotSupported>()(
-  "UpdateAccountTypeNotSupported",
-  { code: Schema.Number, message: Schema.String },
+export class UpdateAccountTypeNotSupported extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<UpdateAccountTypeNotSupported>()(
+    "UpdateAccountTypeNotSupported",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 1001, message: { includes: "account type is not supported" } }],
 ) {}
-T.applyErrorMatchers(UpdateAccountTypeNotSupported, [
-  { code: 1001, message: { includes: "account type is not supported" } },
-]);
 
-export class ValidationError extends Schema.TaggedErrorClass<ValidationError>()(
-  "ValidationError",
-  { code: Schema.Number, message: Schema.String },
+export class ValidationError extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<ValidationError>()("ValidationError", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1001 }],
 ) {}
-T.applyErrorMatchers(ValidationError, [{ code: 1001 }]);
 
 // =============================================================================
 // Account

package/src/services/acm.ts

@@ -16,41 +16,53 @@ import { type DefaultErrors } from "../errors.ts";
 // Errors
 // =============================================================================
 
-export class AdvancedCertificateManagerRequired extends Schema.TaggedErrorClass<AdvancedCertificateManagerRequired>()(
-  "AdvancedCertificateManagerRequired",
-  { code: Schema.Number, message: Schema.String },
+export class AdvancedCertificateManagerRequired extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<AdvancedCertificateManagerRequired>()(
+    "AdvancedCertificateManagerRequired",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 1450 }],
 ) {}
-T.applyErrorMatchers(AdvancedCertificateManagerRequired, [{ code: 1450 }]);
 
-export class CustomTrustStoreNotFound extends Schema.TaggedErrorClass<CustomTrustStoreNotFound>()(
-  "CustomTrustStoreNotFound",
-  { code: Schema.Number, message: Schema.String },
+export class CustomTrustStoreNotFound extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<CustomTrustStoreNotFound>()(
+    "CustomTrustStoreNotFound",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ status: 404 }],
 ) {}
-T.applyErrorMatchers(CustomTrustStoreNotFound, [{ status: 404 }]);
 
-export class Forbidden extends Schema.TaggedErrorClass<Forbidden>()(
-  "Forbidden",
-  { code: Schema.Number, message: Schema.String },
+export class Forbidden extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<Forbidden>()("Forbidden", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ status: 403 }],
 ) {}
-T.applyErrorMatchers(Forbidden, [{ status: 403 }]);
 
-export class InvalidObjectIdentifier extends Schema.TaggedErrorClass<InvalidObjectIdentifier>()(
-  "InvalidObjectIdentifier",
-  { code: Schema.Number, message: Schema.String },
+export class InvalidObjectIdentifier extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<InvalidObjectIdentifier>()(
+    "InvalidObjectIdentifier",
+    { code: Schema.Number, message: Schema.String },
+  ),
+  [{ code: 7003 }],
 ) {}
-T.applyErrorMatchers(InvalidObjectIdentifier, [{ code: 7003 }]);
 
-export class NoStateChange extends Schema.TaggedErrorClass<NoStateChange>()(
-  "NoStateChange",
-  { code: Schema.Number, message: Schema.String },
+export class NoStateChange extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<NoStateChange>()("NoStateChange", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1467 }],
 ) {}
-T.applyErrorMatchers(NoStateChange, [{ code: 1467 }]);
 
-export class PreviousJobInProgress extends Schema.TaggedErrorClass<PreviousJobInProgress>()(
-  "PreviousJobInProgress",
-  { code: Schema.Number, message: Schema.String },
+export class PreviousJobInProgress extends T.applyErrorMatchers(
+  Schema.TaggedErrorClass<PreviousJobInProgress>()("PreviousJobInProgress", {
+    code: Schema.Number,
+    message: Schema.String,
+  }),
+  [{ code: 1482 }],
 ) {}
-T.applyErrorMatchers(PreviousJobInProgress, [{ code: 1482 }]);
 
 // =============================================================================
 // CustomTrustStore