nextjs-cms 0.9.29 → 0.9.30

package/dist/api/root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/api/root.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcvB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAA;AAI5C,eAAO,MAAM,aAAa,KAAsB,CAAA;AAEhD,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAA"}
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/api/root.ts"],"names":[],"mappings":"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"}

package/dist/api/root.js

@@ -1,19 +1,29 @@
-import { privateProcedure, router } from './trpc.js';
-import { adminsRouter } from './trpc/routers/admins.js';
-import { hasItemsSectionRouter } from './trpc/routers/hasItemsSection.js';
-import { filesRouter } from './trpc/routers/files.js';
-import { authRouter } from './trpc/routers/auth.js';
-import { configRouter } from './trpc/routers/config.js';
-import { navRouter } from './trpc/routers/navigation.js';
-import { simpleSectionRouter } from './trpc/routers/simpleSection.js';
-import { categorySectionRouter } from './trpc/routers/categorySection.js';
-import { accountSettings } from './trpc/routers/accountSettings.js';
-import { galleryRouter } from './trpc/routers/gallery.js';
-import { logsRouter } from './trpc/routers/logs.js';
-import { fieldsRouter } from './trpc/routers/fields.js';
-import { getPluginRoutes } from '../plugins/loader.js';
+import { createCallerFactory, privateProcedure, router } from './trpc.js';
+import { adminsRouter } from './routers/admins.js';
+import { hasItemsSectionRouter } from './routers/hasItemsSection.js';
+import { filesRouter } from './routers/files.js';
+import { authRouter } from './routers/auth.js';
+import { configRouter } from './routers/config.js';
+import { navRouter } from './routers/navigation.js';
+import { simpleSectionRouter } from './routers/simpleSection.js';
+import { categorySectionRouter } from './routers/categorySection.js';
+import { accountSettings } from './routers/accountSettings.js';
+import { galleryRouter } from './routers/gallery.js';
+import { logsRouter } from './routers/logs.js';
+import { fieldsRouter } from './routers/fields.js';
+import { getConfigImportVersion } from '../core/config/index.js';
+import { getPluginRoutes, loadPlugins } from '../plugins/loader.js';
 import { z } from 'zod';
 import { getAdminPrivileges } from './lib/serverActions.js';
