@ditojs/server 0.275.0 → 1.0.0

package/src/query/QueryFilters.js

@@ -1,66 +1,66 @@
-import Registry from './Registry'
-import { parameters } from '@/decorators'
-
+import Registry from './Registry.js'
 export const QueryFilters = new Registry()
 
 QueryFilters.register({
-  @parameters([
-    {
-      name: 'operator',
-      type: 'string'
+  'text': {
+    parameters: {
+      operator: {
+        type: 'string'
+      },
+      text: {
+        type: 'string'
+      }
     },
-    {
-      name: 'text',
-      type: 'string'
-    }
-  ])
-  text(query, property, operator, text) {
-    if (text === undefined) {
-      text = operator
-      operator = 'contains'
-    }
-    const templates = {
-      'equals': text => text,
-      'contains': text => `%${text}%`,
-      'starts-with': text => `${text}%`,
-      'ends-with': text => `%${text}`
-    }
-    if (text) {
-      const operand = templates[operator]?.(text)
-      if (operand) {
-        if (query.isPostgreSQL()) {
-          query.where(property, 'ILIKE', operand)
-        } else {
-          query.whereRaw(
+
+    handler(query, property, { operator, text }) {
+      if (text === undefined) {
+        text = operator
+        operator = 'contains'
+      }
+      const templates = {
+        'equals': text => text,
+        'contains': text => `%${text}%`,
+        'starts-with': text => `${text}%`,
+        'ends-with': text => `%${text}`
+      }
+      if (text) {
+        const operand = templates[operator]?.(text)
+        if (operand) {
+          if (query.isPostgreSQL()) {
+            query.where(property, 'ILIKE', operand)
+          } else {
+            query.whereRaw(
             `LOWER(??) LIKE ?`,
             [property, operand.toLowerCase()]
-          )
+            )
+          }
         }
       }
     }
   },
 
-  @parameters([
-    {
-      name: 'from',
-      type: 'datetime',
-      nullable: true
+  'date-range': {
+    parameters: {
+      from: {
+        type: 'datetime',
+        nullable: true
+      },
+      to: {
+        type: 'datetime',
+        nullable: true
+      }
     },
-    {
-      name: 'to',
-      type: 'datetime',
-      nullable: true
-    }
-  ])
-  'date-range'(query, property, from, to) {
-    if (from && to) {
-      query.whereBetween(property, [new Date(from), new Date(to)])
-    } else if (from) {
-      query.where(property, '>=', new Date(from))
-    } else if (to) {
-      query.where(property, '<=', new Date(to))
-    } else {
+
+    handler(query, property, { from, to }) {
+      if (from && to) {
+        query.whereBetween(property, [new Date(from), new Date(to)])
+      } else if (from) {
+        query.where(property, '>=', new Date(from))
+      } else if (to) {
+        query.where(property, '<=', new Date(to))
+      } else {
       // TODO: Can we get validation to catch the case where both are empty?
+      }
     }
   }
 })

package/src/query/QueryParameters.js

@@ -1,6 +1,6 @@
-import { ResponseError, QueryBuilderError } from '@/errors'
 import { isString, asArray } from '@ditojs/utils'
-import Registry from './Registry'
+import Registry from './Registry.js'
+import { ResponseError, QueryBuilderError } from '../errors/index.js'
 
 export const QueryParameters = new Registry()
 

package/src/query/index.js

@@ -1,3 +1,3 @@
-export * from './QueryBuilder'
-export * from './QueryFilters'
-export * from './QueryParameters'
+export * from './QueryBuilder.js'
+export * from './QueryFilters.js'
+export * from './QueryParameters.js'

package/src/schema/formats/index.js

@@ -1,2 +1,2 @@
-export * from './_empty'
-export * from './_required'
+export * from './_empty.js'
+export * from './_required.js'

package/src/schema/index.js

@@ -1,4 +1,4 @@
-export * as keywords from './keywords'
-export * as formats from './formats'
-export * from './properties'
-export * from './relations'
+export * as keywords from './keywords/index.js'
+export * as formats from './formats/index.js'
+export * from './properties.js'
+export * from './relations.js'

package/src/schema/keywords/_relate.js

@@ -1,5 +1,5 @@
 // This keyword is used to validate reference-only data in relations: { id: 1 }
-// See @/schema/relation.js for more details
+// See ../schema/relation.js for more details
 export const relate = {
   silent: true,
 

package/src/schema/keywords/index.js

@@ -1,12 +1,12 @@
-export * from './_specificType'
-export * from './_primary'
-export * from './_foreign'
-export * from './_unique'
-export * from './_index'
-export * from './_computed'
-export * from './_hidden'
-export * from './_unsigned'
-export * from './_instanceof'
-export * from './_validate'
-export * from './_relate'
-export * from './_range'
+export * from './_specificType.js'
+export * from './_primary.js'
+export * from './_foreign.js'
+export * from './_unique.js'
+export * from './_index.js'
+export * from './_computed.js'
+export * from './_hidden.js'
+export * from './_unsigned.js'
+export * from './_instanceof.js'
+export * from './_validate.js'
+export * from './_relate.js'
+export * from './_range.js'

package/src/schema/properties.test.js

@@ -1,4 +1,4 @@
-import { convertSchema, expandSchemaShorthand } from './properties'
+import { convertSchema, expandSchemaShorthand } from './properties.js'
 
 describe('convertSchema()', () => {
   it('expands objects with properties to full JSON schemas', () => {

package/src/schema/relations.js

@@ -6,10 +6,10 @@ import {
   HasManyRelation,
   ManyToManyRelation
 } from 'objection'
-import { RelationError } from '@/errors'
 import {
   isObject, isArray, isString, asArray, capitalize, camelize
 } from '@ditojs/utils'
+import { RelationError } from '../errors/index.js'
 
 const relationLookup = {
   // one:

package/src/schema/relations.test.js

@@ -5,10 +5,10 @@ import {
   HasManyRelation,
   ManyToManyRelation
 } from 'objection'
-import { Model } from '@/models'
+import { Model } from '../models.js'
 import {
   getRelationClass, convertRelation, addRelationSchemas
-} from './relations'
+} from './relations.js'
 
 describe('getRelationClass()', () => {
   it('returns the corresponding relation classes', () => {

package/src/services/index.js

@@ -1 +1 @@
-export * from './Service'
+export * from './Service.js'

package/src/storage/DiskStorage.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra'
 import path from 'path'
 import multer from '@koa/multer'
-import { Storage } from './Storage'
+import { Storage } from './Storage.js'
 
 export class DiskStorage extends Storage {
   static type = 'disk'

package/src/storage/S3Storage.js

@@ -1,8 +1,8 @@
 import aws from 'aws-sdk'
 import multerS3 from 'multer-s3'
-import FileType from 'file-type'
+import { fileTypeFromBuffer } from 'file-type'
 import isSvg from 'is-svg'
-import { Storage } from './Storage'
+import { Storage } from './Storage.js'
 import { PassThrough } from 'stream'
 
 export class S3Storage extends Storage {
@@ -49,7 +49,7 @@ export class S3Storage extends Storage {
           const onData = chunk => {
             if (!data) {
               // 2. Try reading the mimetype from the first chunk.
-              const type = FileType.fromBuffer(chunk)?.mime
+              const type = fileTypeFromBuffer(chunk)?.mime
               if (type) {
                 stream.off('data', onData)
                 done(type)
@@ -58,7 +58,7 @@ export class S3Storage extends Storage {
                 //    the mimetype using the full data.
                 stream.once('end', () => {
                   const type = (
-                    FileType.fromBuffer(data)?.mime ||
+                    fileTypeFromBuffer(data)?.mime ||
                     (isSvg(data) ? 'image/svg+xml' : 'application/octet-stream')
                   )
                   done(type)

package/src/storage/Storage.js

@@ -4,7 +4,7 @@ import imageSize from 'image-size'
 import { PassThrough } from 'stream'
 import { URL } from 'url'
 import { hyphenate, toPromiseCallback } from '@ditojs/utils'
-import { AssetFile } from './AssetFile'
+import { AssetFile } from './AssetFile.js'
 
 const storageClasses = {}
 

package/src/storage/index.js

@@ -1,9 +1,9 @@
-import { Storage } from './Storage'
-import { DiskStorage } from './DiskStorage'
-import { S3Storage } from './S3Storage'
+import { Storage } from './Storage.js'
+import { DiskStorage } from './DiskStorage.js'
+import { S3Storage } from './S3Storage.js'
 
 Storage.register(DiskStorage)
 Storage.register(S3Storage)
 
-export * from './AssetFile'
+export * from './AssetFile.js'
 export { Storage }

package/src/utils/function.test.js

@@ -1,4 +1,4 @@
-import { describeFunction } from './function'
+import { describeFunction } from './function.js'
 
 describe('describeFunction()', () => {
   it('describes normal functions', () => {

package/src/utils/handler.js

@@ -0,0 +1,17 @@
+import { asArray } from '@ditojs/utils'
+
+export function processHandlerParameters(handler, name, value) {
+  if (value) {
+    const [schema, options] = asArray(value)
+    handler[name] = schema
+
+    // If validation options are provided, expose them through
+    // `handler.options[name]`, see `ControllerAction`.
+    if (options) {
+      handler.options = {
+        ...handler.options,
+        [name]: options
+      }
+    }
+  }
+}

package/src/utils/index.js

@@ -1,7 +1,8 @@
-export * from './decorator'
-export * from './deprecate'
-export * from './emitter'
-export * from './function'
-export * from './json'
-export * from './object'
-export * from './scope'
+export * from './decorator.js'
+export * from './deprecate.js'
+export * from './emitter.js'
+export * from './function.js'
+export * from './handler.js'
+export * from './json.js'
+export * from './object.js'
+export * from './scope.js'

package/src/utils/object.test.js

@@ -1,6 +1,6 @@
 import {
   getAllKeys, getOwnProperty, createLookup, mergeReversed, mergeAsReversedArrays
-} from './object'
+} from './object.js'
 
 const object = Object.create({ a: 1 })
 object.b = 2