rimecms 0.27.6 → 0.28.0

package/dist/core/i18n/fr/common.d.ts

@@ -58,6 +58,7 @@ declare namespace _default {
     export let version_created: string;
     export let versions_history: string;
     export let versions: string;
+    export let view_all: string;
     export let view_page: string;
     export let view_site: string;
     export let welcome: string;

package/dist/core/i18n/fr/common.js

@@ -61,6 +61,7 @@ export default {
   version_created: 'Nouvelle version créée',
   versions_history: 'Historique des versions',
   versions: 'Versions',
+  view_all: 'Voir tout',
   view_page: 'Voir la page',
   view_site: 'Voir le site',
   welcome: 'Bienvenue',

package/dist/core/operations/hooks/before-read/populate-url.server.js

@@ -1,5 +1,7 @@
+import { PARAMS } from '../../../constant.js';
 import { logger } from '../../../logger/index.server.js';
 import { getValueAtPath } from '../../../../util/object.js';
+import validate from '../../../../util/validate.js';
 import { Hooks } from '../index.server.js';
 /**
  * Hook to populate _children property on document from a nested collection
@@ -25,6 +27,11 @@ export const populateURL = Hooks.beforeRead(async (args) => {
             logger.error(`Error while generating url of ${config.slug} with id: ${args.doc.id}, ${err.message}`);
             return args;
         }
+        const isValidURL = validate.url(url);
+        if (typeof isValidURL === 'string') {
+            logger.warn(`Invalid URL generated for ${config.slug} with id: ${args.doc.id}, url: ${url}`);
+            return args;
+        }
         const match = url.match(/\[\.\.\.parent\.(\w+(?:\.\w+)*)\]/);
         if (match) {
             const fullMatch = match[0];
@@ -91,8 +98,9 @@ export const populateURL = Hooks.beforeRead(async (args) => {
         }
         // Add the live url if needed
         if (config.live && event.locals.user && url) {
-            args.doc._live = `${process.env.PUBLIC_RIME_URL}/live?src=${url}&slug=${config.slug}&id=${args.doc.id}`;
-            args.doc._live += locale ? `&locale=${locale}` : '';
+            args.doc._live = `${process.env.PUBLIC_RIME_URL}/panel/live-edit?src=${url}&slug=${config.slug}&id=${args.doc.id}`;
+            args.doc._live += args.doc.versionId ? `&${PARAMS.VERSION_ID}=${args.doc.versionId}` : '';
+            args.doc._live += locale ? `&${PARAMS.LOCALE}=${locale}` : '';
         }
     }
     return args;

package/dist/core/operations/hooks/before-upsert/handle-new-version.server.js

@@ -1,4 +1,4 @@
-import { filePathToFile } from '../../../collections/upload/util/converter.js';
+import { filePathToFile } from '../../../collections/upload/util/converter.server.js';
 import { VersionOperations } from '../../../collections/versions/operations.js';
 import { VERSIONS_STATUS } from '../../../constant.js';
 import { RimeError } from '../../../errors/index.js';
@@ -84,7 +84,7 @@ async function prepareDataForNewVersion(args) {
         original: originalDoc,
         configMap: originalConfigMap,
         ignore: ['status'],
-        mode: 'required'
+        mode: 'all'
     });
     // Set default status to "draft" if no data.status
     if (!data.status) {

package/dist/core/operations/relations/diff.server.d.ts

@@ -1,4 +1,4 @@
-import type { BeforeOperationRelation } from '../../../adapter-sqlite/relations.js';
+import type { BeforeOperationRelation } from '../../../adapter-sqlite/relations.server.js';
 import type { Relation } from '../../../fields/relation/index.js';
 export type RelationDiff = {
     toAdd: BeforeOperationRelation[];

package/dist/core/operations/relations/extract.server.d.ts

@@ -1,4 +1,4 @@
-import type { BeforeOperationRelation } from '../../../adapter-sqlite/relations.js';
+import type { BeforeOperationRelation } from '../../../adapter-sqlite/relations.server.js';
 import type { Dic } from '../../../util/types.js';
 import type { ConfigMap } from '../configMap/types.js';
 type Args = {

package/dist/core/rime.server.d.ts

@@ -76,7 +76,14 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                             appName: string;
                             baseURL: string;
                             trustedOrigins: string[];
-                            isTrustedOrigin: (url: string, settings?: {
+                            isTrustedOrigin: (url: string, settings
+                            /**
+                             * Get a collection api
+                             * @example
+                             *
+                             * rime.collection('pages').find({ query: 'where[isHome][equals]=true' })
+                             */
+                            ?: {
                                 allowRelativePaths: boolean;
                             }) => boolean;
                             oauthConfig: {
@@ -1149,7 +1156,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                         $Infer: {
                             body: {
                                 userId: string;
-                                role: "user" | "staff" | "admin" | ("user" | "staff" | "admin")[];
+                                role: "user" | "admin" | "staff" | ("user" | "admin" | "staff")[];
                             };
                         };
                     };
@@ -1229,7 +1236,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                                 email: string;
                                 password?: string | undefined;
                                 name: string;
-                                role?: "user" | "staff" | "admin" | ("user" | "staff" | "admin")[] | undefined;
+                                role?: "user" | "admin" | "staff" | ("user" | "admin" | "staff")[] | undefined;
                                 data?: Record<string, any> | undefined;
                             };
                         };
