@ditojs/server 1.23.0 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.23.0",
+  "version": "1.25.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",
@@ -22,10 +22,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.23.0",
-    "@ditojs/build": "^1.23.0",
-    "@ditojs/router": "^1.23.0",
-    "@ditojs/utils": "^1.23.0",
+    "@ditojs/admin": "^1.25.0",
+    "@ditojs/build": "^1.25.0",
+    "@ditojs/router": "^1.25.0",
+    "@ditojs/utils": "^1.25.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -35,9 +35,8 @@
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^4.0.1",
     "eventemitter2": "^6.4.9",
-    "file-type": "^18.2.0",
+    "file-type": "^18.2.1",
     "image-size": "^1.0.2",
-    "is-svg": "^4.3.2",
     "koa": "^2.14.1",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.1.0",
@@ -54,17 +53,17 @@
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
     "nanoid": "^4.0.1",
-    "parse-duration": "^1.0.2",
+    "parse-duration": "^1.0.3",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^8.9.0",
-    "pino-pretty": "^9.1.1",
+    "pino": "^8.11.0",
+    "pino-pretty": "^9.4.0",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^9.0.0",
-    "vite": "^4.1.1",
+    "vite": "^4.1.4",
     "vite-plugin-vue2": "^2.0.3",
     "vue": "^2.7.14",
     "vue-template-compiler": "^2.7.14"
@@ -75,7 +74,7 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.264.0",
+    "@aws-sdk/client-s3": "^3.282.0",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-compress": "^4.0.3",
     "@types/koa-logger": "^3.1.2",
@@ -83,15 +82,15 @@
     "@types/koa-response-time": "^2.1.2",
     "@types/koa-session": "^5.10.6",
     "@types/koa-static": "^4.0.2",
-    "@types/koa__cors": "^3.3.0",
-    "@types/node": "^18.11.19",
+    "@types/koa__cors": "^3.3.1",
+    "@types/node": "^18.14.6",
     "knex": "^2.4.2",
     "objection": "^3.0.1",
-    "type-fest": "^3.5.5",
+    "type-fest": "^3.6.1",
     "typescript": "^4.9.5"
   },
   "types": "types",
-  "gitHead": "3258fd030226062efa6837bfc5e5a761e80cead5",
+  "gitHead": "29e7f8d8c613c48a856d90d1ee876e85c8d84c08",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/app/Application.js

@@ -22,7 +22,8 @@ import { Model, knexSnakeCaseMappers, ref } from 'objection'
 import Router from '@ditojs/router'
 import {
   isArray, isObject, isString, asArray, isPlainObject, isModule,
-  hyphenate, clone, merge, parseDataPath, normalizeDataPath, toPromiseCallback
+  hyphenate, clone, merge, parseDataPath, normalizeDataPath, toPromiseCallback,
+  mapConcurrently
 } from '@ditojs/utils'
 import SessionStore from './SessionStore.js'
 import { Validator } from './Validator.js'
