@7nohe/openapi-react-query-codegen 0.1.3 → 0.2.0

package/README.md

@@ -18,15 +18,20 @@ $ npm install -D @7nohe/openapi-react-query-codegen
 ```
 $ openapi-rq --help
 
-  Usage: openapi-rq [options]
-
-  Generate React Query code based on OpenAPI
-
-  Options:
-    -V, --version                 output the version number
-    -p, --path <path>             Path to OpenAPI file
-    -o, --output-dir [directory]  Directory to output the generated package (default: "openapi")
-    -h, --help                    display help for command
+Usage: openapi-rq [options]
+
+Generate React Query code based on OpenAPI
+
+Options:
+  -V, --version            output the version number
+  -i, --input <value>      OpenAPI specification, can be a path, url or string content (required)
+  -o, --output <value>     Output directory (default: "openapi")
+  -c, --client <value>     HTTP client to generate [fetch, xhr, node, axios, angular] (default: "fetch")
+  --exportSchemas <value>  Write schemas to disk (default: false)
+  --indent <value>         Indentation options [4, 2, tabs] (default: "4")
+  --postfix <value>        Service name postfix (default: "Service")
+  --request <value>        Path to custom request file
+  -h, --help               display help for command
 ```
 
 ## Example Usage

package/dist/node_modules/.bin/openapi

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="$NODE_PATH:/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../../../node_modules/.pnpm/openapi-typescript-codegen@0.23.0/node_modules/openapi-typescript-codegen/bin/index.js" "$@"
+else
+  exec node  "$basedir/../../../node_modules/.pnpm/openapi-typescript-codegen@0.23.0/node_modules/openapi-typescript-codegen/bin/index.js" "$@"
+fi

package/dist/node_modules/.bin/tsc

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="$NODE_PATH:/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../../../node_modules/.pnpm/typescript@4.7.4/node_modules/typescript/bin/tsc" "$@"
+else
+  exec node  "$basedir/../../../node_modules/.pnpm/typescript@4.7.4/node_modules/typescript/bin/tsc" "$@"
+fi

package/dist/node_modules/.bin/tsserver

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="$NODE_PATH:/Users/daiki/Documents/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../../../node_modules/.pnpm/typescript@4.7.4/node_modules/typescript/bin/tsserver" "$@"
+else
+  exec node  "$basedir/../../../node_modules/.pnpm/typescript@4.7.4/node_modules/typescript/bin/tsserver" "$@"
+fi

package/dist/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@7nohe/openapi-react-query-codegen",
-    "version": "0.1.3",
+    "version": "0.2.0",
     "description": "OpenAPI React Query Codegen",
     "bin": {
-        "openapi-rq": "bin/cli.js"
+        "openapi-rq": "dist/src/cli.js"
     },
     "scripts": {
         "build": "tsc -p tsconfig.json",
@@ -32,14 +32,13 @@
     "author": "Daiki Urata (@7nohe)",
     "license": "MIT",
     "dependencies": {
-        "commander": "^9.4.0"
-    },
-    "devDependencies": {
-        "@types/glob": "^7.2.0",
-        "@types/node": "^18.0.6",
+        "commander": "^9.4.0",
         "glob": "^8.0.3",
-        "openapi-types": "^12.0.0",
         "openapi-typescript-codegen": "^0.23.0",
         "typescript": "^4.7.4"
+    },
+    "devDependencies": {
+        "@types/glob": "^7.2.0",
+        "@types/node": "^18.0.6"
     }
 }

package/dist/src/cli.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var generate_1 = require("./generate");
+var commander_1 = require("commander");
+var package_json_1 = __importDefault(require("../package.json"));
+var program = new commander_1.Command();
+program
+    .name("openapi-rq")
+    .version(package_json_1["default"].version)
+    .description("Generate React Query code based on OpenAPI")
+    .requiredOption("-i, --input <value>", "OpenAPI specification, can be a path, url or string content (required)")
+    .option("-o, --output <value>", "Output directory", "openapi")
+    .option("-c, --client <value>", "HTTP client to generate [fetch, xhr, node, axios, angular]", "fetch")
+    .option("--exportSchemas <value>", "Write schemas to disk", false)
+    .option("--indent <value>", "Indentation options [4, 2, tabs]", "4")
+    .option("--postfix <value>", "Service name postfix", "Service")
+    .option("--request <value>", "Path to custom request file")
+    .parse();
+var options = program.opts();
+console.log("Generating React Query code using OpenApi file ".concat(options.output));
+(0, generate_1.generate)(options);

