@tinkerstack/graphql-annotation 0.0.7 → 0.0.9

package/dist/index.js

@@ -290,12 +290,6 @@ function split(array, predicate) {
   ];
 }
 __name(split, "split");
-function shallowMerge(objects) {
-  const res = {};
-  objects.forEach((o) => Object.assign(res, o));
-  return res;
-}
-__name(shallowMerge, "shallowMerge");
 function isPlainObject(obj) {
   const prototype = Object.getPrototypeOf(obj);
   return prototype === Object.getPrototypeOf({}) || prototype === null;
@@ -335,7 +329,16 @@ var GraphQLAnnotatedSchemaLoader = class {
     const schema = (0, import_stitch.stitchSchemas)({
       subschemas: loadedSources.map((s) => s.subschema)
     });
-    const annotations = shallowMerge(loadedSources.map((s) => s.annotation));
+    const annotations = {
+      name: loadedSources.map((s) => s.annotation?.name).filter(Boolean).join(","),
+      resolvers: loadedSources.reduce((acc, s) => {
+        for (const [field, infos] of Object.entries(s.annotation?.resolvers ?? {})) acc[field] = acc[field] ? [
+          ...acc[field],
+          ...infos
+        ] : infos;
+        return acc;
+      }, {})
+    };
     const annotationResolvers = await this.discoverAnnotationResolvers();
     return this.embedAnnotationResolversToSchema(schema, annotations, annotationResolvers);
   }
@@ -369,6 +372,7 @@ var GraphQLAnnotatedSchemaLoader = class {
         return loaded2;
       } catch (err) {
         this._logger.error(`Unable to load schema for ${loadId}`);
+        this._logger.error(err);
         throw err;
       }
     });
@@ -395,6 +399,7 @@ var GraphQLAnnotatedSchemaLoader = class {
       return res.data[ANNOTATION_QUERY_NAME];
     } catch (err) {
       this._logger.warn(`Failed to load annotations at ${url}, assuming empty`);
+      this._logger.warn(err);
       return {};
     }
   }

package/dist/index.mjs

@@ -261,12 +261,6 @@ function split(array, predicate) {
   ];
 }
 __name(split, "split");
-function shallowMerge(objects) {
-  const res = {};
-  objects.forEach((o) => Object.assign(res, o));
-  return res;
-}
-__name(shallowMerge, "shallowMerge");
 function isPlainObject(obj) {
   const prototype = Object.getPrototypeOf(obj);
   return prototype === Object.getPrototypeOf({}) || prototype === null;
@@ -306,7 +300,16 @@ var GraphQLAnnotatedSchemaLoader = class {
     const schema = stitchSchemas({
       subschemas: loadedSources.map((s) => s.subschema)
     });
-    const annotations = shallowMerge(loadedSources.map((s) => s.annotation));
+    const annotations = {
+      name: loadedSources.map((s) => s.annotation?.name).filter(Boolean).join(","),
+      resolvers: loadedSources.reduce((acc, s) => {
+        for (const [field, infos] of Object.entries(s.annotation?.resolvers ?? {})) acc[field] = acc[field] ? [
+          ...acc[field],
+          ...infos
+        ] : infos;
+        return acc;
+      }, {})
+    };
     const annotationResolvers = await this.discoverAnnotationResolvers();
     return this.embedAnnotationResolversToSchema(schema, annotations, annotationResolvers);
   }
@@ -340,6 +343,7 @@ var GraphQLAnnotatedSchemaLoader = class {
         return loaded2;
       } catch (err) {
         this._logger.error(`Unable to load schema for ${loadId}`);
+        this._logger.error(err);
         throw err;
       }
     });
@@ -366,6 +370,7 @@ var GraphQLAnnotatedSchemaLoader = class {
       return res.data[ANNOTATION_QUERY_NAME];
     } catch (err) {
       this._logger.warn(`Failed to load annotations at ${url}, assuming empty`);
+      this._logger.warn(err);
       return {};
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkerstack/graphql-annotation",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Better type-safe-able graphql directives",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/plasteek/tinkerstack.git"
+    "url": "git+https://github.com/tinkerve/tinkerstack.git"
   },
   "peerDependencies": {
     "@nestjs/common": "^10 || ^11",

package/src/modules/core/annotation.loader.ts

@@ -20,6 +20,7 @@ import {
   ANNOTATION_RESOLVER_METADATA,
   AnnotationResolverMetadata,
   AnnotationSchemaSources,
+  GraphQLResolversAnnotations,
   ResolverName,
 } from "./annotation.constants";
 import {
@@ -27,12 +28,7 @@ import {
   GraphQLAnnotationMeta,
   GraphQLAnnotationResolver,
 } from "./annotation.resolver";
-import {
-  isPlainObject,
-  loadGraphQLSchema,
-  shallowMerge,
-  split,
-} from "./annotation.utils";
+import { isPlainObject, loadGraphQLSchema, split } from "./annotation.utils";
 import { ResolverDiscoveryService } from "./resolver.explorer";
 import { instanceToPlain } from "class-transformer";
 
@@ -57,9 +53,24 @@ export class GraphQLAnnotatedSchemaLoader {
     const schema = stitchSchemas({
       subschemas: loadedSources.map((s) => s.subschema),
     });
-    const annotations = shallowMerge(
-      loadedSources.map((s) => s.annotation),
-    ) as GraphQLAnnotationMeta;
+    // Deep-merge each source's `resolvers` map. A shallow merge of the whole
+    // annotation objects lets a later source's `resolvers` clobber earlier ones
+    // wholesale — silently dropping every annotation (e.g. session injection)
+    // from all but the last-loaded sub-gateway. Merge per field-name instead so
+    // every stitched sub-gateway keeps its annotations.
+    const annotations = {
+      name: loadedSources
+        .map((s) => s.annotation?.name)
+        .filter(Boolean)
+        .join(","),
+      resolvers: loadedSources.reduce((acc, s) => {
+        for (const [field, infos] of Object.entries(
+          s.annotation?.resolvers ?? {},
+        ))
+          acc[field] = acc[field] ? [...acc[field], ...infos] : infos;
+        return acc;
+      }, {} as GraphQLResolversAnnotations),
+    } satisfies GraphQLAnnotationMeta;
     const annotationResolvers = await this.discoverAnnotationResolvers();
 
     return this.embedAnnotationResolversToSchema(
@@ -140,6 +151,7 @@ export class GraphQLAnnotatedSchemaLoader {
         return loaded;
       } catch (err) {
         this._logger.error(`Unable to load schema for ${loadId}`);
+        this._logger.error(err);
         throw err;
       }
     });
@@ -184,6 +196,7 @@ export class GraphQLAnnotatedSchemaLoader {
       return res.data[ANNOTATION_QUERY_NAME];
     } catch (err) {
       this._logger.warn(`Failed to load annotations at ${url}, assuming empty`);
+      this._logger.warn(err);
       return {} as GraphQLAnnotationMeta;
     }
   }