@plyaz/core 1.18.1 → 1.18.3

package/dist/frameworks/nextjs/index.mjs

@@ -6118,21 +6118,21 @@ function getStatusForMethod(method) {
   }
 }
 __name(getStatusForMethod, "getStatusForMethod");
-function getInjectedServices() {
+function getInjectedServices(coreInstance) {
   return {
-    db: Core.db,
-    cache: Core.cache,
-    storage: Core.storage,
-    notifications: Core.notifications,
-    api: Core.api
+    db: coreInstance.db,
+    cache: coreInstance.cache,
+    storage: coreInstance.storage,
+    notifications: coreInstance.notifications,
+    api: coreInstance.api
   };
 }
 __name(getInjectedServices, "getInjectedServices");
 function createServiceGetter(service, getCore) {
   return async () => {
-    if (getCore) await getCore();
-    if (typeof service === "function") return service();
-    return ServiceRegistry.get(service);
+    const coreInstance = getCore ? await getCore() : Core;
+    const svc = typeof service === "function" ? await service() : ServiceRegistry.get(service);
+    return { service: svc, core: coreInstance };
   };
 }
 __name(createServiceGetter, "createServiceGetter");
@@ -6165,13 +6165,13 @@ function createNextApiRoute(config) {
   function createHandler(method, handler) {
     return ServerErrorMiddleware.withErrorHandler(
       async (request, context) => {
-        const svc = await getService();
+        const { service: svc, core: coreInstance } = await getService();
         const routeContext = context;
         const params = routeContext?.params ? await routeContext.params : {};
         const query = parseQueryParams(request);
         const headers = parseHeaders(request);
         const body = await parseMutationBody(request, method);
-        const services = injectServices ? getInjectedServices() : emptyServices;
+        const services = injectServices ? getInjectedServices(coreInstance) : emptyServices;
         const ctx = {
           params,
           query,