rimecms 0.29.0 → 0.30.1

package/dist/core/collections/auth/fields.d.ts

@@ -1,190 +1,10 @@
-declare const emailField: {
-    _metaUrl: string;
-    layout(layout: "compact" | "default"): /*elided*/ any;
-    readonly component: import("svelte").Component<import("../../../fields/email/component/props").EmailFieldProps, {}, "">;
-    unique(bool?: boolean): /*elided*/ any;
-    defaultValue(value: string | import("../../../types").DefaultValueFn<string>): /*elided*/ any;
-    isTitle(): /*elided*/ any;
-    _generateSchema: null | ((args: {
-        camel: string;
-        snake: string;
-        suffix: string;
-    }) => string);
-    readonly name: string;
-    label(label: string): /*elided*/ any;
-    hidden(): /*elided*/ any;
-    localized(): /*elided*/ any;
-    validate(validateFunction: import("../../../types").FieldValidationFunc<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-    condition(conditionFunction: (doc: import("../../../util/types").Dic, siblings: import("../../../util/types").Dic) => boolean): /*elided*/ any;
-    table(params?: import("../../../types").FieldPanelTableConfig | number): /*elided*/ any;
-    width(value: import("../../../types").FieldWidth): /*elided*/ any;
-    required(bool?: boolean): /*elided*/ any;
-    access(access: {
-        create?: import("../../../types").FieldAccess;
-        read?: import("../../../types").FieldAccess;
-        update?: import("../../../types").FieldAccess;
-    }): /*elided*/ any;
-    onChange(hook: import("../../../types").FieldHookClient): /*elided*/ any;
-    hint(hint: string): /*elided*/ any;
-    clone(): /*elided*/ any;
-    $generateSchema(fn: (args: {
-        camel: string;
-        snake: string;
-        suffix: string;
-    }) => string): /*elided*/ any;
-    $beforeRead(hook: import("../../../types").FieldHook<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-    $beforeSave(hook: import("../../../types").FieldHook<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-    beforeValidate(hook: import("../../../types").FieldHookShared): /*elided*/ any;
-    field: import("../../../fields/email/index.js").EmailField;
-    className(str: string): /*elided*/ any;
-    compile(): {
-        type: "email";
-        live?: boolean | undefined;
-        condition?: ((doc: any, siblings: any) => boolean) | undefined;
-        width?: import("../../../types").FieldWidth | undefined;
-        className?: string | undefined;
-        component: import("svelte").Component<any>;
-        cell: import("svelte").Component<any> | undefined;
-        access: {
-            create: import("../../../types").FieldAccess;
-            read: import("../../../types").FieldAccess;
-            update: import("../../../types").FieldAccess;
-        };
-        name: string;
-        hidden?: boolean | undefined;
-        validate?: import("../../../types").FieldValidationFunc<any> | undefined;
-        required?: boolean | undefined;
-        localized?: boolean | undefined;
-        label?: string | undefined;
-        hint?: string | undefined;
-        table?: {
-            cell?: import("svelte").Component<{
-                value: any;
-            }> | undefined;
-            sort?: boolean | undefined;
-            position: number;
-        } | undefined;
-        hooks?: {
-            beforeRead?: import("../../../types").FieldHook<any>[] | undefined;
-            beforeSave?: import("../../../types").FieldHook<any>[] | undefined;
-            beforeValidate?: import("../../../types").FieldHookShared<any>[] | undefined;
-            onChange?: import("../../../types").FieldHookClient[] | undefined;
-        } | undefined;
-        defaultValue?: string | import("../../../types").DefaultValueFn<string> | undefined;
-        isEmpty: (value: unknown) => boolean;
-        placeholder?: string | undefined;
-        layout?: "compact" | "default" | undefined;
-        unique?: boolean | undefined;
-        isTitle?: true | undefined;
-    } & {
-        component: import("svelte").Component<any>;
-        cell?: import("svelte").Component<{
-            value: any;
-        }> | null;
-    };
-    live(bool: boolean): /*elided*/ any;
-    readonly type: string;
-    readonly raw: import("../../../fields/email/index.js").EmailField;
-    readonly cell: import("svelte").Component<{
-        value: any;
-    }> | null;
-};
+declare const emailField: import("../../../fields/email/index.js").EmailFieldBuilder;
 declare const name: import("../../../fields/text/index.js").TextFieldBuilder;
 declare const roles: import("../../../fields/select/index.js").SelectFieldBuilder;
 declare const password: import("../../../fields/text/index.js").TextFieldBuilder;
 declare const confirmPassword: import("../../../fields/text/index.js").TextFieldBuilder;
 export declare const usersFields: {
-    email: {
-        _metaUrl: string;
-        layout(layout: "compact" | "default"): /*elided*/ any;
-        readonly component: import("svelte").Component<import("../../../fields/email/component/props").EmailFieldProps, {}, "">;
-        unique(bool?: boolean): /*elided*/ any;
-        defaultValue(value: string | import("../../../types").DefaultValueFn<string>): /*elided*/ any;
-        isTitle(): /*elided*/ any;
-        _generateSchema: null | ((args: {
-            camel: string;
-            snake: string;
-            suffix: string;
-        }) => string);
-        readonly name: string;
-        label(label: string): /*elided*/ any;
-        hidden(): /*elided*/ any;
-        localized(): /*elided*/ any;
-        validate(validateFunction: import("../../../types").FieldValidationFunc<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-        condition(conditionFunction: (doc: import("../../../util/types").Dic, siblings: import("../../../util/types").Dic) => boolean): /*elided*/ any;
-        table(params?: import("../../../types").FieldPanelTableConfig | number): /*elided*/ any;
-        width(value: import("../../../types").FieldWidth): /*elided*/ any;
-        required(bool?: boolean): /*elided*/ any;
-        access(access: {
-            create?: import("../../../types").FieldAccess;
-            read?: import("../../../types").FieldAccess;
-            update?: import("../../../types").FieldAccess;
-        }): /*elided*/ any;
-        onChange(hook: import("../../../types").FieldHookClient): /*elided*/ any;
-        hint(hint: string): /*elided*/ any;
-        clone(): /*elided*/ any;
-        $generateSchema(fn: (args: {
-            camel: string;
-            snake: string;
-            suffix: string;
-        }) => string): /*elided*/ any;
-        $beforeRead(hook: import("../../../types").FieldHook<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-        $beforeSave(hook: import("../../../types").FieldHook<import("../../../fields/email/index.js").EmailField>): /*elided*/ any;
-        beforeValidate(hook: import("../../../types").FieldHookShared): /*elided*/ any;
-        field: import("../../../fields/email/index.js").EmailField;
-        className(str: string): /*elided*/ any;
-        compile(): {
-            type: "email";
-            live?: boolean | undefined;
-            condition?: ((doc: any, siblings: any) => boolean) | undefined;
-            width?: import("../../../types").FieldWidth | undefined;
-            className?: string | undefined;
-            component: import("svelte").Component<any>;
-            cell: import("svelte").Component<any> | undefined;
-            access: {
-                create: import("../../../types").FieldAccess;
-                read: import("../../../types").FieldAccess;
-                update: import("../../../types").FieldAccess;
-            };
-            name: string;
-            hidden?: boolean | undefined;
-            validate?: import("../../../types").FieldValidationFunc<any> | undefined;
-            required?: boolean | undefined;
-            localized?: boolean | undefined;
-            label?: string | undefined;
-            hint?: string | undefined;
-            table?: {
-                cell?: import("svelte").Component<{
-                    value: any;
-                }> | undefined;
-                sort?: boolean | undefined;
-                position: number;
-            } | undefined;
-            hooks?: {
-                beforeRead?: import("../../../types").FieldHook<any>[] | undefined;
-                beforeSave?: import("../../../types").FieldHook<any>[] | undefined;
-                beforeValidate?: import("../../../types").FieldHookShared<any>[] | undefined;
-                onChange?: import("../../../types").FieldHookClient[] | undefined;
-            } | undefined;
-            defaultValue?: string | import("../../../types").DefaultValueFn<string> | undefined;
-            isEmpty: (value: unknown) => boolean;
-            placeholder?: string | undefined;
-            layout?: "compact" | "default" | undefined;
-            unique?: boolean | undefined;
-            isTitle?: true | undefined;
-        } & {
-            component: import("svelte").Component<any>;
-            cell?: import("svelte").Component<{
-                value: any;
-            }> | null;
-        };
-        live(bool: boolean): /*elided*/ any;
-        readonly type: string;
-        readonly raw: import("../../../fields/email/index.js").EmailField;
-        readonly cell: import("svelte").Component<{
-            value: any;
-        }> | null;
-    };
+    email: import("../../../fields/email/index.js").EmailFieldBuilder;
     name: import("../../../fields/text/index.js").TextFieldBuilder;
     roles: import("../../../fields/select/index.js").SelectFieldBuilder;
     password: import("../../../fields/text/index.js").TextFieldBuilder;

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

@@ -11,7 +11,7 @@ export const augmentAuthServer = (config) => {
     function addSchemaStaffReferenceForAPIKeys() {
         (collection.fields || []).forEach((field) => {
             if (field instanceof FormFieldBuilder && field.name === 'ownerId') {
-                field = field.$generateSchema(() => `ownerId: text('onwer_id').references(() => staff.id, {onDelete: 'cascade'})`);
+                field.$references('staff', { onDelete: 'cascade' });
             }
         });
         return collection;

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

@@ -8,7 +8,7 @@ export const augmentNestedServer = (config) => {
     const fields = [...(config.fields || [])];
     if (config.nested) {
         const _parentField = text('_parent')
-            .$generateSchema(() => `_parent: text('_parent').references((): any => ${config.slug}.id, {onDelete: 'set null'})`)
+            .$references(config.slug, { onDelete: 'set null', selfReferencing: true })
             .hidden()
             ._root();
         fields.push(_parentField);

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

@@ -46,10 +46,10 @@ export const augmentUpload = (config) => {
         // Add validation if accept is defined
         if ('accept' in upload && Array.isArray(upload.accept)) {
             const allowedMimeTypes = upload.accept;
-            mimeType.raw.validate = (value) => {
+            mimeType.validate((value) => {
                 return ((typeof value === 'string' && allowedMimeTypes.includes(value)) ||
                     `File should be the type of ${allowedMimeTypes.toString()}`);
-            };
+            });
         }
         const _pathField = text('_path')._root().hidden().validate(validatePath);
         // Add hidden fields

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

@@ -9,7 +9,10 @@ export const augmentUploadServer = (config) => {
     const collection = augmentUpload(config);
     (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'})`);
+            field.$references(withDirectoriesSuffix(config.slug), {
+                onDelete: 'cascade',
+                onUpdate: 'cascade'
+            });
         }
     });
     return collection;

package/dist/core/collections/operations/duplicate.js

@@ -1,9 +1,8 @@
 import { VERSIONS_STATUS } from '../../constant.js';
 import { buildConfigMap } from '../../operations/configMap/index.js';
-import { isBlocksFieldRaw } from '../../../fields/blocks/index.js';
-import { isJSONContent } from '../../../fields/rich-text/index.js';
-import { richTextJSONToText } from '../../../fields/rich-text/index.js';
-import { isTreeFieldRaw } from '../../../fields/tree/index.js';
+import { BlocksBuilder } from '../../../fields/blocks/index.js';
+import { isJSONContent, richTextJSONToText } from '../../../fields/rich-text/index.js';
+import { TreeBuilder } from '../../../fields/tree/index.js';
 import { getValueAtPath, isObjectLiteral, matchStructure, omitId, setValueAtPath } from '../../../util/object.js';
 // If block is localized should not keep its id so it created a new one
 // If block is not localized than it should keep its id so block is updated
@@ -15,6 +14,13 @@ export const duplicate = async (args) => {
      * on the given document
      */
     function setCopyTitle(doc) {
+        // For upload collections with no real title field, asTitle falls back to
+        // 'filename' (see augmentTitle) — that's a display fallback, not a
+        // mutable title. filename must keep matching the actual file on disk
+        // (saveFile dedupes by content), so leave it alone rather than
+        // corrupting the reference with a suffix no file on disk has.
+        if (config.upload && config.asTitle === 'filename')
+            return doc;
         const getTitle = () => {
             const title = getValueAtPath(config.asTitle, doc);
             return isJSONContent(title)
@@ -46,8 +52,11 @@ export const duplicate = async (args) => {
     // Set locale to the default one
     if (defaultLocale)
         rime.setLocale(defaultLocale);
-    // Fetch document to copy
-    const document = await collection.findById({ id, locale: defaultLocale });
+    // Fetch document to copy — draft: true, since the source document may
+    // never have been published (buildPublishedOrLatestVersionParams treats a
+    // missing draft flag as "published only" for versioned-with-draft
+    // collections, which would 404 on a draft-only source).
+    const document = await collection.findById({ id, locale: defaultLocale, draft: true });
     // Prepare data
     const data = prepareDuplicate(document, defaultLocale, false);
     // Create document
@@ -61,11 +70,11 @@ export const duplicate = async (args) => {
         rime.setLocale(locale);
         // Get localized document
         let source = await collection.findById({ id, locale, draft: true });
-        const configMap = buildConfigMap(source, config.fields.map((f) => f.compile()));
+        const configMap = buildConfigMap(source, config.fields);
         // Id mapping
         for (const [key, field] of Object.entries(configMap)) {
             // Process only tree and blocks
-            if (!isBlocksFieldRaw(field) && !isTreeFieldRaw(field))
+            if (!(field instanceof BlocksBuilder) && !(field instanceof TreeBuilder))
                 continue;
             const handleField = {
                 // For localized blocks just remove the id so a new one will be created
@@ -93,12 +102,22 @@ export const duplicate = async (args) => {
                     });
                 }
             };
-            handleField[field.localized ? 'localized' : 'unlocalized']();
+            handleField[field.get.localized ? 'localized' : 'unlocalized']();
         }
         // Prepare data
         const data = prepareDuplicate(source, locale, true);
-        // Update document for this locale
-        await collection.updateById({ id: newDocument.id, data, locale });
+        // Update document for this locale — target newDocument's own version
+        // directly (versionId, not draft: true). draft: true with no versionId
+        // resolves to NEW_DRAFT_FROM_PUBLISHED, which still fetches the
+        // *published* original to branch from; newDocument was just created as
+        // a draft copy with no published version yet, so that 404s the same way
+        // an unqualified update would.
+        await collection.updateById({
+            id: newDocument.id,
+            data,
+            locale,
+            versionId: newDocument.versionId
+        });
     }
     // Reset event locale
     rime.setLocale(currentLocale);

package/dist/core/collections/operations/updateById.js

@@ -45,16 +45,17 @@ export const updateById = async (args) => {
         data = result.data;
     }
     const makeMessage = (name) => `missing ${name} @uppdateById`;
+    const makeError = (name) => new RimeError(RimeError.OPERATION_ERROR, makeMessage(name));
     if (!context.configMap)
-        throw new RimeError(RimeError.OPERATION_ERROR, makeMessage('configMap'));
+        throw makeError('configMap');
     if (!context.originalConfigMap)
-        throw new RimeError(RimeError.OPERATION_ERROR, makeMessage('originalConfigMap'));
+        throw makeError('originalConfigMap');
     if (!context.originalDoc)
-        throw new RimeError(RimeError.OPERATION_ERROR, makeMessage('originalDoc'));
+        throw makeError('originalDoc');
     if (!context.versionOperation)
-        throw new RimeError(RimeError.OPERATION_ERROR, makeMessage('versionOperation'));
+        throw makeError('versionOperation');
     if (!context.params.versionId)
-        throw new RimeError(RimeError.OPERATION_ERROR, makeMessage('versionId'));
+        throw makeError('versionId');
     const incomingPaths = Object.keys(context.configMap);
     const { id: updatedId } = await rime.adapter.collection.update({
         id,

package/dist/core/collections/rest/duplicate.server.js

@@ -1,16 +1,20 @@
-import { handleError } from '../../errors/handler.server.js';
+import { ERROR_CONTEXT, handleError } from '../../errors/handler.server.js';
 import { RimeError } from '../../errors/index.js';
+import { trycatch } from '../../../util/function.js';
 import { error, json } from '@sveltejs/kit';
 export async function restDuplicate(event) {
     //
     const { rime } = event.locals;
     const slug = event.params.slug;
     if (!rime.config.isCollection(slug)) {
-        return handleError(new RimeError(RimeError.NOT_FOUND), { context: 'api' });
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.API });
     }
     const collection = rime.collection(slug);
     if (!event.params.id)
         throw error(404);
-    const newId = await collection.duplicate({ id: event.params.id });
+    const [duplicateError, newId] = await trycatch(() => collection.duplicate({ id: event.params.id }));
+    if (duplicateError) {
+        return handleError(duplicateError, { context: ERROR_CONTEXT.API });
+    }
     return json({ id: newId });
 }

package/dist/core/collections/upload/disk/delete.server.d.ts

@@ -2,7 +2,7 @@ import type { BuiltCollection, Config } from '../../../config/types.js';
 import type { RimeContext } from '../../../rime.server.js';
 import type { GenericDoc } from '../../../types/doc.js';
 import type { WithUpload } from '../util/config.js';
-export declare const cleanupStoredFiles: <C extends Config>(args: {
+export declare const cleanUpDocumentFile: <C extends Config>(args: {
     config: WithUpload<BuiltCollection>;
     rime: RimeContext<C>;
     id: string;

package/dist/core/collections/upload/disk/delete.server.js

@@ -1,11 +1,58 @@
 import { logger } from '../../../logger/index.server.js';
+import { hasVersionsSuffix, withVersionsSuffix } from '../../../naming.js';
 import { existsSync, unlink, unlinkSync } from 'fs';
 import path from 'path';
-export const cleanupStoredFiles = async (args) => {
+/**
+ * A given filename on disk can be shared by several document rows across
+ * unrelated upload collections — saveFile dedupes any byte-identical upload
+ * to a single file (see isSameFile). For a versioned collection the root
+ * table is just an id/hierarchy envelope — all actual content, including
+ * the published state, lives in its `_versions` table — so versioned
+ * collections are checked via that sibling, which holds the full history
+ * rather than just the one row a base-collection query would join in.
+ * `selfId` must already be in whichever id-space `selfSlug` resolves to
+ * (a `_versions` row's own id, not the envelope's `id` — see versionId in
+ * mergeRawDocumentWithVersion). Every configured locale is checked since a
+ * localized collection's query can otherwise miss rows in non-default
+ * locales, even though `filename` itself is never a localized field.
+ */
+const isFilenameStillReferenced = async (args) => {
+    const { rime, filename, selfSlug, selfId } = args;
+    const targetSlugs = Object.values(rime.config.collections)
+        .filter((c) => c?.upload && !hasVersionsSuffix(c.slug))
+        .map((c) => (c.versions ? withVersionsSuffix(c.slug) : c.slug));
+    const locales = rime.config.getLocalesCodes();
+    const localesToQuery = locales.length ? locales : [undefined];
+    for (const slug of targetSlugs) {
+        for (const locale of localesToQuery) {
+            const docs = await rime.collection(slug).find({
+                query: `where[filename][equals]=${filename}`,
+                draft: true,
+                locale,
+                limit: slug === selfSlug ? 2 : 1
+            });
+            const referenced = docs.some((doc) => slug !== selfSlug || doc.id !== selfId);
+            if (referenced)
+                return true;
+        }
+    }
+    return false;
+};
+export const cleanUpDocumentFile = async (args) => {
     //
     const { config, rime, id } = args;
     const doc = await rime.collection(config.slug).findById({ id, draft: true });
     try {
+        if (!doc.filename)
+            return doc;
+        const stillReferenced = await isFilenameStillReferenced({
+            rime,
+            filename: doc.filename,
+            selfSlug: config.versions ? withVersionsSuffix(config.slug) : config.slug,
+            selfId: doc.versionId ?? doc.id
+        });
+        if (stillReferenced)
+            return doc;
         const filePath = path.resolve(process.cwd(), `static/medias/${doc.filename}`);
         // Delete original
         unlinkSync(filePath);

package/dist/core/collections/upload/hooks/clean-up-files.server.js

@@ -1,4 +1,4 @@
-import { cleanupStoredFiles } from '../disk/delete.server.js';
+import { cleanUpDocumentFile } from '../disk/delete.server.js';
 import { Hooks } from '../../../operations/hooks/index.server.js';
 /**
  * Hook executed before deleting a document to clean up associated files from storage.
@@ -12,6 +12,6 @@ import { Hooks } from '../../../operations/hooks/index.server.js';
 export const cleanUpFiles = Hooks.beforeDelete(async (args) => {
     const config = args.config;
     const id = args.context.params.id || '';
-    await cleanupStoredFiles({ config, rime: args.event.locals.rime, id });
+    await cleanUpDocumentFile({ config, rime: args.event.locals.rime, id });
     return args;
 });

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

@@ -1,6 +1,6 @@
 /**
  * Hook executed before save/update operations on {uploadSlug}_directories collections
- * the function nomalize and validate path ({slug}_directories.id).
+ * 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">;

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

@@ -4,7 +4,7 @@ import { trycatchSync } from '../../../../util/function.js';
 import { getSegments } from '../util/path.js';
 /**
  * Hook executed before save/update operations on {uploadSlug}_directories collections
- * the function nomalize and validate path ({slug}_directories.id).
+ * the function normalize and validate path ({slug}_directories.id).
  * Then extract parent, name from the given path.
  */
 export const exctractPath = Hooks.beforeUpsert(async (args) => {

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

@@ -1,4 +1,4 @@
-import { cleanupStoredFiles } from '../disk/delete.server.js';
+import { cleanUpDocumentFile } from '../disk/delete.server.js';
 import { saveFile } from '../disk/save.server.js';
 import { Hooks } from '../../../operations/hooks/index.server.js';
 import { omit } from '../../../../util/object.js';
@@ -33,7 +33,7 @@ export const processFileUpload = Hooks.beforeUpsert(async (args) => {
     const sizesConfig = hasSizeConfig ? config.upload.imageSizes : [];
     if (data.file) {
         if (operation === 'update' && args.context.originalDoc) {
-            await cleanupStoredFiles({ config, rime, id: args.context.originalDoc.id });
+            await cleanUpDocumentFile({ config, rime, id: args.context.originalDoc.id });
         }
         const { filename, imageSizes } = await saveFile(data.file, sizesConfig);
         data = {
@@ -46,7 +46,7 @@ export const processFileUpload = Hooks.beforeUpsert(async (args) => {
     if (data.file === null) {
         // delete files
         if (operation === 'update' && args.context.originalDoc) {
-            await cleanupStoredFiles({ config, rime, id: args.context.originalDoc.id });
+            await cleanUpDocumentFile({ config, rime, id: args.context.originalDoc.id });
         }
         // update data for DB update
         for (const size of sizesConfig) {