@ditojs/server 2.100.0 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.100.0",
+  "version": "3.1.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/main/packages/server",
@@ -10,11 +10,10 @@
   "types": "./types/index.d.ts",
   "files": [
     "src/",
-    "types/"
+    "types/",
+    "!src/**/*.test.js",
+    "!src/**/__snapshots__/"
   ],
-  "scripts": {
-    "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
-  },
   "bin": {
     "dito": "./src/cli/index.js"
   },
@@ -25,14 +24,13 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.100.0",
-    "@ditojs/build": "^2.100.0",
-    "@ditojs/router": "^2.100.0",
-    "@ditojs/utils": "^2.100.0",
+    "@ditojs/admin": "^3.1.0",
+    "@ditojs/build": "^3.1.0",
+    "@ditojs/router": "^3.1.0",
+    "@ditojs/utils": "^3.1.0",
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/multer": "^4.0.0",
-    "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "bcryptjs": "^3.0.3",
@@ -62,7 +60,7 @@
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.7",
-    "pino": "^10.3.1",
+    "pino": "^10.4.0",
     "pino-pretty": "^13.1.3",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
@@ -76,19 +74,20 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.1145.0",
-    "@aws-sdk/lib-storage": "^3.1145.0",
+    "@aws-sdk/client-s3": "^3.1146.0",
+    "@aws-sdk/lib-storage": "^3.1146.0",
     "@types/koa-bodyparser": "^4.3.13",
     "@types/koa-compress": "^4.0.7",
+    "@types/koa-mount": "^4.0.5",
     "@types/koa-response-time": "^2.1.5",
-    "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.1",
     "@types/koa__multer": "^2.0.8",
+    "@types/multer-s3": "^3.0.3",
     "@types/node": "^26.6.4",
     "knex": "^3.3.0",
     "objection": "^3.1.5",
     "typescript": "^6.0.3"
   },
-  "gitHead": "c6fdbe03971188779fc9cf5f1b4202e08bc75a65"
+  "gitHead": "97314265c5cbac6a248d7350f43fea8ea92b995f"
 }

package/src/controllers/AdminController.js

@@ -3,7 +3,6 @@ import Koa from 'koa'
 import serve from 'koa-static'
 import { defineConfig, createServer } from 'vite'
 import createVuePlugin from '@vitejs/plugin-vue'
-import { viteCommonjs as createCommonJsPlugin } from '@originjs/vite-plugin-commonjs'
 import { testModuleIdentifier, getPostCssConfig } from '@ditojs/build'
 import { assignDeeply } from '@ditojs/utils'
 import { Controller } from './Controller.js'
@@ -178,7 +177,6 @@ export class AdminController extends Controller {
           configFile: false,
           plugins: [
             createVuePlugin(),
-            createCommonJsPlugin(),
             {
               // Private plugin to inject script tag above main module that
               // loads the `dito` object through its own end-point, see:
@@ -250,8 +248,7 @@ export class AdminController extends Controller {
                       'prosemirror-view'
                     ]
                   : ditoPackages
-              ),
-              ...nonEsmDependencies
+              )
             ]
           },
           resolve: {
@@ -279,12 +276,6 @@ const ditoPackages = [
   '@ditojs/utils'
 ]
 
-const nonEsmDependencies = [
-  // All non-es modules need to be explicitly included here, and some of
-  // them only work due to the use of `createCommonJsPlugin()`.
-  '@lk77/vue3-color'
-]
-
 const coreDependencies = [
   ...ditoPackages,
 
@@ -296,12 +287,11 @@ const coreDependencies = [
   'vue',
   '@vue/*',
   '@vueuse/*',
-  '@lk77/vue3-color',
+  'vue-color',
   '@kyvg/vue3-notification',
   'vue-multiselect',
   'vue-router',
   'vue-upload-component',
-  'tinycolor2',
   'focus-trap',
   'tabbable',
   'sortablejs',
@@ -314,8 +304,6 @@ const coreDependencies = [
   'nanoid',
   'punycode',
   'rope-sequence',
-  'filesize',
-  'filesize-parser',
   'tslib', // ?
   'orderedmap',
   'w3c-keyname'

package/src/models/Model.js

@@ -16,7 +16,9 @@ import {
   setValueAtDataPath,
   mapConcurrently,
   assignDeeply,
-  deprecate
+  deprecate,
+  formatPlainDate,
+  parsePlainDate
 } from '@ditojs/utils'
 import { QueryBuilder } from '../query/index.js'
 import { EventEmitter, KnexHelper } from '../lib/index.js'
@@ -443,10 +445,21 @@ export class Model extends objection.Model {
   static get dateAttributes() {
     return this._getCached(
       'jsonSchema:dateAttributes',
+      () =>
+        this.getAttributes(
+          ({ type, computed }) => !computed && type === 'date'
+        ),
+      []
+    )
+  }
+
+  static get datetimeAttributes() {
+    return this._getCached(
+      'jsonSchema:datetimeAttributes',
       () =>
         this.getAttributes(
           ({ type, computed }) => (
-            !computed && ['date', 'datetime', 'timestamp'].includes(type)
+            !computed && ['datetime', 'timestamp'].includes(type)
           )
         ),
       []
@@ -590,12 +603,20 @@ export class Model extends objection.Model {
   // @override
   $formatDatabaseJson(json) {
     const { constructor } = this
-    for (const key of constructor.dateAttributes) {
+    for (const key of constructor.datetimeAttributes) {
       const date = json[key]
       if (date?.toISOString) {
         json[key] = date.toISOString()
       }
     }
+    for (const key of constructor.dateAttributes) {
+      const date = json[key]
+      if (date?.toISOString) {
+        // Store dates as their plain date, as the database ignores the
+        // time zone when casting a timestamp to a date.
+        json[key] = formatPlainDate(date)
+      }
+    }
     if (constructor.isSQLite()) {
       // SQLite does not support boolean natively and needs conversion...
       for (const key of constructor.booleanAttributes) {
@@ -636,10 +657,17 @@ export class Model extends objection.Model {
   // @override
   $parseJson(json, { trusted = false } = {}) {
     const { constructor } = this
-    for (const key of constructor.dateAttributes) {
+    for (const key of [
+      ...constructor.dateAttributes,
+      ...constructor.datetimeAttributes
+    ]) {
       const date = json[key]
       if (date !== undefined) {
-        json[key] = isString(date) ? new Date(date) : date
+        // Parse plain dates like `2026-05-14` as local midnight, which is
+        // also how Postgres reads them for timestamps.
+        json[key] = isString(date)
+          ? parsePlainDate(date) ?? new Date(date)
+          : date
       }
     }
     // Convert plain asset files objects to AssetFile instances with references
@@ -652,13 +680,21 @@ export class Model extends objection.Model {
 
   // @override
   $formatJson(json) {
+    const { constructor } = this
     // Remove hidden attributes.
-    for (const key of this.constructor.hiddenAttributes) {
+    for (const key of constructor.hiddenAttributes) {
       delete json[key]
     }
+    // Return dates as their plain date, see `$formatDatabaseJson()`.
+    for (const key of constructor.dateAttributes) {
+      const date = json[key]
+      if (date?.toISOString) {
+        json[key] = formatPlainDate(date)
+      }
+    }
     // Sign asset files so clients can send them back with valid signatures.
     // Clone file objects to avoid mutating the model's internals.
-    this.constructor._signAssetFiles(json)
+    constructor._signAssetFiles(json)
     return json
   }