rimecms 0.27.6 → 0.28.0

package/dist/adapter-sqlite/{area.js → area.server.js}

@@ -5,8 +5,8 @@ import { RimeError } from '../core/errors/index.js';
 import { withLocalesSuffix, withVersionsSuffix } from '../core/naming.js';
 import { createBlankDocument } from '../util/doc.js';
 import { eq } from 'drizzle-orm';
-import * as adapterUtil from './util.js';
-import { buildWithParam } from './with.js';
+import * as adapterUtil from './util.server.js';
+import { buildWithParam } from './with.server.js';
 /**
  * Creates an area facade for SQLite adapter operations with CRUD functionality.
  * Handles both versioned and non-versioned areas with support for localization.

package/dist/adapter-sqlite/{blocks.d.ts → blocks.server.d.ts}

@@ -1,4 +1,4 @@
-import type { GenericAdapteFacadeArgs } from './types.js';
+import type { GenericAdapteFacadeArgs } from './types.server.js';
 import type { GenericBlock } from '../core/types/doc.js';
 import type { WithOptional } from '../util/types.js';
 declare const createBlocksFacade: ({ db, tables }: GenericAdapteFacadeArgs) => {

package/dist/adapter-sqlite/{blocks.js → blocks.server.js}

@@ -2,7 +2,7 @@ import { withLocalesSuffix } from '../core/naming.js';
 import { and, eq, getTableColumns } from 'drizzle-orm';
 import { omit } from '../util/object.js';
 import { toPascalCase } from '../util/string.js';
-import { generatePK, transformDataToSchema } from './util.js';
+import { generatePK, transformDataToSchema } from './util.server.js';
 const createBlocksFacade = ({ db, tables }) => {
     const buildBlockTableName = (slug, blockName) => `${slug}Blocks${toPascalCase(blockName)}`;
     const update = async ({ parentSlug, block, locale }) => {

package/dist/adapter-sqlite/{collection.js → collection.server.js}

@@ -5,10 +5,10 @@ import { withDirectoriesSuffix, withLocalesSuffix, withVersionsSuffix } from '..
 import { trycatchSync } from '../util/function.js';
 import { and, desc, eq } from 'drizzle-orm';
 import { RimeError } from '../core/errors/index.js';
-import { buildOrderByParam } from './orderBy.js';
-import * as adapterUtil from './util.js';
-import { buildWhereParam } from './where.js';
-import { buildWithParam } from './with.js';
+import { buildOrderByParam } from './orderBy.server.js';
+import * as adapterUtil from './util.server.js';
+import { buildWhereParam } from './where.server.js';
+import { buildWithParam } from './with.server.js';
 /**
  * Creates a collection facade for SQLite adapter operations with CRUD functionality.
  * Handles both versioned and non-versioned collections with support for localization.
@@ -19,15 +19,17 @@ const createCollectionFacade = (args) => {
      * Retrieves a document by its ID from a collection. For versioned collections,
      * returns either a specific version (if versionId is provided) or the latest/published version.
      */
