studiocms 0.2.0 → 0.4.0

package/dist/consts.d.ts

@@ -1,8 +1,8 @@
 import type uiIntegration from '@studiocms/ui';
 import { type AvailablePermissionRanks } from '@withstudiocms/auth-kit/types';
 import type { AstroConfig } from 'astro';
+import { Duration } from 'effect';
 import type { RobotsConfig } from './integrations/robots/schema.js';
-import type { TimeString } from './schemas/config/sdk.js';
 /**
  * Paths to search for the StudioCMS config file,
  * sorted by how likely they're to appear.
@@ -25,11 +25,11 @@ export declare const CMSNotificationSettingsId: string;
 export declare const Next_NotificationSettingsId: string;
 export declare const TemplateConfigId: string;
 /**
- * The default lifetime for cached items.
- * This value is used to determine how long an item should remain in the cache before it is considered expired.
- * This value is used in ./schemas/config/sdk.ts to set the default cache lifetime.
+ * Utility Constant for Default Cache Lifetime
+ *
+ * This constant represents the default cache lifetime as a Duration object, which can be used throughout the codebase for consistency when referring to the default cache lifetime.
  */
-export declare const defaultCacheLifeTime: TimeString;
+export declare const DefaultCacheLifetime: Duration.Duration;
 /**
  * The default lifetime for cached items in milliseconds.
  * This value is used to determine how long an item should remain in the cache before it is considered expired.

package/dist/consts.js

@@ -4,6 +4,7 @@ import { icons as simpleIcons } from "@iconify-json/simple-icons";
 import {
   availablePermissionRanks
 } from "@withstudiocms/auth-kit/types";
+import { Duration } from "effect";
 import { stripIconify } from "./utils/stripIconify.js";
 import { makeAPIRoute } from "./virtuals/lib/makeAPIRoute.js";
 import { stripLeadingAndTrailingSlashes } from "./virtuals/lib/pathGenerators.js";
@@ -22,7 +23,7 @@ const Next_MailerConfigId = "SCMS_MAILER_CONFIG_1";
 const CMSNotificationSettingsId = "1";
 const Next_NotificationSettingsId = "SCMS_NOTIFICATION_SETTINGS_1";
 const TemplateConfigId = "SCMS_EMAIL_TEMPLATES_1";
-const defaultCacheLifeTime = "5m";
+const DefaultCacheLifetime = Duration.minutes(5);
 const OneDay = 1e3 * 60 * 60 * 24;
 const versionCacheLifetime = OneDay * 7;
 const currentRESTAPIVersions = ["v1"];
@@ -175,6 +176,7 @@ export {
   CMSMailerConfigId,
   CMSNotificationSettingsId,
   CMSSiteConfigId,
+  DefaultCacheLifetime,
   FAVICON_ASSETS,
   GhostUserDefaults,
   LinkNewOAuthCookieName,
@@ -193,7 +195,6 @@ export {
   configPaths,
   currentRESTAPIVersions,
   dashboardAPIRoute,
-  defaultCacheLifeTime,
   getUiOpts,
   makeDashboardRoute,
   routesDir,

package/dist/db/plugins.d.ts

@@ -7,7 +7,7 @@ export * from '@withstudiocms/kysely/plugin';
  * @param root - The root URL to load the configuration from
  *   - Root URL can be obtained via the `config.root` property from the `astro:config:setup` integration hook
  */
-export declare const getDBClientDialect: (root: URL) => Effect.Effect<DbDialectType, import("effect/Cause").UnknownException, never>;
+export declare const getDBClientDialect: (root: URL) => Effect.Effect<DbDialectType, import("effect/ParseResult").ParseError | import("effect/Cause").UnknownException, never>;
 /**
  * Get a Kysely DB Plugin Client for the specified dialect
  */

package/dist/db/plugins.js

@@ -1,10 +1,7 @@
-import {
-  loadConfigFile as _loadConfigFile,
-  parseAndMerge as _parseAndMerge
-} from "@withstudiocms/config-utils";
+import { loadConfigFile as _loadConfigFile } from "@withstudiocms/config-utils";
 import { getDBClientLive } from "@withstudiocms/kysely/client";
 import { configPaths } from "../consts.js";
