rimecms 0.25.10 → 0.25.11

package/dist/adapter-sqlite/transform.js

@@ -4,7 +4,7 @@ import { getTableColumns } from 'drizzle-orm';
 import { flatten, unflatten } from 'flat';
 import { logger } from '../core/logger/index.server.js';
 import { extractFieldName } from '../fields/tree/util.js';
-import { omit } from '../util/object.js';
+import { isObjectLiteral, omit } from '../util/object.js';
 import { getBlocksTableNames, getTreeTableNames, makeBlockTableSlug, makeTreeTableSlug } from './generate-schema/util.js';
 import { transformDatabaseColumnsToPaths } from './util.js';
 /**
@@ -165,6 +165,15 @@ export const transformerFacade = (args) => {
                 }
                 /** Assign relation */
                 if (!relation.locale || relation.locale === locale) {
+                    const parentPath = relationPath.split('.').slice(0, -1).join('.');
+                    // If parent path ends with .[digits], it means the relation is inside a blocks/tree array,
+                    // then check if the parent path exists in the flatDoc.
+                    if (/.*\.[\d]+$/.test(parentPath)) {
+                        if (!flatDoc[parentPath]) {
+                            logger.warn(`Orphean ${config.slug} relation at ${relationPath} with id ${relation.id} because parent path ${parentPath} doesn't exist in the document`);
+                            continue;
+                        }
+                    }
                     flatDoc[relationPath] = [...(flatDoc[relationPath] || []), relationOutput];
                 }
             }
@@ -177,6 +186,23 @@ export const transformerFacade = (args) => {
         if (tableNameRelationFields in output) {
             keysToDelete.push(tableNameRelationFields);
         }
+        // Filter out arrays that contains empty elements
+        function cleanEmptyElementsInArrays(obj) {
+            if (Array.isArray(obj)) {
+                return obj
+                    .map((item) => cleanEmptyElementsInArrays(item))
+                    .filter((item) => item !== null && item !== undefined);
+            }
+            else if (isObjectLiteral(obj)) {
+                const cleanedObj = {};
+                for (const key in obj) {
+                    cleanedObj[key] = cleanEmptyElementsInArrays(obj[key]);
+                }
+                return cleanedObj;
+            }
+            return obj;
+        }
+        output = cleanEmptyElementsInArrays(output);
         if (!isPanel || !event.locals.user) {
             keysToDelete.push('editedBy');
         }

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

@@ -5,7 +5,7 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
     mailer: MailerActions | undefined;
     config: ConfigContext<C>;
 }): {
-    readonly baseURL: string | undefined;
+    readonly baseURL: any;
     readonly plugins: ({
         id: "api-key";
         $ERROR_CODES: {

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

@@ -1,10 +1,11 @@
 import { dev } from '$app/environment';
+import { env } from '$env/dynamic/public';
 import { admin as adminPlugin, apiKey } from 'better-auth/plugins';
 import { betterAuthAfterHook, betterAuthBeforeHook } from './better-auth-hooks.js';
 import { accessControl, admin, staff, user } from './better-auth-permissions.js';
 export function getBaseAuthConfig(ctx) {
     const betterAuthOptions = {
-        baseURL: ctx.config.raw.siteUrl,
+        baseURL: env.PUBLIC_RIME_URL,
         plugins: configurePlugins(ctx.config.raw),
         rateLimit: {
             enabled: !dev,

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

@@ -1909,7 +1909,7 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
             plugins: any;
         } ? C["$auth"]["plugins"] : [])[number])[];
         database: (options: import("better-auth/types").BetterAuthOptions) => import("better-auth/types").DBAdapter<import("better-auth/types").BetterAuthOptions>;
-        baseURL: string | undefined;
+        baseURL: any;
         rateLimit: {
             readonly enabled: boolean;
             readonly window: 10;
@@ -3891,7 +3891,7 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
                 plugins: any;
             } ? C["$auth"]["plugins"] : [])[number])[];
             database: (options: import("better-auth/types").BetterAuthOptions) => import("better-auth/types").DBAdapter<import("better-auth/types").BetterAuthOptions>;
-            baseURL: string | undefined;
+            baseURL: any;
             rateLimit: {
                 readonly enabled: boolean;
                 readonly window: 10;

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

@@ -1921,7 +1921,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
             plugins: any;
         } ? C["$auth"]["plugins"] : [])[number])[];
         database: (options: import("better-auth/*").BetterAuthOptions) => import("better-auth/*").DBAdapter<import("better-auth/*").BetterAuthOptions>;
-        baseURL: string | undefined;
+        baseURL: any;
         rateLimit: {
             readonly enabled: boolean;
             readonly window: 10;
@@ -3927,7 +3927,7 @@ export declare function createRime<const C extends Config>(config: BuildConfig<C
                 plugins: any;
             } ? C["$auth"]["plugins"] : [])[number])[];
             database: (options: import("better-auth/*").BetterAuthOptions) => import("better-auth/*").DBAdapter<import("better-auth/*").BetterAuthOptions>;
-            baseURL: string | undefined;
+            baseURL: any;
             rateLimit: {
                 readonly enabled: boolean;
                 readonly window: 10;

package/dist/util/doc.d.ts

@@ -1,5 +1,6 @@
 import type { GenericDoc } from '../core/types/doc.js';
 import type { BuiltArea, BuiltCollection } from '../types.js';
+import type { Dic } from './types.js';
 import type { RequestEvent } from '@sveltejs/kit';
 /**
  * Creates a blank document based on a collection or area configuration.
@@ -37,3 +38,13 @@ export declare const toNestedStructure: (documents: GenericDoc[]) => GenericDoc[
  * // return foo.bar.0.baz
  */
 export declare const normalizeFieldPath: (path: string) => string;
+/**
+ * Ensure path exists, meaning the path hold anything else than undefined.
+ *
+ * @example
+ * const obj = { foo: { baz: null }, bar: 1 };
+ * ensurePathExists('foo.bar', obj); // false
+ * ensurePathExists('foo.baz', obj); // true
+ * ensurePathExists('bar', obj); // true
+ */
+export declare const ensurePathExists: (path: string, obj: Dic) => boolean;

package/dist/util/doc.js

@@ -1,5 +1,6 @@
 import { isUploadConfig } from '../core/collections/upload/util/config.js';
 import { TabsBuilder } from '../fields/tabs/index.js';
+import { getValueAtPath } from './object.js';
 import { snapshot } from './state.js';
 /**
  * Creates a blank document based on a collection or area configuration.
@@ -126,3 +127,16 @@ export const normalizeFieldPath = (path) => {
     const regExpBlockType = /:[a-zA-Z0-9]+/g;
     return path.replace(regExpBlockType, '');
 };
+/**
+ * Ensure path exists, meaning the path hold anything else than undefined.
+ *
+ * @example
+ * const obj = { foo: { baz: null }, bar: 1 };
+ * ensurePathExists('foo.bar', obj); // false
+ * ensurePathExists('foo.baz', obj); // true
+ * ensurePathExists('bar', obj); // true
+ */
+export const ensurePathExists = (path, obj) => {
+    const value = getValueAtPath(path, obj);
+    return value !== undefined;
+};

package/package.json

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