@ditojs/server 2.0.2 → 2.0.4

package/package.json

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

package/src/app/Application.js

@@ -566,6 +566,7 @@ export class Application extends Koa {
     if (app.session) {
       const {
         modelClass,
+        autoCommit = true,
         ...options
       } = getOptions(app.session)
       if (modelClass) {
@@ -575,7 +576,25 @@ export class Application extends Koa {
         // 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()
+          }
+        }
+      })
     }
     // 6. passport
     if (app.passport) {

package/src/controllers/AdminController.js

@@ -273,13 +273,14 @@ const coreDependencies = [
 
   'vue',
   '@vue/*',
+  '@vueuse/*',
   '@lk77/vue3-color',
   '@kyvg/vue3-notification',
-  'vue-draggable-plus',
   'vue-multiselect',
   'vue-router',
   'vue-upload-component',
   'tinycolor2',
+  'sortablejs',
   '@tiptap/*',
   'prosemirror-*',
   'linkifyjs',