@ditojs/server 2.51.1 → 2.52.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.51.1",
+  "version": "2.52.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",
@@ -26,10 +26,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.51.0",
-    "@ditojs/build": "^2.51.0",
-    "@ditojs/router": "^2.51.0",
-    "@ditojs/utils": "^2.51.0",
+    "@ditojs/admin": "^2.52.0",
+    "@ditojs/build": "^2.52.0",
+    "@ditojs/router": "^2.52.0",
+    "@ditojs/utils": "^2.52.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -90,5 +90,5 @@
     "objection": "^3.1.5",
     "typescript": "^5.8.3"
   },
-  "gitHead": "b9faeb3c676bb792da67a028fa7de3bbdbc85de4"
+  "gitHead": "dbfde6b475d824a88fbbbc1e007fd264e80d46fb"
 }

package/src/app/Application.js

@@ -64,6 +64,7 @@ export class Application extends Koa {
   #logger
 
   constructor({
+    basePath = process.cwd(),
     config = {},
     validator,
     router,
@@ -74,6 +75,7 @@ export class Application extends Koa {
     controllers
   } = {}) {
     super()
+    this.basePath = basePath
     this._configureEmitter(events)
     const {
       // Pluck keys out of `config.app` to keep them secret
@@ -430,9 +432,8 @@ export class Application extends Koa {
   }
 
   async loadAdminViteConfig() {
-    const cwd = process.cwd()
     for (const extension of ['js', 'mjs', 'cjs', 'ts']) {
-      const file = path.join(cwd, `admin.vite.config.${extension}`)
+      const file = path.join(this.basePath, `admin.vite.config.${extension}`)
       try {
         await fs.access(file)
         return (await import(file)).default

package/src/cli/db/createMigration.js

@@ -21,9 +21,8 @@ const defaultValues = {
   'now()': `knex.raw('CURRENT_TIMESTAMP')`
 }
 
-const migrationDir = path.join(process.cwd(), 'migrations')
-
 export async function createMigration(app, name, ...modelNames) {
+  const migrationDir = path.join(app.basePath, 'migrations')
   const models = modelNames.map(modelName => {
     const modelClass = app.models[modelName]
     if (!modelClass) {

package/src/cli/db/seed.js

@@ -6,7 +6,7 @@ import pluralize from 'pluralize'
 import { isFunction, isArray, camelize } from '@ditojs/utils'
 
 export async function seed(app) {
-  const seedDir = path.join(process.cwd(), 'seeds')
+  const seedDir = path.join(app.basePath, 'seeds')
   const files = await fs.readdir(seedDir)
   const seeds = []
   // Create a lookup table with sort indices per model name.

package/src/controllers/AdminController.js

@@ -164,7 +164,6 @@ export class AdminController extends Controller {
   defineViteConfig(config = {}) {
     const isDevelopment = this.mode === 'development'
 
-    const cwd = process.cwd()
     const root = this.getPath('root')
     const base = `${this.url}/`
     const views = path.join(root, 'views')
@@ -205,10 +204,10 @@ export class AdminController extends Controller {
                 chunkSizeWarningLimit: 1000,
                 rollupOptions: {
                   output: {
-                    manualChunks(id) {
+                    manualChunks: id => {
                       if (id.startsWith(views)) {
                         return 'views'
-                      } else if (id.startsWith(cwd)) {
+                      } else if (id.startsWith(this.app.basePath)) {
                         return 'common'
                       } else {
                         const module = id.match(

package/src/controllers/ControllerAction.js

@@ -1,11 +1,5 @@
-import {
-  isString,
-  isObject,
-  asArray,
-  clone,
-  convertToJson,
-  deprecate
-} from '@ditojs/utils'
+import { isString, isObject, asArray, clone, deprecate } from '@ditojs/utils'
+import { convertModelsToJson } from '../utils/model.js'
 
 export default class ControllerAction {
   constructor(
@@ -126,11 +120,11 @@ export default class ControllerAction {
     await this.controller.emitHook(`before:${identifier}`, false, ctx, ...args)
     const response = await this.callHandler(ctx, ...args)
     const result =
-      // Don't convert response to JSON if it isn't being validated (e.g. useful
-      // for streams or buffers), or if the response contains model references.
+      // Don't convert response to JSON if it isn't being validated, or if the
+      // response validation schema contains model references.
       !this.response.validate || this.response.hasModelRefs
         ? response
-        : convertToJson(response)
+        : convertModelsToJson(response)
     return this.validateResponse(
       await this.controller.emitHook(`after:${identifier}`, true, ctx, result)
     )

package/src/storage/Storage.js

@@ -136,7 +136,7 @@ export class Storage {
 
   _getPath(...parts) {
     return this.path
-      ? path.join(this.path, ...parts)
+      ? path.resolve(this.app.basePath, this.path, ...parts)
       : undefined // So that it doesn't show up in JSON data.
   }
 

package/src/utils/model.js

@@ -0,0 +1,35 @@
+import { isPlainObject, isPlainArray } from '@ditojs/utils'
+
+/**
+ * Converts Models to their external representation by calling the `$toJson()`
+ * method. It does not create a JSON string, but a plain object. It is necessary
+ * to do this before the validation is performed, otherwise different properties
+ * might end up in the Json response. This is done recursively, so that nested
+ * models are also converted. Streams, Buffers and other non plain objects are
+ * left as-is, so this can directly be used on any results.
+ */
+export function convertModelsToJson(value) {
+  return value?.$isObjectionModel
+    ? value.$toJson()
+    : isPlainObject(value)
+      ? convertToJsonObject(value)
+      : isPlainArray(value)
+        ? convertToJsonArray(value)
+        : value
+}
+
+function convertToJsonObject(value) {
+  const object = {}
+  for (const key of Object.keys(value)) {
+    object[key] = convertModelsToJson(value[key])
+  }
+  return object
+}
+
+function convertToJsonArray(value) {
+  const array = new Array(value.length)
+  for (let i = 0, l = value.length; i < l; ++i) {
+    array[i] = convertModelsToJson(value[i])
+  }
+  return array
+}

package/types/index.d.ts

@@ -352,6 +352,7 @@ interface AsyncRequestLocals {
 
 export class Application<$Models extends Models = Models> {
   constructor(options: {
+    basePath?: string
     config?: ApplicationConfig
     validator?: Validator
     // TODO: router types