@snowtop/ent 0.1.0-alpha131 → 0.1.0-alpha133

package/graphql/graphql.d.ts

@@ -28,7 +28,7 @@ interface gqlFieldArg extends gqlFieldOptionsBase {
     isContextArg?: boolean;
 }
 export interface gqlFieldOptions extends gqlFieldOptionsBase {
-    nodeName: string;
+    class: string;
     args?: gqlFieldArg[];
     async?: boolean;
     type: NonNullable<gqlFieldOptionsBase["type"]>;

package/graphql/graphql.js

@@ -331,7 +331,7 @@ class GQLCapture {
             });
         }
         return {
-            nodeName: options.nodeName,
+            nodeName: options.class,
             gqlName: options?.name || ctx.name.toString(),
             functionName: ctx.name.toString(),
             args: args,
@@ -420,15 +420,29 @@ class GQLCapture {
                 if (inter) {
                     const fields = this.customFields.get(inter.nodeName);
                     if (fields) {
+                        // TODO check for duplicate fields
+                        // e.g. if field is already defined no need to add it
                         let objFields = this.customFields.get(obj.nodeName);
                         if (!objFields) {
                             objFields = [];
                         }
+                        let map = new Map();
+                        for (const f of objFields) {
+                            map.set(f.gqlName, f);
+                        }
                         for (const field of fields) {
-                            objFields.push({
+                            const newField = {
                                 ...field,
                                 nodeName: obj.nodeName,
-                            });
+                            };
+                            if (map.has(field.gqlName)) {
+                                const existing = map.get(field.gqlName);
+                                if (JSON.stringify(existing) !== JSON.stringify(newField)) {
+                                    throw new Error(`object ${obj.nodeName} has duplicate field ${field.gqlName} with different definition`);
+                                }
+                                continue;
+                            }
+                            objFields.push(newField);
                         }
                         this.customFields.set(obj.nodeName, objFields);
                     }

package/imports/dataz/example1/_auth.js

@@ -59,11 +59,11 @@ let UserAuthInput = (() => {
     __setFunctionName(_classThis, "UserAuthInput");
     (() => {
         _emailAddress_decorators = [(0, graphql_1.gqlField)({
-                nodeName: "UserAuthInput",
+                class: "UserAuthInput",
                 type: graphql_2.GraphQLString,
             })];
         _password_decorators = [(0, graphql_1.gqlField)({
-                nodeName: "UserAuthInput",
+                class: "UserAuthInput",
                 type: graphql_2.GraphQLString,
             })];
         __esDecorate(null, null, _emailAddress_decorators, { kind: "field", name: "emailAddress", static: false, private: false, access: { has: obj => "emailAddress" in obj, get: obj => obj.emailAddress, set: (obj, value) => { obj.emailAddress = value; } } }, _emailAddress_initializers, _instanceExtraInitializers);
@@ -93,10 +93,10 @@ let UserAuthResponse = (() => {
     __setFunctionName(_classThis_1, "UserAuthResponse");
     (() => {
         _token_decorators = [(0, graphql_1.gqlField)({
-                nodeName: "UserAuthResponse",
+                class: "UserAuthResponse",
                 type: graphql_2.GraphQLString,
             })];
-        _viewerID_decorators = [(0, graphql_1.gqlField)({ nodeName: "UserAuthResponses", type: graphql_2.GraphQLID })];
+        _viewerID_decorators = [(0, graphql_1.gqlField)({ class: "UserAuthResponses", type: graphql_2.GraphQLID })];
         __esDecorate(null, null, _token_decorators, { kind: "field", name: "token", static: false, private: false, access: { has: obj => "token" in obj, get: obj => obj.token, set: (obj, value) => { obj.token = value; } } }, _token_initializers, _instanceExtraInitializers_1);
         __esDecorate(null, null, _viewerID_decorators, { kind: "field", name: "viewerID", static: false, private: false, access: { has: obj => "viewerID" in obj, get: obj => obj.viewerID, set: (obj, value) => { obj.viewerID = value; } } }, _viewerID_initializers, _instanceExtraInitializers_1);
         __esDecorate(null, _classDescriptor_1 = { value: _classThis_1 }, _classDecorators_1, { kind: "class", name: _classThis_1.name }, null, _classExtraInitializers_1);
@@ -119,7 +119,7 @@ let AuthResolver = (() => {
         },
         (() => {
             _userAuth_decorators = [(0, graphql_1.gqlMutation)({
-                    nodeName: "AuthResolver",
+                    class: "AuthResolver",
                     name: "userAuth",
                     type: UserAuthResponse,
                     args: [

package/imports/dataz/example1/_viewer.js

@@ -58,7 +58,7 @@ let ViewerType = (() => {
     __setFunctionName(_classThis, "ViewerType");
     (() => {
         _get_viewerID_decorators = [(0, graphql_1.gqlField)({
-                nodeName: "ViewerType",
+                class: "ViewerType",
                 type: graphql_2.GraphQLID,
                 nullable: true,
             })];
@@ -83,7 +83,7 @@ exports.default = (() => {
         },
         (() => {
             _viewer_decorators = [(0, graphql_1.gqlQuery)({
-                    nodeName: "ViewerResolver",
+                    class: "ViewerResolver",
                     name: "viewer",
                     type: ViewerType,
                     args: [(0, graphql_1.gqlContextType)()],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha131",
+  "version": "0.1.0-alpha133",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",