@@ -1773,7 +1780,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                                 permission?: never | undefined;
                             }) & {
                                 userId?: string | undefined;
-                                role?: "user" | "staff" | "admin" | undefined;
+                                role?: "user" | "admin" | "staff" | undefined;
                             };
                         };
                     };
@@ -2082,7 +2089,14 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                                 appName: string;
                                 baseURL: string;
                                 trustedOrigins: string[];
-                                isTrustedOrigin: (url: string, settings?: {
+                                isTrustedOrigin: (url: string, settings
+                                /**
+                                 * Get a collection api
+                                 * @example
+                                 *
+                                 * rime.collection('pages').find({ query: 'where[isHome][equals]=true' })
+                                 */
+                                ?: {
                                     allowRelativePaths: boolean;
                                 }) => boolean;
                                 oauthConfig: {
@@ -3155,7 +3169,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                             $Infer: {
                                 body: {
                                     userId: string;
-                                    role: "user" | "staff" | "admin" | ("user" | "staff" | "admin")[];
+                                    role: "user" | "admin" | "staff" | ("user" | "admin" | "staff")[];
                                 };
                             };
                         };
@@ -3235,7 +3249,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                                     email: string;
                                     password?: string | undefined;
                                     name: string;
-                                    role?: "user" | "staff" | "admin" | ("user" | "staff" | "admin")[] | undefined;
+                                    role?: "user" | "admin" | "staff" | ("user" | "admin" | "staff")[] | undefined;
                                     data?: Record<string, any> | undefined;
                                 };
                             };
@@ -3779,7 +3793,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                                     permission?: never | undefined;
                                 }) & {
                                     userId?: string | undefined;
-                                    role?: "user" | "staff" | "admin" | undefined;
+                                    role?: "user" | "admin" | "staff" | undefined;
                                 };
                             };
                         };

package/dist/core/rime.server.js

@@ -1,15 +1,15 @@
 // import type { Adapter } from '../adapter-sqlite/index.server.js';
 import { dev } from '$app/environment';
-import devCache from './dev/cache/index.js';
+import devCache from './dev/cache/index.server.js';
 import { betterAuth } from 'better-auth';
 import { AreaAPI } from './areas/local-api.server.js';
 import { CollectionAPI } from './collections/local-api.server.js';
 import { getBaseAuthConfig } from './config/auth/better-auth.server.js';
 import { createConfigContext } from './config/config-context.server.js';
-import validate from './config/server/validate.js';
-import writeMemo from './config/server/write.js';
-import generateRoutes from './dev/generate/routes/index.js';
-import generateTypes from './dev/generate/types/index.js';
+import validate from './config/server/validate.server.js';
+import writeMemo from './config/server/write.server.js';
+import generateRoutes from './dev/generate/routes/index.server.js';
+import generateTypes from './dev/generate/types/index.server.js';
 import { RimeError } from './errors/index.js';
 import i18n from './i18n/index.js';
 import { registerTranslation } from './i18n/register.server.js';

package/dist/fields/blocks/component/Block.svelte

@@ -91,33 +91,27 @@
   </div>
 </div>
 