-    const findById = async ({ slug, id, versionId, locale, draft }) => {
+    const findById = async ({ slug, id, versionId, select, locale, draft }) => {
         const config = configCtx.collections[slug];
         const isVersioned = !!config.versions;
         const table = tables[slug];
         if (!isVersioned) {
             // Original implementation for non-versioned collections
-            const withParam = buildWithParam({ slug, locale, tables, config });
+            const withParam = buildWithParam({ slug, select, locale, tables, config });
+            const selectColumns = adapterUtil.columnsParams({ table: tables[slug], select });
             //@ts-expect-error slug is a table for sure
             const doc = await db.query[slug].findFirst({
+                columns: selectColumns,
                 where: eq(table.id, id),
                 with: withParam
             });
@@ -39,14 +41,21 @@ const createCollectionFacade = (args) => {
         else {
             // Implementation for versioned collections
             const versionsTable = withVersionsSuffix(slug);
-            const withParam = buildWithParam({ slug: versionsTable, locale, tables, config });
+            const withParam = buildWithParam({ slug: versionsTable, select, locale, tables, config });
+            const rootSelectColumns = adapterUtil.columnsParams({ table: tables[slug], select });
+            const versionSelectColumns = adapterUtil.columnsParams({
+                table: tables[versionsTable],
+                select
+            });
             // Build params based
             // if version Id get the specifi version
             // else get the published or the latest, depending on the draft param
             const params = {
+                columns: rootSelectColumns,
                 where: eq(table.id, id),
                 with: {
                     [versionsTable]: {
+                        columns: versionSelectColumns,
                         with: withParam,
                         ...(versionId
                             ? {
@@ -67,7 +76,7 @@ const createCollectionFacade = (args) => {
             if (!doc || !doc[versionsTable] || doc[versionsTable].length === 0) {
                 throw new RimeError(RimeError.NOT_FOUND);
             }
-            return adapterUtil.mergeRawDocumentWithVersion(doc, versionsTable);
+            return adapterUtil.mergeRawDocumentWithVersion(doc, versionsTable, select);
         }
     };
     /**

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

@@ -1,5 +1,5 @@
-import cache from '../../core/dev/cache/index.js';
-import { getPackageManager } from '../../core/dev/cli/init/packageManagerUtil';
+import cache from '../../core/dev/cache/index.server.js';
+import { getPackageManager } from '../../core/dev/cli/init/package-manager-util.server.js';
 import { logger } from '../../core/logger/index.server.js';
 import fs from 'fs';
 import { spawnSync } from 'node:child_process';

package/dist/adapter-sqlite/index.server.d.ts

@@ -3,18 +3,18 @@ import type { ConfigContext } from '../core/rime.server.js';
 import type { GetRegisterType } from '../index.js';
 import type { Dic } from '../util/types.js';
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
-import createAreaFacade from './area.js';
+import createAreaFacade from './area.server.js';
 import createAuthFacade from './auth.server.js';
-import createBlocksFacade from './blocks.js';
-import createCollectionFacade from './collection.js';
+import createBlocksFacade from './blocks.server.js';
+import createCollectionFacade from './collection.server.js';
 import generateSchema from './generate-schema/index.server.js';
 import type { RelationFieldsMap } from './generate-schema/relations/definition.server.js';
-import createRelationsFacade from './relations.js';
-import { transformerFacade } from './transform.js';
-import createTreeFacade from './tree.js';
-import type { GenericTable } from './types.js';
+import createRelationsFacade from './relations.server.js';
+import { transformerFacade } from './transform.server.js';
+import createTreeFacade from './tree.server.js';
+import type { GenericTable } from './types.server.js';
 import { updateDocumentUrl } from './url.server.js';
-import { updateTableRecord } from './util.js';
+import { updateTableRecord } from './util.server.js';
 type Schema = GetRegisterType<'Schema'>;
 export declare function adapterSqlite(database: string): {
     createAdapter: <C extends Config>(configCtx: ConfigContext<C>) => Promise<Adapter>;

package/dist/adapter-sqlite/index.server.js

@@ -1,15 +1,15 @@
 import { drizzle, LibSQLDatabase } from 'drizzle-orm/libsql';
 import path from 'path';
-import createAreaFacade from './area.js';
+import createAreaFacade from './area.server.js';
 import createAuthFacade from './auth.server.js';
-import createBlocksFacade from './blocks.js';
-import createCollectionFacade from './collection.js';
+import createBlocksFacade from './blocks.server.js';
+import createCollectionFacade from './collection.server.js';
 import generateSchema from './generate-schema/index.server.js';
-import createRelationsFacade from './relations.js';
-import { transformerFacade } from './transform.js';
-import createTreeFacade from './tree.js';
+import createRelationsFacade from './relations.server.js';
+import { transformerFacade } from './transform.server.js';
+import createTreeFacade from './tree.server.js';
 import { updateDocumentUrl } from './url.server.js';
-import { updateTableRecord } from './util.js';
+import { updateTableRecord } from './util.server.js';
 export function adapterSqlite(database) {
     //
     return {

package/dist/adapter-sqlite/{orderBy.js → orderBy.server.js}

@@ -2,7 +2,7 @@ import { logger } from '../core/logger/index.server.js';
 import { withLocalesSuffix, withVersionsSuffix } from '../core/naming.js';
 import { asc, desc, getTableColumns, sql } from 'drizzle-orm';
 import { getTableConfig } from 'drizzle-orm/sqlite-core';
-import { pathToDatabaseColumn } from './util.js';
+import { pathToDatabaseColumn } from './util.server.js';
 export const buildOrderByParam = ({ slug, locale, tables, config, by }) => {
     const hasVersions = !!config.versions;
     const getOrderFunc = (str) => {

package/dist/adapter-sqlite/{relations.d.ts → relations.server.d.ts}

@@ -1,4 +1,4 @@
-import type { GenericAdapteFacadeArgs } from './types.js';
+import type { GenericAdapteFacadeArgs } from './types.server.js';
 import type { Relation } from '../fields/relation/index.js';
 declare const createRelationsFacade: ({ db, tables }: GenericAdapteFacadeArgs) => {
     create: Create;

package/dist/adapter-sqlite/{relations.js → relations.server.js}

@@ -1,6 +1,6 @@
 import { omit } from '../util/object.js';
 import { and, eq, getTableColumns, inArray, isNull, or } from 'drizzle-orm';
-import { transformDataToSchema } from './util.js';
+import { transformDataToSchema } from './util.server.js';
 const createRelationsFacade = ({ db, tables }) => {
     //
     const deleteFromPaths = async ({ parentSlug, ownerId, paths, locale }) => {

package/dist/adapter-sqlite/{transform.js → transform.server.js}

@@ -6,7 +6,7 @@ import { logger } from '../core/logger/index.server.js';
 import { extractFieldName } from '../fields/tree/util.js';
 import { isObjectLiteral, omit } from '../util/object.js';
 import { getBlocksTableNames, getTreeTableNames, makeBlockTableSlug, makeTreeTableSlug } from './generate-schema/util.js';
-import { transformDatabaseColumnsToPaths } from './util.js';
+import { transformDatabaseColumnsToPaths } from './util.server.js';
 /**
  * Facade responsible of converting raw database document
  * with relations, blocks, locales,... related rows
@@ -24,8 +24,7 @@ export const transformerFacade = (args) => {
         const tableName = isVersioned ? withVersionsSuffix(slug) : slug;
         const tableNameRelationFields = `${tableName}Rels`;
         const tableNameLocales = withLocalesSuffix(tableName);
-        const isLive = event.url.pathname.startsWith('/live');
-        const isPanel = event.url.pathname.startsWith('/panel') || isLive;
+        const isPanel = event.url.pathname.startsWith('/panel');
         let docAPI;
         if (configCtx.isCollection(slug)) {
             docAPI = rime.collection(slug);

package/dist/adapter-sqlite/{tree.d.ts → tree.server.d.ts}

@@ -1,4 +1,4 @@
-import type { GenericAdapteFacadeArgs } from './types.js';
+import type { GenericAdapteFacadeArgs } from './types.server.js';
 import type { TreeBlock } from '../core/types/doc.js';
 import type { WithRequired } from '../util/types.js';
 declare const createTreeFacade: ({ db, tables }: GenericAdapteFacadeArgs) => {

package/dist/adapter-sqlite/{tree.js → tree.server.js}

@@ -3,7 +3,7 @@ import { extractFieldName } from '../fields/tree/util.js';
 import { and, eq, getTableColumns } from 'drizzle-orm';
 import { omit } from '../util/object.js';
 import { toPascalCase } from '../util/string.js';
-import { generatePK, transformDataToSchema } from './util.js';
+import { generatePK, transformDataToSchema } from './util.server.js';
 const createTreeFacade = ({ db, tables }) => {
     //
     const buildBlockTableName = (slug, blockPath) => {

package/dist/adapter-sqlite/url.server.d.ts

@@ -1,7 +1,7 @@
 import type { GetRegisterType } from '../index.js';
 import type { BuiltArea, BuiltCollection } from '../types.js';
 import type { LibSQLDatabase } from 'drizzle-orm/libsql';
-import type { GenericTables } from './types.js';
+import type { GenericTables } from './types.server.js';
 type Params = {
     id: string;
     versionId?: string;

package/dist/core/areas/local-api.server.d.ts

@@ -54,7 +54,7 @@ declare class AreaAPI<Doc extends GenericDoc = GenericDoc> {
      * // Get the latest version including draft
      * const doc = await rime.area('settings').find({ draft: true })
      */
-    find(args: APIMethodArgs<typeof find>): Promise<Doc>;
+    find(args?: APIMethodArgs<typeof find>): Promise<Doc>;
     /**
      * Updates an area document with the provided data
      *

package/dist/core/areas/local-api.server.js

@@ -67,6 +67,7 @@ class AreaAPI {
      * const doc = await rime.area('settings').find({ draft: true })
      */
     find(args) {
+        args = args || {};
         const { locale, select = [], depth = 0, versionId, draft } = args;
         const params = {
             locale: this.#fallbackLocale(locale),

package/dist/core/collections/api/delete.server.js

@@ -1,4 +1,4 @@
-import { normalizeQuery } from '../../../adapter-sqlite/util.js';
+import { normalizeQuery } from '../../../adapter-sqlite/util.server.js';
 import { PARAMS } from '../../constant.js';
 import { handleError } from '../../errors/handler.server.js';
 import { trycatch } from '../../../util/function.js';

package/dist/core/collections/api/get.server.js

@@ -1,4 +1,4 @@
-import { normalizeQuery } from '../../../adapter-sqlite/util.js';
+import { normalizeQuery } from '../../../adapter-sqlite/util.server.js';
 import { PARAMS } from '../../constant.js';
 import { handleError } from '../../errors/handler.server.js';
 import { trycatch } from '../../../util/function.js';

package/dist/core/collections/api/getById.server.js

@@ -12,12 +12,14 @@ export default function (slug) {
         const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
         const draft = paramDraft ? paramDraft === 'true' : undefined;
         const depth = typeof paramDepth === 'string' ? parseInt(paramDepth) : 0;
+        const select = event.url.searchParams.get(PARAMS.SELECT)?.split(',') || undefined;
         const [error, document] = await trycatch(() => rime.collection(slug).findById({
             id,
             locale: rime.getLocale(),
             depth,
             draft,
-            versionId
+            versionId,
+            select
         }));
         if (error) {
             return handleError(error, { context: 'api' });

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

@@ -0,0 +1,13 @@
+import type { CollectionPanelConfig, UploadConfig } from '../../config/types';
+type Input = {
+    panel?: CollectionPanelConfig;
+    upload?: UploadConfig;
+};
+type WithPanel<T> = T & {
+    panel: CollectionPanelConfig;
+};
+/**
+ * Set panel to the defined one, or fallback to default
+ */
+export declare const augmentPanel: <T extends Input>(config: T) => WithPanel<T>;
+export {};

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

@@ -0,0 +1,19 @@
+/**
+ * Set panel to the defined one, or fallback to default
+ */
+export const augmentPanel = (config) => {
+    function addPanel() {
+        return {
+            ...(config.panel || {}),
+            dashboard: {
+                maxEntries: 8,
+                layout: config.upload ? 'grid' : 'rows',
+                ...(config.panel && config.panel.dashboard ? config.panel.dashboard : {})
+            }
+        };
+    }
+    return {
+        ...config,
+        panel: addPanel()
+    };
+};

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

@@ -2,5 +2,6 @@ import type { Collection } from '../../config/types.js';
 import { type WithNormalizedUpload } from './augment-upload.js';
 /**
  * Override _path field to add foreign key constraints
+ * @TODO why exactly
  */
 export declare const augmentUploadServer: <T extends Collection<any>>(config: T) => WithNormalizedUpload<T>;

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

@@ -3,6 +3,7 @@ import { withDirectoriesSuffix } from '../../naming.js';
 import { augmentUpload } from './augment-upload.js';
 /**
  * Override _path field to add foreign key constraints
+ * @TODO why exactly
  */
 export const augmentUploadServer = (config) => {
     const collection = augmentUpload(config);

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

@@ -9,6 +9,7 @@ import { access } from '../../../util/index.js';
 import { toKebabCase } from '../../../util/string.js';
 import { FileText } from '@lucide/svelte';
 import { augmentLabel } from './augment-label.js';
+import { augmentPanel } from './augment-panel.js';
 import { augmentThumbnail } from './augment-thumbnail.js';
 export const create = (slug, incomingConfig) => {
     //
@@ -22,7 +23,8 @@ export const create = (slug, incomingConfig) => {
     const withAuth = augmentAuth(withUrl);
     const withMetas = augmentMetas(withAuth);
     const withTitle = augmentTitle(withMetas);
-    const augmented = augmentThumbnail(withTitle);
+    const withPanel = augmentPanel(withTitle);
+    const augmented = augmentThumbnail(withPanel);
     return {
         type: 'collection',
         slug: augmented.slug,

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

@@ -10,6 +10,7 @@ import { Hooks } from '../../operations/hooks/index.server.js';
 import { toKebabCase } from '../../../util/string.js';
 import { FileText } from '@lucide/svelte';
 import { augmentLabel } from './augment-label.js';
+import { augmentPanel } from './augment-panel.js';
 import { augmentThumbnail } from './augment-thumbnail.js';
 export const create = (slug, incomingConfig) => {
     //
@@ -20,7 +21,8 @@ export const create = (slug, incomingConfig) => {
     const withNested = augmentNestedServer(withUpload);
     const withVersions = augmentVersions(withNested);
     const withUrl = augmentUrl(withVersions);
-    const withAuth = augmentAuthServer(withUrl);
+    const withPanel = augmentPanel(withUrl);
+    const withAuth = augmentAuthServer(withPanel);
     const withMetas = augmentMetas(withAuth);
     const withHooks = augmentHooks(withMetas);
     const withTitle = augmentTitle(withHooks);

package/dist/core/collections/local-api.server.js

@@ -190,7 +190,7 @@ class CollectionAPI {
      * });
      */
     findById(args) {
-        const { id, versionId, locale, draft, depth = 0 } = args;
+        const { id, versionId, locale, select, draft, depth = 0 } = args;
         if (!id) {
             throw new RimeError(RimeError.NOT_FOUND);
         }
@@ -202,6 +202,7 @@ class CollectionAPI {
             event: this.#event,
             draft,
             depth,
+            select,
             isSystemOperation: this.isSystemOperation
         };
         if (this.#event.locals.cacheEnabled && !this.isSystemOperation) {
@@ -211,6 +212,7 @@ class CollectionAPI {
                 userRoles: this.#event.locals.user?.roles,
                 id,
                 versionId,
+                select,
                 depth,
                 draft,
                 locale

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

@@ -29,12 +29,14 @@ export const findById = async (args) => {
         select,
         draft
     });
+    const hasSelect = select && Array.isArray(select) && select.length;
     let document = await event.locals.rime.adapter.transform.doc({
         doc: documentRaw,
         slug: config.slug,
         locale,
         event,
-        depth
+        depth,
+        withBlank: !hasSelect
     });
     for (const hook of config.$hooks?.beforeRead || []) {
         const result = await hook({

package/dist/core/collections/upload/hooks/convert-base64.server.js

@@ -1,4 +1,4 @@
-import { jsonFileToFile } from '../util/converter.js';
+import { jsonFileToFile } from '../util/converter.server.js';
 import { RimeError } from '../../../errors/index.js';
 import { Hooks } from '../../../operations/hooks/index.server.js';
 import { isFile } from '../../../../util/file.js';

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

@@ -1140,7 +1140,7 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
                     $Infer: {
                         body: {
                             userId: string;
-                            role: "user" | "staff" | "admin" | ("user" | "staff" | "admin")[];
+                            role: "user" | "admin" | "staff" | ("user" | "admin" | "staff")[];
                         };
                     };
                 };
@@ -1220,7 +1220,7 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
                             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;
                         };
                     };
@@ -1764,7 +1764,7 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
                             permission?: never | undefined;
                         }) & {
                             userId?: string | undefined;
-                            role?: "user" | "staff" | "admin" | undefined;
+                            role?: "user" | "admin" | "staff" | undefined;
                         };
                     };
                 };

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

@@ -1,7 +1,7 @@
 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 { betterAuthAfterHook, betterAuthBeforeHook } from './better-auth-hooks.server.js';
 import { accessControl, admin, staff, user } from './better-auth-permissions.js';
 export function getBaseAuthConfig(ctx) {
     const betterAuthOptions = {

package/dist/core/config/client/augment-panel.d.ts

@@ -11,16 +11,16 @@ export declare const augmentPanel: <const T extends {
                 icon: import("svelte").Component<import("@lucide/svelte").IconProps>;
             }[], {
                 readonly label: "content";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "system";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "collections";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "areas";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }];
         };
         readonly components: {

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

@@ -2,7 +2,7 @@ import type { SanitizedConfigClient } from '../types.js';
 export declare const buildConfigClient: <C extends SanitizedConfigClient>(config: C) => C & {
     readonly collections: readonly [import("../types.js").BuiltCollection, ...import("../types.js").BuiltCollection[]];
 } & {
-    readonly icons: import("../../../util/types.js").Dic<import("svelte").Component<import("@lucide/svelte").IconProps, {}, string>>;
+    readonly icons: import("../../../util/types.js").Dic<import("svelte").Component<import("@lucide/svelte").LucideProps, {}, string>>;
 } & {
     readonly panel: {
         readonly routes: Record<string, import("../types.js").CustomPanelRoute>;
@@ -13,16 +13,16 @@ export declare const buildConfigClient: <C extends SanitizedConfigClient>(config
                 icon: import("svelte").Component<import("@lucide/svelte").IconProps>;
             }[], {
                 readonly label: "content";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "system";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "collections";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }, {
                 readonly label: "areas";
-                readonly icon: import("svelte").Component<import("@lucide/svelte").IconProps, {}, "">;
+                readonly icon: import("svelte").Component<import("@lucide/svelte").LucideProps, {}, "">;
             }];
         };
         readonly components: {

package/dist/core/config/server/augment-directories.server.js

@@ -1,6 +1,6 @@
-import { augmentHooks } from '../../collections/config/augment-hooks.server';
-import { exctractPath } from '../../collections/upload/hooks/extract-path.server';
-import { prepareDirectoryChildren, updateDirectoryChildren } from '../../collections/upload/hooks/update-directory-children.server';
+import { augmentHooks } from '../../collections/config/augment-hooks.server.js';
+import { exctractPath } from '../../collections/upload/hooks/extract-path.server.js';
+import { prepareDirectoryChildren, updateDirectoryChildren } from '../../collections/upload/hooks/update-directory-children.server.js';
 import { isUploadConfig } from '../../collections/upload/util/config.js';
 import { makeUploadDirectoriesCollectionClient } from '../shared/upload-directories';
 export const augmentDirectoriesServer = (config) => {

package/dist/core/config/server/augment-staff.server.d.ts

@@ -3,5 +3,5 @@ export declare const augmentStaffServer: <const T extends {
     collections?: BuiltCollection[];
     staff?: Config["staff"];
 }>(config: T) => T & {
-    readonly collections: readonly [BuiltCollection, ...BuiltCollection[]];
+    readonly collections: readonly [...BuiltCollection[], BuiltCollection];
 };

package/dist/core/config/server/augment-staff.server.js

@@ -2,5 +2,5 @@ import { getStaffCollection } from '../shared/get-staff-collection.js';
 import { Collection } from './index.server.js';
 export const augmentStaffServer = (config) => {
     const staff = Collection.create('staff', getStaffCollection(config.staff));
-    return { ...config, collections: [staff, ...(config.collections || [])] };
+    return { ...config, collections: [...(config.collections || []), staff] };
 };