-import { Effect } from "../effect.js";
+import { Effect, Schema } from "../effect.js";
 import { StudioCMSOptionsSchema } from "../schemas/index.js";
 import { getDbDriver, parseDbDialect } from "./index.js";
 export * from "@withstudiocms/kysely/plugin";
@@ -13,10 +10,10 @@ const loadConfigFile = Effect.fn(
     () => _loadConfigFile(root, configPaths, "studiocms-db-plugin")
   )
 );
-const parseAndMerge = Effect.fn(
-  (config) => Effect.try(() => _parseAndMerge(StudioCMSOptionsSchema, config))
+const parse = Effect.fn(
+  (config) => Schema.decode(StudioCMSOptionsSchema)(config ?? {})
 );
-const loadConfig = (root) => loadConfigFile(root).pipe(Effect.flatMap(parseAndMerge));
+const loadConfig = (root) => loadConfigFile(root).pipe(Effect.flatMap(parse));
 const getDBClientDialect = Effect.fn(
   (root) => loadConfig(root).pipe(Effect.map((config) => config.db.dialect))
 );

package/dist/handlers/frontend/routes.d.ts

@@ -18,18 +18,6 @@ export declare const setupRoutes: InjectedRoute[];
  * These routes include SDK API endpoints and the renderer service.
  */
 export declare const noDbSetupRoutes: InjectedRoute[];
-/**
- * REST API routes for StudioCMS.
- *
- * These routes cover folders, pages, settings, users, and public access.
- */
-export declare const restRoutes: InjectedRoute[];
-/**
- * OAuth Enabled Routes
- *
- * Injected when oAuthEnabled is true.
- */
-export declare const oAuthEnabledRoutes: InjectedRoute[];
 /**
  * User Registration Enabled Routes
  *
@@ -42,12 +30,6 @@ export declare const userRegistrationEnabledRoutes: (dashboardRoute: (path: stri
  * Injected when dashboardEnabled is true.
  */
 export declare const dashboardEnabledRoutes: (dashboardRoute: (path: string) => string) => InjectedRoute[];
-/**
- * Dashboard API Enabled Routes
- *
- * Injected when dashboardAPIEnabled is true.
- */
-export declare const dashboardAPIEnabledRoutes: (dashboardRoute: (path: string) => string) => InjectedRoute[];
 /**
  * 404 Error Page Route
  *
@@ -71,3 +53,7 @@ export declare const middleware: (dbStartPage: boolean) => AstroIntegrationMiddl
  *          and middleware to be injected.
  */
 export declare const getAstroProject: Effect.Effect<import("./types.js").InjectedRoutesWithMiddleware, never, StudioCMSRouteConfig>;
+/**
+ * Get route configuration for StudioCMS.
+ */
+export declare const getRouteConfig: Effect.Effect<import("./types.js").ProcessedRouteConfig, never, StudioCMSRouteConfig>;

package/dist/handlers/frontend/routes.js

@@ -41,47 +41,18 @@ const setupRoutes = [
     pattern: "/studiocms_api/dashboard/step-2",
     entrypoint: "setup-pages/studiocms_api/dashboard/step-2.ts"
   },
-  {
-    pattern: "/studiocms_api/integrations/[type]/[...id]",
-    entrypoint: "pages/studiocms_api/integrations/[type]/[...id].ts"
-  },
-  // Renderer service routes
-  {
-    pattern: "/studiocms_api/partials/render",
-    entrypoint: "pages/studiocms_api/partials/render.astro"
-  }
-];
-const noDbSetupRoutes = [
-  // SDK API routes
-  {
-    pattern: "/studiocms_api/sdk/[...path]",
-    entrypoint: "pages/studiocms_api/sdk/[...path].ts"
-  },
-  // Renderer service routes
-  {
-    pattern: "/studiocms_api/partials/render",
-    entrypoint: "pages/studiocms_api/partials/render.astro"
-  },
   // Integration routes
   {
-    pattern: "/studiocms_api/integrations/[type]/[...id]",
-    entrypoint: "pages/studiocms_api/integrations/[type]/[...id].ts"
+    // This will also be joining the combined API route, but will also remain it's own dedicated route for the db setup stage.
+    pattern: "/studiocms_api/integrations/[...all]",
+    entrypoint: "pages/studiocms_api/integrations/[...all].ts"
   }
 ];
