@devticon-os/graphql-codegen-axios 0.3.4-test → 0.3.4

package/lib/print.js

@@ -37,8 +37,17 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printScalars = exports.printHelpers = exports.printInput = exports.printFragmentGql = exports.printFragmentType = exports.printEnum = exports.printCreateSdkFunction = exports.printOperationTypes = void 0;
+exports.printTsTypeVariable = exports.printScalars = exports.printHelpers = exports.printInput = exports.printFragmentGql = exports.printObjectType = exports.printFragmentType = exports.printEnum = exports.printCreateSdkFunction = exports.printOperationTypes = void 0;
 var type_1 = require("graphql/type");
 var language_1 = require("graphql/language");
 var graphql_1 = require("./graphql");
@@ -46,13 +55,14 @@ var fs = require("fs");
 var path = require("path");
 var operation_1 = require("./operation");
 var utils_1 = require("./utils");
+var definition_1 = require("graphql/type/definition");
 var printOperationTypes = function (operation, config) {
     var e_1, _a;
     var content = [];
     if (operation.variables) {
-        content.push(printTsType(operation.variables));
+        content.push((0, exports.printTsTypeVariable)(operation.variables));
     }
-    content.push(printTsType(operation.results));
+    content.push((0, exports.printTsTypeVariable)(operation.results));
     var queryFragments = operation.fragments.map(function (fragment) { return "${".concat(fragment, "FragmentQuery}\n"); });
     var query = (0, language_1.print)(operation.definition);
     try {
@@ -103,7 +113,7 @@ var printCreateSdkFunction = function (operations, config) {
         var defArgs = [];
         var execArgs = ['client'];
         if (hasVariables) {
-            defArgs.push("variables: ".concat(operation.variables.name));
+            defArgs.push("variables".concat(operation.variables.isNullable ? '?' : '', ": ").concat(operation.variables.name));
             execArgs.push("{variables, query: ".concat(getOperationQueryName(operation.name), "}"));
         }
         else {
@@ -132,28 +142,59 @@ var printFragmentType = function (fragment, schema, config) {
     var _a;
     var suffix = ((_a = config === null || config === void 0 ? void 0 : config.suffix) === null || _a === void 0 ? void 0 : _a.fragment) || '';
     var parent = (0, type_1.assertObjectType)(schema.getType(fragment.typeCondition.name.value));
-    return printTsType(__assign({ name: fragment.name.value + suffix }, (0, graphql_1.selectionSetToTsType)(parent, fragment.selectionSet.selections, config)));
+    return (0, exports.printTsTypeVariable)(__assign({ name: fragment.name.value + suffix, kind: 'object', isList: false, isNullable: false }, (0, graphql_1.selectionSetToTsType)(parent, fragment.selectionSet.selections, config)));
 };
 exports.printFragmentType = printFragmentType;
+var printObjectType = function (object, config) {
+    return (0, exports.printTsTypeVariable)({
+        kind: 'object',
+        name: (0, utils_1.capitalize)(object.name),
+        fields: Object.values((0, type_1.assertObjectType)((0, definition_1.getNamedType)(object)).getFields()).map(function (field) { return (__assign({ name: field.name, kind: 'inLine', type: (0, graphql_1.graphqlTypeToTypescript)(field.type, config) }, (0, graphql_1.getGraphqlTypeWrappers)(field.type))); }),
+        isList: false,
+        isNullable: false,
+    });
+};
+exports.printObjectType = printObjectType;
 var printFragmentGql = function (fragment) {
-    return "const ".concat(fragment.name.value, "FragmentQuery = `").concat((0, language_1.print)(fragment), "`");
+    var e_3, _a;
+    var query = (0, language_1.print)(fragment);
+    try {
+        for (var pluginDirectives_2 = __values(operation_1.pluginDirectives), pluginDirectives_2_1 = pluginDirectives_2.next(); !pluginDirectives_2_1.done; pluginDirectives_2_1 = pluginDirectives_2.next()) {
+            var pluginDirective = pluginDirectives_2_1.value;
+            query = query.replace(new RegExp('@' + pluginDirective, 'g'), '');
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (pluginDirectives_2_1 && !pluginDirectives_2_1.done && (_a = pluginDirectives_2.return)) _a.call(pluginDirectives_2);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    return "const ".concat(fragment.name.value, "FragmentQuery = `").concat(query, "`");
 };
 exports.printFragmentGql = printFragmentGql;
 var printInput = function (input, config) {
     var _a;
     var suffix = ((_a = config === null || config === void 0 ? void 0 : config.suffix) === null || _a === void 0 ? void 0 : _a.input) || '';
-    return printTsType({
+    return (0, exports.printTsTypeVariable)({
+        kind: 'object',
         name: input.name + suffix,
-        fields: Object.values(input.getFields()).map(function (field) { return (__assign({ name: field.name, kind: 'inLine', type: (0, graphql_1.graphqlTypeToTypescript)(field.type, config) }, (0, graphql_1.getGraphqlTypeWrappers)(field.type))); }),
+        fields: Object.values(input.getFields()).map(function (field) { return (__assign(__assign({ name: field.name, kind: 'inLine', type: (0, graphql_1.graphqlTypeToTypescript)(field.type, config) }, (0, graphql_1.getGraphqlTypeWrappers)(field.type)), { unionListAndObject: true })); }),
+        isNullable: false,
+        isList: false,
     });
 };
 exports.printInput = printInput;
-var printHelpers = function () {
-    return fs.readFileSync(path.resolve(__dirname, '../templates/helpers.ts'));
+var printHelpers = function (config) {
+    var content = fs.readFileSync(path.resolve(__dirname, '../templates/helpers.ts'), 'utf8');
+    content += '\n';
+    content += "type Nullable<T> = ".concat(config.nullableValue ? config.nullableValue : 'T | null', ";\n");
+    return content;
 };
 exports.printHelpers = printHelpers;
 var printScalars = function (scalars, config) {
-    var e_3, _a;
+    var e_4, _a;
     var map = __assign({ String: 'string', Int: 'number', Float: 'number', Boolean: 'boolean' }, (config.scalars || {}));
     try {
         for (var scalars_1 = __values(scalars), scalars_1_1 = scalars_1.next(); !scalars_1_1.done; scalars_1_1 = scalars_1.next()) {
@@ -163,12 +204,12 @@ var printScalars = function (scalars, config) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (scalars_1_1 && !scalars_1_1.done && (_a = scalars_1.return)) _a.call(scalars_1);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     return "export type Scalar = {".concat(Object.entries(map).map(function (_a) {
         var _b = __read(_a, 2), name = _b[0], value = _b[1];
@@ -176,30 +217,33 @@ var printScalars = function (scalars, config) {
     }), "};");
 };
 exports.printScalars = printScalars;
-var printTsTypeFields = function (fields) {
-    var ts = fields.map(function (field) {
-        var _a;
-        var fieldType;
-        if (field.kind === 'inLine') {
-            fieldType = field.type;
-        }
-        else {
-            var unions = ((_a = field.unions) === null || _a === void 0 ? void 0 : _a.length) ? field.unions.join(' & ') + ' &' : '';
-            fieldType = unions + printTsTypeFields(field.fields);
-        }
-        if (field.isList) {
-            fieldType += '[]';
-        }
-        if (field.isNullable) {
-            fieldType = "Nullable<".concat(fieldType, ">");
-        }
-        return "".concat(field.name).concat(field.isNullable ? '?' : '', ": ").concat(fieldType);
-    });
-    return "{".concat(ts.join(','), "}");
-};
 var printTsType = function (type) {
-    var union = type.unions && type.unions.length ? type.unions.join(' & ') + ' &' : '';
-    return "export type ".concat(type.name, " = ").concat(union, " ").concat(printTsTypeFields(type.fields), ";");
+    var _a;
+    var ts;
+    if (type.kind === 'object') {
+        ts = type.fields.map(function (field) { return "".concat(field.name).concat(field.isNullable ? '?' : '', ": ").concat(printTsType(field)); }).join(',');
+        ts = "{".concat(ts, "}");
+    }
+    else {
+        ts = type.type;
+    }
+    if ((_a = type.unions) === null || _a === void 0 ? void 0 : _a.length) {
+        ts = '(' + __spreadArray(__spreadArray([], __read(type.unions), false), [ts], false).join(' & ') + ')';
+    }
+    if (type.isList) {
+        ts += '[]';
+    }
+    if (type.isNullable) {
+        ts = "Nullable<".concat(ts, ">");
+    }
+    if (type.isList && type.unionListAndObject) {
+        ts = "(".concat(ts, " | ").concat(printTsType(__assign(__assign({}, type), { unionListAndObject: false, isList: false })), ")");
+    }
+    return ts;
+};
+var printTsTypeVariable = function (type) {
+    return "export type ".concat(type.name, " = ").concat(printTsType(type), ";");
 };
+exports.printTsTypeVariable = printTsTypeVariable;
 var getOperationQueryName = function (name) { return "".concat(name, "Query"); };
 //# sourceMappingURL=print.js.map

package/lib/print.js.map

@@ -1 +1 @@
-{"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devticon-os/graphql-codegen-axios",
-  "version": "0.3.4-test",
+  "version": "0.3.4",
   "license": "MIT",
   "main": "lib/index.js",
   "repository": "https://github.com/devticon/graphql-codegen-axios",
@@ -22,11 +22,16 @@
     "graphql": "^16.6.0"
   },
   "devDependencies": {
+    "@cloudticon/functions": "^1.2.12",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.15.0",
     "axios": "^1.3.4",
     "graphql": "^16.6.0",
     "prettier": "^2.8.4",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
+  },
+  "dependencies": {
+    "js-yaml": "^4.1.0"
   }
 }

package/templates/helpers.ts

@@ -1,8 +1,6 @@
 import { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
 import { GraphQLError } from 'graphql';
 
-type Nullable<T> = T | undefined;
-
 type GraphqlResponse<T> = {
   data: T;
   errors?: GraphQLError[];
@@ -30,13 +28,13 @@ const firstOrFail = (key: string) => (data: any) => {
 
 const required = (path: string) => (data: any) => {
   const p = path.split('.');
-  let d = data;
+  let d: any = data;
   while (p.length) {
     const k = p.shift();
-    const f = d[k];
+    const f = d[k!];
     if (Array.isArray(f)) {
       for (let i of f) {
-        required(p.join('.'))(f);
+        required(p.join('.'))(i);
       }
     } else if (p.length > 0) {
       d = f;
@@ -65,7 +63,7 @@ const execute = (
     for (let func of functions) {
       try {
         d = func(d);
-      } catch (e) {
+      } catch (e: any) {
         if (e.code) {
           throw new QueryError(e.message, e.code, body);
         } else {