maxibase 1.0.0 → 1.0.1

package/README.md

@@ -63,7 +63,7 @@ Each build is tagged `{utc-timestamp}-{commit}` and the last 5 stay on the serve
 Roll back with `pnpm rollback` (the version before the live one), `pnpm rollback {tag}`, or
 list what is available with `pnpm rollback --list`. Rolling back does not undo migrations.
 
-Push your migration through SSH with `pnpm db:push-server`.
+Push your migration through SSH with `pnpm db:push-prod`.
 
 In a project that uses the layer, these scripts run from the package, see [Scripts](#scripts).
 
@@ -204,8 +204,9 @@ The tables of the `auth` schema ship with the layer, in `layers/base/server/data
 Your `server/database/schema.ts` re-exports them and adds your own tables, so `pnpm update maxibase`
 brings their changes: run `pnpm db:generate` after an update. To customise one, copy it into your
 schema, a table declared in your file takes precedence over the package's one with the same name.
-Their relations come from `authRelations`, merged after yours in `db.ts`, so only define relations
-on your own tables.
+Their relations come from `authRelations` in `layers/base/server/database/relations.ts`. To add a
+relation to one of these tables, define the table in your `relations.ts`: your entry replaces the
+layer's for that table, so repeat the layer's relations you still need there.
 
 `db.ts`, `relations.ts` and `access.ts` in `server/database` are optional, the layer has a default
 for each in `layers/base/server/database/defaults`: no relations of your own, and file access to
@@ -229,7 +230,7 @@ A project's `package.json` looks like this. Add any package your own files impor
     "db:seed": "npx jiti ./server/database/seed.ts",
     "db:generate": "drizzle-kit generate",
     "db:push": "drizzle-kit push",
-    "db:push-server": "bash node_modules/maxibase/scripts/db/push-server.sh",
+    "db:push-prod": "bash node_modules/maxibase/scripts/db/push-server.sh",
     "db:restore": "bash node_modules/maxibase/scripts/db/restore.sh",
     "db:migrate": "npx jiti node_modules/maxibase/scripts/db/migrate.ts",
     "db:studio": "drizzle-kit studio",

package/docker/compose.yaml

@@ -5,8 +5,8 @@ services:
     env_file:
       - .env
     volumes:
-      - ./volumes/files/public:/app/${NUXT_FILES_PUBLIC_FOLDER:-files}
-      - ./volumes/files/private:/app/${NUXT_FILES_PRIVATE_FOLDER:-files}
+      - ./volumes/files/public:/app/${NUXT_FILES_PUBLIC_FOLDER:-files/public}
+      - ./volumes/files/private:/app/${NUXT_FILES_PRIVATE_FOLDER:-files/private}
       - ./volumes/backups:/app/backups
     ports:
       - ${SERVER_PORT:-3000}:3000

package/layers/base/server/database/defaults/db.ts

@@ -2,4 +2,12 @@ import { drizzle } from 'drizzle-orm/node-postgres'
 import { relations } from '#database/relations'
 import { authRelations } from '../relations'
 
-export const db = drizzle(useRuntimeConfig().db, { relations: { ...relations, ...authRelations } })
+// defineRelations gives every table an entry, empty ones included: only the project's tables
+// with relations override the layer's, so an empty entry never erases them
+const own = Object.fromEntries(
+  Object.entries(relations).filter(([, table]) => Object.keys(table.relations).length),
+)
+
+export const db = drizzle(useRuntimeConfig().db, {
+  relations: { ...relations, ...authRelations, ...own } as typeof relations & typeof authRelations,
+})

package/layers/base/server/database/relations.ts

@@ -2,7 +2,7 @@ import * as schema from '#server/database/schema'
 import { defineRelationsPart } from 'drizzle-orm'
 
 // Built from the project schema, so they also apply to a table the project overrides.
-// Spread after the project's relations, so they replace any the project defines on these tables.
+// A project entry for one of these tables replaces the layer's, see defaults/db.ts.
 export const authRelations = defineRelationsPart(schema, (r) => ({
   auth: {
     refreshTokens: r.many.refreshTokens({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxibase",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Nuxt layer with auth, files, logs and backups",
   "keywords": [
     "nuxt",
@@ -44,7 +44,7 @@
     "db:seed": "npx jiti ./server/database/seed.ts",
     "db:generate": "drizzle-kit generate",
     "db:push": "drizzle-kit push",
-    "db:push-server": "./scripts/db/push-server.sh",
+    "db:push-prod": "./scripts/db/push-server.sh",
     "db:restore": "./scripts/db/restore.sh",
     "db:migrate": "npx jiti ./scripts/db/migrate.ts",
     "db:studio": "drizzle-kit studio",