-const restRoutes = [
-  {
-    pattern: "/studiocms_api/rest/v1/[type]/[...id]",
-    entrypoint: "pages/studiocms_api/rest/v1/[type]/[...id].ts"
-  },
-  {
-    pattern: "/studiocms_api/rest/v1/public/[type]/[...id]",
-    entrypoint: "pages/studiocms_api/rest/v1/public/[type]/[...id].ts"
-  }
-];
-const oAuthEnabledRoutes = [
+const noDbSetupRoutes = [
+  // StudioCMS Primary API routes
   {
-    pattern: "/studiocms_api/auth/[provider]/[...id]",
-    entrypoint: "pages/studiocms_api/auth/[provider]/[...id].ts"
+    pattern: "/studiocms_api/[...all]",
+    entrypoint: "pages/studiocms_api/[...all].ts"
   }
 ];
 const userRegistrationEnabledRoutes = (dashboardRoute) => [
@@ -91,27 +62,6 @@ const userRegistrationEnabledRoutes = (dashboardRoute) => [
   }
 ];
 const dashboardEnabledRoutes = (dashboardRoute) => [
-  // Dashboard API Routes
-  {
-    pattern: "/studiocms_api/dashboard/templates",
-    entrypoint: "pages/studiocms_api/dashboard/templates.ts"
-  },
-  {
-    pattern: "/studiocms_api/partials/editor",
-    entrypoint: "pages/studiocms_api/partials/editor.astro"
-  },
-  {
-    pattern: "/studiocms_api/partials/user-list-items",
-    entrypoint: "pages/studiocms_api/partials/user-list-items.astro"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/search-list",
-    entrypoint: "pages/studiocms_api/dashboard/search-list.ts"
-  },
-  {
-    pattern: "/studiocms_api/auth/[path]",
-    entrypoint: "pages/studiocms_api/auth/[path].ts"
-  },
   // Dashboard Frontend Route
   ...[
     {
@@ -193,6 +143,10 @@ const dashboardEnabledRoutes = (dashboardRoute) => [
     {
       pattern: "system-management",
       entrypoint: "pages/[dashboard]/system-management.astro"
+    },
+    {
+      pattern: "password-reset",
+      entrypoint: "pages/[dashboard]/password-reset.astro"
     }
   ].map(({ entrypoint, pattern }) => ({
     // Remap pattern to include dashboard base path
@@ -200,98 +154,6 @@ const dashboardEnabledRoutes = (dashboardRoute) => [
     entrypoint
   }))
 ];
-const dashboardAPIEnabledRoutes = (dashboardRoute) => [
-  // Dashboard page routes
-  {
-    pattern: dashboardRoute("password-reset"),
-    entrypoint: "pages/[dashboard]/password-reset.astro"
-  },
-  // API Routes
-  {
-    pattern: "/studiocms_api/dashboard/config",
-    entrypoint: "pages/studiocms_api/dashboard/config.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/profile",
-    entrypoint: "pages/studiocms_api/dashboard/profile.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/users",
-    entrypoint: "pages/studiocms_api/dashboard/users.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/content/page",
-    entrypoint: "pages/studiocms_api/dashboard/content/page.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/content/folder",
-    entrypoint: "pages/studiocms_api/dashboard/content/folder.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/content/diff",
-    entrypoint: "pages/studiocms_api/dashboard/content/diff.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/taxonomy",
-    entrypoint: "pages/studiocms_api/dashboard/taxonomy.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/taxonomy-search",
-    entrypoint: "pages/studiocms_api/dashboard/taxonomy-search.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/create-reset-link",
-    entrypoint: "pages/studiocms_api/dashboard/create-reset-link.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/reset-password",
-    entrypoint: "pages/studiocms_api/dashboard/reset-password.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/plugins/[plugin]",
-    entrypoint: "pages/studiocms_api/dashboard/plugins/[plugin].ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/create-user",
-    entrypoint: "pages/studiocms_api/dashboard/create-user.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/create-user-invite",
-    entrypoint: "pages/studiocms_api/dashboard/create-user-invite.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/api-tokens",
-    entrypoint: "pages/studiocms_api/dashboard/api-tokens.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/verify-session",
-    entrypoint: "pages/studiocms_api/dashboard/verify-session.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/mailer/config",
-    entrypoint: "pages/studiocms_api/dashboard/mailer/config.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/mailer/test-email",
-    entrypoint: "pages/studiocms_api/dashboard/mailer/check-email.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/verify-email",
-    entrypoint: "pages/studiocms_api/dashboard/verify-email.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/email-notification-settings-site",
-    entrypoint: "pages/studiocms_api/dashboard/email-notification-settings-site.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/resend-verify-email",
-    entrypoint: "pages/studiocms_api/dashboard/resend-verify-email.ts"
-  },
-  {
-    pattern: "/studiocms_api/dashboard/update-user-notifications",
-    entrypoint: "pages/studiocms_api/dashboard/update-user-notifications.ts"
-  }
-];
 const error404Route = {
   pattern: "/404",
   entrypoint: "pages/404.astro"
@@ -326,15 +188,14 @@ const getAstroProject = Effect.gen(function* () {
     Effect.flatMap(injectMiddleware(config))
   );
 });
+const getRouteConfig = StudioCMSRouteConfig.pipe(Effect.flatMap(processedConfig));
 export {
-  dashboardAPIEnabledRoutes,
   dashboardEnabledRoutes,
   error404Route,
   getAstroProject,
+  getRouteConfig,
   middleware,
   noDbSetupRoutes,
-  oAuthEnabledRoutes,
-  restRoutes,
   setupRoutes,
   userRegistrationEnabledRoutes
 };

package/dist/handlers/frontend/types.d.ts

@@ -28,7 +28,7 @@ export interface RouteConfig {
     oAuthProvidersConfigured: boolean;
     extraRoutes: InjectedRoute[];
     developerConfig: {
-        demoMode: false | {
+        demoMode: boolean | {
             username: string;
             password: string;
         };

package/dist/handlers/frontend/utils.js

@@ -1,12 +1,9 @@
 import { Context, Effect, Layer } from "@withstudiocms/effect";
 import {
-  dashboardAPIEnabledRoutes,
   dashboardEnabledRoutes,
   error404Route,
   middleware,
   noDbSetupRoutes,
-  oAuthEnabledRoutes,
-  restRoutes,
   setupRoutes,
   userRegistrationEnabledRoutes
 } from "./routes.js";
@@ -43,11 +40,8 @@ const setPrerenderFalse = (items) => {
 };
 const mapProcessedConfig = Effect.fn(
   ({
-    dashboardAPIEnabled,
     dashboardEnabled,
     dbStartPage,
-    oAuthEnabled,
-    restAPIEnabled,
     shouldInject404Route,
     userRegistrationEnabled,
     dashboardRoute
@@ -64,14 +58,6 @@ const mapProcessedConfig = Effect.fn(
       enabled: shouldInject404Route,
       routes: setPrerenderFalse(error404Route)
     },
-    {
-      enabled: restAPIEnabled,
-      routes: setPrerenderFalse(restRoutes)
-    },
-    {
-      enabled: oAuthEnabled,
-      routes: setPrerenderFalse(oAuthEnabledRoutes)
-    },
     {
       enabled: userRegistrationEnabled,
       routes: setPrerenderFalse(userRegistrationEnabledRoutes(dashboardRoute))
@@ -79,10 +65,6 @@ const mapProcessedConfig = Effect.fn(
     {
       enabled: dashboardEnabled,
       routes: setPrerenderFalse(dashboardEnabledRoutes(dashboardRoute))
-    },
-    {
-      enabled: dashboardAPIEnabled,
-      routes: setPrerenderFalse(dashboardAPIEnabledRoutes(dashboardRoute))
     }
   ])
 );