@avantstay/graphql-ts-client 11.0.0 → 12.0.1

package/dist/index.js

@@ -477,9 +477,7 @@ var import_case = __toESM(require("case"));
 var esbuild = __toESM(require("esbuild"));
 var fs = __toESM(require("fs"));
 var import_graphql = require("graphql");
-var import_kebabCase = __toESM(require("lodash/kebabCase"));
-var import_orderBy = __toESM(require("lodash/orderBy"));
-var import_set = __toESM(require("lodash/set"));
+var import_lodash = require("lodash");
 var import_md5 = __toESM(require("md5"));
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
@@ -487,65 +485,52 @@ var prettier = __toESM(require("prettier"));
 // package.json
 var package_default = {
     name: "@avantstay/graphql-ts-client",
-    version: "11.0.0",
+    version: "12.0.1",
     description: "GraphQL Typescript Client Generator",
-    author: "Wellington Guimaraes",
-    license: "MIT",
-    main: "dist/index.js",
-    typings: "dist/index.d.ts",
-    scripts: {
-        build: "tsup src/index.ts src/endpoint.ts --dts",
-        test: "cross-env GQL_CLIENT_DIST_PATH='.' jest --watch",
-        prepublishOnly: "yarn build"
-    },
-    files: [
-        "dist",
-        "src"
-    ],
-    engines: {
-        node: ">=12"
-    },
+    homepage: "https://github.com/avantstay/graphql-ts-client",
     bugs: {
         url: "https://github.com/avantstay/graphql-ts-client/issues"
     },
-    homepage: "https://github.com/avantstay/graphql-ts-client#readme",
     repository: {
         type: "git",
         url: "git+https://github.com/avantstay/graphql-ts-client.git"
     },
-    peerDependencies: {},
-    prettier: {
-        trailingComma: "es5",
-        tabWidth: 2,
-        proseWrap: "always",
-        bracketSpacing: true,
-        jsxBracketSameLine: false,
-        semi: false,
-        singleQuote: true,
-        arrowParens: "avoid",
-        endOfLine: "lf",
-        printWidth: 130,
-        htmlWhitespaceSensitivity: "ignore",
-        jsxSingleQuote: false
-    },
-    module: "dist/graphql-ts-client.esm.js",
-    "size-limit": [
-        {
-            path: "dist/graphql-ts-client.cjs.production.min.js",
-            limit: "10 KB"
+    license: "MIT",
+    author: "Wellington Guimaraes",
+    contributors: [
+        "Felipe Pinheiro <felipe.pinheiro.90@hotmail.com>"
+    ],
+    exports: {
+        ".": {
+            import: "./dist/index.mjs",
+            require: "./dist/index.js",
+            types: "./dist/index.d.ts"
         },
-        {
-            path: "dist/graphql-ts-client.esm.js",
-            limit: "10 KB"
+        "./dist/endpoint": {
+            import: "./dist/endpoint.mjs",
+            require: "./dist/endpoint.js",
+            types: "./dist/endpoint.d.ts"
         }
+    },
+    main: "dist/index.js",
+    module: "dist/index.mjs",
+    typings: "dist/index.d.ts",
+    files: [
+        "dist",
+        "src"
     ],
+    scripts: {
+        build: "yarn tsup src/index.ts src/endpoint.ts --dts --format cjs,esm",
+        prepublishOnly: "yarn build",
+        test: "cross-env GQL_CLIENT_DIST_PATH='.' jest --watch"
+    },
     dependencies: {
         "@types/md5": "^2.3.2",
         axios: "^0.24.0",
         "axios-retry": "^3.2.4",
         case: "^1.6.3",
         esbuild: "^0.13.14",
-        graphql: "^15.6.0",
+        graphql: "^16.13.2",
         lodash: "^4.17.21",
         md5: "^2.3.0",
         moize: "^6.1.0",
@@ -574,9 +559,23 @@ var package_default = {
         tsup: "^6.5.0",
         typescript: "^4.9.4"
     },
+    peerDependencies: {},
+    engines: {
+        node: ">=12"
+    },
     publishConfig: {
         "@avantstay:registry": "https://registry.npmjs.org/"
-    }
+    },
+    "size-limit": [
+        {
+            path: "dist/graphql-ts-client.cjs.production.min.js",
+            limit: "10 KB"
+        },
+        {
+            path: "dist/graphql-ts-client.esm.js",
+            limit: "10 KB"
+        }
+    ]
 };
 // src/generateTypescriptClient.ts
 var tempDir = fs.realpathSync(import_os.default.tmpdir());
@@ -691,9 +690,9 @@ function gqlSchemaToCode(gqlType, param) {
     if (rawKind === "SCALAR") {
         return outputType === "ts" ? "export declare type ".concat(gqlType.name, " = ").concat(/date/i.test(gqlType.name) ? "IDate" : "string") : "";
     }
-    if (rawKind === "ENUM") return outputType === "ts" ? "\n      export declare enum ".concat(gqlType.name, " {\n        ").concat((0, import_orderBy.default)(gqlType.enumValues, "name").map(function(_) {
+    if (rawKind === "ENUM") return outputType === "ts" ? "\n      export declare enum ".concat(gqlType.name, " {\n        ").concat((0, import_lodash.orderBy)(gqlType.enumValues, "name").map(function(_) {
         return "".concat(import_case.default.camel(_.name), " = '").concat(_.name, "'");
-    }).join(",\n  "), "\n      }") : "export const ".concat(gqlType.name, " = {").concat((0, import_orderBy.default)(gqlType.enumValues, "name").map(function(_) {
+    }).join(",\n  "), "\n      }") : "export const ".concat(gqlType.name, " = {").concat((0, import_lodash.orderBy)(gqlType.enumValues, "name").map(function(_) {
         return "".concat(import_case.default.camel(_.name), ": '").concat(_.name, "'");
     }).join(",\n  "), "}");
     var fields = gqlType.fields && gqlType.fields || gqlType.inputFields && gqlType.inputFields || [];
@@ -739,7 +738,7 @@ function getTypesTreeCode(types) {
             return _.args.forEach(function(a) {
                 var inputType = getGraphQLInputType(a.type);
                 if (inputType) {
-                    (0, import_set.default)(typesTree, "".concat(type.name, ".").concat(_.name, ".__args.").concat(a.name), inputType);
+                    (0, import_lodash.set)(typesTree, "".concat(type.name, ".").concat(_.name, ".__args.").concat(a.name), inputType);
                 }
             });
         });
@@ -748,7 +747,7 @@ function getTypesTreeCode(types) {
         return t.fields.forEach(function(f) {
             var outputType = getGraphQLOutputType(f.type);
             if (outputType) {
-                (0, import_set.default)(typesTree, "".concat(t.name, ".").concat(f.name, ".__shape"), outputType);
+                (0, import_lodash.set)(typesTree, "".concat(t.name, ".").concat(f.name, ".__shape"), outputType);
             }
         });
     });
@@ -773,9 +772,12 @@ function generateClientCode(types, options) {
     var clientCacheFileName = "gql-ts-client__client__".concat(typesHash, "__").concat(package_default.version, ".json");
     var clientCacheFilePath = import_path.default.resolve(tempDir, clientCacheFileName);
     if (!options.skipCache && fs.existsSync(clientCacheFilePath)) {
-        return JSON.parse(fs.readFileSync(clientCacheFilePath, {
+        var output2 = JSON.parse(fs.readFileSync(clientCacheFilePath, {
             encoding: "utf8"
         }));
+        if (output2.js && output2.mjs && output2.typings) {
+            return output2;
+        }
     }
     var queries = ((_types_find = types.find(function(it) {
         return it.name === "Query";
@@ -848,6 +850,10 @@ function generateClientCode(types, options) {
             format: "cjs",
             loader: "js"
         }).code,
+        mjs: esbuild.transformSync(jsCode, {
+            format: "esm",
+            loader: "js"
+        }).code,
         typings: prettier.format(typingsCode, {
             semi: false,
             parser: "typescript"
@@ -866,7 +872,7 @@ function _fetchIntrospection() {
             switch(_state.label){
                 case 0:
                     endpoint = param.endpoint, headers = param.headers;
-                    introspectionCacheFileName = "gql-ts-client__introspection__".concat((0, import_kebabCase.default)(endpoint), ".json");
+                    introspectionCacheFileName = "gql-ts-client__introspection__".concat((0, import_lodash.kebabCase)(endpoint), ".json");
                     introspectionCacheFilePath = import_path.default.resolve(tempDir, introspectionCacheFileName);
                     loadedFromCache = false;
                     return [
@@ -876,21 +882,21 @@ function _fetchIntrospection() {
                         }, {
                             headers: _objectSpread({
                                 "Content-Type": "application/json"
-                            }, headers)
+                            }, headers),
+                            timeout: 5e3
                         }).catch(function(e) {
-                            var errorMessage = "The GraphQL introspection request failed (".concat(endpoint, ")");
                             if (fs.existsSync(introspectionCacheFilePath)) {
                                 var cachedSchema = JSON.parse(fs.readFileSync(introspectionCacheFilePath, {
                                     encoding: "utf8"
                                 }));
                                 loadedFromCache = true;
-                                console.warn("Successfully restored from local cache.");
+                                console.warn("Successfully restored (".concat(endpoint, ") from local cache."));
                                 return {
                                     data: cachedSchema
                                 };
                             } else {
                                 console.error(e);
-                                return Promise.reject(errorMessage);
+                                return Promise.reject("The GraphQL introspection request failed (".concat(endpoint, ")"));
                             }
                         })
                     ];
@@ -916,7 +922,7 @@ function generateClient(introspectionTypes, _param) {
     var output = _param.output, restOptions = _objectWithoutProperties(_param, [
         "output"
     ]);
-    var _generateClientCode = generateClientCode(introspectionTypes, restOptions), js = _generateClientCode.js, typings = _generateClientCode.typings;
+    var _generateClientCode = generateClientCode(introspectionTypes, restOptions), js = _generateClientCode.js, mjs = _generateClientCode.mjs, typings = _generateClientCode.typings;
     if (output && typeof output === "string") {
         var outputDir = import_path.default.dirname(output);
         if (!fs.existsSync(outputDir)) {
@@ -930,9 +936,13 @@ function generateClient(introspectionTypes, _param) {
         fs.writeFileSync(output.replace(/(\.(ts|js))?$/, ".js"), js, {
             encoding: "utf8"
         });
+        fs.writeFileSync(output.replace(/(\.(ts|js))?$/, ".mjs"), mjs, {
+            encoding: "utf8"
+        });
     }
     return {
         js: js,
+        mjs: mjs,
         typings: typings
     };
 }
@@ -973,11 +983,15 @@ function _generateTypescriptClient() {
     return _generateTypescriptClient.apply(this, arguments);
 }
 function generateTypescriptClientFromSDL(SDL, options) {
-    var _data;
+    var _introspectionResult_data;
     var _options_clientName;
     console.log("Generating TypeScript client from SDL (name: ".concat((_options_clientName = options.clientName) !== null && _options_clientName !== void 0 ? _options_clientName : "n/a", ")"));
     var graphqlSchemaObj = (0, import_graphql.buildSchema)(SDL);
-    var introspectionTypes = (_data = (0, import_graphql.graphqlSync)(graphqlSchemaObj, new import_graphql.Source((0, import_graphql.getIntrospectionQuery)())).data) === null || _data === void 0 ? void 0 : _data.__schema.types;
+    var introspectionResult = (0, import_graphql.graphqlSync)({
+        schema: graphqlSchemaObj,
+        source: (0, import_graphql.getIntrospectionQuery)()
+    });
+    var introspectionTypes = (_introspectionResult_data = introspectionResult.data) === null || _introspectionResult_data === void 0 ? void 0 : _introspectionResult_data.__schema.types;
     return generateClient(introspectionTypes, options);
 }
 // src/types.ts