package/dist/src/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+exports.__esModule = true;
+exports.requestsOutputPath = exports.queriesOutputPath = exports.defaultOutputPath = void 0;
+exports.defaultOutputPath = "openapi";
+exports.queriesOutputPath = "queries";
+exports.requestsOutputPath = "requests";

package/dist/src/generate.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -44,19 +55,18 @@ var openapi_typescript_codegen_1 = require("openapi-typescript-codegen");
 var print_1 = require("./print");
 var path_1 = __importDefault(require("path"));
 var createSource_1 = require("./createSource");
+var constants_1 = require("./constants");
 function generate(options) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var openApiOutputPath, source;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    openApiOutputPath = path_1["default"].join(options.outputDir, "requests");
-                    return [4 /*yield*/, (0, openapi_typescript_codegen_1.generate)({
-                            input: options.path,
-                            output: openApiOutputPath
-                        })];
+                    openApiOutputPath = path_1["default"].join((_a = options.output) !== null && _a !== void 0 ? _a : constants_1.defaultOutputPath, constants_1.requestsOutputPath);
+                    return [4 /*yield*/, (0, openapi_typescript_codegen_1.generate)(__assign(__assign({}, options), { httpClient: options.client, output: openApiOutputPath }))];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     source = (0, createSource_1.createSource)(openApiOutputPath);
                     (0, print_1.print)(source, options);
                     return [2 /*return*/];

package/dist/src/print.js

@@ -6,16 +6,20 @@ exports.__esModule = true;
 exports.print = void 0;
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
+var constants_1 = require("./constants");
 function printGeneratedTS(result, options) {
-    var dir = path_1["default"].join(options.outputDir, "queries");
+    var _a;
+    var dir = path_1["default"].join((_a = options.output) !== null && _a !== void 0 ? _a : constants_1.defaultOutputPath, constants_1.queriesOutputPath);
     if (!fs_1["default"].existsSync(dir)) {
         fs_1["default"].mkdirSync(dir, { recursive: true });
     }
-    fs_1["default"].writeFileSync(path_1["default"].join(dir, 'index.ts'), result);
+    fs_1["default"].writeFileSync(path_1["default"].join(dir, "index.ts"), result);
 }
 function print(result, options) {
-    if (!fs_1["default"].existsSync(options.outputDir)) {
-        fs_1["default"].mkdirSync(options.outputDir);
+    var _a;
+    var outputPath = (_a = options.output) !== null && _a !== void 0 ? _a : constants_1.defaultOutputPath;
+    if (!fs_1["default"].existsSync(outputPath)) {
+        fs_1["default"].mkdirSync(outputPath);
     }
     printGeneratedTS(result, options);
 }

package/package.json

@@ -1,15 +1,9 @@
 {
   "name": "@7nohe/openapi-react-query-codegen",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "OpenAPI React Query Codegen",
   "bin": {
-    "openapi-rq": "bin/cli.js"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "preview": "npm run build && npm -C examples/react-app run generate:api",
-    "prepublishOnly": "npm run build",
-    "release": "npx git-ensure -a && npx bumpp --commit --tag --push"
+    "openapi-rq": "dist/src/cli.js"
   },
   "repository": {
     "type": "git",
@@ -32,14 +26,18 @@
   "author": "Daiki Urata (@7nohe)",
   "license": "MIT",
   "dependencies": {
-    "commander": "^9.4.0"
-  },
-  "devDependencies": {
-    "@types/glob": "^7.2.0",
-    "@types/node": "^18.0.6",
+    "commander": "^9.4.0",
     "glob": "^8.0.3",
-    "openapi-types": "^12.0.0",
     "openapi-typescript-codegen": "^0.23.0",
     "typescript": "^4.7.4"
+  },
+  "devDependencies": {
+    "@types/glob": "^7.2.0",
+    "@types/node": "^18.0.6"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "preview": "npm run build && npm -C examples/react-app run generate:api",
+    "release": "npx git-ensure -a && npx bumpp --commit --tag --push"
   }
-}
+}

package/dist/bin/cli.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var generate_1 = require("../src/generate");
-var commander_1 = require("commander");
-var package_json_1 = __importDefault(require("../package.json"));
-var program = new commander_1.Command();
-program
-    .name('openapi-rq')
-    .version(package_json_1["default"].version)
-    .description("Generate React Query code based on OpenAPI")
-    .requiredOption("-p, --path <path>", "Path to OpenAPI file")
-    .option("-o, --output-dir [directory]", "Directory to output the generated package", "openapi")
-    .parse();
-var options = program.opts();
-console.log("Generating React Query code using OpenApi file ".concat(options.path));
-(0, generate_1.generate)(options);