@@ -389,22 +390,23 @@ export class Application extends Koa {
         for (const [assetDataPath, config] of Object.entries(assets)) {
           const {
             property,
+            relation,
+            wildcard,
             nestedDataPath,
-            name,
-            index
+            name
           } = modelClass.getPropertyOrRelationAtDataPath(assetDataPath)
-          if (property && index === 0) {
+          if (relation) {
+            throw new Error('Assets on nested relations are not supported')
+          } else if (property || wildcard) {
             const normalizedName = normalizeDbNames
               ? this.normalizeIdentifier(name)
               : name
             const dataPath = normalizeDataPath([
-              normalizedName,
+              wildcard || normalizedName,
               ...parseDataPath(nestedDataPath)
             ])
             const assetConfigs = convertedAssets[normalizedName] ||= {}
             assetConfigs[dataPath] = config
-          } else {
-            throw new Error('Nested graph properties are not supported yet')
           }
         }
         assetConfig[normalizedModelName] = convertedAssets
@@ -706,7 +708,7 @@ export class Application extends Koa {
       this.on('error', this.logError)
     }
     // It's ok to call this multiple times, because only the entries in the
-    // registres (storages, services, models, controllers) that weren't
+    // registers (storages, services, models, controllers) that weren't
     // initialized yet will be initialized.
     await this.setup()
     await this.emit('before:start')
@@ -797,7 +799,7 @@ export class Application extends Koa {
     return null
   }
 
-  async handleAdddedAndRemovedAssets(
+  async handleAddedAndRemovedAssets(
     storage,
     addedFiles,
     removedFiles,
@@ -808,16 +810,18 @@ export class Application extends Koa {
         cleanupTimeThreshold = 0
       } = {}
     } = this.config
-    // Only remove unused assets that haven't seen changes for given timeframe.
+    // Only remove unused assets that haven't seen changes for given time frame.
     const timeThreshold = isString(cleanupTimeThreshold)
       ? parseDuration(cleanupTimeThreshold)
       : cleanupTimeThreshold
 
-    const importedFiles = []
+    let importedFiles = []
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
-      importedFiles.push(
-        ...await this.addForeignAssets(storage, addedFiles, trx)
+      importedFiles = await this.addForeignAssets(
+        storage,
+        addedFiles,
+        trx
       )
       if (
         addedFiles.length > 0 ||
@@ -854,24 +858,23 @@ export class Application extends Koa {
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
       // Find missing assets (copied from another system), and add them.
-      await Promise.all(
-        files.map(async file => {
-          const asset = await AssetModel.query(trx).findOne('key', file.key)
-          if (!asset) {
-            if (file.data || file.url) {
-              let { data } = file
-              if (!data) {
-                const { url } = file
-                if (!storage.isImportSourceAllowed(url)) {
-                  throw new AssetError(
+      await mapConcurrently(files, async file => {
+        const asset = await AssetModel.query(trx).findOne('key', file.key)
+        if (!asset) {
+          if (file.data || file.url) {
+            let { data } = file
+            if (!data) {
+              const { url } = file
+              if (!storage.isImportSourceAllowed(url)) {
+                throw new AssetError(
                     `Unable to import asset from foreign source: '${
                       file.name
                     }' ('${
                       url
                     }'): The source needs to be explicitly allowed.`
-                  )
-                }
-                console.info(
+                )
+              }
+              console.info(
                   `${
                     pico.red('INFO:')
                   } Asset ${
@@ -881,41 +884,40 @@ export class Application extends Koa {
                   } and adding to storage ${
                     pico.green(`'${storage.name}'`)
                   }...`
-                )
-                if (url.startsWith('file://')) {
-                  const filepath = path.resolve(url.substring(7))
-                  data = await fs.readFile(filepath)
-                } else {
-                  const response = await fetch(url)
-                  const buffer = await response.arrayBuffer()
-                  data = new DataView(buffer)
-                }
+              )
+              if (url.startsWith('file://')) {
+                const filepath = path.resolve(url.substring(7))
+                data = await fs.readFile(filepath)
+              } else {
+                const response = await fetch(url)
+                const buffer = await response.arrayBuffer()
+                data = new DataView(buffer)
               }
-              const importedFile = await storage.addFile(file, data)
-              await this.createAssets(storage, [importedFile], 0, trx)
-              // Merge back the changed file properties into the actual files
-              // object, so that the data from the static model hook can be used
-              // directly for the actual running query.
-              Object.assign(file, importedFile)
-              importedFiles.push(importedFile)
-            } else {
-              throw new AssetError(
+            }
+            const importedFile = await storage.addFile(file, data)
+            await this.createAssets(storage, [importedFile], 0, trx)
+            // Merge back the changed file properties into the actual files
+            // object, so that the data from the static model hook can be used
+            // directly for the actual running query.
+            Object.assign(file, importedFile)
+            importedFiles.push(importedFile)
+          } else {
+            throw new AssetError(
                 `Unable to import asset from foreign source: '${
                   file.name
                 }' ('${
                   file.key
                 }')`
-              )
-            }
-          } else {
-            // Asset is from a foreign source, but was already imported and can
-            // be reused. See above for an explanation of this merge.
-            Object.assign(file, asset.file)
-            // NOTE: No need to add `file` to `importedFiles`, since it's
-            // already been imported to the storage before.
+            )
           }
-        })
-      )
+        } else {
+          // Asset is from a foreign source, but was already imported and can
+          // be reused. See above for an explanation of this merge.
+          Object.assign(file, asset.file)
+          // NOTE: No need to add `file` to `importedFiles`, since it's
+          // already been imported to the storage before.
+        }
+      }, { concurrency: storage.concurrency })
     }
     return importedFiles
   }
@@ -924,29 +926,27 @@ export class Application extends Koa {
     const modifiedFiles = []
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
-      await Promise.all(
-        files.map(async file => {
-          if (file.data) {
-            const asset = await AssetModel.query(trx).findOne('key', file.key)
-            if (asset) {
-              const changedFile = await storage.addFile(file, file.data)
-              // Merge back the changed file properties into the actual files
-              // object, so that the data from the static model hook can be used
-              // directly for the actual running query.
-              Object.assign(file, changedFile)
-              modifiedFiles.push(changedFile)
-            } else {
-              throw new AssetError(
+      await mapConcurrently(files, async file => {
+        if (file.data) {
+          const asset = await AssetModel.query(trx).findOne('key', file.key)
+          if (asset) {
+            const changedFile = await storage.addFile(file, file.data)
+            // Merge back the changed file properties into the actual files
+            // object, so that the data from the static model hook can be used
+            // directly for the actual running query.
+            Object.assign(file, changedFile)
+            modifiedFiles.push(changedFile)
+          } else {
+            throw new AssetError(
                 `Unable to update modified asset from memory source: '${
                   file.name
                 }' ('${
                   file.key
                 }')`
-              )
-            }
+            )
           }
-        })
-      )
+        }
+      })
     }
     return modifiedFiles
   }
@@ -967,8 +967,9 @@ export class Application extends Koa {
           // .e.g. when `config.assets.cleanupTimeThreshold = 0`
           .andWhere('updatedAt', '>', ref('createdAt'))
         if (orphanedAssets.length > 0) {
-          const orphanedKeys = await Promise.all(
-            orphanedAssets.map(async asset => {
+          const orphanedKeys = await mapConcurrently(
+            orphanedAssets,
+            async asset => {
               try {
                 await this.getStorage(asset.storage).removeFile(asset.file)
               } catch (error) {
@@ -976,7 +977,7 @@ export class Application extends Koa {
                 asset.error = error
               }
               return asset.key
-            })
+            }
           )
           await AssetModel
             .query(trx)

package/src/controllers/AdminController.js

@@ -29,7 +29,7 @@ export class AdminController extends Controller {
     }
     // If no mode is specified, use `production` since that's just the hosting
     // of the pre-built admin files. `development` serves the admin directly
-    // sources with HRM, and thus should be explicitely activated.
+    // sources with HRM, and thus should be explicitly activated.
     this.mode = this.config.mode || (
       this.app.config.env === 'development' ? 'development' : 'production'
     )

package/src/controllers/CollectionController.js

@@ -36,7 +36,7 @@ export class CollectionController extends Controller {
       this.assets = modelClass.definition.assets || null
     } else if (isObject(this.assets)) {
       // Merge in the assets definition from the model into the assets config.
-      // That way, we can still use `allow` and `authorize` to controll the
+      // That way, we can still use `allow` and `authorize` to control the
       // upload access, while keeping the assets definitions in one central
       // location on the model.
       this.assets = {

package/src/controllers/Controller.js

@@ -228,14 +228,10 @@ export class Controller {
     const tokens = parseDataPath(dataPath)
     const getDataPath = callback => normalizeDataPath(tokens.map(callback))
 
-    // Replace wildcards with numbered indices and convert to '/'-notation:
-    let index = 0
-    const multipleWildcards = tokens.filter(token => token === '*').length > 1
     const normalizedPath = getDataPath(
-      token => token === '*'
-        ? multipleWildcards
-          ? `:index${++index}`
-          : ':index'
+      // Router supports both shallow & deep wildcards, no normalization needed.
+      token => token === '*' || token === '**'
+        ? token
         : this.app.normalizePath(token)
     )
 
@@ -243,7 +239,16 @@ export class Controller {
     // against, but convert wildcards (*) to match both numeric ids and words,
     // e.g. 'create':
     const matchDataPath = new RegExp(
-      `^${getDataPath(token => token === '*' ? '\\w+' : token)}$`
+      `^${
+        getDataPath(
+          // Use the exact same regexps as in `Router`:
+          token => token === '*'
+            ? '[^/]+' // shallow wildcard
+            : token === '**'
+              ? '.+?' // deep wildcard
+              : token
+        )
+      }$`
     )
 
     const url = this.getUrl('controller', `upload/${normalizedPath}`)
@@ -557,7 +562,7 @@ function convertActionObject(name, object, actions) {
     ...rest
   } = object
 
-  // In order to suport `super` calls in the `handler` function in object
+  // In order to support `super` calls in the `handler` function in object
   // notation, deploy this crazy JS sorcery:
   Object.setPrototypeOf(object, Object.getPrototypeOf(actions))
 

package/src/controllers/ControllerAction.js

@@ -123,7 +123,7 @@ export default class ControllerAction {
       type, // String: What type should this validated against / coerced to.
       from, // String: Allow parameters to be 'borrowed' from other objects.
       root, // Boolean: Use full root object, instead of data at given property.
-      member // Boolean: Fetch member instance insted of data from request.
+      member // Boolean: Fetch member instance instead of data from request.
     } of this.parameters.list) {
       // Don't validate member parameters as they get resolved separately after.
       if (member) continue
@@ -271,7 +271,7 @@ export default class ControllerAction {
             // - `"key1":X, "key2":Y` (curly braces are added and parsed through
             //   `JSON.parse()`)
             // - `key1:X,key2:Y` (a simple parser is applied, splitting into
-            //   entries and key/value pairs, valuse are parsed with
+            //   entries and key/value pairs, values are parsed with
             //   `JSON.parse()`, falling back to string.
             if (/"/.test(value)) {
               // Just add the curly braces and parse as JSON

package/src/controllers/MemberAction.js

@@ -10,12 +10,12 @@ export default class MemberAction extends ControllerAction {
   // @override
   async getMember(ctx, param) {
     // member parameters can provide special query parameters as well,
-    // and they can even controll `forUpdate()` behavior:
+    // and they can even control `forUpdate()` behavior:
     // {
     //   member: true,
     //   query: { ... },
     //   forUpdate: true,
-    //   modify: query => query.degbug()
+    //   modify: query => query.debug()
     // }
     // These are passed on to and handled in `CollectionController#getMember()`.
     // For handling of `member: true` and calling of `MemberAction.getMember()`,

package/src/controllers/ModelController.js

@@ -44,7 +44,7 @@ export class ModelController extends CollectionController {
       this, object, relationInstance, relationDefinition
     )
     // RelationController instances are not registered with the app, but are
-    // manged by their parent controller instead.
+    // managed by their parent controller instead.
     relation.configure()
     relation.setup()
     return relation

package/src/graph/graph.js

@@ -1,4 +1,4 @@
-import { isObject, isArray, asArray } from '@ditojs/utils'
+import { isObject, isArray, asArray, mapConcurrently } from '@ditojs/utils'
 import { QueryBuilder } from '../query/index.js'
 import { collectExpressionPaths, expressionPathToString } from './expression.js'
 
@@ -212,8 +212,9 @@ export async function populateGraph(rootModelClass, graph, expr, trx) {
     // Load all found models by ids asynchronously, within provided transaction.
     // NOTE: Using the same transaction means that all involved tables need to
     // be in the same database.
-    await Promise.all(
-      groups.map(async ({ modelClass, modify, expr, ids, modelsById }) => {
+    await mapConcurrently(
+      groups,
+      async ({ modelClass, modify, expr, ids, modelsById }) => {
         const query = modelClass.query(trx).findByIds(ids).modify(modify)
         if (expr) {
           // TODO: Make algorithm configurable through options.
@@ -224,7 +225,7 @@ export async function populateGraph(rootModelClass, graph, expr, trx) {
         for (const model of models) {
           modelsById[model.$id()] = model
         }
-      })
+      }
     )
 
     // Finally populate the targets with the loaded models.

package/src/middleware/handleConnectMiddleware.js

@@ -40,7 +40,7 @@ export function handleConnectMiddleware(middleware, {
           if (isArray(headers)) {
             // Convert raw headers array to object.
             headers = Object.fromEntries(headers.reduce(
-              // Translate raw array to [field, value] tuplets.
+              // Translate raw array to [field, value] tuples.
               (entries, value, index) => {
                 if (index & 1) { // Odd: value
                   entries[entries.length - 1].push(value)

package/src/mixins/AssetMixin.js

@@ -36,7 +36,7 @@ export const AssetMixin = mixin(Model => class extends TimeStampedMixin(Model) {
           type: 'integer',
           required: true
         },
-        // Use for storages configured for files to be publically accessible:
+        // Use for storages configured for files to be publicly accessible:
         url: {
           type: 'string'
         },

package/src/models/Model.js

@@ -1,7 +1,8 @@
 import objection from 'objection'
 import {
   isString, isObject, isArray, isFunction, isPromise, asArray, merge, flatten,
-  parseDataPath, normalizeDataPath, getValueAtDataPath
+  parseDataPath, normalizeDataPath, getValueAtDataPath,
+  mapConcurrently
 } from '@ditojs/utils'
 import { QueryBuilder } from '../query/index.js'
 import { EventEmitter, KnexHelper } from '../lib/index.js'
@@ -617,9 +618,13 @@ export class Model extends objection.Model {
     const parsedDataPath = parseDataPath(dataPath)
     let index = 0
 
-    const getResult = (property = null, relation = null) => {
-      const found = property || relation
-      const name = parsedDataPath[index]
+    const getResult = ({
+      property = null,
+      relation = null,
+      wildcard = null
+    } = {}) => {
+      const found = !!(property || relation || wildcard)
+      const name = wildcard ? '*' : parsedDataPath[index]
       const next = index + 1
       const dataPath = found
         ? normalizeDataPath(parsedDataPath.slice(0, next))
@@ -634,18 +639,20 @@ export class Model extends objection.Model {
       return {
         property,
         relation,
+        wildcard,
         dataPath,
         nestedDataPath,
         name,
-        expression,
-        index
+        expression
       }
     }
 
     const [firstToken, ...otherTokens] = parsedDataPath
     const property = this.definition.properties[firstToken]
     if (property) {
-      return getResult(property)
+      return getResult({ property })
+    } else if (firstToken === '*' || firstToken === '**') {
+      return getResult({ wildcard: firstToken })
     } else {
       let relation = this.getRelations()[firstToken]
       if (relation) {
@@ -654,27 +661,32 @@ export class Model extends objection.Model {
           index++
           const property = relatedModelClass.definition.properties[token]
           if (property) {
-            return getResult(property)
+            return getResult({ property, relation })
           } else if (token === '*') {
             if (relation.isOneToOne()) {
               // Do not support wildcards on one-to-one relations:
-              return getResult()
+              return getResult() // Not found.
             } else {
               continue
             }
+          } else if (token === '**') {
+            throw new ModelError(
+              this,
+              'Deep wildcards on relations are unsupported.'
+            )
           } else {
             // Found a relation? Keep iterating.
             relation = relatedModelClass.getRelations()[token]
             if (relation) {
               relatedModelClass = relation.relatedModelClass
             } else {
-              return getResult()
+              return getResult() // Not found.
             }
           }
         }
         if (relation) {
           // Still here? Found a relation at the end of the data-path.
-          return getResult(null, relation)
+          return getResult({ relation })
         }
       }
     }
@@ -704,6 +716,10 @@ export class Model extends objection.Model {
         return query.ignoreScope(modifier.slice(1))
       case '#': // Select column:
         return query.select(modifier.slice(1))
+      case '*': // Select all columns:
+        if (modifier.length === 1) {
+          return query.select('*')
+        }
       }
     }
     super.modifierNotFound(query, modifier)
@@ -958,10 +974,9 @@ export class Model extends objection.Model {
                 importedFiles.map(file => `'${file.name}'`)
               }`
             )
-            await Promise.all(
-              importedFiles.map(
-                file => file.storage.removeFile(file)
-              )
+            await mapConcurrently(
+              importedFiles,
+              file => file.storage.removeFile(file)
             )
           }
           if (modifiedFiles.length > 0) {
@@ -985,14 +1000,14 @@ export class Model extends objection.Model {
         const removedFiles = beforeFiles.filter(file => !afterByKey[file.key])
         const addedFiles = afterFiles.filter(file => !beforeByKey[file.key])
         // Also handle modified files, which are files where the data property
-        // is changed before update / patch, meanting the file is changed.
+        // is changed before update / patch, meaning the file is changed.
         // NOTE: This will change the content for all the references to it,
         // and thus should only really be used when there's only one reference.
         const modifiedFiles = afterFiles.filter(
           file => file.data && beforeByKey[file.key]
         )
         importedFiles.push(
-          ...await this.app.handleAdddedAndRemovedAssets(
+          ...await this.app.handleAddedAndRemovedAssets(
             storage,
             addedFiles,
             removedFiles,

package/src/query/QueryBuilder.js

@@ -48,7 +48,7 @@ export class QueryBuilder extends objection.QueryBuilder {
       // to not mess with special selects such as `count`, etc:
       this._ignoreGraph = !isNormalFind
       // All scopes in `_scopes` were already checked against `_allowScopes`.
-      // They themeselves are allowed to apply / request other scopes that
+      // They themselves are allowed to apply / request other scopes that
       // aren't listed, so clear `_applyScope` and restore again after:
       const { _allowScopes } = this
       this._allowScopes = null
@@ -347,16 +347,22 @@ export class QueryBuilder extends objection.QueryBuilder {
 
     const {
       property,
+      relation,
+      wildcard,
       expression,
       nestedDataPath,
-      name,
-      index
+      name
     } = this.modelClass().getPropertyOrRelationAtDataPath(parsedDataPath)
 
     if (nestedDataPath) {
       // Once a JSON data type is reached, even if it's not at the end of the
       // provided path, load it and assume we're done with the loading part.
-      if (!(property && ['object', 'array'].includes(property.type))) {
+      if (
+        !(
+          wildcard ||
+          property && ['object', 'array'].includes(property.type)
+        )
+      ) {
         throw new QueryBuilderError(
           `Unable to load full data-path '${
             dataPath
@@ -369,7 +375,7 @@ export class QueryBuilder extends objection.QueryBuilder {
 
     // Handle the special case of root-level property separately,
     // because `withGraph('(#propertyName)')` is not supported.
-    if (property && index === 0) {
+    if (name && !relation) {
       this.select(name)
     } else {
       this.withGraph(expression, options)

package/src/schema/properties.js

@@ -12,7 +12,7 @@ export function convertSchema(schema, options = {}) {
       // Our 'required' is not the same as JSON Schema's: Use the 'required'
       // format instead that only validates if the required value is not empty,
       // meaning neither nullish nor an empty string. The JSON schema `required`
-      // array is generated seperately below through `convertProperties()`.
+      // array is generated separately below through `convertProperties()`.
       delete schema.required
       schema = addFormat(schema, 'required')
     }
@@ -58,7 +58,7 @@ export function convertSchema(schema, options = {}) {
         schema.type = jsonType
         if (hasConvertedProperties && !('additionalProperties' in schema)) {
           // Invert the logic of `additionalProperties` so that it needs to be
-          // explicitely set to `true`:
+          // explicitly set to `true`:
           schema.additionalProperties = false
         }
       } else if (['date', 'datetime', 'timestamp'].includes(type)) {

package/src/schema/properties.test.js

@@ -69,7 +69,7 @@ describe('convertSchema()', () => {
     })
   })
 
-  it(`expands 'text' typess to 'string' JSON schema typess`, () => {
+  it(`expands 'text' types to 'string' JSON schema types`, () => {
     expect(convertSchema({
       type: 'object',
       properties: {
@@ -159,7 +159,7 @@ describe('convertSchema()', () => {
     })
   })
 
-  it('preserves preexisting settings for no additional properties', () => {
+  it('preserves pre-existing settings for no additional properties', () => {
     expect(convertSchema({
       type: 'object',
       properties: {

package/src/storage/AssetFile.js

@@ -8,11 +8,13 @@ const SYMBOL_STORAGE = Symbol('storage')
 const SYMBOL_DATA = Symbol('data')
 
 export class AssetFile {
-  constructor(name, data, type) {
+  constructor({ name, data, type, width, height }) {
     this.key = AssetFile.getUniqueKey(name)
     this.name = name
     // Set `type` before `data`, so it can be used as default in `set data`
     this.type = type
+    this.width = width
+    this.height = height
     this.data = data
   }
 
@@ -60,8 +62,8 @@ export class AssetFile {
     return object
   }
 
-  static create({ name, data, type }) {
-    return new AssetFile(name, data, type)
+  static create(options) {
+    return new AssetFile(options)
   }
 
   static getUniqueKey(name) {

package/src/storage/DiskStorage.js

@@ -1,6 +1,7 @@
 import fs from 'fs/promises'
 import path from 'path'
 import multer from '@koa/multer'
+import { mapConcurrently } from '@ditojs/utils'
 import { Storage } from './Storage.js'
 
 export class DiskStorage extends Storage {
@@ -38,11 +39,11 @@ export class DiskStorage extends Storage {
   }
 
   // @override
-  async _addFile(file, buffer) {
+  async _addFile(file, data) {
     const filePath = this._getFilePath(file)
     const dir = path.dirname(filePath)
     await fs.mkdir(dir, { recursive: true })
-    await fs.writeFile(filePath, buffer)
+    await fs.writeFile(filePath, data)
     return file
   }
 
@@ -82,12 +83,14 @@ export class DiskStorage extends Storage {
 
     const files = []
     const list1 = await readDir()
-    await Promise.all(
-      list1.map(async level1 => {
+    await mapConcurrently(
+      list1,
+      async level1 => {
         if (level1.isDirectory() && level1.name.length === 1) {
           const list2 = await readDir(level1.name)
-          await Promise.all(
-            list2.map(async level2 => {
+          await mapConcurrently(
+            list2,
+            async level2 => {
               if (level2.isDirectory() && level2.name.length === 1) {
                 const nestedFolder = this._getPath(level1.name, level2.name)
                 for (const file of await fs.readdir(nestedFolder)) {
@@ -96,10 +99,10 @@ export class DiskStorage extends Storage {
                   }
                 }
               }
-            })
+            }
           )
         }
-      })
+      }
     )
     return files
   }

package/src/storage/S3Storage.js

@@ -1,9 +1,9 @@
 import multerS3 from 'multer-s3'
 import { fileTypeFromBuffer } from 'file-type'
-import isSvg from 'is-svg'
 import { Storage } from './Storage.js'
 import { PassThrough } from 'stream'
 import consumers from 'stream/consumers'
+import imageSize from 'image-size'
 
 export class S3Storage extends Storage {
   static type = 's3'
@@ -47,6 +47,7 @@ export class S3Storage extends Storage {
           let data = null
 
           const done = type => {
+            stream.off('data', onData)
             const outStream = new PassThrough()
             outStream.write(data)
             stream.pipe(outStream)
@@ -56,20 +57,15 @@ export class S3Storage extends Storage {
           const onData = chunk => {
             if (!data) {
               // 2. Try reading the mimetype from the first chunk.
-              const type = fileTypeFromBuffer(chunk)?.mime
+              const type = getFileTypeFromBuffer(chunk)
               if (type) {
-                stream.off('data', onData)
                 done(type)
               } else {
                 // 3. If that fails, keep collecting all chunks and determine
                 //    the mimetype using the full data.
-                stream.once('end', () => {
-                  const type = (
-                    fileTypeFromBuffer(data)?.mime ||
-                    (isSvg(data) ? 'image/svg+xml' : 'application/octet-stream')
-                  )
-                  done(type)
-                })
+                stream.once('end', () => done(
+                  getFileTypeFromBuffer(data) || 'application/octet-stream'
+                ))
               }
             }
             data = data ? Buffer.concat([data, chunk]) : chunk
@@ -107,19 +103,19 @@ export class S3Storage extends Storage {
   }
 
   // @override
-  async _addFile(file, buffer) {
-    const data = await this.s3.putObject({
+  async _addFile(file, data) {
+    const result = await this.s3.putObject({
       Bucket: this.bucket,
       ACL: this.acl,
       Key: file.key,
       ContentType: file.type,
-      Body: buffer
+      Body: data
     })
     // "Convert" `file` to something looking more like a S3 `storageFile`.
     // For now, only the `location` property is of interest:
     return {
       ...file,
-      location: data.Location
+      location: result.Location
     }
   }
 
@@ -163,3 +159,33 @@ export class S3Storage extends Storage {
     return files
   }
 }
+
+function getFileTypeFromBuffer(buffer) {
+  const type = fileTypeFromBuffer(buffer)
+  if (type) {
+    return type.mime
+  }
+  try {
+    const { type } = imageSize(buffer)
+    return {
+      jpg: 'image/jpeg',
+      png: 'image/png',
+      gif: 'image/gif',
+      svg: 'image/svg+xml',
+      webp: 'image/webp',
+      tiff: 'image/tiff',
+      j2c: 'image/jp2',
+      jp2: 'image/jp2',
+      ktx: 'image/ktx',
+      bmp: 'image/bmp',
+      tga: 'image/x-targa',
+      cur: 'image/x-win-bitmap',
+      icns: 'image/x-icon',
+      ico: 'image/x-icon',
+      pnm: 'image/x-portable-anymap',
+      dds: 'image/vnd-ms.dds',
+      psd: 'image/vnd.adobe.photoshop'
+    }[type]
+  } catch (err) {}
+  return null
+}

package/src/storage/Storage.js

@@ -18,6 +18,7 @@ export class Storage {
     this.name = config.name
     this.url = config.url
     this.path = config.path
+    this.concurrency = config.concurrency ?? null
     // The actual multer storage object.
     this.storage = null
   }
@@ -94,9 +95,9 @@ export class Storage {
     return storageFiles.map(storageFile => this.convertStorageFile(storageFile))
   }
 
-  async addFile(file, buffer) {
-    const storageFile = await this._addFile(file, buffer)
-    file.size = Buffer.byteLength(buffer)
+  async addFile(file, data) {
+    const storageFile = await this._addFile(file, data)
+    file.size = Buffer.byteLength(data)
     file.url = this._getFileUrl(storageFile)
     // TODO: Support `config.readImageSize`, but this can only be done onces
     // there are separate storage instances per model assets config!
@@ -146,7 +147,7 @@ export class Storage {
   _getFileUrl(_file) {}
 
   // @overridable
-  async _addFile(_file, _buffer) {}
+  async _addFile(_file, _data) {}
 
   // @overridable
   async _removeFile(_file) {}

package/src/utils/emitter.js

@@ -1,7 +1,8 @@
+import { mapConcurrently } from '@ditojs/utils'
+
 export function emitAsync(emitter, event, ...args) {
-  return Promise.all(
-    emitter.listeners(event).map(
-      listener => listener.call(emitter, ...args)
-    )
+  return mapConcurrently(
+    emitter.listeners(event),
+    listener => listener.call(emitter, ...args)
   )
 }