@geins/cms 0.3.4-canary → 0.3.5-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 8.2s
-Done in 9.02s.
+created dist/index.cjs, dist/index.esm.js in 8.9s
+Done in 9.83s.

package/CHANGELOG.md

@@ -1,14 +1,26 @@
 # @geins/cms
 
-## 0.3.4-canary
+## 0.3.5-canary
 
 ### Patch Changes
 
 - d666708: added settingvars to GraphQLService
+- 2158dcd: Possiblity to use string as query for the merchantAPI
 - 5f86eeb: ci fixes
 - Updated dependencies [d666708]
+- Updated dependencies [2158dcd]
 - Updated dependencies [5f86eeb]
-  - @geins/core@0.3.4-canary
+  - @geins/core@0.3.5-canary
+
+## 0.3.4
+
+### Patch Changes
+
+- 3cf633e: added settingvars to GraphQLService
+- 3cf633e: ci fixes
+- Updated dependencies [3cf633e]
+- Updated dependencies [3cf633e]
+  - @geins/core@0.3.4
 
 ## 0.3.3
 

package/dist/index.cjs

@@ -16236,15 +16236,18 @@ var MerchantApiClient = /** @class */ (function () {
         }
         return FetchPolicyOptions.NETWORK_ONLY;
     };
-    MerchantApiClient.prototype.getOperationObject = function (operationType, document, variables, options) {
+    MerchantApiClient.prototype.getOperationObject = function (operationType, operationOptions) {
         var _a;
         var _b;
-        if (variables === void 0) { variables = {}; }
-        if (options === void 0) { options = {}; }
+        var query = operationOptions.query, queryAsString = operationOptions.queryAsString, variables = operationOptions.variables, requestOptions = operationOptions.requestOptions;
+        var queryDocument = query || gql(queryAsString || '');
+        var options = requestOptions || {};
         var token = this._userToken || ((_b = this._cookieService) === null || _b === void 0 ? void 0 : _b.get(AUTH_COOKIES.USER_AUTH));
-        // remove typename from variables
+        if (!queryDocument) {
+            throw new Error('Query is required');
+        }
         var operationObj = (_a = {},
-            _a[operationType] = document,
+            _a[operationType] = queryDocument,
             _a.variables = variables,
             _a.fetchPolicy = this.getFetchPolicy(operationType, options.fetchPolicy),
             _a.pollInterval = options.pollInterval || this.pollInterval,
@@ -16260,20 +16263,18 @@ var MerchantApiClient = /** @class */ (function () {
     };
     MerchantApiClient.prototype.runQuery = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var query, variables, requestOptions, q;
+            var q;
             return __generator(this, function (_a) {
-                query = options.query, variables = options.variables, requestOptions = options.requestOptions;
-                q = this.getOperationObject(OperationType.QUERY, query, variables, requestOptions);
+                q = this.getOperationObject(OperationType.QUERY, options);
                 return [2 /*return*/, this._apolloClient.query(q)];
             });
         });
     };
     MerchantApiClient.prototype.runMutation = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var query, variables, requestOptions, q;
+            var q;
             return __generator(this, function (_a) {
-                query = options.query, variables = options.variables, requestOptions = options.requestOptions;
-                q = this.getOperationObject(OperationType.MUTATION, query, variables, requestOptions);
+                q = this.getOperationObject(OperationType.MUTATION, options);
                 return [2 /*return*/, this._apolloClient.mutate(q)];
             });
         });
@@ -20664,37 +20665,45 @@ var ChannelService = /** @class */ (function (_super) {
     return ChannelService;
 }(BaseApiService));
 
