@ditojs/server 1.5.5 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.5.5",
+  "version": "1.7.0",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -21,16 +21,16 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.5.5",
-    "@ditojs/build": "^1.5.5",
-    "@ditojs/router": "^1.5.5",
-    "@ditojs/utils": "^1.5.5",
+    "@ditojs/admin": "^1.7.0",
+    "@ditojs/build": "^1.7.0",
+    "@ditojs/router": "^1.6.0",
+    "@ditojs/utils": "^1.6.0",
     "@koa/cors": "^3.3.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "aws-sdk": "^2.1131.0",
+    "aws-sdk": "^2.1141.0",
     "axios": "^0.27.2",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
@@ -66,8 +66,8 @@
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^8.3.2",
-    "vite": "^2.9.8",
-    "vite-plugin-vue2": "^2.0.0",
+    "vite": "^2.9.9",
+    "vite-plugin-vue2": "^2.0.1",
     "vue": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
   },
@@ -79,5 +79,5 @@
     "knex": "^2.0.0",
     "objection": "^3.0.1"
   },
-  "gitHead": "157b519f3f3552fb25b67adf7e0fd402485ac4c9"
+  "gitHead": "20bdea5596f70da591987707df7aa5336ecb6aa3"
 }

package/src/app/Validator.js

@@ -1,5 +1,5 @@
 import objection from 'objection'
-import Ajv from 'ajv'
+import Ajv from 'ajv/dist/2020.js'
 import addFormats from 'ajv-formats'
 import { isArray, isObject, clone, isAsync, isPromise } from '@ditojs/utils'
 import { formatJson } from '../utils/index.js'

package/src/cli/db/migrate.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function migrate(knex, config) {
-  const [batch, log] = await knex.migrate.latest(config)
+export async function migrate(knex) {
+  const [batch, log] = await knex.migrate.latest()
   console.info(log.length === 0
     ? pico.cyan('Already up to date')
     : pico.green(`Batch ${batch} run: ${log.length} migrations\n`) +

package/src/cli/db/reset.js

@@ -1,11 +1,11 @@
 import pico from 'picocolors'
 import { migrate } from './migrate.js'
 
-export async function reset(knex, config) {
+export async function reset(knex) {
   const batches = []
   const migrations = []
   while (true) {
-    const [batch, log] = await knex.migrate.rollback(config)
+    const [batch, log] = await knex.migrate.rollback()
     if (log.length === 0) break
     batches.push(batch)
     migrations.push(...log)

package/src/cli/db/rollback.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function rollback(knex, config) {
-  const [batch, log] = await knex.migrate.rollback(config)
+export async function rollback(knex) {
+  const [batch, log] = await knex.migrate.rollback()
   console.info(log.length === 0
     ? pico.cyan('Already at the base migration')
     : pico.green(`Batch ${batch} rolled back: ${log.length} migrations\n`) +

package/src/cli/db/unlock.js

@@ -1,7 +1,7 @@
 import pico from 'picocolors'
 
-export async function unlock(knex, config) {
-  await knex.migrate.forceFreeMigrationsLock(config)
+export async function unlock(knex) {
+  await knex.migrate.forceFreeMigrationsLock()
   console.info(
     pico.green(`Successfully unlocked the migrations lock table`)
   )

package/src/cli/index.js

@@ -45,9 +45,6 @@ async function execute() {
       // A config object with a knex field was passed in, create a knex object
       // from it to pass on to the execute function.
       arg = Knex(arg.knex)
-      // Also add `knex.migrations` config as the first argument to `execute()`,
-      // so db:migrate & co. can receive migration configuration settings.
-      args.unshift(arg.knex.migrations || null)
     }
     const res = await execute(arg, ...args)
     process.exit(res === true ? 0 : 1)

package/src/models/Model.js

@@ -366,7 +366,6 @@ export class Model extends objection.Model {
       merge(schema, this.definition.schema)
       return {
         $id: this.name,
-        $schema: 'http://json-schema.org/draft-07/schema',
         ...schema
       }
     }, {})

package/src/schema/keywords/_range.js

@@ -2,11 +2,12 @@ export const range = {
   type: ['number', 'integer'],
   metaSchema: {
     type: 'array',
-    items: [
+    prefixItems: [
       { type: 'number' },
       { type: 'number' }
     ],
-    additionalItems: false
+    minItems: 2,
+    items: false
   },
   macro(config) {
     return {

package/src/schema/keywords/_validate.js

@@ -1,4 +1,4 @@
-import Ajv from 'ajv'
+import Ajv from 'ajv/dist/2020.js'
 import { isNumber, isArray } from '@ditojs/utils'
 
 export const validate = {