rimecms 0.30.2 → 0.31.0

package/README.md

@@ -76,44 +76,6 @@ The `rime init` command will automatically:
 - Install dependencies.
 - Push initial schema
 
-> [!NOTE]
-> Please check that these files have been properly configured:
-
-```ts
-// vite.config.ts
-import { defineConfig } from 'vite';
-import { sveltekit } from '@sveltejs/kit/vite';
-import { rime } from 'rimecms/vite';
-
-export default defineConfig({
-  plugins: [rime(), sveltekit()]
-});
-```
-
-```typescript
-// src/hooks.server.ts (should be created)
-import config from '$lib/+rime.generated/rime.config.server.js';
-import { handlers } from 'rimecms/server';
-import { sequence } from '@sveltejs/kit/hooks';
-
-export const handle = sequence(...(await handlers(config)));
-```
-
-```
-#.env
-BETTER_AUTH_SECRET=super_secret
-PUBLIC_RIME_URL=http://localhost:5173
-
-RIME_LOG_TO_FILE=true
-RIME_LOG_LEVEL=DEBUG
-
-# RIME_CACHE_ENABLED=false
-# RIME_SMTP_USER=user@mail.com
-# RIME_SMTP_PASSWORD=supersecret
-# RIME_SMTP_HOST=smtphost.com
-# RIME_SMTP_PORT=465
-```
-
 ### 3. Create the first admin user
 
 ```bash
@@ -129,7 +91,7 @@ curl -v POST http://localhost:5173/api/init \
 ## Configuration Example
 
 ```typescript
-// ./src/lib/+rime/rime.config.ts
+// ./src/lib/+rime/rime.config.server.ts
 import { rime, Collection, Area } from '$rime/config';
 import { adapterSqlite } from 'rimecms/adapter-sqlite';
 import { Settings2 } from '@lucide/svelte';