+/**
+ * GraphQLService class provides methods to interact with a GraphQL API.
+ * It extends the BaseApiService and includes methods for querying and mutating data.
+ */
 var GraphQLService = /** @class */ (function (_super) {
     __extends(GraphQLService, _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);
+        var _a, _b, _c, _d, _e;
+        var returnOptions = __assign({}, options);
+        if (!options.query && !options.queryAsString) {
+            throw new Error('Query or queryAsString is required');
+        }
+        // check if query is a string and convert it to a gql object
+        typeof returnOptions.query === 'string' && (returnOptions.query = gql(options.queryAsString || ''));
+        var definition = (_b = (_a = returnOptions.query) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b[0];
+        if (!definition ||
+            definition.kind !== 'OperationDefinition' ||
+            !(((_d = (_c = definition.variableDefinitions) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 0)) {
+            return returnOptions;
+        }
+        var queryOptions = __assign({}, returnOptions);
+        var queryDocument = queryOptions.query;
         queryOptions.variables = this.createVariables(queryOptions.variables);
-        var queryVars = queryOptions.query.definitions[0].variableDefinitions.map(function (v) { return v.variable.name.value; });
+        var queryVars = ((_e = queryDocument.definitions[0].variableDefinitions) === null || _e === void 0 ? void 0 : _e.map(function (v) { return v.variable.name.value; })) || [];
         var providedVars = Object.keys(queryOptions.variables);
         providedVars.forEach(function (v) {
-            if (!queryVars.includes(v)) {
+            if (queryVars && !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
-     * @param variables - Variables to pass to the query
-     * @param options - Optional options like fetchPolicy, pollInterval, etc.
-     * @returns The result data of the query or null
+     * Executes a GraphQL query with the provided options.
+     * @param options - The options for the GraphQL query.
+     * @returns A promise that resolves to the query result or null if an error occurs.
      */
     GraphQLService.prototype.query = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -20716,17 +20725,15 @@ var GraphQLService = /** @class */ (function (_super) {
                         error_1 = _b.sent();
                         console.error('Query error:', error_1);
                         return [2 /*return*/, null];
-                    case 4: return [2 /*return*/, null];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Generic method to run any GraphQL mutation
-     * @param mutation - The GraphQL mutation DocumentNode or gql mutation object
-     * @param variables - Variables to pass to the mutation
-     * @param options - Optional options like fetchPolicy, etc.
-     * @returns The result data of the mutation or null
+     * Executes a GraphQL mutation with the provided options.
+     * @param options - The options for the GraphQL mutation.
+     * @returns A promise that resolves to the mutation result or null if an error occurs.
      */
     GraphQLService.prototype.mutation = function (options) {
         return __awaiter(this, void 0, void 0, function () {

package/dist/index.esm.js

@@ -16234,15 +16234,18 @@ var MerchantApiClient = /** @class */ (function () {
         }
         return FetchPolicyOptions.NETWORK_ONLY;
     };
-    MerchantApiClient.prototype.getOperationObject = function (operationType, document, variables, options) {
+    MerchantApiClient.prototype.getOperationObject = function (operationType, operationOptions) {
         var _a;
         var _b;
-        if (variables === void 0) { variables = {}; }
-        if (options === void 0) { options = {}; }
+        var query = operationOptions.query, queryAsString = operationOptions.queryAsString, variables = operationOptions.variables, requestOptions = operationOptions.requestOptions;
+        var queryDocument = query || gql(queryAsString || '');
+        var options = requestOptions || {};
         var token = this._userToken || ((_b = this._cookieService) === null || _b === void 0 ? void 0 : _b.get(AUTH_COOKIES.USER_AUTH));
-        // remove typename from variables
+        if (!queryDocument) {
+            throw new Error('Query is required');
+        }
         var operationObj = (_a = {},
-            _a[operationType] = document,
+            _a[operationType] = queryDocument,
             _a.variables = variables,
             _a.fetchPolicy = this.getFetchPolicy(operationType, options.fetchPolicy),
             _a.pollInterval = options.pollInterval || this.pollInterval,
@@ -16258,20 +16261,18 @@ var MerchantApiClient = /** @class */ (function () {
     };
     MerchantApiClient.prototype.runQuery = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var query, variables, requestOptions, q;
+            var q;
             return __generator(this, function (_a) {
-                query = options.query, variables = options.variables, requestOptions = options.requestOptions;
-                q = this.getOperationObject(OperationType.QUERY, query, variables, requestOptions);
+                q = this.getOperationObject(OperationType.QUERY, options);
                 return [2 /*return*/, this._apolloClient.query(q)];
             });
         });
     };
     MerchantApiClient.prototype.runMutation = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var query, variables, requestOptions, q;
+            var q;
             return __generator(this, function (_a) {
-                query = options.query, variables = options.variables, requestOptions = options.requestOptions;
-                q = this.getOperationObject(OperationType.MUTATION, query, variables, requestOptions);
+                q = this.getOperationObject(OperationType.MUTATION, options);
                 return [2 /*return*/, this._apolloClient.mutate(q)];
             });
         });
@@ -20662,37 +20663,45 @@ var ChannelService = /** @class */ (function (_super) {
     return ChannelService;
 }(BaseApiService));
 
+/**
+ * GraphQLService class provides methods to interact with a GraphQL API.
+ * It extends the BaseApiService and includes methods for querying and mutating data.
+ */
 var GraphQLService = /** @class */ (function (_super) {
     __extends(GraphQLService, _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);
+        var _a, _b, _c, _d, _e;
+        var returnOptions = __assign({}, options);
+        if (!options.query && !options.queryAsString) {
+            throw new Error('Query or queryAsString is required');
+        }
+        // check if query is a string and convert it to a gql object
+        typeof returnOptions.query === 'string' && (returnOptions.query = gql(options.queryAsString || ''));
+        var definition = (_b = (_a = returnOptions.query) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b[0];
+        if (!definition ||
+            definition.kind !== 'OperationDefinition' ||
+            !(((_d = (_c = definition.variableDefinitions) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 0)) {
+            return returnOptions;
+        }
+        var queryOptions = __assign({}, returnOptions);
+        var queryDocument = queryOptions.query;
         queryOptions.variables = this.createVariables(queryOptions.variables);
-        var queryVars = queryOptions.query.definitions[0].variableDefinitions.map(function (v) { return v.variable.name.value; });
+        var queryVars = ((_e = queryDocument.definitions[0].variableDefinitions) === null || _e === void 0 ? void 0 : _e.map(function (v) { return v.variable.name.value; })) || [];
         var providedVars = Object.keys(queryOptions.variables);
         providedVars.forEach(function (v) {
-            if (!queryVars.includes(v)) {
+            if (queryVars && !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
-     * @param variables - Variables to pass to the query
-     * @param options - Optional options like fetchPolicy, pollInterval, etc.
-     * @returns The result data of the query or null
+     * Executes a GraphQL query with the provided options.
+     * @param options - The options for the GraphQL query.
+     * @returns A promise that resolves to the query result or null if an error occurs.
      */
     GraphQLService.prototype.query = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -20714,17 +20723,15 @@ var GraphQLService = /** @class */ (function (_super) {
                         error_1 = _b.sent();
                         console.error('Query error:', error_1);
                         return [2 /*return*/, null];
-                    case 4: return [2 /*return*/, null];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Generic method to run any GraphQL mutation
-     * @param mutation - The GraphQL mutation DocumentNode or gql mutation object
-     * @param variables - Variables to pass to the mutation
-     * @param options - Optional options like fetchPolicy, etc.
-     * @returns The result data of the mutation or null
+     * Executes a GraphQL mutation with the provided options.
+     * @param options - The options for the GraphQL mutation.
+     * @returns A promise that resolves to the mutation result or null if an error occurs.
      */
     GraphQLService.prototype.mutation = function (options) {
         return __awaiter(this, void 0, void 0, function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geins/cms",
-  "version": "0.3.4-canary",
+  "version": "0.3.5-canary",
   "main": "dist/index.cjs",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@apollo/client": "^3.11.8",
     "graphql": "^16.9.0",
-    "@geins/core": "0.3.4-canary"
+    "@geins/core": "0.3.5-canary"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-typescript": "^12.1.0",
-    "@geins/eslint-config": "0.1.5-canary",
+    "@geins/eslint-config": "0.1.6-canary",
     "typescript": "^5.6.2",
     "eslint": "^9.11.1"
   }