From e77697719f0ae464d143126b3cee91d83e66b464 Mon Sep 17 00:00:00 2001
From: Morgbn <morgan.balde@gmail.com>
Date: Wed, 15 Nov 2023 14:09:53 +0100
Subject: [PATCH] feat: :sparkles: provide `useOaModelAjv` to access ajv
 instance & addKeywords

---
 playground/ajv-keywords.ts          | 20 ++++++++++++++++++++
 playground/app.vue                  |  3 ++-
 playground/schemas/Todo.json        |  4 ++++
 playground/server/api/[...todos].ts |  5 +++++
 src/module.ts                       |  2 +-
 src/runtime/server/helpers/model.ts | 22 +++++++++++++---------
 6 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 playground/ajv-keywords.ts

diff --git a/playground/ajv-keywords.ts b/playground/ajv-keywords.ts
new file mode 100644
index 0000000..04519bc
--- /dev/null
+++ b/playground/ajv-keywords.ts
@@ -0,0 +1,20 @@
+import type { KeywordDefinition } from 'ajv'
+
+export const keywords: KeywordDefinition[] = [{
+  keyword: 'range', // example from https://ajv.js.org/keywords.html#define-keyword-with-validate-function
+  validate ([min, max], data, parentSchema, _dataCxt) {
+    return data >= min && data <= max
+  },
+  error: {
+    message: ({ schema: [min, max], parentSchema }) => {
+      return `Value must be between ${min} and ${max} (inclusive)`
+    }
+  },
+  metaSchema: {
+    // schema to validate keyword value
+    type: 'array',
+    items: [{ type: 'number' }, { type: 'number' }],
+    minItems: 2,
+    additionalItems: false
+  }
+}]
diff --git a/playground/app.vue b/playground/app.vue
index 8ea5557..728e205 100644
--- a/playground/app.vue
+++ b/playground/app.vue
@@ -33,7 +33,7 @@
         </template>
       </json-list>
       <dialog ref="dialog">
-        <json-schema ref="form" v-model="editedTodo" :schema="schema" :defs-schema="defsSchema" />
+        <json-schema ref="form" v-model="editedTodo" :schema="schema" :defs-schema="defsSchema" :keywords="keywords" />
         <menu>
           <button value="cancel" @click="closeTodo">
             Cancel
@@ -59,6 +59,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
+import { keywords } from '~/ajv-keywords'
 import { useFetch, useOaSchema, useOaDefsSchema } from '#imports'
 
 const schema = useOaSchema('Todo')
diff --git a/playground/schemas/Todo.json b/playground/schemas/Todo.json
index 0ce8939..f9dfc24 100644
--- a/playground/schemas/Todo.json
+++ b/playground/schemas/Todo.json
@@ -12,6 +12,10 @@
         "$ref": "defs#/definitions/tag"
       }
     },
+    "cost": {
+      "type": "integer",
+      "range": [0, 250]
+    },
     "done": {
       "type": "string",
       "format": "date-time",
diff --git a/playground/server/api/[...todos].ts b/playground/server/api/[...todos].ts
index 6c4a0a9..f80f613 100644
--- a/playground/server/api/[...todos].ts
+++ b/playground/server/api/[...todos].ts
@@ -1,5 +1,10 @@
+import { ObjectId } from 'mongodb'
 import { consola } from 'consola'
 import { H3Event } from 'h3'
+import { keywords } from '~/ajv-keywords'
+
+const { addKeywords } = useOaModelAjv() // need to be called before any useOaModel()
+addKeywords(keywords)
 
 const Layer = useOaModel('Layer')
 consola.log(Layer.name) // model from layer base
diff --git a/src/module.ts b/src/module.ts
index 1a5ac72..97a7cb6 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -81,7 +81,7 @@ export default defineNuxtModule<ModuleOptions>({
     nuxt.options.nitro.imports.presets = nuxt.options.nitro.imports.presets || []
     nuxt.options.nitro.imports.presets.push({
       from: resolve('runtime/server/helpers/model'),
-      imports: ['useOaModel', 'useModel']
+      imports: ['useOaModel', 'useOaModelAjv']
     })
     nuxt.options.nitro.imports.presets.push({
       from: resolve('runtime/server/helpers/controllers'),
diff --git a/src/runtime/server/helpers/model.ts b/src/runtime/server/helpers/model.ts
index c1b9e81..da807dd 100644
--- a/src/runtime/server/helpers/model.ts
+++ b/src/runtime/server/helpers/model.ts
@@ -1,8 +1,7 @@
 import { randomBytes } from 'node:crypto'
-import { useLogger } from '@nuxt/kit'
 import Ajv from 'ajv'
 import addFormats from 'ajv-formats'
-import type { ValidateFunction } from 'ajv'
+import type { KeywordDefinition, ValidateFunction } from 'ajv'
 import type { Collection, Document, ObjectId, OptionalUnlessRequiredId, WithId } from 'mongodb'
 import { Hookable, type HookCallback } from 'hookable'
 import { createError, type H3Event } from 'h3'
@@ -13,7 +12,6 @@ import { decrypt, encrypt } from './cipher'
 
 import { useRuntimeConfig } from '#imports'
 
-const logger = useLogger('nuxt-oa')
 const { cipherAlgo, cipherKey, stringifiedSchemasByName, stringifiedDefsSchemas } = useRuntimeConfig().oa
 const schemasByName = JSON.parse(stringifiedSchemasByName) as Record<keyof OaModels, Schema>
 const defsSchemas = JSON.parse(stringifiedDefsSchemas) as DefsSchema[]
@@ -365,10 +363,16 @@ export function useOaModel<T extends keyof OaModels & string> (name: T): Model<T
   return modelsCache[name]
 }
 
-/**
- * @deprecated use 'useOaModel' instead
- */
-export function useModel<T extends keyof OaModels & string> (name: T): Model<T> {
-  logger.warn('"useModel" is deprecated. Use "useOaModel" instead.')
-  return useOaModel(name)
+/** Add user-defined keywords to ajv instance used in OaModel */
+const addKeywords = (keywords: KeywordDefinition[]) => {
+  for (const keyword of keywords) {
+    ajv.addKeyword(keyword)
+  }
+}
+
+export function useOaModelAjv () {
+  return {
+    instance: ajv,
+    addKeywords
+  }
 }