@tsed/ajv 8.14.2-rc.2 → 8.16.0-rc.1

package/lib/esm/decorators/formats.js

@@ -1,5 +1,4 @@
-import { StoreSet, useDecorators } from "@tsed/core";
-import { Injectable } from "@tsed/di";
+import { formats } from "../fn/formats.js";
 /**
  * Create a new custom formats validator
  * @param name
@@ -8,10 +7,7 @@ import { Injectable } from "@tsed/di";
  * @ajv
  */
 export function Formats(name, options = {}) {
-    return useDecorators(Injectable({
-        type: "ajv:formats"
-    }), StoreSet("ajv:formats", {
-        name,
-        options
-    }));
+    return (target) => {
+        formats(target, name, options);
+    };
 }

package/lib/esm/decorators/keyword.js

@@ -1,5 +1,4 @@
-import { StoreSet, useDecorators } from "@tsed/core";
-import { Injectable } from "@tsed/di";
+import { keyword } from "../fn/keyword.js";
 /**
  * Create new keyword custom validator
  * @param options
@@ -7,10 +6,7 @@ import { Injectable } from "@tsed/di";
  * @ajv
  */
 export function Keyword(options) {
-    return useDecorators(Injectable({
-        type: "ajv:keyword"
-    }), StoreSet("ajv:keyword", {
-        ...options,
-        metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema
-    }));
+    return (target) => {
+        keyword(target, options);
+    };
 }

package/lib/esm/fn/formats.js

@@ -0,0 +1,14 @@
+import { injectable } from "@tsed/di";
+/**
+ * Create a new custom formats validator
+ * @param token
+ * @param name
+ * @param options
+ * @ajv
+ */
+export function formats(token, name, options = {}) {
+    return injectable(token, { type: "ajv:formats" }).set("ajv:formats", {
+        name,
+        options
+    });
+}

package/lib/esm/fn/keyword.js

@@ -0,0 +1,16 @@
+import { injectable } from "@tsed/di";
+/**
+ * Create a new keyword custom validator
+ * @param token
+ * @param options
+ * @decorator
+ * @ajv
+ */
+export function keyword(token, options) {
+    return injectable(token)
+        .type("ajv:keyword")
+        .set("ajv:keyword", {
+        ...options,
+        metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema
+    });
+}

package/lib/esm/index.js

@@ -4,9 +4,11 @@
 export * from "./decorators/formats.js";
 export * from "./decorators/keyword.js";
 export * from "./errors/AjvValidationError.js";
+export * from "./fn/formats.js";
+export * from "./fn/keyword.js";
 export * from "./fn/validate.js";
+export * from "./interfaces/AjvSettings.js";
 export * from "./interfaces/FormatsMethods.js";
-export * from "./interfaces/IAjvSettings.js";
 export * from "./interfaces/interfaces.js";
 export * from "./interfaces/KeywordMethods.js";
 export * from "./services/Ajv.js";

package/lib/types/decorators/formats.d.ts

@@ -1,5 +1,4 @@
-import { AsyncFormatDefinition, FormatDefinition } from "ajv";
-export type FormatsOptions = Omit<FormatDefinition<any>, "validate" | "compare"> | Omit<AsyncFormatDefinition<any>, "validate" | "compare">;
+import { type FormatsOptions } from "../fn/formats.js";
 /**
  * Create a new custom formats validator
  * @param name

package/lib/types/decorators/keyword.d.ts

@@ -1,8 +1,4 @@
-import { JsonSchema } from "@tsed/schema";
-import { AnySchemaObject, KeywordDefinition } from "ajv";
-export type KeywordOptions = Partial<Omit<KeywordDefinition, "metaSchema">> & {
-    metaSchema?: AnySchemaObject | JsonSchema;
-};
+import { type KeywordOptions } from "../fn/keyword.js";
 /**
  * Create new keyword custom validator
  * @param options

package/lib/types/fn/formats.d.ts

@@ -0,0 +1,11 @@
+import { injectable, type TokenProvider } from "@tsed/di";
+import { AsyncFormatDefinition, FormatDefinition } from "ajv";
+export type FormatsOptions = Omit<FormatDefinition<any>, "validate" | "compare"> | Omit<AsyncFormatDefinition<any>, "validate" | "compare">;
+/**
+ * Create a new custom formats validator
+ * @param token
+ * @param name
+ * @param options
+ * @ajv
+ */
+export declare function formats(token: TokenProvider, name: string, options?: FormatsOptions): ReturnType<typeof injectable>;

