@btst/stack 3.0.0-rc.2 → 3.0.0-rc.3

package/dist/packages/stack/src/plugins/cms/client/plugin.cjs

@@ -6,6 +6,7 @@ const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
 const utils = require('../../utils.cjs');
 const plugins_cms_queryKeys = require('../../../../../../plugins/cms/query-keys.cjs');
+const constants = require('./constants.cjs');
 
 const DashboardPageComponent = React.lazy(
   () => import('./components/pages/dashboard-page.cjs').then((m) => ({
@@ -22,6 +23,41 @@ const ContentEditorPageComponent = React.lazy(
     default: m.ContentEditorPageComponent
   }))
 );
+function resolveCMSClientConfig(config, runtime) {
+  return {
+    hooks: config.hooks,
+    pageComponents: config.pageComponents,
+    apiBaseURL: runtime.api.baseURL,
+    apiBasePath: runtime.api.basePath,
+    siteBaseURL: runtime.site.baseURL,
+    siteBasePath: runtime.site.basePath,
+    queryClient: runtime.queryClient,
+    ...runtime.api.headers ? { headers: runtime.api.headers } : {},
+    ...runtime.api.credentials ? { credentials: runtime.api.credentials } : {}
+  };
+}
+function createCMSApiClient(config) {
+  return client.createApiClient({
+    baseURL: config.apiBaseURL,
+    basePath: config.apiBasePath,
+    headers: config.headers,
+    credentials: config.credentials
+  });
+}
+function createLoadErrorReporter(hooks, context) {
+  let reported = false;
+  return async (error) => {
+    if (reported || !hooks?.onErrorLoad) return;
+    reported = true;
+    try {
+      await hooks.onErrorLoad(
+        error instanceof Error ? error : new Error(String(error)),
+        context
+      );
+    } catch {
+    }
+  };
+}
 function createDashboardLoader(config) {
   return async () => {
     if (typeof window === "undefined") {
@@ -33,11 +69,8 @@ function createDashboardLoader(config) {
         apiBasePath,
         headers
       };
-      const client$1 = client.createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(createCMSApiClient(config));
       const typesQuery = queries.cmsTypes.list();
       try {
         if (hooks?.beforeLoadDashboard) {
@@ -48,14 +81,14 @@ function createDashboardLoader(config) {
           await hooks.afterLoadDashboard(context);
         }
         const queryState = queryClient.getQueryState(typesQuery.queryKey);
-        if (queryState?.error && hooks?.onLoadError) {
+        if (queryState?.error) {
           const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (client.isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = utils.createSanitizedSSRLoaderError();
@@ -67,9 +100,7 @@ function createDashboardLoader(config) {
             retry: false
           });
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -86,11 +117,8 @@ function createContentListLoader(typeSlug, config) {
         apiBasePath,
         headers
       };
-      const client$1 = client.createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(createCMSApiClient(config));
       const limit = 20;
       const typesQuery = queries.cmsTypes.list();
       const listQuery = queries.cmsContent.list({ typeSlug, limit });
@@ -109,14 +137,14 @@ function createContentListLoader(typeSlug, config) {
         const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const listState = queryClient.getQueryState(listQuery.queryKey);
         const queryError = typesState?.error || listState?.error;
-        if (queryError && hooks?.onLoadError) {
+        if (queryError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (client.isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = utils.createSanitizedSSRLoaderError();
@@ -129,9 +157,7 @@ function createContentListLoader(typeSlug, config) {
             retry: false
           });
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -148,11 +174,8 @@ function createContentEditorLoader(typeSlug, id, config) {
         apiBasePath,
         headers
       };
-      const client$1 = client.createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(createCMSApiClient(config));
       const typesQuery = queries.cmsTypes.list();
       const detailQuery = id ? queries.cmsContent.detail(typeSlug, id) : void 0;
       try {
@@ -170,14 +193,14 @@ function createContentEditorLoader(typeSlug, id, config) {
         const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const itemState = id ? queryClient.getQueryState(detailQuery.queryKey) : null;
         const queryError = typesState?.error || itemState?.error;
-        if (queryError && hooks?.onLoadError) {
+        if (queryError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (client.isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = utils.createSanitizedSSRLoaderError();
@@ -198,9 +221,7 @@ function createContentEditorLoader(typeSlug, id, config) {
             });
           }
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -217,12 +238,8 @@ function createDashboardMeta() {
 }
 function createContentListMeta(typeSlug, config) {
   return () => {
-    const { queryClient, apiBasePath, apiBaseURL } = config;
-    const client$1 = client.createApiClient({
-      baseURL: apiBaseURL,
-      basePath: apiBasePath
-    });
-    const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1);
+    const { queryClient } = config;
+    const queries = plugins_cms_queryKeys.createCMSQueryKeys(createCMSApiClient(config));
     const contentTypes = queryClient.getQueryData(
       queries.cmsTypes.list().queryKey
     );
@@ -237,12 +254,8 @@ function createContentListMeta(typeSlug, config) {
 }
 function createContentEditorMeta(typeSlug, id, config) {
   return () => {
-    const { queryClient, apiBasePath, apiBaseURL } = config;
-    const client$1 = client.createApiClient({
-      baseURL: apiBaseURL,
-      basePath: apiBasePath
-    });
-    const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1);
+    const { queryClient } = config;
+    const queries = plugins_cms_queryKeys.createCMSQueryKeys(createCMSApiClient(config));
     const contentTypes = queryClient.getQueryData(
       queries.cmsTypes.list().queryKey
     );
@@ -255,42 +268,50 @@ function createContentEditorMeta(typeSlug, id, config) {
     ];
   };
 }
-const cmsClientPlugin = (config) => client.defineClientPlugin({
-  name: "cms",
-  routes: () => yar.defineRoutes(
-    {
-      dashboard: yar.defineRoute("/cms", {
-        page: DashboardPageComponent,
-        loader: createDashboardLoader(config),
-        meta: createDashboardMeta()
-      }),
-      contentList: yar.defineRoute("/cms/:typeSlug", {
-        page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(ContentListPageComponent, { typeSlug: params.typeSlug }),
-        loader: ({ params }) => createContentListLoader(params.typeSlug, config)(),
-        meta: ({ params }) => createContentListMeta(params.typeSlug, config)()
-      }),
-      newContent: yar.defineRoute("/cms/:typeSlug/new", {
-        page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(ContentEditorPageComponent, { typeSlug: params.typeSlug }),
-        loader: ({ params }) => createContentEditorLoader(params.typeSlug, void 0, config)(),
-        meta: ({ params }) => createContentEditorMeta(params.typeSlug, void 0, config)()
-      }),
-      editContent: yar.defineRoute("/cms/:typeSlug/:id", {
-        page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(
-          ContentEditorPageComponent,
-          {
-            typeSlug: params.typeSlug,
-            id: params.id
-          }
-        ),
-        loader: ({ params }) => createContentEditorLoader(params.typeSlug, params.id, config)(),
-        meta: ({ params }) => createContentEditorMeta(params.typeSlug, params.id, config)()
-      })
-    },
-    { pages: config.pageComponents }
-  ),
-  sitemap: async () => {
-    return [];
-  }
+function createResolvedCMSPlugin(config) {
+  return {
+    routes: () => yar.defineRoutes(
+      {
+        dashboard: yar.defineRoute("/cms", {
+          page: DashboardPageComponent,
+          loader: createDashboardLoader(config),
+          meta: createDashboardMeta()
+        }),
+        contentList: yar.defineRoute("/cms/:typeSlug", {
+          page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(ContentListPageComponent, { typeSlug: params.typeSlug }),
+          loader: ({ params }) => createContentListLoader(params.typeSlug, config)(),
+          meta: ({ params }) => createContentListMeta(params.typeSlug, config)()
+        }),
+        newContent: yar.defineRoute("/cms/:typeSlug/new", {
+          page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(ContentEditorPageComponent, { typeSlug: params.typeSlug }),
+          loader: ({ params }) => createContentEditorLoader(params.typeSlug, void 0, config)(),
+          meta: ({ params }) => createContentEditorMeta(params.typeSlug, void 0, config)()
+        }),
+        editContent: yar.defineRoute("/cms/:typeSlug/:id", {
+          page: ({ params }) => /* @__PURE__ */ jsxRuntime.jsx(
+            ContentEditorPageComponent,
+            {
+              typeSlug: params.typeSlug,
+              id: params.id
+            }
+          ),
+          loader: ({ params }) => createContentEditorLoader(params.typeSlug, params.id, config)(),
+          meta: ({ params }) => createContentEditorMeta(params.typeSlug, params.id, config)()
+        })
+      },
+      { pages: config.pageComponents }
+    ),
+    sitemap: async () => {
+      return [];
+    }
+  };
+}
+const cmsClientPlugin = (config = {}) => client.defineClientPlugin()({
+  id: constants.CMS_PLUGIN_ID,
+  providerConfig: {
+    ...config.contentTypes ? { contentTypes: config.contentTypes } : {}
+  },
+  resolve: (runtime) => createResolvedCMSPlugin(resolveCMSClientConfig(config, runtime))
 });
 
 exports.cmsClientPlugin = cmsClientPlugin;

package/dist/packages/stack/src/plugins/cms/client/plugin.mjs

@@ -1,9 +1,10 @@
 import { jsx } from 'react/jsx-runtime';
 import { lazy } from 'react';
-import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
+import { defineClientPlugin, isConnectionError, createApiClient } from '@btst/stack/plugins/client';
 import { defineRoutes, defineRoute } from '@btst/yar';
 import { createSanitizedSSRLoaderError } from '../../utils.mjs';
 import { createCMSQueryKeys } from '../../../../../../plugins/cms/query-keys.mjs';
+import { CMS_PLUGIN_ID } from './constants.mjs';
 
 const DashboardPageComponent = lazy(
   () => import('./components/pages/dashboard-page.mjs').then((m) => ({
@@ -20,6 +21,41 @@ const ContentEditorPageComponent = lazy(
     default: m.ContentEditorPageComponent
   }))
 );
+function resolveCMSClientConfig(config, runtime) {
+  return {
+    hooks: config.hooks,
+    pageComponents: config.pageComponents,
+    apiBaseURL: runtime.api.baseURL,
+    apiBasePath: runtime.api.basePath,
+    siteBaseURL: runtime.site.baseURL,
+    siteBasePath: runtime.site.basePath,
+    queryClient: runtime.queryClient,
+    ...runtime.api.headers ? { headers: runtime.api.headers } : {},
+    ...runtime.api.credentials ? { credentials: runtime.api.credentials } : {}
+  };
+}
+function createCMSApiClient(config) {
+  return createApiClient({
+    baseURL: config.apiBaseURL,
+    basePath: config.apiBasePath,
+    headers: config.headers,
+    credentials: config.credentials
+  });
+}
+function createLoadErrorReporter(hooks, context) {
+  let reported = false;
+  return async (error) => {
+    if (reported || !hooks?.onErrorLoad) return;
+    reported = true;
+    try {
+      await hooks.onErrorLoad(
+        error instanceof Error ? error : new Error(String(error)),
+        context
+      );
+    } catch {
+    }
+  };
+}
 function createDashboardLoader(config) {
   return async () => {
     if (typeof window === "undefined") {
@@ -31,11 +67,8 @@ function createDashboardLoader(config) {
         apiBasePath,
         headers
       };
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = createCMSQueryKeys(createCMSApiClient(config));
       const typesQuery = queries.cmsTypes.list();
       try {
         if (hooks?.beforeLoadDashboard) {
@@ -46,14 +79,14 @@ function createDashboardLoader(config) {
           await hooks.afterLoadDashboard(context);
         }
         const queryState = queryClient.getQueryState(typesQuery.queryKey);
-        if (queryState?.error && hooks?.onLoadError) {
+        if (queryState?.error) {
           const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = createSanitizedSSRLoaderError();
@@ -65,9 +98,7 @@ function createDashboardLoader(config) {
             retry: false
           });
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -84,11 +115,8 @@ function createContentListLoader(typeSlug, config) {
         apiBasePath,
         headers
       };
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = createCMSQueryKeys(createCMSApiClient(config));
       const limit = 20;
       const typesQuery = queries.cmsTypes.list();
       const listQuery = queries.cmsContent.list({ typeSlug, limit });
@@ -107,14 +135,14 @@ function createContentListLoader(typeSlug, config) {
         const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const listState = queryClient.getQueryState(listQuery.queryKey);
         const queryError = typesState?.error || listState?.error;
-        if (queryError && hooks?.onLoadError) {
+        if (queryError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = createSanitizedSSRLoaderError();
@@ -127,9 +155,7 @@ function createContentListLoader(typeSlug, config) {
             retry: false
           });
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -146,11 +172,8 @@ function createContentEditorLoader(typeSlug, id, config) {
         apiBasePath,
         headers
       };
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
+      const reportError = createLoadErrorReporter(hooks, context);
+      const queries = createCMSQueryKeys(createCMSApiClient(config));
       const typesQuery = queries.cmsTypes.list();
       const detailQuery = id ? queries.cmsContent.detail(typeSlug, id) : void 0;
       try {
@@ -168,14 +191,14 @@ function createContentEditorLoader(typeSlug, id, config) {
         const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const itemState = id ? queryClient.getQueryState(detailQuery.queryKey) : null;
         const queryError = typesState?.error || itemState?.error;
-        if (queryError && hooks?.onLoadError) {
+        if (queryError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
-          await hooks.onLoadError(error, context);
+          await reportError(error);
         }
       } catch (error) {
         if (isConnectionError(error)) {
           console.warn(
-            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.raw.cms.prefetchForRoute() for SSG data prefetching."
           );
         } else {
           const errToStore = createSanitizedSSRLoaderError();
@@ -196,9 +219,7 @@ function createContentEditorLoader(typeSlug, id, config) {
             });
           }
         }
-        if (hooks?.onLoadError) {
-          await hooks.onLoadError(error, context);
-        }
+        await reportError(error);
       }
     }
   };
@@ -215,12 +236,8 @@ function createDashboardMeta() {
 }
 function createContentListMeta(typeSlug, config) {
   return () => {
-    const { queryClient, apiBasePath, apiBaseURL } = config;
-    const client = createApiClient({
-      baseURL: apiBaseURL,
-      basePath: apiBasePath
-    });
-    const queries = createCMSQueryKeys(client);
+    const { queryClient } = config;
+    const queries = createCMSQueryKeys(createCMSApiClient(config));
     const contentTypes = queryClient.getQueryData(
       queries.cmsTypes.list().queryKey
     );
@@ -235,12 +252,8 @@ function createContentListMeta(typeSlug, config) {
 }
 function createContentEditorMeta(typeSlug, id, config) {
   return () => {
-    const { queryClient, apiBasePath, apiBaseURL } = config;
-    const client = createApiClient({
-      baseURL: apiBaseURL,
-      basePath: apiBasePath
-    });
-    const queries = createCMSQueryKeys(client);
+    const { queryClient } = config;
+    const queries = createCMSQueryKeys(createCMSApiClient(config));
     const contentTypes = queryClient.getQueryData(
       queries.cmsTypes.list().queryKey
     );
@@ -253,42 +266,50 @@ function createContentEditorMeta(typeSlug, id, config) {
     ];
   };
 }
-const cmsClientPlugin = (config) => defineClientPlugin({
-  name: "cms",
-  routes: () => defineRoutes(
-    {
-      dashboard: defineRoute("/cms", {
-        page: DashboardPageComponent,
-        loader: createDashboardLoader(config),
-        meta: createDashboardMeta()
-      }),
-      contentList: defineRoute("/cms/:typeSlug", {
-        page: ({ params }) => /* @__PURE__ */ jsx(ContentListPageComponent, { typeSlug: params.typeSlug }),
-        loader: ({ params }) => createContentListLoader(params.typeSlug, config)(),
-        meta: ({ params }) => createContentListMeta(params.typeSlug, config)()
-      }),
-      newContent: defineRoute("/cms/:typeSlug/new", {
-        page: ({ params }) => /* @__PURE__ */ jsx(ContentEditorPageComponent, { typeSlug: params.typeSlug }),
-        loader: ({ params }) => createContentEditorLoader(params.typeSlug, void 0, config)(),
-        meta: ({ params }) => createContentEditorMeta(params.typeSlug, void 0, config)()
-      }),
-      editContent: defineRoute("/cms/:typeSlug/:id", {
-        page: ({ params }) => /* @__PURE__ */ jsx(
-          ContentEditorPageComponent,
-          {
-            typeSlug: params.typeSlug,
-            id: params.id
-          }
-        ),
-        loader: ({ params }) => createContentEditorLoader(params.typeSlug, params.id, config)(),
-        meta: ({ params }) => createContentEditorMeta(params.typeSlug, params.id, config)()
-      })
-    },
-    { pages: config.pageComponents }
-  ),
-  sitemap: async () => {
-    return [];
-  }
+function createResolvedCMSPlugin(config) {
+  return {
+    routes: () => defineRoutes(
+      {
+        dashboard: defineRoute("/cms", {
+          page: DashboardPageComponent,
+          loader: createDashboardLoader(config),
+          meta: createDashboardMeta()
+        }),
+        contentList: defineRoute("/cms/:typeSlug", {
+          page: ({ params }) => /* @__PURE__ */ jsx(ContentListPageComponent, { typeSlug: params.typeSlug }),
+          loader: ({ params }) => createContentListLoader(params.typeSlug, config)(),
+          meta: ({ params }) => createContentListMeta(params.typeSlug, config)()
+        }),
+        newContent: defineRoute("/cms/:typeSlug/new", {
+          page: ({ params }) => /* @__PURE__ */ jsx(ContentEditorPageComponent, { typeSlug: params.typeSlug }),
+          loader: ({ params }) => createContentEditorLoader(params.typeSlug, void 0, config)(),
+          meta: ({ params }) => createContentEditorMeta(params.typeSlug, void 0, config)()
+        }),
+        editContent: defineRoute("/cms/:typeSlug/:id", {
+          page: ({ params }) => /* @__PURE__ */ jsx(
+            ContentEditorPageComponent,
+            {
+              typeSlug: params.typeSlug,
+              id: params.id
+            }
+          ),
+          loader: ({ params }) => createContentEditorLoader(params.typeSlug, params.id, config)(),
+          meta: ({ params }) => createContentEditorMeta(params.typeSlug, params.id, config)()
+        })
+      },
+      { pages: config.pageComponents }
+    ),
+    sitemap: async () => {
+      return [];
+    }
+  };
+}
+const cmsClientPlugin = (config = {}) => defineClientPlugin()({
+  id: CMS_PLUGIN_ID,
+  providerConfig: {
+    ...config.contentTypes ? { contentTypes: config.contentTypes } : {}
+  },
+  resolve: (runtime) => createResolvedCMSPlugin(resolveCMSClientConfig(config, runtime))
 });
 
 export { cmsClientPlugin };

package/dist/packages/stack/src/plugins/comments/api/getters.cjs

@@ -251,17 +251,20 @@ async function getCommentById(adapter, id, resolveUser, currentUserId) {
     where: [{ field: "id", value: id, operator: "eq" }]
   });
   if (!comment) return null;
+  return enrichCommentRecord(adapter, comment, resolveUser, currentUserId);
+}
+async function enrichCommentRecord(adapter, comment, resolveUser, currentUserId) {
   const authorMap = await resolveAuthors([comment.authorId], resolveUser);
   const likedCommentIds = /* @__PURE__ */ new Set();
   if (currentUserId) {
     const like = await adapter.findOne({
       model: "commentLike",
       where: [
-        { field: "commentId", value: id, operator: "eq" },
+        { field: "commentId", value: comment.id, operator: "eq" },
         { field: "authorId", value: currentUserId, operator: "eq" }
       ]
     });
-    if (like) likedCommentIds.add(id);
+    if (like) likedCommentIds.add(comment.id);
   }
   return enrichComment(comment, authorMap, likedCommentIds);
 }
@@ -279,6 +282,7 @@ async function getCommentCount(adapter, params) {
   return adapter.count({ model: "comment", where: whereConditions });
 }
 
+exports.enrichCommentRecord = enrichCommentRecord;
 exports.getCommentById = getCommentById;
 exports.getCommentCount = getCommentCount;
 exports.listComments = listComments;

package/dist/packages/stack/src/plugins/comments/api/getters.mjs

@@ -249,17 +249,20 @@ async function getCommentById(adapter, id, resolveUser, currentUserId) {
     where: [{ field: "id", value: id, operator: "eq" }]
   });
   if (!comment) return null;
+  return enrichCommentRecord(adapter, comment, resolveUser, currentUserId);
+}
+async function enrichCommentRecord(adapter, comment, resolveUser, currentUserId) {
   const authorMap = await resolveAuthors([comment.authorId], resolveUser);
   const likedCommentIds = /* @__PURE__ */ new Set();
   if (currentUserId) {
     const like = await adapter.findOne({
       model: "commentLike",
       where: [
-        { field: "commentId", value: id, operator: "eq" },
+        { field: "commentId", value: comment.id, operator: "eq" },
         { field: "authorId", value: currentUserId, operator: "eq" }
       ]
     });
-    if (like) likedCommentIds.add(id);
+    if (like) likedCommentIds.add(comment.id);
   }
   return enrichComment(comment, authorMap, likedCommentIds);
 }
@@ -277,4 +280,4 @@ async function getCommentCount(adapter, params) {
   return adapter.count({ model: "comment", where: whereConditions });
 }
 
-export { getCommentById, getCommentCount, listComments };
+export { enrichCommentRecord, getCommentById, getCommentCount, listComments };

package/dist/packages/stack/src/plugins/comments/api/lifecycle-migrations.cjs

@@ -0,0 +1,18 @@
+'use strict';
+
+const COMMENTS_LIFECYCLE_HOOK_MIGRATIONS = Object.freeze({
+  onBeforeList: "onBeforeListComments",
+  onBeforeCount: "onBeforeCountComments",
+  onBeforeListByAuthor: "onBeforeListCommentsByAuthor",
+  onBeforePost: "onBeforeCreateComment",
+  onAfterPost: "onAfterCreateComment",
+  onBeforeEdit: "onBeforeUpdateComment",
+  onAfterEdit: "onAfterUpdateComment",
+  onBeforeLike: "onBeforeToggleCommentReaction",
+  onBeforeStatusChange: "onBeforeModerateComment",
+  onAfterApprove: "onAfterApproveComment",
+  onBeforeDelete: "onBeforeDeleteComment",
+  onAfterDelete: "onAfterDeleteComment"
+});
+
+exports.COMMENTS_LIFECYCLE_HOOK_MIGRATIONS = COMMENTS_LIFECYCLE_HOOK_MIGRATIONS;