rimecms 0.32.0 → 0.33.0

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

@@ -39,7 +39,7 @@ const RESOLVE_DEFAULT = {
     checkbox: (f) => f.get.defaultValue ?? false,
     toggle: (f) => ensureBoolean(f.get.defaultValue) ?? false,
     number: (f) => ensureNumber(f.get.defaultValue) ?? 0,
-    date: (f) => ensureDate(f.get.defaultValue)?.getTime() ?? 0,
+    date: (f) => ensureDate(f.get.defaultValue) ?? new Date(0),
     link: (f) => ensureObject(f.get.defaultValue) ?? {},
     richText: (f) => ensureObject(f.get.defaultValue) ?? {},
     relation: () => ({}),

package/dist/adapter-sqlite/generate-schema/templates.server.d.ts

@@ -129,15 +129,17 @@ export declare const templateRelations: (tree: Record<string, string[]>, referen
 }[]) => string;
 /** Templates Field Relations */
 /**
- * Generates a foreign key column for a relation field
- * Creates a reference to another table's primary key with cascade delete
+ * The junction column pointing at one target collection. The property is keyed by the slug, which
+ * is how the adapter reads it back; the SQL column and the referenced table carry the table name.
  *
- * @example
- * ```typescript
+ * ```ts
+ * // 'medias'
  * mediasId: text('medias_id').references(() => medias.id, { onDelete: 'cascade' })
+ * // 'eventsCategories'
+ * eventsCategoriesId: text('events_categories_id').references(() => events_categories.id, { onDelete: 'cascade' })
  * ```
  */
-export declare const templateFieldRelationColumn: (table: string) => string;
+export declare const templateFieldRelationColumn: (slug: string) => string;
 /**
  * Generates a junction table for many-to-many relationships
  * Creates a table with references to the owner table and related tables

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

@@ -147,9 +147,19 @@ export const ${declaredTableProperty(table.slug)} = sqliteTable('${baseTableName
  */
 export const templateUniqueRequired = (field, defaultValue) => {
     const { unique, required } = field;
-    const defaultStr = required && defaultValue !== undefined ? `.default(${JSON.stringify(defaultValue)})` : '';
+    const defaultStr = required && defaultValue !== undefined ? `.default(${templateDefault(defaultValue)})` : '';
     return `${unique ? '.unique()' : ''}${required ? `.notNull()${defaultStr}` : ''}`;
 };
+/**
+ * A default value as drizzle wants it written. A timestamp column takes a `Date`, which
+ * drizzle-kit stores as the same integer a number would have been.
+ *
+ * ```ts
+ * templateDefault('')            // ""
+ * templateDefault(new Date(0))   // new Date(0)
+ * ```
+ */
+const templateDefault = (value) => value instanceof Date ? `new Date(${value.getTime()})` : JSON.stringify(value);
 /** Template rows Relation */
 /**
  * The whole schema's relations, in one declaration.
@@ -208,16 +218,19 @@ ${entries.join(',\n')}
 };
 /** Templates Field Relations */
 /**
- * Generates a foreign key column for a relation field
- * Creates a reference to another table's primary key with cascade delete
+ * The junction column pointing at one target collection. The property is keyed by the slug, which
+ * is how the adapter reads it back; the SQL column and the referenced table carry the table name.
  *
- * @example
- * ```typescript
+ * ```ts
+ * // 'medias'
  * mediasId: text('medias_id').references(() => medias.id, { onDelete: 'cascade' })
+ * // 'eventsCategories'
+ * eventsCategoriesId: text('events_categories_id').references(() => events_categories.id, { onDelete: 'cascade' })
  * ```
  */