+async function getPluginRouters() {
+    const loadedPlugins = await loadPlugins();
+    return loadedPlugins.reduce((acc, current) => {
+        if (current.plugin.router) {
+            acc[current.routerKey] = current.plugin.router;
+        }
+        return acc;
+    }, {});
+}
 const pluginsRouter = router({
     checkRoute: privateProcedure
         .input(z.object({
@@ -30,7 +40,7 @@ const pluginsRouter = router({
         return plugin;
     }),
 });
-export const coreRouters = {
+const coreRouters = {
     auth: authRouter,
     admins: adminsRouter,
     config: configRouter,
@@ -45,6 +55,61 @@ export const coreRouters = {
     logs: logsRouter,
     plugins: pluginsRouter,
 };
-// Core-only router used for package-level type helpers.
-// App-owned routers should be created with createTRPCRouter().
-export const coreAppRouter = router(coreRouters);
+// Lazy router creation - cache the result
+let _appRouter = null;
+let routerInitPromise = null;
+let appRouterConfigVersion = -1;
+async function createAppRouterWithPlugins() {
+    const currentVersion = getConfigImportVersion();
+    if (appRouterConfigVersion !== currentVersion) {
+        _appRouter = null;
+        routerInitPromise = null;
+    }
+    if (_appRouter) {
+        return _appRouter;
+    }
+    if (routerInitPromise) {
+        return routerInitPromise;
+    }
+    routerInitPromise = (async () => {
+        const pluginRouters = await getPluginRouters();
+        const safePluginRouters = Object.entries(pluginRouters).reduce((acc, [key, pluginRouter]) => {
+            if (key in coreRouters) {
+                console.error(`[plugins] Router key "${key}" conflicts with a core router. Skipping.`);
+                return acc;
+            }
+            acc[key] = pluginRouter;
+            return acc;
+        }, {});
+        const routerInstance = router({
+            ...coreRouters,
+            ...safePluginRouters,
+        });
+        _appRouter = routerInstance;
+        appRouterConfigVersion = currentVersion;
+        return routerInstance;
+    })();
+    return routerInitPromise;
+}
+// Create router synchronously with core routes only
+// This allows the module to load without top-level await
+// NOTE: Plugin routes will not be available until plugins are loaded
+// For now, we export the core router. Plugin routes should be added
+// via the plugins router's list/routes procedures
+export const appRouter = router(coreRouters);
+// Start loading plugins in the background (non-blocking)
+// Plugin routes can be accessed through the plugins.list/routes procedures
+createAppRouterWithPlugins().catch((error) => {
+    console.error('Failed to load plugins for router:', error);
+});
+// Export a function to get the full router with plugins
+// This should be used in server contexts where async is allowed
+export async function getAppRouter() {
+    return createAppRouterWithPlugins();
+}
+export async function createCallerWithPlugins(ctx) {
+    const routerWithPlugins = await getAppRouter();
+    return routerWithPlugins.createCaller(ctx);
+}
+// createCaller factory
+export const createCaller = createCallerFactory(appRouter);

package/dist/api/routers/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/api/routers/config.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAaozZ,CAAC;;;;;;GAD50Z,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/api/routers/config.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAa4sY,CAAC;;;;;;GADpuY,CAAA"}

package/dist/api/routers/gallery.d.ts

@@ -26,7 +26,6 @@ export declare const galleryRouter: import("@trpc/server").TRPCBuiltRouter<{
             sectionName: string;
             photoName: string;
             referenceId: string;
-            locale?: string | undefined;
         };
         output: boolean;
         meta: object;

package/dist/api/routers/gallery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gallery.d.ts","sourceRoot":"","sources":["../../../src/api/routers/gallery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAUxB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0FxB,CAAA"}
+{"version":3,"file":"gallery.d.ts","sourceRoot":"","sources":["../../../src/api/routers/gallery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAWxB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DxB,CAAA"}

package/dist/api/routers/gallery.js

@@ -1,26 +1,23 @@
+import { privateProcedure, router } from '../trpc.js';
+import * as z from 'zod';
 import fs from 'fs';
 import path from 'path';
+import { SectionFactory } from '../../core/factories/index.js';
 import { TRPCError } from '@trpc/server';
+import getString from '../../translations/index.js';
+import { db } from '../../db/client.js';
 import { sql } from 'drizzle-orm';
-import * as z from 'zod';
-import { getCMSConfig } from '../../core/config/index.js';
 import { MysqlTableChecker } from '../../core/db/index.js';
-import { SectionFactory } from '../../core/factories/index.js';
-import { resolveLocale } from '../../core/localization/index.js';
-import { db } from '../../db/client.js';
-import getString from '../../translations/index.js';
-import { privateProcedure, router } from '../trpc.js';
+import { getCMSConfig } from '../../core/config/index.js';
 export const galleryRouter = router({
     deletePhoto: privateProcedure
         .input(z.object({
         sectionName: z.string(),
         photoName: z.string(),
         referenceId: z.string(),
-        locale: z.string().optional(),
     }))
         .mutation(async ({ ctx, input }) => {
-        const cmsConfig = await getCMSConfig();
-        const uploadsFolder = cmsConfig.media.upload.path;
+        const uploadsFolder = (await getCMSConfig()).media.upload.path;
         /**
          * Get the section information
          */
@@ -46,32 +43,7 @@ export const galleryRouter = router({
             const columns = await MysqlTableChecker.getColumns(gallery.db.tableName);
             if (columns.includes(gallery.db.photoNameField) &&
                 columns.includes(gallery.db.referenceIdentifierField)) {
-                const galleryIsLocalized = gallery.localized === true && cmsConfig.localization?.enabled === true;
-                if (galleryIsLocalized) {
-                    const localeResult = resolveLocale({
-                        localization: cmsConfig.localization,
-                        locale: input.locale,
-                    });
-                    if (!input.locale || !localeResult.resolvedLocale) {
-                        throw new TRPCError({
-                            code: 'BAD_REQUEST',
-                            message: getString('invalidLocale', ctx.session.user.language, {
-                                locale: input.locale ?? '',
-                                locales: localeResult.availableLocales.map((l) => l.code).join(', '),
-                            }),
-                        });
-                    }
-                    if (!columns.includes('locale')) {
-                        throw new TRPCError({
-                            code: 'BAD_REQUEST',
-                            message: getString('galleryTableNotSetUp', ctx.session.user.language),
-                        });
-                    }
-                    await db.execute(sql `DELETE FROM ${sql.raw(gallery.db.tableName)} WHERE ${sql.raw(gallery.db.photoNameField)} = ${input.photoName} AND ${sql.raw(gallery.db.referenceIdentifierField)} = ${input.referenceId} AND \`locale\` = ${localeResult.resolvedLocale.code}`);
-                }
-                else {
-                    await db.execute(sql `DELETE FROM ${sql.raw(gallery.db.tableName)} WHERE ${sql.raw(gallery.db.photoNameField)} = ${input.photoName} AND ${sql.raw(gallery.db.referenceIdentifierField)} = ${input.referenceId}`);
-                }
+                await db.execute(sql `DELETE FROM ${sql.raw(gallery.db.tableName)} WHERE ${sql.raw(gallery.db.photoNameField)} = ${input.photoName} AND ${sql.raw(gallery.db.referenceIdentifierField)} = ${input.referenceId}`);
             }
         }
         /**

package/dist/api/routers/hasItemsSection.d.ts

@@ -72,7 +72,21 @@ export declare const hasItemsSectionRouter: import("@trpc/server").TRPCBuiltRout
                     singular: string;
                     plural: string;
                 };
-                gallery: import("../../index.js").SectionGallery | undefined;
+                gallery: {
+                    db: {
+                        tableName: string;
+                        referenceIdentifierField: string;
+                        photoNameField: string;
+                        metaField: string;
+                    };
+                    watermark?: boolean;
+                    thumbnail?: {
+                        width: number;
+                        height: number;
+                        fit: "cover" | "contain";
+                        quality: number;
+                    };
+                } | undefined;
                 variants: import("../../core/types/index.js").Variant[] | undefined;
                 configFile: string;
             };
@@ -115,7 +129,21 @@ export declare const hasItemsSectionRouter: import("@trpc/server").TRPCBuiltRout
                     singular: string;
                     plural: string;
                 };
-                gallery: import("../../index.js").SectionGallery | undefined;
+                gallery: {
+                    db: {
+                        tableName: string;
+                        referenceIdentifierField: string;
+                        photoNameField: string;
+                        metaField: string;
+                    };
+                    watermark?: boolean;
+                    thumbnail?: {
+                        width: number;
+                        height: number;
+                        fit: "cover" | "contain";
+                        quality: number;
+                    };
+                } | undefined;
                 variants: import("../../core/types/index.js").Variant[] | undefined;
                 configFile: string;
             };
@@ -139,7 +167,6 @@ export declare const hasItemsSectionRouter: import("@trpc/server").TRPCBuiltRout
                 referenceId: string;
                 photo: string;
                 meta: any;
-                locale?: string;
             }[];
             localization: {
                 defaultLocale: {
@@ -158,8 +185,6 @@ export declare const hasItemsSectionRouter: import("@trpc/server").TRPCBuiltRout
                     label: string;
                     rtl?: boolean;
                 }[];
-                localeSwitcherEnabled: boolean;
-                developerNoteEnabled: boolean;
             } | null;
             error?: undefined;
         } | {

package/dist/api/routers/hasItemsSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hasItemsSection.d.ts","sourceRoot":"","sources":["../../../src/api/routers/hasItemsSection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAcxB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAwG+53C,CAAC;;;;;uBAAyE,CAAC;;;;;;uBAA8G,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GADzn4C,CAAA"}
+{"version":3,"file":"hasItemsSection.d.ts","sourceRoot":"","sources":["../../../src/api/routers/hasItemsSection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAcxB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAwGykwC,CAAC;;;;;uBAAyE,CAAC;;;;;;uBAA8G,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GADnywC,CAAA"}