@ditojs/server 2.0.4 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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,9 +22,9 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.0.4",
+    "@ditojs/admin": "^2.0.5",
     "@ditojs/build": "^2.0.0",
-    "@ditojs/router": "^2.0.1",
+    "@ditojs/router": "^2.0.5",
     "@ditojs/utils": "^2.0.1",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
@@ -90,7 +90,7 @@
     "typescript": "^5.0.3"
   },
   "types": "types",
-  "gitHead": "e2236a6758c7716a20f8e9fc7c7787521782d6d4",
+  "gitHead": "ee7c025d76cf6a59825a407455d3b990e0f016ed",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/app/Application.js

@@ -13,7 +13,6 @@ import compress from 'koa-compress'
 import conditional from 'koa-conditional-get'
 import mount from 'koa-mount'
 import passport from 'koa-passport'
-import session from 'koa-session'
 import etag from 'koa-etag'
 import helmet from 'koa-helmet'
 import responseTime from 'koa-response-time'
@@ -24,7 +23,6 @@ import {
   hyphenate, clone, merge, parseDataPath, normalizeDataPath,
   toPromiseCallback, mapConcurrently
 } from '@ditojs/utils'
-import SessionStore from './SessionStore.js'
 import { Validator } from './Validator.js'
 import { EventEmitter } from '../lib/index.js'
 import { Controller, AdminController } from '../controllers/index.js'
@@ -45,6 +43,7 @@ import {
   findRoute,
   handleError,
   handleRoute,
+  handleSession,
   handleUser,
   logRequests
 } from '../middleware/index.js'
@@ -564,37 +563,7 @@ export class Application extends Koa {
     this.use(createTransaction())
     // 5. session
     if (app.session) {
-      const {
-        modelClass,
-        autoCommit = true,
-        ...options
-      } = getOptions(app.session)
-      if (modelClass) {
-        // Create a ContextStore that resolved the specified model class,
-        // uses it to persist and retrieve the session, and automatically
-        // binds all db operations to `ctx.transaction`, if it is set.
-        // eslint-disable-next-line new-cap
-        options.ContextStore = SessionStore(modelClass)
-      }
-      options.autoCommit = false
-      this.use(session(options, this))
-      this.use(async (ctx, next) => {
-        const { transacted } = ctx.route
-        try {
-          await next()
-          if (autoCommit && transacted) {
-            // When transacted, only commit when there are no errors. Otherwise,
-            // the commit will fail and the original error will be lost.
-            await ctx.session.commit()
-          }
-        } finally {
-          // When not transacted, keep the original behavior of always
-          // committing.
-          if (autoCommit && !transacted) {
-            await ctx.session.commit()
-          }
-        }
-      })
+      this.use(handleSession(this, getOptions(app.session)))
     }
     // 6. passport
     if (app.passport) {

package/src/controllers/AdminController.js

@@ -280,6 +280,8 @@ const coreDependencies = [
   'vue-router',
   'vue-upload-component',
   'tinycolor2',
+  'focus-trap',
+  'tabbable',
   'sortablejs',
   '@tiptap/*',
   'prosemirror-*',

package/src/middleware/handleSession.js

@@ -0,0 +1,74 @@
+import session from 'koa-session'
+import compose from 'koa-compose'
+import { isString } from '@ditojs/utils'
+
+export function handleSession(app, {
+  modelClass,
+  autoCommit = true,
+  ...options
+} = {}) {
+  if (modelClass) {
+    // Create a ContextStore that resolved the specified model class,
+    // uses it to persist and retrieve the session, and automatically
+    // binds all db operations to `ctx.transaction`, if it is set.
+    // eslint-disable-next-line new-cap
+    options.ContextStore = SessionStore(modelClass)
+  }
+  options.autoCommit = false
+  return compose([
+    session(options, app),
+    async (ctx, next) => {
+      // Get hold of `session` now, since it may not be available from the
+      // `ctx` if the session is destroyed.
+      const { session, route: { transacted } } = ctx
+      try {
+        await next()
+        if (autoCommit && transacted) {
+          // When transacted, only commit when there are no errors. Otherwise,
+          // the commit will fail and the original error will be lost.
+          await session.commit()
+        }
+      } finally {
+        // When not transacted, keep the original behavior of always
+        // committing.
+        if (autoCommit && !transacted) {
+          await session.commit()
+        }
+      }
+    }
+  ])
+}
+
+const SessionStore = modelClass => class SessionStore {
+  constructor(ctx) {
+    this.ctx = ctx
+    this.modelClass = isString(modelClass)
+      ? ctx.app.models[modelClass]
+      : modelClass
+    if (!this.modelClass) {
+      throw new Error(`Unable to find model class: '${modelClass}'`)
+    }
+  }
+
+  query() {
+    return this.modelClass.query(this.ctx.transaction)
+  }
+
+  async get(id) {
+    const session = await this.query().findById(id)
+    return session?.value || {}
+  }
+
+  async set(id, value) {
+    await this.query()
+      .findById(id)
+      .upsert({
+        ...this.modelClass.getReference(id),
+        value
+      })
+  }
+
+  async destroy(key) {
+    return this.query().deleteById(key)
+  }
+}

package/src/middleware/index.js

@@ -4,5 +4,6 @@ export * from './findRoute.js'
 export * from './handleConnectMiddleware.js'
 export * from './handleError.js'
 export * from './handleRoute.js'
+export * from './handleSession.js'
 export * from './handleUser.js'
 export * from './logRequests.js'

package/src/app/SessionStore.js

@@ -1,31 +0,0 @@
-export default modelName => class SessionStore {
-  constructor(ctx) {
-    this.ctx = ctx
-    this.modelClass = ctx.app.models[modelName]
-    if (!this.modelClass) {
-      throw new Error(`Unable to find model class: '${modelName}'`)
-    }
-  }
-
-  query() {
-    return this.modelClass.query(this.ctx.transaction)
-  }
-
-  async get(id) {
-    const session = await this.query().findById(id)
-    return session?.value || {}
-  }
-
-  async set(id, value) {
-    await this.query()
-      .findById(id)
-      .upsert({
-        ...this.modelClass.getReference(id),
-        value
-      })
-  }
-
-  async destroy(key) {
-    return this.query().deleteById(key)
-  }
-}