@geins/core 0.3.3 → 0.3.4-canary

package/.turbo/turbo-build.log

@@ -2,5 +2,5 @@ yarn run v1.22.22
 $ rollup -c
 
 src/index.ts → dist/index.cjs, dist/index.esm.js...
-created dist/index.cjs, dist/index.esm.js in 6.5s
-Done in 7.07s.
+created dist/index.cjs, dist/index.esm.js in 6.1s
+Done in 6.66s.

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @geins/core
 
+## 0.3.4-canary
+
+### Patch Changes
+
+- d666708: added settingvars to GraphQLService
+- 5f86eeb: ci fixes
+
 ## 0.3.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -21378,6 +21378,26 @@ var GraphQLService = /** @class */ (function (_super) {
     function GraphQLService(client, geinsSettings) {
         return _super.call(this, client, geinsSettings) || this;
     }
+    GraphQLService.prototype.verifyQueryOptions = function (options) {
+        var _a, _b, _c, _d;
+        if (!options.query) {
+            throw new Error('Query is required');
+        }
+        if (!(((_d = (_c = (_b = (_a = options.query) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.variableDefinitions) === null || _d === void 0 ? void 0 : _d.length) > 0)) {
+            console.log('NO VARS');
+            return options;
+        }
+        var queryOptions = __assign({}, options);
+        queryOptions.variables = this.createVariables(queryOptions.variables);
+        var queryVars = queryOptions.query.definitions[0].variableDefinitions.map(function (v) { return v.variable.name.value; });
+        var providedVars = Object.keys(queryOptions.variables);
+        providedVars.forEach(function (v) {
+            if (!queryVars.includes(v)) {
+                delete queryOptions.variables[v];
+            }
+        });
+        return queryOptions;
+    };
     /**
      * Generic method to run any GraphQL query
      * @param query - The GraphQL query DocumentNode or gql query object
@@ -21387,22 +21407,25 @@ var GraphQLService = /** @class */ (function (_super) {
      */
     GraphQLService.prototype.query = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var result, _a, parsedResult, error_1;
+            var queryOptions, result, _a, parsedResult, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        _a = this.cleanObject;
-                        return [4 /*yield*/, this.runQuery(options)];
+                        _b.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.verifyQueryOptions(options)];
                     case 1:
+                        queryOptions = _b.sent();
+                        _a = this.cleanObject;
+                        return [4 /*yield*/, this.runQuery(queryOptions)];
+                    case 2:
                         result = _a.apply(this, [_b.sent()]);
                         parsedResult = this.parseResult(result);
                         return [2 /*return*/, parsedResult];
-                    case 2:
+                    case 3:
                         error_1 = _b.sent();
                         console.error('Query error:', error_1);
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/, null];
+                    case 4: return [2 /*return*/, null];
                 }
             });
         });

package/dist/index.esm.js

@@ -21376,6 +21376,26 @@ var GraphQLService = /** @class */ (function (_super) {
     function GraphQLService(client, geinsSettings) {
         return _super.call(this, client, geinsSettings) || this;
     }
+    GraphQLService.prototype.verifyQueryOptions = function (options) {
+        var _a, _b, _c, _d;
+        if (!options.query) {
+            throw new Error('Query is required');
+        }
+        if (!(((_d = (_c = (_b = (_a = options.query) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.variableDefinitions) === null || _d === void 0 ? void 0 : _d.length) > 0)) {
+            console.log('NO VARS');
+            return options;
+        }
+        var queryOptions = __assign({}, options);
+        queryOptions.variables = this.createVariables(queryOptions.variables);
+        var queryVars = queryOptions.query.definitions[0].variableDefinitions.map(function (v) { return v.variable.name.value; });
+        var providedVars = Object.keys(queryOptions.variables);
+        providedVars.forEach(function (v) {
+            if (!queryVars.includes(v)) {
+                delete queryOptions.variables[v];
+            }
+        });
+        return queryOptions;
+    };
     /**
      * Generic method to run any GraphQL query
      * @param query - The GraphQL query DocumentNode or gql query object
@@ -21385,22 +21405,25 @@ var GraphQLService = /** @class */ (function (_super) {
      */
     GraphQLService.prototype.query = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var result, _a, parsedResult, error_1;
+            var queryOptions, result, _a, parsedResult, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        _a = this.cleanObject;
-                        return [4 /*yield*/, this.runQuery(options)];
+                        _b.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.verifyQueryOptions(options)];
                     case 1:
+                        queryOptions = _b.sent();
+                        _a = this.cleanObject;
+                        return [4 /*yield*/, this.runQuery(queryOptions)];
+                    case 2:
                         result = _a.apply(this, [_b.sent()]);
                         parsedResult = this.parseResult(result);
                         return [2 /*return*/, parsedResult];
-                    case 2:
+                    case 3:
                         error_1 = _b.sent();
                         console.error('Query error:', error_1);
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/, null];
+                    case 4: return [2 /*return*/, null];
                 }
             });
         });

package/dist/services/graphQLService.d.ts

@@ -3,6 +3,7 @@ import { BaseApiService } from '../base/baseApiService';
 import { GraphQLQueryOptions } from '../api-client/merchantApiClient';
 export declare class GraphQLService extends BaseApiService {
     constructor(client: any, geinsSettings: GeinsSettings);
+    protected verifyQueryOptions(options: GraphQLQueryOptions): GraphQLQueryOptions;
     /**
      * Generic method to run any GraphQL query
      * @param query - The GraphQL query DocumentNode or gql query object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geins/core",
-  "version": "0.3.3",
+  "version": "0.3.4-canary",
   "main": "dist/index.cjs",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,8 @@
     "broadcast-channel": "^7.0.0"
   },
   "devDependencies": {
-    "@geins/types": "0.3.3",
-    "@geins/eslint-config": "*",
+    "@geins/types": "0.3.4-canary",
+    "@geins/eslint-config": "0.1.5-canary",
     "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-graphql": "^2.0.5",
     "@rollup/plugin-node-resolve": "^15.3.0",

package/src/services/graphQLService.ts

@@ -6,6 +6,31 @@ export class GraphQLService extends BaseApiService {
   constructor(client: any, geinsSettings: GeinsSettings) {
     super(client, geinsSettings);
   }
+  protected verifyQueryOptions(options: GraphQLQueryOptions): GraphQLQueryOptions {
+    if (!options.query) {
+      throw new Error('Query is required');
+    }
+    if (!(options.query?.definitions?.[0]?.variableDefinitions?.length > 0)) {
+      console.log('NO VARS');
+      return options;
+    }
+
+    const queryOptions = { ...options };
+    queryOptions.variables = this.createVariables(queryOptions.variables);
+
+    const queryVars = queryOptions.query.definitions[0].variableDefinitions.map(
+      (v: any) => v.variable.name.value,
+    );
+
+    const providedVars = Object.keys(queryOptions.variables);
+    providedVars.forEach(v => {
+      if (!queryVars.includes(v)) {
+        delete queryOptions.variables[v];
+      }
+    });
+
+    return queryOptions;
+  }
 
   /**
    * Generic method to run any GraphQL query
@@ -16,7 +41,9 @@ export class GraphQLService extends BaseApiService {
    */
   async query<T = any>(options: GraphQLQueryOptions): Promise<T | null> {
     try {
-      const result = this.cleanObject(await this.runQuery(options));
+      const queryOptions = await this.verifyQueryOptions(options);
+
+      const result = this.cleanObject(await this.runQuery(queryOptions));
       const parsedResult = this.parseResult(result);
       return parsedResult as T;
     } catch (error) {