@@ -245,7 +207,7 @@ npx rime build
 npx rime build -d # to copy the database directory
 ```
 
-It's doing bascically `vite build` under the hood and create the polka server file inside an app directory, plus giving some info on how to run it.
+It's doing bascically `vite build` under the hood and create the server file inside an app directory, plus giving some info on how to run it.
 
 ## ROADMAP
 

package/dist/.rime-modules.d.ts

@@ -0,0 +1,23 @@
+declare module '$rime/modules/rimecms/core/plugins/sse' {
+  export * from 'rimecms/dist/core/plugins/sse/module.server.js';
+}
+
+declare module '$rime/modules/rimecms/core/plugins/cache' {
+  export * from 'rimecms/dist/core/plugins/cache/module.server.js';
+}
+
+declare module '$rime/modules/rimecms/core/plugins/mailer' {
+  export * from 'rimecms/dist/core/plugins/mailer/module.server.js';
+}
+
+declare module '$rime/modules/rimecms/core/plugins/api-init' {
+  export * from 'rimecms/dist/core/plugins/api-init/module.server.js';
+}
+
+declare module '$rime/modules/rimecms/fields/relation' {
+  export * from 'rimecms/dist/fields/relation/module.server.js';
+}
+
+declare module '$rime/modules/rimecms/fields/link' {
+  export * from 'rimecms/dist/fields/link/module.server.js';
+}

package/dist/.rime-modules.json

@@ -0,0 +1 @@
+{"core/plugins/sse":{"server":"core/plugins/sse/module.server.js"},"core/plugins/cache":{"client":"core/plugins/cache/module.js","server":"core/plugins/cache/module.server.js"},"core/plugins/mailer":{"server":"core/plugins/mailer/module.server.js"},"core/plugins/api-init":{"server":"core/plugins/api-init/module.server.js"},"fields/relation":{"client":"fields/relation/module.js","server":"fields/relation/module.server.js"},"fields/link":{"client":"fields/link/module.js","server":"fields/link/module.server.js"}}

package/dist/adapter-sqlite/generate-schema/column.server.js

@@ -66,10 +66,7 @@ export function toSchemaColumn(field, parentPath) {
     // reading it off the generic FormField base needs a narrow cast, same as
     // each field's own toSchema did today by typing against its concrete field.
     const { unique, required } = field.get;
-    // `dataType` is implemented by every leaf field builder but isn't declared
-    // on the FormFieldBuilder base (see the comment there) — narrow cast here.
-    const dataType = field.dataType;
-    const columnExpr = COLUMN_EXPR[dataType](snake);
+    const columnExpr = COLUMN_EXPR[field.dataType](snake);
     const referencesStr = field._references ? templateReferences(field._references) : '';
     const defaultValue = RESOLVE_DEFAULT[field.type]?.(field);
     const suffix = templateUniqueRequired({ unique, required }, defaultValue);

package/dist/adapter-sqlite/generate-schema/write.server.js

@@ -1,19 +1,19 @@
 import cache from '../../core/dev/cache/index.server.js';
 import { getPackageManager } from '../../core/dev/cli/util/package-manager.server.js';
+import { schemaPath } from '../../core/dev/constants.js';
 import { logger } from '../../core/logger/index.server.js';
 import fs from 'fs';
 import { spawnSync } from 'node:child_process';
 import path from 'node:path';
-const OUTPUT_DIR = '+rime.generated';
 const write = (schema) => {
     const cachedSchema = cache.get('schema');
     if (cachedSchema && cachedSchema === schema) {
         return;
     }
-    const outputPath = path.join('./src/lib', OUTPUT_DIR);
-    const outputFile = path.join(outputPath, 'schema.server.ts');
-    if (!fs.existsSync(outputPath)) {
-        fs.mkdirSync(outputPath);
+    const outputFile = schemaPath();
+    const outputDir = path.dirname(outputFile);
+    if (!fs.existsSync(outputDir)) {
+        fs.mkdirSync(outputDir, { recursive: true });
     }
     try {
         fs.writeFileSync(outputFile, schema);
@@ -30,20 +30,18 @@ const write = (schema) => {
         deno: 'npx'
     };
     const command = commandMap[pm];
-    logger.info('[✓] Schema: generated at src/lib/server/schema.ts');
-    console.log('============================================================');
+    logger.info(`[✓] Schema: generated at ${outputFile}`);
     console.log(`\n ⚡︎ ${command} drizzle-kit generate \n`);
     const generateResult = spawnSync(command, ['drizzle-kit', 'generate'], { stdio: 'inherit' });
     if (generateResult.error || generateResult.status !== 0) {
         throw new Error('drizzle-kit generate failed');
     }
-    console.log('\n============================================================');
     console.log(`\n ⚡︎ ${command} drizzle-kit migrate \n`);
     const migrateResult = spawnSync(command, ['drizzle-kit', 'migrate'], { stdio: 'inherit' });
     if (migrateResult.error || migrateResult.status !== 0) {
         throw new Error('drizzle-kit migrate failed');
     }
-    console.log('\n============================================================');
+    console.log('\n');
     // Only mark the schema as in sync once generate + migrate both actually
     // succeeded — otherwise a future run with an unchanged schema string would
     // skip re-running drizzle-kit and the DB would stay silently out of sync.

package/dist/core/areas/config/builder.server.d.ts

@@ -8,7 +8,6 @@ export declare const hook: {
     beforeUpsert: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "before">;
     beforeUpdate: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "update", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "update", "before">;
     beforeDelete: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "delete", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "delete", "before">;
-    afterRead: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "read", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "read", "after">;
     afterCreate: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "create", "after">;
     afterUpsert: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "after">;
     afterUpdate: <S extends import("../../types/doc").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "update", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "update", "after">;

package/dist/core/collections/auth/hooks/before-upsert/augment-fields-password.server.d.ts

@@ -3,4 +3,4 @@
  * add fields password and confirmPassword
  * to add validations
  */
-export declare const augmentFieldsPassword: import("../../../../operations/hooks/index.server.js").Hook<"auth", "update" | "create", "before">;
+export declare const augmentFieldsPassword: import("../../../../operations/hooks/index.server.js").Hook<"auth", "create" | "update", "before">;

package/dist/core/collections/config/builder.server.d.ts

@@ -8,7 +8,6 @@ export declare const hook: {
     beforeUpsert: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "before">;
     beforeUpdate: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "update", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "update", "before">;
     beforeDelete: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "delete", "before">) => import("../../operations/hooks/index.server.js").Hook<S, "delete", "before">;
-    afterRead: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "read", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "read", "after">;
     afterCreate: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "create", "after">;
     afterUpsert: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "create" | "update", "after">;
     afterUpdate: <S extends import("../../types/doc.js").DocType = "raw">(handler: import("../../operations/hooks/index.server.js").Hook<S, "update", "after">) => import("../../operations/hooks/index.server.js").Hook<S, "update", "after">;

package/dist/core/collections/upload/hooks/convert-base64.server.d.ts

@@ -10,4 +10,4 @@
  * @param args Hook arguments containing the document to process
  * @returns Updated args object with converted file data
  */
-export declare const castBase64ToFile: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;
+export declare const castBase64ToFile: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;

package/dist/core/collections/upload/hooks/extract-path.server.d.ts

@@ -3,4 +3,4 @@
  * the function normalize and validate path ({slug}_directories.id).
  * Then extract parent, name from the given path.
  */
-export declare const exctractPath: import("../../../operations/hooks/index.server.js").Hook<"directory", "update" | "create", "before">;
+export declare const exctractPath: import("../../../operations/hooks/index.server.js").Hook<"directory", "create" | "update", "before">;

package/dist/core/collections/upload/hooks/handle-path-creation.server.d.ts

@@ -3,4 +3,4 @@
  * the function get the document _path and check if it exists,
  * if it doesn't it create {upload_slug}_directories entries recursively
  */
-export declare const handlePathCreation: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;
+export declare const handlePathCreation: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;

package/dist/core/collections/upload/hooks/process-file-upload.server.d.ts

@@ -17,4 +17,4 @@
  *    - Cleans up image variations
  *    - Nullifies related document fields
  */
-export declare const processFileUpload: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;
+export declare const processFileUpload: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;

package/dist/core/config/auth/better-auth-hooks.server.js

@@ -74,7 +74,7 @@ const handleUserCreation = async (ctx) => {
     /**
      * Create the collection document
      */
-    const [error] = await trycatch(() => event.locals.rime
+    const [error, userData] = await trycatch(() => event.locals.rime
         .collection(ctx.body.type)
         .system(event.locals.isInit)
         .create({
@@ -89,7 +89,7 @@ const handleUserCreation = async (ctx) => {
         }
     }));
     // If error clean up session/account/user created
-    // Would be great to do it with the admin plugin,
+    // note: would be cleaner to do it with the admin plugin, not possible at the moment
     if (error) {
         console.log(error);
         logger.error(error.message);
@@ -105,6 +105,8 @@ const handleUserCreation = async (ctx) => {
         await rime.adapter.db.delete(authUsersTable).where(eq(authUsersTable.id, user.id));
         throw new APIError('BAD_REQUEST');
     }
+    // Return rime user data
+    return userData;
 };
 /****************************************************/
 /* Before Hooks
@@ -131,6 +133,7 @@ export const betterAuthAfterHook = createAuthMiddleware(async (ctx) => {
     }
     // Handle sign-up
     if (ctx.path.startsWith('/sign-up')) {
-        return await handleUserCreation(ctx);
+        await handleUserCreation(ctx);
+        return await getUserAttributes(ctx);
     }
 });

package/dist/core/config/auth/better-auth.server.d.ts

@@ -1,4 +1,4 @@
-import type { MailerActions } from '../../plugins/mailer/index.server.js';
+import type { MailerActions } from '../../plugins/mailer/module.server.js';
 import type { ConfigContext } from '../../rime.server.js';
 import type { Config } from '../../../types.js';
 export declare function getBaseAuthConfig<const C extends Config>(ctx: {
@@ -1752,13 +1752,13 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
                     $Infer: {
                         body: ({
                             permission: {
-                                readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                 readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                             };
                             permissions?: never | undefined;
                         } | {
                             permissions: {
-                                readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                 readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                             };
                             permission?: never | undefined;

package/dist/core/config/client/augment-plugins.d.ts

@@ -1,8 +1,4 @@
 import type { SanitizedConfigClient } from '../types.js';
 export declare const augmentPlugins: <const T extends SanitizedConfigClient>(config: T) => T & {
-    readonly plugins: (import("../../plugins/index.js").PluginClient | {
-        readonly name: "cache/client";
-        readonly type: "client";
-        readonly configure: <const C extends SanitizedConfigClient>(config: C) => C;
-    })[];
+    readonly plugins: any[];
 };

package/dist/core/config/client/augment-plugins.js

@@ -1,6 +1,6 @@
-import { cacheClient } from '../../plugins/cache/index.js';
+import { cache } from '../../plugins/cache/index.js';
 export const augmentPlugins = (config) => {
-    const plugins = [cacheClient(), ...(config.plugins || [])];
+    const plugins = [cache(), ...(config.plugins || [])];
     for (const plugin of plugins) {
         if ('configure' in plugin && typeof plugin.configure === 'function') {
             config = plugin.configure(config);
@@ -8,6 +8,6 @@ export const augmentPlugins = (config) => {
     }
     return {
         ...config,
-        plugins: plugins.filter((p) => p.type === 'client')
+        plugins
     };
 };

package/dist/core/config/client/build-config.d.ts

@@ -37,9 +37,5 @@ export declare const buildConfigClient: <C extends SanitizedConfigClient>(config
 } & {
     readonly collections: readonly import("../types.js").BuiltCollection[];
 } & {
-    readonly plugins: (import("../../plugins/index.js").PluginClient | {
-        readonly name: "cache/client";
-        readonly type: "client";
-        readonly configure: <const C_1 extends SanitizedConfigClient>(config: C_1) => C_1;
-    })[];
+    readonly plugins: any[];
 };

package/dist/core/config/config-context.server.d.ts

@@ -54,7 +54,7 @@ export declare function createConfigContext<const C extends Config>(config: Buil
     /**
      * Retrieves either an area or collection configuration by its slug
      */
-    getBySlug: (slug: string) => import("../../types.js").BuiltArea | import("../../types.js").BuiltCollection;
+    getBySlug: (slug: string) => import("../../types.js").BuiltCollection | import("../../types.js").BuiltArea;
     /**
      * Checks if a slug represents a collection
      */

package/dist/core/config/server/augment-plugins.server.d.ts

@@ -1,45 +1,5 @@
 import type { Config } from '../types.js';
+import type { Plugin } from '../../plugins/index.js';
 export declare const augmentPluginsServer: <const T extends Config>(config: T) => T & {
-    readonly $plugins: readonly [{
-        readonly name: "sse";
-        readonly type: "server";
-        readonly actions: {
-            readonly broadcast: (data: import("../../plugins/sse/types").ContentUpdatePayload) => void;
-        };
-        readonly routes: {
-            readonly '/api/sse': {
-                readonly GET: import("@sveltejs/kit").RequestHandler;
-            };
-        };
-    }, {
-        readonly name: "cache";
-        readonly type: "server";
-        readonly configure: <const C extends Config>(config: C) => C;
-        readonly routes: {
-            readonly '/api/clear-cache': {
-                readonly POST: () => Response;
-            };
-        };
-        readonly actions: import("../../plugins/cache/index.server.js").CacheActions;
-        readonly handler: import("@sveltejs/kit").Handle;
-    }, ...(import("../../plugins").Plugin | {
-        readonly name: "apiInit";
-        readonly type: "server";
-        readonly routes: {
-            readonly '/api/init': {
-                readonly POST: import("@sveltejs/kit").RequestHandler;
-            };
-        };
-    } | {
-        readonly name: "mailer";
-        readonly type: "server";
-        readonly actions: {
-            readonly sendMail: (args: {
-                to: string;
-                subject: string;
-                text: string;
-                html?: string;
-            }) => Promise<import("nodemailer/lib/smtp-transport").SentMessageInfo>;
-        };
-    })[]];
+    readonly $plugins: Plugin[];
 };

package/dist/core/config/server/augment-plugins.server.js

@@ -1,9 +1,8 @@
 import { dev } from '$app/environment';
-import { apiInit } from '../../plugins/api-init/index.server.js';
-import { cache } from '../../plugins/cache/index.server.js';
-import { mailer } from '../../plugins/mailer/index.server.js';
-import { sse } from '../../plugins/sse/index.server.js';
-// export type WithPluginsServer<T> = T & { $plugins: ReturnType<Plugin>[] };
+import { apiInit } from '../../plugins/api-init/index.js';
+import { cache } from '../../plugins/cache/index.js';
+import { mailer } from '../../plugins/mailer/index.js';
+import { sse } from '../../plugins/sse/index.js';
 export const augmentPluginsServer = (config) => {
     //
     const corePluginsServer = [
@@ -16,7 +15,13 @@ export const augmentPluginsServer = (config) => {
         // Mailer plugin
         ...(config.$smtp ? [mailer(config.$smtp)] : [])
     ];
-    const plugins = [...corePluginsServer, ...(config.$plugins || [])];
+    // Widened to Plugin[] on purpose: each factory's own `as const satisfies Plugin` return
+    // keeps a precise literal shape (no `handler` key at all on sse's, no `actions` on
+    // apiInit's, ...) — left as a tuple, downstream code reading `.handler`/`.actions` off
+    // the union fails to typecheck even though both are optional on Plugin. Doesn't affect
+    // build-config.server.ts's ExtractCustomPlugins/InferCorePlugins, which infer off the
+    // pre-augmentation config type, not this array.
+    const plugins = [...corePluginsServer, ...(config.plugins || [])];
     let configWithPlugins = config;
     for (const plugin of plugins) {
         if ('configure' in plugin && typeof plugin.configure === 'function') {