package/lib/types/fn/keyword.d.ts

@@ -0,0 +1,14 @@
+import { injectable, type TokenProvider } from "@tsed/di";
+import { JsonSchema } from "@tsed/schema";
+import type { AnySchemaObject, KeywordDefinition } from "ajv";
+export type KeywordOptions = Partial<Omit<KeywordDefinition, "metaSchema">> & {
+    metaSchema?: AnySchemaObject | JsonSchema;
+};
+/**
+ * Create a new keyword custom validator
+ * @param token
+ * @param options
+ * @decorator
+ * @ajv
+ */
+export declare function keyword(token: TokenProvider, options: KeywordOptions): ReturnType<typeof injectable>;

package/lib/types/index.d.ts

@@ -4,9 +4,11 @@
 export * from "./decorators/formats.js";
 export * from "./decorators/keyword.js";
 export * from "./errors/AjvValidationError.js";
+export * from "./fn/formats.js";
+export * from "./fn/keyword.js";
 export * from "./fn/validate.js";
+export * from "./interfaces/AjvSettings.js";
 export * from "./interfaces/FormatsMethods.js";
-export * from "./interfaces/IAjvSettings.js";
 export * from "./interfaces/interfaces.js";
 export * from "./interfaces/KeywordMethods.js";
 export * from "./services/Ajv.js";

package/lib/types/interfaces/{IAjvSettings.d.ts → AjvSettings.d.ts}

@@ -13,7 +13,7 @@ export type ErrorFormatter = (error: AjvErrorObject) => string;
 /**
  *
  */
-export interface IAjvSettings extends Options {
+export interface AjvSettings extends Options {
     Ajv?: any;
     errorFormatter?: ErrorFormatter;
     returnsCoercedValues?: boolean;

package/lib/types/interfaces/interfaces.d.ts

@@ -1,8 +1,8 @@
-import { IAjvSettings } from "./IAjvSettings.js";
+import { AjvSettings } from "./AjvSettings.js";
 declare global {
     namespace TsED {
         interface Configuration {
-            ajv?: IAjvSettings;
+            ajv?: AjvSettings;
         }
     }
 }

package/lib/types/services/AjvService.d.ts

@@ -3,7 +3,7 @@ import { Type } from "@tsed/core";
 import { JsonSchema, JsonSchemaObject } from "@tsed/schema";
 import { Ajv, ErrorObject } from "ajv";
 import { AjvValidationError } from "../errors/AjvValidationError.js";
-import { AjvErrorObject, ErrorFormatter } from "../interfaces/IAjvSettings.js";
+import { AjvErrorObject, ErrorFormatter } from "../interfaces/AjvSettings.js";
 export interface AjvValidateOptions extends Record<string, any> {
     schema?: JsonSchema | Partial<JsonSchemaObject>;
     type?: Type<any> | any;

package/lib/types/utils/defaultErrorFormatter.d.ts

@@ -1,4 +1,4 @@
-import { AjvErrorObject } from "../interfaces/IAjvSettings.js";
+import { AjvErrorObject } from "../interfaces/AjvSettings.js";
 export declare function defaultErrorFormatter(error: AjvErrorObject & {
     dataPath: string;
 }): string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/ajv",
   "description": "AJV package for Ts.ED framework",
   "type": "module",
-  "version": "8.14.2-rc.2",
+  "version": "8.16.0-rc.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -29,12 +29,12 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.14.2-rc.2",
-    "@tsed/core": "8.14.2-rc.2",
-    "@tsed/di": "8.14.2-rc.2",
-    "@tsed/exceptions": "8.14.2-rc.2",
-    "@tsed/schema": "8.14.2-rc.2",
-    "@tsed/typescript": "8.14.2-rc.2",
+    "@tsed/barrels": "8.16.0-rc.1",
+    "@tsed/core": "8.16.0-rc.1",
+    "@tsed/di": "8.16.0-rc.1",
+    "@tsed/exceptions": "8.16.0-rc.1",
+    "@tsed/schema": "8.16.0-rc.1",
+    "@tsed/typescript": "8.16.0-rc.1",
     "ajv": "^8.17.1",
     "eslint": "9.12.0",
     "typescript": "5.4.5",