-export const templateFieldRelationColumn = (table) => {
-    return `${table}Id:  text('${s(table)}_id').references(() => ${table}.id, { onDelete: 'cascade' })`;
+export const templateFieldRelationColumn = (slug) => {
+    const table = baseTableName(slug);
+    return `${slug}Id: text('${table}_id').references(() => ${table}.id, { onDelete: 'cascade' })`;
 };
 /**
  * Generates a junction table for many-to-many relationships

package/dist/core/config/types.d.ts

@@ -10,6 +10,7 @@ import type { Adapter } from '../adapter.js';
 import type { Hook, HookBeforeOperation } from '../pipeline/types.js';
 import type { Plugin } from '../plugins/index.js';
 import type { SMTPConfig } from '../plugins/mailer/index.server.js';
+import type { SSEConfig } from '../plugins/sse/types.js';
 import type { Field } from '../../fields/types.js';
 import type { RegisterArea, RegisterCollection } from '../../index.js';
 import type { DashboardEntry } from '../../panel/pages/dashboard/types.js';
@@ -85,6 +86,15 @@ export interface Config {
     $cache?: CacheConfig;
     /** SMTP config */
     $smtp?: SMTPConfig;
+    /**
+     * The event stream at `/api/sse`: which keys a caller may listen to.
+     *
+     * @example
+     * ```typescript
+     * $sse: { access: (key, user) => key.startsWith('public:') || (key === `user:${user?.id}`) }
+     * ```
+     */
+    $sse?: SSEConfig;
     /** Custom API routes
      * @example
      * routes: {

package/dist/core/dev/vite.server.js

@@ -23,7 +23,12 @@ export function regenerateModulesDeclaration() {
     })
         .filter((block) => block !== null)
         .join('\n\n');
-    writeFileSync(path.resolve(process.cwd(), 'src/rime.modules.generated.d.ts'), `${blocks}\n`);
+    // Nothing to declare, no file.
+    const file = path.resolve(process.cwd(), 'src/rime.modules.generated.d.ts');
+    if (blocks)
+        writeFileSync(file, `${blocks}\n`);
+    else
+        rmSync(file, { force: true });
 }
 export function rime() {
     /** Two reserved names, always resolved to *the currently running app's* generated

package/dist/core/plugins/defaults/module.server.js

@@ -5,8 +5,8 @@ import { mailer } from '../mailer/index.server.js';
 import { sse } from '../sse/index.server.js';
 /** The plugins rime adds to every config, server half. Two of the four are conditional. */
 export const defaultPlugins = (config) => [
-    // Server Sent Events
-    sse(),
+    // The event stream, `$sse` says which keys an app opens
+    sse(config.$sse),
     // Cache plugin, with default isEnabled: event => !event.locals.user
     cache(config.$cache || {}),
     // Init endpoint, dev only

package/dist/core/plugins/defaults/types.d.ts

@@ -1,18 +1,20 @@
 import type { RouteConfig } from '../../config/types.js';
 import type { CacheConfig } from '../cache/types.js';
 import type { SMTPConfig } from '../mailer/index.server.js';
+import type { SSEConfig } from '../sse/types.js';
 import type { Plugin } from '../index.js';
 /**
  * What the plugin step reads off a config.
  *
  * Both halves of `defaultPlugins` take this rather than `Config` or `SanitizedConfigClient`: the
- * step runs on both sides, and naming either one there would pin it to a side. `$cache` and
- * `$smtp` are what the server half branches on; a client build reads neither, and still takes the
- * argument so the two halves are the same function.
+ * step runs on both sides, and naming either one there would pin it to a side. `$cache`, `$smtp`
+ * and `$sse` are what the server half reads; a client build reads none of them, and still takes
+ * the argument so the two halves are the same function.
  */
 export type PluginHost = {
     plugins?: Plugin[];
     $routes?: Record<string, RouteConfig>;
     $cache?: CacheConfig;
     $smtp?: SMTPConfig;
+    $sse?: SSEConfig;
 };

package/dist/core/plugins/sse/index.d.ts

@@ -7,4 +7,4 @@
  * - The client's handler is called with that event.
  */
 export { openSse } from './client.js';
-export type { SSEAccess, SSEEvent, SSEHandler } from './types.js';
+export type { SSEAccess, SSEConfig, SSEEvent, SSEHandler } from './types.js';

package/dist/core/plugins/sse/index.server.d.ts

@@ -1,7 +1,7 @@
 import { emit } from './bus.server.js';
-import type { SSEAccess } from './types.js';
+import type { SSEConfig } from './types.js';
 /**
- * The event stream, at `/api/sse`.
+ * The event stream, at `/api/sse`. Added to every config, configured by its `$sse` key.
  *
  * Send with `rime.sse.emit(key, event, payload)`, listen with `openSse(keys, handler)`.
  *
@@ -9,11 +9,10 @@ import type { SSEAccess } from './types.js';
  * otherwise, so an app opens its own deliberately rather than by leaving a default alone.
  *
  * @example
- * sse({ access: (key) => key.startsWith('public:') })
+ * // rime.config.server.ts
+ * $sse: { access: (key) => key.startsWith('public:') }
  */
-export declare const sse: (options?: {
-    access?: SSEAccess;
-}) => {
+export declare const sse: (options?: SSEConfig) => {
     readonly name: "sse";
     readonly actions: {
         readonly emit: (key: string, event: string, payload?: Record<string, any>) => void;

package/dist/core/plugins/sse/index.server.js

@@ -1,7 +1,7 @@
 import { definePlugin } from '../index.js';
 import { connect, emit } from './bus.server.js';
 /**
- * The event stream, at `/api/sse`.
+ * The event stream, at `/api/sse`. Added to every config, configured by its `$sse` key.
  *
  * Send with `rime.sse.emit(key, event, payload)`, listen with `openSse(keys, handler)`.
  *
@@ -9,7 +9,8 @@ import { connect, emit } from './bus.server.js';
  * otherwise, so an app opens its own deliberately rather than by leaving a default alone.
  *
  * @example
- * sse({ access: (key) => key.startsWith('public:') })
+ * // rime.config.server.ts
+ * $sse: { access: (key) => key.startsWith('public:') }
  */
 export const sse = definePlugin((options) => ({
     name: 'sse',

package/dist/core/plugins/sse/types.d.ts

@@ -14,3 +14,8 @@ export type SSEHandler = (event: SSEEvent) => void | Promise<void>;
  * point of naming keys up front rather than filtering in the browser.
  */
 export type SSEAccess = (key: string, user?: User) => boolean;
+/** The `$sse` key of the config. */
+export type SSEConfig = {
+    /** Which keys, besides the panel's own, a caller may listen to. None without it. */
+    access?: SSEAccess;
+};

package/dist/types.d.ts

@@ -13,6 +13,7 @@ export type { Link } from './fields/link/types.js';
 export type { WithRelationPopulated } from './core/fields/types.js';
 export type { RouteHandlers } from './core/routes/handler.server.js';
 export type { Plugin } from './core/plugins/index.js';
+export type { SSEAccess, SSEConfig } from './core/plugins/sse/types.js';
 export type { Rime, RimeContext } from './core/rime.server.js';
 export type { BlocksFieldBlockRenderTitle } from './fields/blocks/index.js';
 export type { RichTextFeature, RichTextFeatureMark, RichTextFeatureNode } from './fields/rich-text/core/types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimecms",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "homepage": "https://github.com/bienbiendev/rime",
   "packageManager": "bun@1.3.0",
   "scripts": {