rimecms 0.23.15 → 0.23.16

package/dist/core/areas/config/augment-metas.d.ts

@@ -1,6 +1,6 @@
 import type { Area } from '../../../types.js';
 type Input = {
-    fields: Area<any>['fields'];
+    fields?: Area<any>['fields'];
 };
 /**
  * Add updatedAt createdAt editedBy fields

package/dist/core/areas/config/augment-metas.js

@@ -5,7 +5,7 @@ import { text } from '../../../fields/text/index.js';
  * to an Area
  */
 export const augmentMetas = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     fields.push(
     //
     text('editedBy').hidden(), date('createdAt').hidden(), date('updatedAt').hidden());

package/dist/core/areas/config/augment-title.d.ts

@@ -1,6 +1,6 @@
 import type { Area } from '../../../types.js';
 type Input = {
-    fields: Area<any>['fields'];
+    fields?: Area<any>['fields'];
 };
 type WithAsTitle<T> = T & {
     asTitle: string;

package/dist/core/areas/config/augment-url.d.ts

@@ -1,7 +1,7 @@
 import type { Area } from '../../../types.js';
 type Input = {
     $url?: Area<any>['$url'];
-    fields: Area<any>['fields'];
+    fields?: Area<any>['fields'];
 };
 /**
  * Add url field

package/dist/core/areas/config/augment-url.js

@@ -3,7 +3,7 @@ import { text } from '../../../fields/text/index.js';
  * Add url field
  */
 export const augmentUrl = (config) => {
-    let fields = [...config.fields];
+    let fields = [...(config.fields || [])];
     if (config.$url) {
         fields = [...fields, text('url').localized().hidden()];
     }

package/dist/core/areas/config/augment-versions.d.ts

@@ -2,7 +2,7 @@ import type { VersionsConfig } from '../../config/types.js';
 import type { Area } from '../../../types.js';
 type Input = {
     versions?: Area<any>['versions'];
-    fields: Area<any>['fields'];
+    fields?: Area<any>['fields'];
 };
 type WithVersionsConfig<T> = Omit<T, 'versions'> & {
     versions?: Required<VersionsConfig>;

package/dist/core/areas/config/augment-versions.js

@@ -4,7 +4,7 @@ import { text } from '../../../fields/text/index.js';
  * Normalize versions prop and add status field if config.versions.drat is true
  */
 export const augmentVersions = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     const { versions, ...rest } = config;
     let normalizedVersions;
     if (versions) {

package/dist/core/areas/config/builder.js

@@ -17,7 +17,7 @@ export const create = (slug, incomingConfig) => {
         kebab: toKebabCase(augmented.slug),
         icon: augmented.icon || FileText,
         label: augmented.label ? augmented.label : capitalize(area.slug),
-        fields: augmented.fields,
+        fields: augmented.fields || [],
         asTitle: augmented.asTitle,
         versions: augmented.versions,
         live: incomingConfig.live || false,

package/dist/core/areas/config/builder.server.js

@@ -17,6 +17,7 @@ export const create = (slug, incomingConfig) => {
     return {
         ...augmented,
         type: 'area',
+        fields: augmented.fields || [],
         slug: augmented.slug,
         kebab: toKebabCase(augmented.slug),
         $url: augmented.$url,

package/dist/core/collections/config/augment-auth.d.ts

@@ -2,7 +2,7 @@ import type { Collection, CollectionAuthConfig } from '../../config/types.js';
 type Input = {
     slug: string;
     auth?: boolean | CollectionAuthConfig;
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 export type WithNormalizedAuth<T> = Omit<T, 'auth'> & {
     auth?: CollectionAuthConfig;

package/dist/core/collections/config/augment-auth.js

@@ -68,7 +68,7 @@ export const augmentAuth = (config) => {
         // Add email field for non api key auth type.
         ...(!IS_API_AUTH ? [usersFields.email.clone()] : []),
         rolesField,
-        ...normalizedAuthConfig.fields,
+        ...(normalizedAuthConfig.fields || []),
         // Add apiKeyId for api key auth type.
         ...(IS_API_AUTH
             ? [

package/dist/core/collections/config/augment-auth.server.js

@@ -6,9 +6,10 @@ export const augmentAuthServer = (config) => {
     /**
      * For APIKeys auth collections,
      * register the staff ownerId as a reference
+     * this way APIKeys are always correlated to a staff member
      */
     function addSchemaStaffReferenceForAPIKeys() {
-        collection.fields.forEach((field) => {
+        (collection.fields || []).forEach((field) => {
             if (field instanceof FormFieldBuilder && field.name === 'ownerId') {
                 field = field.$generateSchema(() => `ownerId: text('onwer_id').references(() => staff.id, {onDelete: 'cascade'})`);
             }

package/dist/core/collections/config/augment-metas.d.ts

@@ -1,6 +1,6 @@
 import type { Collection } from '../../../types.js';
 type Input = {
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 /**
  * Add updatedAt createdAt editedBy fields

package/dist/core/collections/config/augment-metas.js

@@ -4,7 +4,7 @@ import { text } from '../../../fields/text/index.js';
  * Add updatedAt createdAt editedBy fields
  */
 export const augmentMetas = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     fields.push(
     //
     text('editedBy').hidden(), date('createdAt').hidden(), date('updatedAt').hidden());

package/dist/core/collections/config/augment-nested.d.ts

@@ -1,10 +1,12 @@
 import type { Collection } from '../../../types.js';
+type IncomingConfig = {
+    slug: string;
+    nested?: boolean;
+    fields?: Collection<any>['fields'];
+};
 /**
  * Add root table fields _parent and _position
  * for nested collection
  */
-export declare const augmentNested: <T extends {
-    slug: string;
-    nested?: boolean;
-    fields: Collection<any>["fields"];
-}>(config: T) => T;
+export declare const augmentNested: <T extends IncomingConfig>(config: T) => T;
+export {};

package/dist/core/collections/config/augment-nested.js

@@ -5,7 +5,7 @@ import { text } from '../../../fields/text/index.js';
  * for nested collection
  */
 export const augmentNested = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     if (config.nested) {
         const _parentField = text('_parent').hidden()._root();
         fields.push(_parentField);

package/dist/core/collections/config/augment-nested.server.d.ts

@@ -1,10 +1,12 @@
 import type { Collection } from '../../../types.js';
+type IncomingConfig = {
+    slug: string;
+    nested?: boolean;
+    fields?: Collection<any>['fields'];
+};
 /**
  * Add root table fields _parent and _position
  * for nested collection
  */
-export declare const augmentNestedServer: <T extends {
-    slug: string;
-    nested?: boolean;
-    fields: Collection<any>["fields"];
-}>(config: T) => T;
+export declare const augmentNestedServer: <T extends IncomingConfig>(config: T) => T;
+export {};

package/dist/core/collections/config/augment-nested.server.js

@@ -5,7 +5,7 @@ import { text } from '../../../fields/text/index.js';
  * for nested collection
  */
 export const augmentNestedServer = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     if (config.nested) {
         const _parentField = text('_parent')
             .$generateSchema(() => `_parent: text('_parent').references((): any => ${config.slug}.id, {onDelete: 'set null'})`)

package/dist/core/collections/config/augment-thumbnail.d.ts

@@ -3,7 +3,7 @@ import type { Collection } from '../../../types.js';
 type Input = {
     upload?: UploadConfig;
     auth?: false | CollectionAuthConfig;
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 type WithAsThumbnail<T> = T & {
     asThumbnail: string | null;

package/dist/core/collections/config/augment-title.d.ts

@@ -3,7 +3,7 @@ import type { Collection } from '../../../types.js';
 type Input = {
     upload?: UploadConfig;
     auth?: false | CollectionAuthConfig;
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 type WithAsTitle<T> = T & {
     asTitle: string;

package/dist/core/collections/config/augment-upload.js

@@ -27,10 +27,11 @@ export const augmentUpload = (config) => {
     if (!normalizedUploadConfig.upload)
         return normalizedUploadConfig;
     const { upload } = normalizedUploadConfig;
-    let fields = [...config.fields];
+    let fields = [...(config.fields || [])];
     if (upload) {
         // Add panel thumbnail size if not already present
-        const isPanelThumbnailInSizes = upload.imageSizes && upload.imageSizes.some((size) => size.name === 'thumbnail');
+        const isPanelThumbnailInSizes = upload.imageSizes &&
+            upload.imageSizes.some((size) => size.name === 'thumbnail');
         if (!isPanelThumbnailInSizes) {
             const thumbnailSize = { name: 'thumbnail', width: 400, compression: 60 };
             upload.imageSizes = [thumbnailSize, ...(upload.imageSizes || [])];

package/dist/core/collections/config/augment-upload.server.d.ts

@@ -1,7 +1,6 @@
 import type { Collection } from '../../config/types.js';
 import { type WithNormalizedUpload } from './augment-upload.js';
 /**
- * Normalize config.upload and imagesSizes
- * add corresponding fields with validation if config.upload.accept is defined
+ * Override _path field to add foreign key constraints
  */
 export declare const augmentUploadServer: <T extends Collection<any>>(config: T) => WithNormalizedUpload<T>;

package/dist/core/collections/config/augment-upload.server.js

@@ -2,12 +2,11 @@ import { FormFieldBuilder } from '../../fields/builders/form-field-builder.js';
 import { withDirectoriesSuffix } from '../../naming.js';
 import { augmentUpload } from './augment-upload.js';
 /**
- * Normalize config.upload and imagesSizes
- * add corresponding fields with validation if config.upload.accept is defined
+ * Override _path field to add foreign key constraints
  */
 export const augmentUploadServer = (config) => {
     const collection = augmentUpload(config);
-    collection.fields.forEach((field) => {
+    (collection.fields || []).forEach((field) => {
         if (field instanceof FormFieldBuilder && field.name === '_path') {
             field = field.$generateSchema(() => `_path: text('_path').references(() => ${withDirectoriesSuffix(config.slug)}.id, {onDelete: 'cascade', onUpdate: 'cascade'})`);
         }

package/dist/core/collections/config/augment-url.d.ts

@@ -1,7 +1,7 @@
 import type { Collection } from '../../../types.js';
 type Input = {
     $url?: Collection<any>['$url'];
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 /**
  * Add url field

package/dist/core/collections/config/augment-url.js

@@ -3,7 +3,7 @@ import { text } from '../../../fields/text/index.js';
  * Add url field
  */
 export const augmentUrl = (config) => {
-    let fields = [...config.fields];
+    let fields = [...(config.fields || [])];
     if (config.$url) {
         fields = [...fields, text('url').localized().hidden()];
     }

package/dist/core/collections/config/augment-versions.d.ts

@@ -2,7 +2,7 @@ import type { VersionsConfig } from '../../config/types.js';
 import type { Collection } from '../../../types.js';
 type Input = {
     versions?: Collection<any>['versions'];
-    fields: Collection<any>['fields'];
+    fields?: Collection<any>['fields'];
 };
 type WithVersionsConfig<T> = Omit<T, 'versions'> & {
     versions?: Required<VersionsConfig>;

package/dist/core/collections/config/augment-versions.js

@@ -4,7 +4,7 @@ import { text } from '../../../fields/text/index.js';
  * Normalize versions prop and add status field if config.versions.draft is true
  */
 export const augmentVersions = (config) => {
-    const fields = [...config.fields];
+    const fields = [...(config.fields || [])];
     const { versions, ...rest } = config;
     let normalizedVersions;
     if (versions) {

package/dist/core/collections/config/builder.js

@@ -31,7 +31,7 @@ export const create = (slug, incomingConfig) => {
         auth: augmented.auth,
         nested: augmented.nested,
         upload: augmented.upload,
-        fields: augmented.fields,
+        fields: augmented.fields || [],
         asTitle: augmented.asTitle,
         asThumbnail: augmented.asThumbnail,
         versions: augmented.versions,

package/dist/core/collections/config/builder.server.js

@@ -27,6 +27,7 @@ export const create = (slug, incomingConfig) => {
     const augmented = augmentThumbnail(withTitle);
     return {
         ...augmented,
+        fields: augmented.fields || [],
         $url: augmented.$url,
         slug: augmented.slug,
         kebab: toKebabCase(augmented.slug),

package/dist/core/config/shared/find-thumbnail.d.ts

@@ -5,5 +5,5 @@ interface ThumbnailFieldResult {
     field: FormFieldBuilder<FormField>;
     path: string;
 }
-export declare function findThumbnailField(fields: FieldBuilder<Field>[], basePath?: string): ThumbnailFieldResult | null;
+export declare function findThumbnailField(fields?: FieldBuilder<Field>[], basePath?: string): ThumbnailFieldResult | null;
 export {};

package/dist/core/config/shared/find-thumbnail.js

@@ -2,7 +2,7 @@ import { FormFieldBuilder } from '../../fields/builders/form-field-builder.js';
 import { isGroupField } from '../../../fields/group/index.js';
 import { RelationFieldBuilder } from '../../../fields/relation';
 import { TabsBuilder } from '../../../fields/tabs/index.js';
-export function findThumbnailField(fields, basePath = '') {
+export function findThumbnailField(fields = [], basePath = '') {
     for (const field of fields) {
         // Direct check for isThumbnail
         if (field instanceof RelationFieldBuilder &&

package/dist/core/config/shared/find-title.d.ts

@@ -10,5 +10,5 @@ interface TitleFieldResult {
     field: FormFieldBuilder<FormField>;
     path: string;
 }
-export declare function findTitleField(fields: FieldBuilder<Field>[], basePath?: string): TitleFieldResult | null;
+export declare function findTitleField(fields?: FieldBuilder<Field>[], basePath?: string): TitleFieldResult | null;
 export {};

package/dist/core/config/shared/find-title.js

@@ -2,7 +2,7 @@ import { FormFieldBuilder } from '../../fields/builders/form-field-builder.js';
 import { isGroupField } from '../../../fields/group/index.js';
 import { TabsBuilder } from '../../../fields/tabs/index.js';
 export const hasMaybeTitle = (field) => ['text', 'date', 'slug', 'email'].includes(field.type);
-export function findTitleField(fields, basePath = '') {
+export function findTitleField(fields = [], basePath = '') {
     for (const field of fields) {
         // Direct check for isTitle
         if (field instanceof FormFieldBuilder &&

package/dist/core/config/shared/get-staff-collection.d.ts

@@ -1,8 +1,22 @@
 import type { CollectionWithoutSlug } from '../../collections/config/types.js';
-import type { AdditionalStaffConfig, CollectionAuthConfig } from '../types.js';
-export declare const staffCollection: CollectionWithoutSlug<'staff'> & {
-    auth: CollectionAuthConfig;
-};
-export declare const getStaffCollection: ({ roles: incomingRoles, fields, access, panel, label }?: AdditionalStaffConfig) => CollectionWithoutSlug<"staff"> & {
-    auth: CollectionAuthConfig;
+import type { Field } from '../../../types.js';
+import type { Access, AdditionalStaffConfig } from '../types.js';
+import type { FieldBuilder } from '../../fields/builders/field-builder.js';
+export declare const staffCollection: {
+    label: {
+        singular: string;
+        plural: string;
+    };
+    panel: {
+        description: string;
+        group: string;
+    };
+    auth: {
+        type: string;
+        roles: string[];
+    };
+    icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+    fields: FieldBuilder<Field>[];
+    access: Access;
 };
+export declare const getStaffCollection: ({ roles: incomingRoles, fields, access, panel, label }?: AdditionalStaffConfig) => CollectionWithoutSlug<"staff">;

package/dist/core/config/shared/get-staff-collection.js

@@ -20,7 +20,7 @@ export const staffCollection = {
         update: (user, { id }) => access.isAdminOrMe(user, id)
     }
 };
-export const getStaffCollection = ({ roles: incomingRoles = [], fields, access, panel, label } = {}) => {
+export const getStaffCollection = ({ roles: incomingRoles = [], fields = [], access, panel, label } = {}) => {
     const staffConfig = cloneDeep(staffCollection);
     let roles = incomingRoles.map((role) => typeof role === 'string' ? { value: role } : role);
     if (roles) {

package/dist/core/config/shared/upload-directories.js

@@ -44,6 +44,7 @@ export function makeUploadDirectoriesCollections(config) {
                     beforeCreate: [exctractPath]
                 },
                 asTitle: 'path',
+                asThumbnail: collection.asThumbnail,
                 panel: false,
                 _generateTypes: false,
                 _generateSchema: false

package/dist/core/config/shared/versions-alias.server.js

@@ -24,6 +24,7 @@ export function makeVersionsCollectionsAliases(config) {
                 label: collection.label,
                 type: collection.type,
                 asTitle: collection.asTitle,
+                asThumbnail: collection.asThumbnail,
                 icon: collection.icon,
                 panel: false,
                 _generateTypes: false,
@@ -41,6 +42,7 @@ export function makeVersionsCollectionsAliases(config) {
                 versions: undefined,
                 access: area.access,
                 asTitle: area.asTitle,
+                asThumbnail: null,
                 $hooks: area.$hooks,
                 fields: area.fields,
                 type: 'collection',

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

@@ -177,7 +177,7 @@ export type PrototypePanelConfig = {
 type PrototypeConfig<S extends string = string> = {
     slug: S;
     /** Document fields definition */
-    fields: FieldBuilder<Field>[];
+    fields?: FieldBuilder<Field>[];
     /** Optional icon */
     icon?: Component<IconProps>;
     /** Enable document versions */
@@ -275,6 +275,8 @@ export type ImageSizesConfig = {
 export type BuiltCollection = Omit<Collection<string>, 'icon' | 'versions' | 'upload' | 'auth'> & {
     slug: CollectionSlug;
     type: 'collection';
+    /** Make fields mandatory */
+    fields: FieldBuilder<Field>[];
     /** The kebab-case version of the slug for urls */
     kebab: string;
     label: CollectionLabel;
@@ -293,12 +295,13 @@ export type BuiltAreaClient = Omit<BuiltArea, '$url' | '$hooks'>;
 export type BuiltArea = Omit<Area<string>, 'versions'> & {
     slug: AreaSlug;
     type: 'area';
+    /** Make fields mandatory */
+    fields: FieldBuilder<Field>[];
     /** The kebab-case version of the slug for urls */
     kebab: string;
     label: string;
     asTitle: string;
     versions?: Required<VersionsConfig>;
-    fields: FieldBuilder<Field>[];
     icon: Component<IconProps>;
     access: WithRequired<Access, 'create' | 'read' | 'update' | 'delete'>;
     _generateTypes?: false;

package/dist/fields/rich-text/core/features/link/index.js

@@ -5,9 +5,9 @@ import LinkSelector from './component/link-selector.svelte';
 const linkExtension = import.meta.env.SSR
     ? undefined
     : Link.extend({
+        // @ts-expect-error @tiptap error
         addOptions() {
             return {
-                // @ts-expect-error @tiptap error
                 ...this.parent?.(),
                 types: []
             };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rimecms",
-	"version": "0.23.15",
+	"version": "0.23.16",
 	"homepage": "https://github.com/bienbiendev/rime",
 	"scripts": {
 		"dev": "vite dev",