-<style>/**************************************/
-
-/* Font */
-
-/**************************************/
-
-.rz-block {
+<style>.rz-block {
     --rz-fields-padding: var(--rz-size-5);
     position: relative;
     border: var(--rz-border);
     border-radius: var(--rz-radius-sm);
   }
 
-.rz-block__grip {
+  .rz-block__grip {
     cursor: grab;
   }
 
-.rz-block:hover > :global(.rz-block__content > .rz-block__header > .rz-block-actions) {
+  .rz-block:hover > :global(.rz-block__content > .rz-block__header > .rz-block-actions) {
     opacity: 1;
     pointer-events: all;
   }
 
-.rz-block__content {
+  .rz-block__content {
     background-color: var(--rz-collapse-fields-content-bg);
   }
 
-.rz-block__header {
+  .rz-block__header {
     display: flex;
     position: relative;
     align-items: center;
@@ -129,14 +123,14 @@
     background-color: hsl(var(--rz-row-bg));
   }
 
-.rz-block__title-button {
+  .rz-block__title-button {
     flex: 1;
     justify-content: flex-start;
     flex-direction: row;
     padding: var(--rz-size-3);
   }
 
-.rz-block__content--closed {
+  .rz-block__content--closed {
     border-radius: var(--rz-radius-md);
     .rz-block__header {
       border-color: transparent;
@@ -157,7 +151,7 @@
     }
   }
 
-.rz-block__title {
+  .rz-block__title {
     display: flex;
     height: var(--rz-size-6);
     align-items: center;
@@ -167,25 +161,25 @@
     font-size: var(--rz-text-xs);
   }
 
-.rz-block__heading {
+  .rz-block__heading {
     font-variation-settings: 'wght' 500;
     font-weight: 500;
   }
 
-.rz-block__fields {
+  .rz-block__fields {
     flex: 1;
     padding: var(--rz-size-6) 0;
   }
 
-.rz-block__fields--hidden {
+  .rz-block__fields--hidden {
     display: none;
   }
 
-.rz-block[data-sorting='true'] .rz-block__grip {
+  .rz-block[data-sorting='true'] .rz-block__grip {
     display: none;
   }
 
-:global(.rz-block-actions) {
+  :global(.rz-block-actions) {
     position: absolute;
     opacity: 0;
     pointer-events: none;

package/dist/fields/blocks/component/Blocks.svelte

@@ -131,30 +131,24 @@
   </div>
 </fieldset>
 
-<style>/**************************************/
-
-/* Font */
-
-/**************************************/
-
-.rz-blocks__title {
+<style>.rz-blocks__title {
     font-variation-settings: 'wght' 500;
     font-weight: 500;
   }
 
-sup {
+  sup {
     font-size: var(--rz-text-2xs);
     text-transform: uppercase;
   }
 
-.rz-blocks__actions {
+  .rz-blocks__actions {
     /* translate: 0 calc(-1 * var(--rz-size-2)); */
     display: flex;
     align-items: end;
     gap: var(--rz-size-2);
   }
 
-.rz-blocks__list {
+  .rz-blocks__list {
     display: grid;
     gap: var(--rz-size-4);
 
@@ -163,13 +157,12 @@ sup {
     }
   }
 
-.rz-blocks__header {
+  .rz-blocks__header {
     display: flex;
     justify-content: space-between;
     margin-bottom: var(--rz-size-4);
   }
-
-.rz-blocks__actions-bottom {
+  .rz-blocks__actions-bottom {
     display: flex;
     gap: var(--rz-size-3);
     padding-right: var(--rz-size-3);

package/dist/fields/group/component/Group.svelte

@@ -91,19 +91,13 @@
   {/if}
 </div>
 
-<style>/**************************************/
-
-/* Font */
-
-/**************************************/
-
-:root {
+<style>:root {
     --rz-group-trigger-bg: hsl(var(--rz-row-bg));
     --rz-group-preview-bg: light-dark(hsl(var(--rz-gray-16)), hsl(var(--rz-gray-3)));
     --rz-group-content-bg: var(--rz-collapse-fields-content-bg);
   }
 
-.rz-group-field__wrapper {
+  .rz-group-field__wrapper {
     border: var(--rz-border);
     border-radius: var(--rz-radius-md);
     background-color: var(--rz-group-trigger-bg);
@@ -114,18 +108,18 @@
     }
   }
 
-.rz-group-field__wrapper--hidden {
+  .rz-group-field__wrapper--hidden {
     display: none;
   }
 
-.rz-group-field__content {
+  .rz-group-field__content {
     --rz-fields-padding: var(--rz-size-5);
     padding-top: var(--rz-fields-padding);
     padding-bottom: var(--rz-fields-padding);
     background-color: var(--rz-group-content-bg);
   }
 
-.rz-group-field__trigger {
+  .rz-group-field__trigger {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -149,8 +143,7 @@
       rotate: -180deg;
     }
   }
-
-.rz-group-field__trigger--live {
+  .rz-group-field__trigger--live {
     font-size: var(--rz-text-md);
   }
 </style>

package/dist/fields/number/component/number.css

@@ -76,6 +76,7 @@
 }
 
 /* Chrome, Safari, Edge, Opera */
+
 .rz-number__input::-webkit-outer-spin-button,
 .rz-number__input::-webkit-inner-spin-button {
   -webkit-appearance: none;
@@ -83,6 +84,7 @@
 }
 
 /* Firefox */
+
 .rz-number__input[type='number'] {
   -webkit-appearance: textfield;
           appearance: textfield;

package/dist/fields/relation/component/default/Default.svelte

@@ -155,13 +155,7 @@
   {/if}
 </div>
 
-<style>/**************************************/
-
-/* Font */
-
-/**************************************/
-
-.rz-relation {
+<style>.rz-relation {
     position: relative;
 
     :global {

package/dist/fields/relation/component/upload/upload.css

@@ -24,11 +24,10 @@
   flex-wrap: wrap;
   gap: var(--rz-size-4);
 }
-
 .rz-relation-upload__list:not(.rz-relation-upload__list[data-many]) {
   @container relation-upload-list (min-width: 285px) {
     .rz-card-resource {
-      width: min(400px, 100%);
+      width: min(310px, 100%);
       .rz-card-resource__info {
         display: block;
       }
@@ -41,7 +40,6 @@
     }
   }
 }
-
 .rz-relation-upload__actions {
   display: flex;
   margin-top: var(--rz-size-3);
@@ -58,7 +56,6 @@
 .rz-relation-upload__actions.rz-relation-upload__actions--list-empty {
   margin-top: 0;
 }
-
 .rz-relation-upload__search {
   height: var(--rz-size-10);
   align-items: center;
@@ -67,30 +64,25 @@
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .rz-relation-upload__command-list {
   padding: var(--rz-size-2);
 }
-
 .rz-relation-upload__command-item[aria-selected='true'] {
   /* background-color: hsl(var(--rz-gray-5)); */
   background-color: var(--rz-popover-high-light-bg);
 }
-
 .rz-relation-upload__grid-item {
   display: flex;
   gap: var(--rz-size-4);
   padding-left: var(--rz-size-1);
   padding-right: var(--rz-size-1);
 }
-
 .rz-relation-upload__grid-thumbnail {
   width: var(--rz-size-16);
   height: var(--rz-size-16);
   overflow: hidden;
   border-radius: var(--rz-radius-lg);
 }
-
 .rz-relation-upload__grid-filename {
   margin-top: var(--rz-size-2);
   display: -webkit-box;
@@ -102,7 +94,6 @@
   font-variation-settings: 'wght' 600;
   font-weight: 600;
 }
-
 .rz-relation-upload__grid-filesize,
 .rz-relation-upload__grid-mimetype {
   text-align: left;

package/dist/fields/relation/index.d.ts

@@ -1,6 +1,6 @@
 import { FormFieldBuilder } from '../../core/fields/builders/form-field-builder.js';
 import type { CollectionSlug, GenericDoc } from '../../core/types/doc.js';
-import type { DefaultValueFn, Field, FieldHookShared, FormField } from '../types.js';
+import type { DefaultValueFn, Field, FieldHookShared, FormField, RelationRef, RelationValue } from '../types.js';
 import type { RegisterCollection } from '../../index.js';
 import type { WithOptional } from '../../util/types';
 export declare const ensureRelationExists: FieldHookShared;
@@ -38,6 +38,14 @@ export declare const isRelationField: (field: Field) => field is RelationField;
  * isRelationResolved({ title: 'Home Page', _prototype: 'collection', _type: 'pages' });
  */
 export declare const isRelationResolved: <T>(value: any) => value is T;
+/**
+ * Checks if a relation value is a reference (contains only the relationTo and documentId).
+ *
+ * @example
+ * // Returns true for a relation reference
+ * isRelationRef({ relationTo: 'pages', documentId: '123' });
+ */
+export declare const isRelationRef: (value: unknown) => value is RelationRef;
 /**
  * Checks if a relation value is unresolved (contains only reference information).
  *
@@ -47,14 +55,21 @@ export declare const isRelationResolved: <T>(value: any) => value is T;
  */
 export declare const isRelationUnresolved: (value: any) => value is Omit<Relation, "path" | "position" | "ownerId">;
 /**
- * Resolves a relation by fetching the referenced document.
- * If the relation is already resolved, returns it as is.
+ * Resolves a relation reference to the actual document it points to.
+ *
+ * @example
+ * // Resolves a relation reference to the actual document
+ * const doc = await resolveRelationRef({ relationTo: 'pages', documentId: '123' });
+ */
+export declare function resolveRelationRef<T>(item: T | RelationRef | string): Promise<T>;
+/**
+ * Resolves a relation field value to the actual documents it points to.
  *
  * @example
- * // Resolves a relation to its full document
- * const page = await resolveRelation({ relationTo: 'pages', documentId: '123' });
+ * // Resolves a relation value to the actual documents
+ * const docs = await resolveRelation([{ relationTo: 'pages', documentId: '123' }]);
  */
-export declare const resolveRelation: <T>(value: any) => Promise<T>;
+export declare function resolveRelation<T>(value: RelationValue<T> | null | undefined): Promise<T[] | null | undefined>;
 /****************************************************/
 export type RelationField<Doc extends GenericDoc = GenericDoc> = FormField & {
     type: 'relation';

package/dist/fields/relation/index.js

@@ -102,6 +102,17 @@ export const isRelationField = (field) => field.type === 'relation';
 export const isRelationResolved = (value) => {
     return value && isObjectLiteral(value) && hasProps(['title', '_prototype', '_type'], value);
 };
+/**
+ * Checks if a relation value is a reference (contains only the relationTo and documentId).
+ *
+ * @example
+ * // Returns true for a relation reference
+ * isRelationRef({ relationTo: 'pages', documentId: '123' });
+ */
+export const isRelationRef = (value) => typeof value === 'object' &&
+    value !== null &&
+    typeof value.relationTo === 'string' &&
+    typeof value.documentId === 'string';
 /**
  * Checks if a relation value is unresolved (contains only reference information).
  *
@@ -113,18 +124,37 @@ export const isRelationUnresolved = (value) => {
     return value && isObjectLiteral(value) && hasProps(['relationTo', 'documentId'], value);
 };
 /**
- * Resolves a relation by fetching the referenced document.
- * If the relation is already resolved, returns it as is.
+ * Resolves a relation reference to the actual document it points to.
  *
  * @example
- * // Resolves a relation to its full document
- * const page = await resolveRelation({ relationTo: 'pages', documentId: '123' });
+ * // Resolves a relation reference to the actual document
+ * const doc = await resolveRelationRef({ relationTo: 'pages', documentId: '123' });
  */
-export const resolveRelation = async (value) => {
-    if (isRelationResolved(value)) {
-        return value;
+export async function resolveRelationRef(item) {
+    if (isRelationRef(item)) {
+        return fetch(`api/${item.relationTo}/${item.documentId}`)
+            .then((r) => r.json())
+            .then((r) => r.doc);
     }
-    return (await fetch(`api/${value.relationTo}/${value.documentId}`)
-        .then((r) => r.json())
-        .then((r) => r.doc));
-};
+    if (typeof item === 'string') {
+        throw new Error(`Cannot resolve relation from a bare id ("${item}") — missing "relationTo". ` +
+            `resolveRelationRef only works on populated docs or { relationTo, documentId } objects.`);
+    }
+    if (isRelationResolved(item)) {
+        return item;
+    }
+    throw new Error(`Unrecognized relation shape: ${JSON.stringify(item)}`);
+}
+/**
+ * Resolves a relation field value to the actual documents it points to.
+ *
+ * @example
+ * // Resolves a relation value to the actual documents
+ * const docs = await resolveRelation([{ relationTo: 'pages', documentId: '123' }]);
+ */
+export async function resolveRelation(value) {
+    if (value === null || value === undefined)
+        return value;
+    const items = Array.isArray(value) ? value : [value];
+    return Promise.all(items.map((item) => resolveRelationRef(item)));
+}

package/dist/fields/rich-text/component/RichText.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import { Field } from '../../../panel/components/fields/index.js';
   import { root } from '../../../panel/components/fields/root.svelte.js';
+  import { random } from '../../../util/index.js';
   import { Editor, type JSONContent } from '@tiptap/core';
   import { onMount } from 'svelte';
   import { buildEditorConfig } from '../core/build-editor-config.js';
@@ -22,10 +23,9 @@
   let editor = $state<Editor>();
   let features = $state<RichTextFeature[]>([]);
   const field = $derived(form.useField<JSONContent>(path, config));
+  const instanceId = random.randomId(8);
 
-  $effect(() => {
-    setRichTextContext(path);
-  });
+  const ctx = setRichTextContext(instanceId);
 
   const withSuggestion = $derived(hasSuggestion(config.features || defaultFeatures));
 
@@ -82,7 +82,7 @@
       {/if}
 
       {#key key}
-        <EditorBubbleMenu {features} {editor} {path} />
+        <EditorBubbleMenu {features} {editor} {path} context={ctx} />
       {/key}
     {/if}
   </div>