@common-stack/server-stack 7.2.1-alpha.8 → 7.2.1-alpha.81

package/lib/inngest/setup.mjs

@@ -1,4 +1,4 @@
-import {serve}from'inngest/express';/**
+import {serve}from'inngest/express';import {globalFunctionRegistry}from'./middleware/function-reference-helper.mjs';/**
  * Sets up Inngest functions from the Feature system and registers the handler
  */
 async function setupInngestFunctions(modules, app, serviceContainer, logger) {
@@ -6,33 +6,50 @@ async function setupInngestFunctions(modules, app, serviceContainer, logger) {
         // Get Inngest client from the container (already bound in infraModule)
         const inngestClient = serviceContainer.get('INNGEST_CLIENT');
         logger.info('✅ Retrieved Inngest client from service container');
-        const inngestFunctions = modules.loadInngestFunctions({
+        // Load Inngest functions from all modules
+        // The improved loadInngestFunctions now handles both array and object returns
+        const inngestFunctions = await modules.loadInngestFunctions({
             container: serviceContainer,
             inngest: inngestClient,
             settings: {},
         });
-        const flatFunctions = inngestFunctions.reduce((acc, curr) => {
-            if (Array.isArray(curr)) {
-                return [...acc, ...curr];
+        if (inngestFunctions.length > 0) {
+            logger.info(`✅ Loaded ${inngestFunctions.length} Inngest functions from Feature system`);
+            // Log function IDs for debugging
+            const functionIds = inngestFunctions
+                .filter((fn) => fn && fn.id)
+                .map((fn) => (typeof fn.id === 'function' ? fn.id() : fn.id))
+                .join(', ');
+            logger.debug(`Registering Inngest functions: ${functionIds}`);
+            // ✨ Register functions with global registry for referenceFunction() helper
+            logger.info('📝 Registering functions with global function registry...');
+            try {
+                globalFunctionRegistry.register(inngestFunctions);
+                logger.info(`✅ Registered ${globalFunctionRegistry.count} functions for referenceFunction() helper`);
+                logger.info('💡 You can now use: referenceFunction("function-id") or auto-invoke in step.invoke()');
             }
-            return [...acc, curr];
-        }, []);
-        if (flatFunctions.length > 0) {
-            logger.info(`✅ Loaded ${flatFunctions.length} Inngest functions from Feature system`);
-        }
-        if (flatFunctions.length > 0) {
+            catch (registryError) {
+                logger.error('❌ Error registering functions with global registry:', registryError);
+            }
+            // Register Inngest handler
+            logger.info('📞 Calling serve() to register Inngest handler...');
             const inngestHandler = serve({
                 client: inngestClient,
-                functions: flatFunctions,
+                functions: inngestFunctions,
             });
+            logger.info('✅ serve() completed successfully');
             app.use('/api/inngest', inngestHandler);
-            logger.info(`✅ Inngest handler registered with ${flatFunctions.length} functions`);
+            logger.info(`✅ Inngest handler registered at /api/inngest with ${inngestFunctions.length} functions`);
         }
         else {
             logger.info('No Inngest functions found - handler not registered');
         }
     }
     catch (error) {
-        logger.warn('Inngest handler registration failed:', error.message);
+        logger.warn('Inngest handler registration failed:', error?.message || String(error));
+        logger.debug('Full error stack:', error?.stack || error);
+        if (error && typeof error === 'object') {
+            logger.debug('Error keys:', Object.keys(error));
+        }
     }
 }export{setupInngestFunctions};//# sourceMappingURL=setup.mjs.map

package/lib/inngest/setup.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"setup.mjs","sources":["../../src/inngest/setup.ts"],"sourcesContent":[null],"names":[],"mappings":"oCASA;;AAEG;AACI,eAAe,qBAAqB,CACvC,OAAgB,EAChB,GAAY,EACZ,gBAA2B,EAC3B,MAAe,EAAA;AAEf,IAAA,IAAI;;QAEA,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAU,gBAAgB,CAAC,CAAC;AACtE,QAAA,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;AAEjE,QAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;AAClD,YAAA,SAAS,EAAE,gBAAgB;AAC3B,YAAA,OAAO,EAAE,aAAa;AACtB,YAAA,QAAQ,EAAE,EAAE;AACf,SAAA,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,KAAI;AACxD,YAAA,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AACrB,gBAAA,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;aAC5B;AACD,YAAA,OAAO,CAAC,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;SACzB,EAAE,EAAE,CAAC,CAAC;AAEP,QAAA,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC,CAAA,SAAA,EAAY,aAAa,CAAC,MAAM,CAAwC,sCAAA,CAAA,CAAC,CAAC;SACzF;AAED,QAAA,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,cAAc,GAAG,KAAK,CAAC;AACzB,gBAAA,MAAM,EAAE,aAAa;AACrB,gBAAA,SAAS,EAAE,aAAa;AAC3B,aAAA,CAAC,CAAC;AACH,YAAA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,CAAA,kCAAA,EAAqC,aAAa,CAAC,MAAM,CAAY,UAAA,CAAA,CAAC,CAAC;SACtF;aAAM;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;SACtE;KACJ;IAAC,OAAO,KAAK,EAAE;QACZ,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KACtE;AACL"}
+{"version":3,"file":"setup.mjs","sources":["../../src/inngest/setup.ts"],"sourcesContent":[null],"names":[],"mappings":"oHAWA;;AAEG;AACI,eAAe,qBAAqB,CACvC,OAAgB,EAChB,GAAY,EACZ,gBAA2B,EAC3B,MAAe,EAAA;AAEf,IAAA,IAAI;;QAEA,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAU,gBAAgB,CAAC,CAAC;AACtE,QAAA,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;;;AAIjE,QAAA,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC;AACxD,YAAA,SAAS,EAAE,gBAAgB;AAC3B,YAAA,OAAO,EAAE,aAAa;AACtB,YAAA,QAAQ,EAAE,EAAE;AACf,SAAA,CAAC,CAAC;AAEH,QAAA,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,CAAA,SAAA,EAAY,gBAAgB,CAAC,MAAM,CAAwC,sCAAA,CAAA,CAAC,CAAC;;YAGzF,MAAM,WAAW,GAAG,gBAAgB;iBAC/B,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;iBAC3B,GAAG,CAAC,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC,EAAE,KAAK,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;iBAC5D,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,YAAA,MAAM,CAAC,KAAK,CAAC,kCAAkC,WAAW,CAAA,CAAE,CAAC,CAAC;;AAG9D,YAAA,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;AACzE,YAAA,IAAI;AACA,gBAAA,sBAAsB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,CAAA,aAAA,EAAgB,sBAAsB,CAAC,KAAK,CAA2C,yCAAA,CAAA,CAAC,CAAC;AACrG,gBAAA,MAAM,CAAC,IAAI,CAAC,sFAAsF,CAAC,CAAC;aACvG;YAAC,OAAO,aAAa,EAAE;AACpB,gBAAA,MAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE,aAAa,CAAC,CAAC;aACtF;;AAGD,YAAA,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACjE,MAAM,cAAc,GAAG,KAAK,CAAC;AACzB,gBAAA,MAAM,EAAE,aAAa;AACrB,gBAAA,SAAS,EAAE,gBAAgB;AAC9B,aAAA,CAAC,CAAC;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;AAEhD,YAAA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,CAAA,kDAAA,EAAqD,gBAAgB,CAAC,MAAM,CAAY,UAAA,CAAA,CAAC,CAAC;SACzG;aAAM;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;SACtE;KACJ;IAAC,OAAO,KAAK,EAAE;AACZ,QAAA,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC;AACzD,QAAA,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;AACpC,YAAA,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACnD;KACJ;AACL"}

package/lib/servers/GraphqlWs.cjs

@@ -1,18 +1,4 @@
-'use strict';var ws=require('graphql-ws/lib/use/ws');require('graphql');// @workaround as the `dataSources` not available in Subscription (websocket) Context.
-// https://github.com/apollographql/apollo-server/issues/1526 need to revisit in Apollo-Server v3.
-const constructDataSourcesForSubscriptions = (context, cache, dataSources) => {
-    const intializeDataSource = (instance) => {
-        instance.initialize({ context, cache });
-    };
-    // tslint:disable-next-line:forin
-    for (const prop in dataSources) {
-        if (dataSources[prop] && typeof dataSources[prop]?.initialize === 'function') {
-            intializeDataSource(dataSources[prop]);
-        }
-    }
-    return dataSources;
-};
-class GraphqlWs {
+'use strict';var ws=require('graphql-ws/lib/use/ws');require('graphql');var websocketContext=require('./websocket-context.cjs');class GraphqlWs {
     wsServer;
     moduleService;
     cache;
@@ -28,35 +14,8 @@ class GraphqlWs {
         this.subscriptionServer = ws.useServer({
             schema: this.moduleService.schema,
             // Adding a context property lets you add data to your GraphQL operation context
-            context: async (ctx) => {
-                // Returning an object here will add that information to our
-                // GraphQL context, which all of our resolvers have access to.
-                // ctx is the `graphql-ws` Context where connectionParams live
-                try {
-                    const pureContext = await this.moduleService.createContext(ctx.connectionParams, null);
-                    const contextServices = await this.moduleService.serviceContext(ctx.connectionParams, null);
-                    const context = {
-                        ...contextServices,
-                        ...pureContext,
-                        preferences: this.moduleService.defaultPreferences,
-                        // update: updateContainers,
-                        ...ctx,
-                    };
-                    const addons = {
-                        dataSources: constructDataSourcesForSubscriptions(context, this.cache, this.moduleService.dataSource),
-                    };
-                    return {
-                        ...context,
-                        ...addons,
-                        ...ctx,
-                        ...pureContext,
-                        preferences: this.moduleService.defaultPreferences,
-                    };
-                }
-                catch (err) {
-                    this.logger.error(err);
-                }
-            },
+            // Using shared context creation function to maintain consistency
+            context: async (ctx) => websocketContext.createWebSocketContext(ctx, this.moduleService, this.cache),
             // onConnect: async (ctx) => {
             //     // do anything when connected
             // },

package/lib/servers/GraphqlWs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"GraphqlWs.cjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":["useServer"],"mappings":"wEAUA;AACA;AACA,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,KAAI;AACzE,IAAA,MAAM,mBAAmB,GAAG,CAAC,QAAQ,KAAI;QACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5C,KAAC,CAAC;;AAEF,IAAA,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;AAC5B,QAAA,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,EAAE;AAC1E,YAAA,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;KACJ;AACD,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;MA0CW,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAAyB,EACzB,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAiB;QACzB,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;AACT,QAAA,IAAI,CAAC,kBAAkB,GAAGA,YAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;AAEjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAI;;;;AAInB,gBAAA,IAAI;AACA,oBAAA,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACvF,oBAAA,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAC5F,oBAAA,MAAM,OAAO,GAAG;AACZ,wBAAA,GAAG,eAAe;AAClB,wBAAA,GAAG,WAAW;AACd,wBAAA,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB;;AAElD,wBAAA,GAAG,GAAG;qBACT,CAAC;AACF,oBAAA,MAAM,MAAM,GAAG;AACX,wBAAA,WAAW,EAAE,oCAAoC,CAC7C,OAAO,EACP,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,aAAa,CAAC,UAAU,CAChC;qBACJ,CAAC;oBACF,OAAO;AACH,wBAAA,GAAG,OAAO;AACV,wBAAA,GAAG,MAAM;AACT,wBAAA,GAAG,GAAG;AACN,wBAAA,GAAG,WAAW;AACd,wBAAA,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB;qBACrD,CAAC;iBACL;gBAAC,OAAO,GAAG,EAAE;AACV,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBAC1B;aACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCJ,SAAA,EACD,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}
+{"version":3,"file":"GraphqlWs.cjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":["useServer","createWebSocketContext"],"mappings":"sIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAAyB,EACzB,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAiB;QACzB,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;AACT,QAAA,IAAI,CAAC,kBAAkB,GAAGA,YAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;;AAGjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAKC,uCAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCtF,SAAA,EACD,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}

package/lib/servers/GraphqlWs.mjs

@@ -1,18 +1,4 @@
-import {useServer}from'graphql-ws/lib/use/ws';import'graphql';// @workaround as the `dataSources` not available in Subscription (websocket) Context.
-// https://github.com/apollographql/apollo-server/issues/1526 need to revisit in Apollo-Server v3.
-const constructDataSourcesForSubscriptions = (context, cache, dataSources) => {
-    const intializeDataSource = (instance) => {
-        instance.initialize({ context, cache });
-    };
-    // tslint:disable-next-line:forin
-    for (const prop in dataSources) {
-        if (dataSources[prop] && typeof dataSources[prop]?.initialize === 'function') {
-            intializeDataSource(dataSources[prop]);
-        }
-    }
-    return dataSources;
-};
-class GraphqlWs {
+import {useServer}from'graphql-ws/lib/use/ws';import'graphql';import {createWebSocketContext}from'./websocket-context.mjs';class GraphqlWs {
     wsServer;
     moduleService;
     cache;
@@ -28,35 +14,8 @@ class GraphqlWs {
         this.subscriptionServer = useServer({
             schema: this.moduleService.schema,
             // Adding a context property lets you add data to your GraphQL operation context
-            context: async (ctx) => {
-                // Returning an object here will add that information to our
-                // GraphQL context, which all of our resolvers have access to.
-                // ctx is the `graphql-ws` Context where connectionParams live
-                try {
-                    const pureContext = await this.moduleService.createContext(ctx.connectionParams, null);
-                    const contextServices = await this.moduleService.serviceContext(ctx.connectionParams, null);
-                    const context = {
-                        ...contextServices,
-                        ...pureContext,
-                        preferences: this.moduleService.defaultPreferences,
-                        // update: updateContainers,
-                        ...ctx,
-                    };
-                    const addons = {
-                        dataSources: constructDataSourcesForSubscriptions(context, this.cache, this.moduleService.dataSource),
-                    };
-                    return {
-                        ...context,
-                        ...addons,
-                        ...ctx,
-                        ...pureContext,
-                        preferences: this.moduleService.defaultPreferences,
-                    };
-                }
-                catch (err) {
-                    this.logger.error(err);
-                }
-            },
+            // Using shared context creation function to maintain consistency
+            context: async (ctx) => createWebSocketContext(ctx, this.moduleService, this.cache),
             // onConnect: async (ctx) => {
             //     // do anything when connected
             // },

package/lib/servers/GraphqlWs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"GraphqlWs.mjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":[],"mappings":"8DAUA;AACA;AACA,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,KAAI;AACzE,IAAA,MAAM,mBAAmB,GAAG,CAAC,QAAQ,KAAI;QACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5C,KAAC,CAAC;;AAEF,IAAA,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;AAC5B,QAAA,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,EAAE;AAC1E,YAAA,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;KACJ;AACD,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;MA0CW,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAAyB,EACzB,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAiB;QACzB,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;AACT,QAAA,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;AAEjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAI;;;;AAInB,gBAAA,IAAI;AACA,oBAAA,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACvF,oBAAA,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAC5F,oBAAA,MAAM,OAAO,GAAG;AACZ,wBAAA,GAAG,eAAe;AAClB,wBAAA,GAAG,WAAW;AACd,wBAAA,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB;;AAElD,wBAAA,GAAG,GAAG;qBACT,CAAC;AACF,oBAAA,MAAM,MAAM,GAAG;AACX,wBAAA,WAAW,EAAE,oCAAoC,CAC7C,OAAO,EACP,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,aAAa,CAAC,UAAU,CAChC;qBACJ,CAAC;oBACF,OAAO;AACH,wBAAA,GAAG,OAAO;AACV,wBAAA,GAAG,MAAM;AACT,wBAAA,GAAG,GAAG;AACN,wBAAA,GAAG,WAAW;AACd,wBAAA,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB;qBACrD,CAAC;iBACL;gBAAC,OAAO,GAAG,EAAE;AACV,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBAC1B;aACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCJ,SAAA,EACD,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}
+{"version":3,"file":"GraphqlWs.mjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":[],"mappings":"iIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAAyB,EACzB,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAiB;QACzB,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;AACT,QAAA,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;;AAGjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAK,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCtF,SAAA,EACD,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}

package/lib/servers/WebsocketMultipathUpdate.cjs

@@ -1,4 +1,4 @@
-'use strict';var url=require('url'),ws=require('ws'),ws$1=require('graphql-ws/lib/use/ws');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var url__namespace=/*#__PURE__*/_interopNamespaceDefault(url);class WebsocketMultiPathServer {
+'use strict';var url=require('url'),ws=require('ws'),ws$1=require('graphql-ws/lib/use/ws'),websocketContext=require('./websocket-context.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var url__namespace=/*#__PURE__*/_interopNamespaceDefault(url);class WebsocketMultiPathServer {
     moduleService;
     cache;
     webSockets = {};
@@ -9,10 +9,12 @@
         this.cache = cache;
         this._graphqlWs = new ws.WebSocketServer({ noServer: true, path: __GRAPHQL_ENDPOINT__ });
         this.webSockets[__GRAPHQL_ENDPOINT__] = this._graphqlWs;
-        this.webSockets[__GRAPHQL_ENDPOINT__].on('connection', (ws, request) => {
+        this.webSockets[__GRAPHQL_ENDPOINT__].on('connection', () => {
             console.log('--REQUESTED CONNECTION--', this._graphqlWs);
             ws$1.useServer({
                 schema: moduleService.schema,
+                // Using shared context creation function to maintain consistency with GraphqlWs
+                context: async (ctx) => websocketContext.createWebSocketContext(ctx, moduleService, cache),
             }, this._graphqlWs);
         });
         for (let key in multiplePathConfig) {

package/lib/servers/WebsocketMultipathUpdate.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketMultipathUpdate.cjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":["WebSocketServer","useServer","url"],"mappings":"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"}
+{"version":3,"file":"WebsocketMultipathUpdate.cjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":["WebSocketServer","useServer","createWebSocketContext","url"],"mappings":"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"}

package/lib/servers/WebsocketMultipathUpdate.mjs

@@ -1,4 +1,4 @@
-import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'graphql-ws/lib/use/ws';class WebsocketMultiPathServer {
+import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'graphql-ws/lib/use/ws';import {createWebSocketContext}from'./websocket-context.mjs';class WebsocketMultiPathServer {
     moduleService;
     cache;
     webSockets = {};
@@ -9,10 +9,12 @@ import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'
         this.cache = cache;
         this._graphqlWs = new WebSocketServer({ noServer: true, path: __GRAPHQL_ENDPOINT__ });
         this.webSockets[__GRAPHQL_ENDPOINT__] = this._graphqlWs;
-        this.webSockets[__GRAPHQL_ENDPOINT__].on('connection', (ws, request) => {
+        this.webSockets[__GRAPHQL_ENDPOINT__].on('connection', () => {
             console.log('--REQUESTED CONNECTION--', this._graphqlWs);
             useServer({
                 schema: moduleService.schema,
+                // Using shared context creation function to maintain consistency with GraphqlWs
+                context: async (ctx) => createWebSocketContext(ctx, moduleService, cache),
             }, this._graphqlWs);
         });
         for (let key in multiplePathConfig) {

package/lib/servers/WebsocketMultipathUpdate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/servers/websocket-context.cjs

@@ -0,0 +1,70 @@
+'use strict';/**
+ * Helper function to construct data sources for WebSocket subscriptions
+ *
+ * @workaround DataSources are an Apollo Server feature that only work with HTTP requests.
+ * When using graphql-ws for WebSocket subscriptions, we must manually initialize data sources
+ * because graphql-ws has a separate context pipeline from Apollo Server's HTTP pipeline.
+ *
+ * This is necessary as of:
+ * - Apollo Server v4.10.4
+ * - graphql-ws v5.11.2
+ *
+ * References:
+ * - Original issue: https://github.com/apollographql/apollo-server/issues/1526
+ * - Community solution: https://github.com/apollographql/apollo-server/issues/1526#issuecomment-502884432
+ * - graphql-ws context: https://github.com/enisdenjo/graphql-ws#context
+ */
+const constructDataSourcesForSubscriptions = (context, cache, dataSources) => {
+    const initializeDataSource = (instance) => {
+        instance.initialize({ context, cache });
+    };
+    // tslint:disable-next-line:forin
+    for (const prop in dataSources) {
+        if (dataSources[prop] && typeof dataSources[prop]?.initialize === 'function') {
+            initializeDataSource(dataSources[prop]);
+        }
+    }
+    return dataSources;
+};
+/**
+ * Creates the WebSocket subscription context
+ * This function is shared between GraphqlWs and WebsocketMultiPathServer
+ * to ensure consistent context creation across all subscription endpoints.
+ *
+ * @param ctx - The graphql-ws context containing connectionParams
+ * @param moduleService - The module service for creating context
+ * @param cache - Redis cache instance
+ * @returns Promise<object> - The complete subscription context
+ */
+async function createWebSocketContext(ctx, moduleService, cache) {
+    try {
+        const connectionParams = ctx.connectionParams || {};
+        const pureContext = await moduleService.createContext(connectionParams, null);
+        const contextServices = await moduleService.serviceContext(connectionParams, null);
+        const context = {
+            ...contextServices,
+            ...pureContext,
+            preferences: moduleService.defaultPreferences,
+            ...ctx,
+        };
+        const addons = {
+            dataSources: constructDataSourcesForSubscriptions(context, cache, moduleService.dataSource),
+        };
+        return {
+            ...context,
+            ...addons,
+            ...ctx,
+            ...pureContext,
+            preferences: moduleService.defaultPreferences,
+        };
+    }
+    catch (err) {
+        moduleService.logger.error('Error creating WebSocket context:', err);
+        // Return a minimal context to prevent crashes
+        return {
+            userContext: {},
+            req: {},
+            connectionParams: ctx.connectionParams || {},
+        };
+    }
+}exports.constructDataSourcesForSubscriptions=constructDataSourcesForSubscriptions;exports.createWebSocketContext=createWebSocketContext;//# sourceMappingURL=websocket-context.cjs.map

package/lib/servers/websocket-context.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-context.cjs","sources":["../../src/servers/websocket-context.ts"],"sourcesContent":[null],"names":[],"mappings":"aAGA;;;;;;;;;;;;;;;AAeG;AACU,MAAA,oCAAoC,GAAG,CAAC,OAAY,EAAE,KAAU,EAAE,WAAgB,KAAI;AAC/F,IAAA,MAAM,oBAAoB,GAAG,CAAC,QAAa,KAAI;QAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5C,KAAC,CAAC;;AAEF,IAAA,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;AAC5B,QAAA,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,EAAE;AAC1E,YAAA,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3C;KACJ;AACD,IAAA,OAAO,WAAW,CAAC;AACvB,EAAE;AAEF;;;;;;;;;AASG;AACI,eAAe,sBAAsB,CACxC,GAAQ,EACR,aAA6B,EAC7B,KAAsC,EAAA;AAEtC,IAAA,IAAI;AACA,QAAA,MAAM,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAEnF,QAAA,MAAM,OAAO,GAAG;AACZ,YAAA,GAAG,eAAe;AAClB,YAAA,GAAG,WAAW;YACd,WAAW,EAAE,aAAa,CAAC,kBAAkB;AAC7C,YAAA,GAAG,GAAG;SACT,CAAC;AAEF,QAAA,MAAM,MAAM,GAAG;YACX,WAAW,EAAE,oCAAoC,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC;SAC9F,CAAC;QAEF,OAAO;AACH,YAAA,GAAG,OAAO;AACV,YAAA,GAAG,MAAM;AACT,YAAA,GAAG,GAAG;AACN,YAAA,GAAG,WAAW;YACd,WAAW,EAAE,aAAa,CAAC,kBAAkB;SAChD,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;;QAErE,OAAO;AACH,YAAA,WAAW,EAAE,EAAE;AACf,YAAA,GAAG,EAAE,EAAE;AACP,YAAA,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,EAAE;SAC/C,CAAC;KACL;AACL"}

package/lib/servers/websocket-context.d.ts

@@ -0,0 +1,30 @@
+import * as IORedis from 'ioredis';
+import { IModuleService } from '../interfaces';
+/**
+ * Helper function to construct data sources for WebSocket subscriptions
+ *
+ * @workaround DataSources are an Apollo Server feature that only work with HTTP requests.
+ * When using graphql-ws for WebSocket subscriptions, we must manually initialize data sources
+ * because graphql-ws has a separate context pipeline from Apollo Server's HTTP pipeline.
+ *
+ * This is necessary as of:
+ * - Apollo Server v4.10.4
+ * - graphql-ws v5.11.2
+ *
+ * References:
+ * - Original issue: https://github.com/apollographql/apollo-server/issues/1526
+ * - Community solution: https://github.com/apollographql/apollo-server/issues/1526#issuecomment-502884432
+ * - graphql-ws context: https://github.com/enisdenjo/graphql-ws#context
+ */
+export declare const constructDataSourcesForSubscriptions: (context: any, cache: any, dataSources: any) => any;
+/**
+ * Creates the WebSocket subscription context
+ * This function is shared between GraphqlWs and WebsocketMultiPathServer
+ * to ensure consistent context creation across all subscription endpoints.
+ *
+ * @param ctx - The graphql-ws context containing connectionParams
+ * @param moduleService - The module service for creating context
+ * @param cache - Redis cache instance
+ * @returns Promise<object> - The complete subscription context
+ */
+export declare function createWebSocketContext(ctx: any, moduleService: IModuleService, cache: IORedis.Redis | IORedis.Cluster): Promise<any>;

package/lib/servers/websocket-context.mjs

@@ -0,0 +1,70 @@
+/**
+ * Helper function to construct data sources for WebSocket subscriptions
+ *
+ * @workaround DataSources are an Apollo Server feature that only work with HTTP requests.
+ * When using graphql-ws for WebSocket subscriptions, we must manually initialize data sources
+ * because graphql-ws has a separate context pipeline from Apollo Server's HTTP pipeline.
+ *
+ * This is necessary as of:
+ * - Apollo Server v4.10.4
+ * - graphql-ws v5.11.2
+ *
+ * References:
+ * - Original issue: https://github.com/apollographql/apollo-server/issues/1526
+ * - Community solution: https://github.com/apollographql/apollo-server/issues/1526#issuecomment-502884432
+ * - graphql-ws context: https://github.com/enisdenjo/graphql-ws#context
+ */
+const constructDataSourcesForSubscriptions = (context, cache, dataSources) => {
+    const initializeDataSource = (instance) => {
+        instance.initialize({ context, cache });
+    };
+    // tslint:disable-next-line:forin
+    for (const prop in dataSources) {
+        if (dataSources[prop] && typeof dataSources[prop]?.initialize === 'function') {
+            initializeDataSource(dataSources[prop]);
+        }
+    }
+    return dataSources;
+};
+/**
+ * Creates the WebSocket subscription context
+ * This function is shared between GraphqlWs and WebsocketMultiPathServer
+ * to ensure consistent context creation across all subscription endpoints.
+ *
+ * @param ctx - The graphql-ws context containing connectionParams
+ * @param moduleService - The module service for creating context
+ * @param cache - Redis cache instance
+ * @returns Promise<object> - The complete subscription context
+ */
+async function createWebSocketContext(ctx, moduleService, cache) {
+    try {
+        const connectionParams = ctx.connectionParams || {};
+        const pureContext = await moduleService.createContext(connectionParams, null);
+        const contextServices = await moduleService.serviceContext(connectionParams, null);
+        const context = {
+            ...contextServices,
+            ...pureContext,
+            preferences: moduleService.defaultPreferences,
+            ...ctx,
+        };
+        const addons = {
+            dataSources: constructDataSourcesForSubscriptions(context, cache, moduleService.dataSource),
+        };
+        return {
+            ...context,
+            ...addons,
+            ...ctx,
+            ...pureContext,
+            preferences: moduleService.defaultPreferences,
+        };
+    }
+    catch (err) {
+        moduleService.logger.error('Error creating WebSocket context:', err);
+        // Return a minimal context to prevent crashes
+        return {
+            userContext: {},
+            req: {},
+            connectionParams: ctx.connectionParams || {},
+        };
+    }
+}export{constructDataSourcesForSubscriptions,createWebSocketContext};//# sourceMappingURL=websocket-context.mjs.map

package/lib/servers/websocket-context.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-context.mjs","sources":["../../src/servers/websocket-context.ts"],"sourcesContent":[null],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;AAeG;AACU,MAAA,oCAAoC,GAAG,CAAC,OAAY,EAAE,KAAU,EAAE,WAAgB,KAAI;AAC/F,IAAA,MAAM,oBAAoB,GAAG,CAAC,QAAa,KAAI;QAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5C,KAAC,CAAC;;AAEF,IAAA,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;AAC5B,QAAA,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,EAAE;AAC1E,YAAA,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3C;KACJ;AACD,IAAA,OAAO,WAAW,CAAC;AACvB,EAAE;AAEF;;;;;;;;;AASG;AACI,eAAe,sBAAsB,CACxC,GAAQ,EACR,aAA6B,EAC7B,KAAsC,EAAA;AAEtC,IAAA,IAAI;AACA,QAAA,MAAM,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAEnF,QAAA,MAAM,OAAO,GAAG;AACZ,YAAA,GAAG,eAAe;AAClB,YAAA,GAAG,WAAW;YACd,WAAW,EAAE,aAAa,CAAC,kBAAkB;AAC7C,YAAA,GAAG,GAAG;SACT,CAAC;AAEF,QAAA,MAAM,MAAM,GAAG;YACX,WAAW,EAAE,oCAAoC,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC;SAC9F,CAAC;QAEF,OAAO;AACH,YAAA,GAAG,OAAO;AACV,YAAA,GAAG,MAAM;AACT,YAAA,GAAG,GAAG;AACN,YAAA,GAAG,WAAW;YACd,WAAW,EAAE,aAAa,CAAC,kBAAkB;SAChD,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;;QAErE,OAAO;AACH,YAAA,WAAW,EAAE,EAAE;AACf,YAAA,GAAG,EAAE,EAAE;AACP,YAAA,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,EAAE;SAC/C,CAAC;KACL;AACL"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/server-stack",
-    "version": "7.2.1-alpha.8",
+    "version": "7.2.1-alpha.81",
     "description": "common core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -32,7 +32,8 @@
         "@cdm-logger/client": "^9.0.8",
         "@cdm-logger/server": "^9.0.15",
         "@cdmbase/graphql-type-uri": "^4.0.0",
-        "@common-stack/graphql-api": "7.2.1-alpha.6",
+        "@common-stack/codegen-zod": "7.2.1-alpha.81",
+        "@common-stack/graphql-api": "7.2.1-alpha.72",
         "@graphql-tools/links": "~9.0.1",
         "@graphql-tools/schema": "~10.0.6",
         "@graphql-tools/stitch": "~9.2.10",
@@ -76,11 +77,12 @@
         "rxjs": "^7.8.1",
         "subscriptions-transport-ws": "^0.11.0",
         "universal-cookie-express": "^4.0.1",
-        "ws": "^8.11.0"
+        "ws": "^8.11.0",
+        "zod": "^4.0.0"
     },
     "devDependencies": {
-        "@common-stack/server-core": "7.2.1-alpha.5",
-        "common": "7.2.1-alpha.5"
+        "@common-stack/server-core": "7.2.1-alpha.81",
+        "common": "7.2.1-alpha.66"
     },
     "peerDependencies": {
         "@cdm-logger/core": ">=7.0.12",
@@ -90,7 +92,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "228a0fc7a8131f9f017c565d92bbc0e96cbf4768",
+    "gitHead": "57b5d3790618c54039ba0c685cf091b2d414316f",
     "typescript": {
         "definition": "lib/index.d.ts"
     }

package/lib/plugins/invalidateCachePlugin.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/plugins/response-cache-plugin.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/utils/add-shareable-directive-to-schema.test.d.ts

@@ -1 +0,0 @@
-export {};