@7nohe/openapi-react-query-codegen 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node_modules/.bin/glob +17 -0
- package/dist/node_modules/.bin/openapi +17 -0
- package/dist/node_modules/.bin/tsc +17 -0
- package/dist/node_modules/.bin/tsserver +17 -0
- package/dist/package.json +6 -6
- package/dist/src/createImports.js +5 -4
- package/dist/src/createUseMutation.js +8 -6
- package/dist/src/createUseQuery.js +17 -11
- package/package.json +6 -6
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
|
|
3
|
+
|
|
4
|
+
case `uname` in
|
|
5
|
+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
|
|
6
|
+
esac
|
|
7
|
+
|
|
8
|
+
if [ -z "$NODE_PATH" ]; then
|
|
9
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/dist/esm/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/dist/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
|
|
10
|
+
else
|
|
11
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/dist/esm/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/dist/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules/glob/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/glob@10.3.10/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules:$NODE_PATH"
|
|
12
|
+
fi
|
|
13
|
+
if [ -x "$basedir/node" ]; then
|
|
14
|
+
exec "$basedir/node" "$basedir/../glob/dist/esm/bin.mjs" "$@"
|
|
15
|
+
else
|
|
16
|
+
exec node "$basedir/../glob/dist/esm/bin.mjs" "$@"
|
|
17
|
+
fi
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
|
|
3
|
+
|
|
4
|
+
case `uname` in
|
|
5
|
+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
|
|
6
|
+
esac
|
|
7
|
+
|
|
8
|
+
if [ -z "$NODE_PATH" ]; then
|
|
9
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules/openapi-typescript-codegen/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules/openapi-typescript-codegen/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
|
|
10
|
+
else
|
|
11
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules/openapi-typescript-codegen/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules/openapi-typescript-codegen/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/openapi-typescript-codegen@0.25.0/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules:$NODE_PATH"
|
|
12
|
+
fi
|
|
13
|
+
if [ -x "$basedir/node" ]; then
|
|
14
|
+
exec "$basedir/node" "$basedir/../openapi-typescript-codegen/bin/index.js" "$@"
|
|
15
|
+
else
|
|
16
|
+
exec node "$basedir/../openapi-typescript-codegen/bin/index.js" "$@"
|
|
17
|
+
fi
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
|
|
3
|
+
|
|
4
|
+
case `uname` in
|
|
5
|
+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
|
|
6
|
+
esac
|
|
7
|
+
|
|
8
|
+
if [ -z "$NODE_PATH" ]; then
|
|
9
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
|
|
10
|
+
else
|
|
11
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules:$NODE_PATH"
|
|
12
|
+
fi
|
|
13
|
+
if [ -x "$basedir/node" ]; then
|
|
14
|
+
exec "$basedir/node" "$basedir/../typescript/bin/tsc" "$@"
|
|
15
|
+
else
|
|
16
|
+
exec node "$basedir/../typescript/bin/tsc" "$@"
|
|
17
|
+
fi
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
|
|
3
|
+
|
|
4
|
+
case `uname` in
|
|
5
|
+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
|
|
6
|
+
esac
|
|
7
|
+
|
|
8
|
+
if [ -z "$NODE_PATH" ]; then
|
|
9
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules"
|
|
10
|
+
else
|
|
11
|
+
export NODE_PATH="/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/bin/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules/typescript/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/typescript@5.2.2/node_modules:/Users/daikiurata/Development/openapi-react-query-codegen/node_modules/.pnpm/node_modules:$NODE_PATH"
|
|
12
|
+
fi
|
|
13
|
+
if [ -x "$basedir/node" ]; then
|
|
14
|
+
exec "$basedir/node" "$basedir/../typescript/bin/tsserver" "$@"
|
|
15
|
+
else
|
|
16
|
+
exec node "$basedir/../typescript/bin/tsserver" "$@"
|
|
17
|
+
fi
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@7nohe/openapi-react-query-codegen",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"description": "OpenAPI React Query Codegen",
|
|
5
5
|
"bin": {
|
|
6
6
|
"openapi-rq": "dist/src/cli.js"
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"author": "Daiki Urata (@7nohe)",
|
|
33
33
|
"license": "MIT",
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@types/node": "^18.
|
|
36
|
-
"commander": "^
|
|
37
|
-
"glob": "^10.
|
|
38
|
-
"openapi-typescript-codegen": "^0.
|
|
35
|
+
"@types/node": "^18.16.0",
|
|
36
|
+
"commander": "^11.1.0",
|
|
37
|
+
"glob": "^10.2.5",
|
|
38
|
+
"openapi-typescript-codegen": "^0.25.0",
|
|
39
39
|
"typescript": "^5.0.4"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"commander": ">=
|
|
42
|
+
"commander": ">= 11 < 12",
|
|
43
43
|
"glob": ">= 10",
|
|
44
44
|
"openapi-typescript-codegen": "^0.24.0",
|
|
45
45
|
"typescript": ">= 4.8.3"
|
|
@@ -7,9 +7,10 @@ exports.createImports = void 0;
|
|
|
7
7
|
const typescript_1 = __importDefault(require("typescript"));
|
|
8
8
|
const glob_1 = require("glob");
|
|
9
9
|
const path_1 = require("path");
|
|
10
|
+
const { join } = path_1.posix;
|
|
10
11
|
const createImports = (generatedClientsPath) => {
|
|
11
|
-
const models = (0, glob_1.sync)(
|
|
12
|
-
const services = (0, glob_1.sync)(
|
|
12
|
+
const models = (0, glob_1.sync)(join(generatedClientsPath, 'models', '*.ts').replace(/\\/g, '/'));
|
|
13
|
+
const services = (0, glob_1.sync)(join(generatedClientsPath, 'services', '*.ts').replace(/\\/g, '/'));
|
|
13
14
|
return [
|
|
14
15
|
typescript_1.default.factory.createImportDeclaration(undefined, typescript_1.default.factory.createImportClause(false, undefined, typescript_1.default.factory.createNamedImports([
|
|
15
16
|
typescript_1.default.factory.createImportSpecifier(false, undefined, typescript_1.default.factory.createIdentifier("useQuery")),
|
|
@@ -21,13 +22,13 @@ const createImports = (generatedClientsPath) => {
|
|
|
21
22
|
const modelName = (0, path_1.basename)(model, (0, path_1.extname)(model));
|
|
22
23
|
return typescript_1.default.factory.createImportDeclaration(undefined, typescript_1.default.factory.createImportClause(false, undefined, typescript_1.default.factory.createNamedImports([
|
|
23
24
|
typescript_1.default.factory.createImportSpecifier(false, undefined, typescript_1.default.factory.createIdentifier(modelName)),
|
|
24
|
-
])), typescript_1.default.factory.createStringLiteral(
|
|
25
|
+
])), typescript_1.default.factory.createStringLiteral(join("../requests/models/", modelName)), undefined);
|
|
25
26
|
}),
|
|
26
27
|
...services.map((service) => {
|
|
27
28
|
const serviceName = (0, path_1.basename)(service, (0, path_1.extname)(service));
|
|
28
29
|
return typescript_1.default.factory.createImportDeclaration(undefined, typescript_1.default.factory.createImportClause(false, undefined, typescript_1.default.factory.createNamedImports([
|
|
29
30
|
typescript_1.default.factory.createImportSpecifier(false, undefined, typescript_1.default.factory.createIdentifier(serviceName)),
|
|
30
|
-
])), typescript_1.default.factory.createStringLiteral(
|
|
31
|
+
])), typescript_1.default.factory.createStringLiteral(join("../requests/services", serviceName)), undefined);
|
|
31
32
|
}),
|
|
32
33
|
];
|
|
33
34
|
};
|
|
@@ -26,12 +26,14 @@ const createUseMutation = (node, className, method) => {
|
|
|
26
26
|
typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral("mutationFn")),
|
|
27
27
|
]), undefined),
|
|
28
28
|
], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier("useMutation"), undefined, [
|
|
29
|
-
typescript_1.default.factory.
|
|
30
|
-
typescript_1.default.factory.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
typescript_1.default.factory.createObjectLiteralExpression([
|
|
30
|
+
typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("mutationFn"), typescript_1.default.factory.createArrowFunction(undefined, undefined, method.parameters.length !== 0 ? [
|
|
31
|
+
typescript_1.default.factory.createParameterDeclaration(undefined, undefined, typescript_1.default.factory.createObjectBindingPattern(method.parameters.map((param) => {
|
|
32
|
+
return typescript_1.default.factory.createBindingElement(undefined, undefined, typescript_1.default.factory.createIdentifier(param.name.getText(node)), undefined);
|
|
33
|
+
})), undefined, undefined, undefined),
|
|
34
|
+
] : [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier(className), typescript_1.default.factory.createIdentifier(methodName)), undefined, method.parameters.map((params) => typescript_1.default.factory.createIdentifier(params.name.getText(node)))))),
|
|
35
|
+
typescript_1.default.factory.createSpreadAssignment(typescript_1.default.factory.createIdentifier("options")),
|
|
36
|
+
]),
|
|
35
37
|
]))),
|
|
36
38
|
], typescript_1.default.NodeFlags.Const));
|
|
37
39
|
};
|
|
@@ -17,10 +17,12 @@ const createUseQuery = (node, className, method) => {
|
|
|
17
17
|
const queryKeyGenericType = typescript_1.default.factory.createTypeReferenceNode('TQueryKey', undefined);
|
|
18
18
|
const queryKeyConstraint = typescript_1.default.factory.createTypeReferenceNode('Array', [typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.UnknownKeyword)]);
|
|
19
19
|
return [
|
|
20
|
-
typescript_1.default.factory.createVariableStatement([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createVariableDeclarationList([
|
|
20
|
+
typescript_1.default.factory.createVariableStatement([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createVariableDeclarationList([
|
|
21
|
+
typescript_1.default.factory.createVariableDeclaration(typescript_1.default.factory.createIdentifier(queryKey), undefined, undefined, typescript_1.default.factory.createStringLiteral(`${className}${(0, common_1.capitalizeFirstLetter)(methodName)}`)),
|
|
22
|
+
], typescript_1.default.NodeFlags.Const)),
|
|
21
23
|
typescript_1.default.factory.createVariableStatement([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createVariableDeclarationList([
|
|
22
24
|
typescript_1.default.factory.createVariableDeclaration(typescript_1.default.factory.createIdentifier(customHookName), undefined, undefined, typescript_1.default.factory.createArrowFunction(undefined, typescript_1.default.factory.createNodeArray([
|
|
23
|
-
typescript_1.default.factory.createTypeParameterDeclaration(undefined,
|
|
25
|
+
typescript_1.default.factory.createTypeParameterDeclaration(undefined, "TQueryKey", queryKeyConstraint, typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.UnknownKeyword))),
|
|
24
26
|
]), [
|
|
25
27
|
...requestParam,
|
|
26
28
|
typescript_1.default.factory.createParameterDeclaration(undefined, undefined, typescript_1.default.factory.createIdentifier("queryKey"), typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.QuestionToken), queryKeyGenericType),
|
|
@@ -46,16 +48,20 @@ const createUseQuery = (node, className, method) => {
|
|
|
46
48
|
]),
|
|
47
49
|
])),
|
|
48
50
|
], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier("useQuery"), undefined, [
|
|
49
|
-
typescript_1.default.factory.
|
|
50
|
-
typescript_1.default.factory.createIdentifier(queryKey),
|
|
51
|
-
|
|
52
|
-
typescript_1.default.factory.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
51
|
+
typescript_1.default.factory.createObjectLiteralExpression([
|
|
52
|
+
typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("queryKey"), typescript_1.default.factory.createArrayLiteralExpression([
|
|
53
|
+
typescript_1.default.factory.createIdentifier(queryKey),
|
|
54
|
+
typescript_1.default.factory.createSpreadElement(typescript_1.default.factory.createParenthesizedExpression(typescript_1.default.factory.createBinaryExpression(typescript_1.default.factory.createIdentifier("queryKey"), typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.QuestionQuestionToken), method.parameters.length
|
|
55
|
+
? typescript_1.default.factory.createArrayLiteralExpression([
|
|
56
|
+
typescript_1.default.factory.createObjectLiteralExpression(method.parameters.map((param) => typescript_1.default.factory.createShorthandPropertyAssignment(typescript_1.default.factory.createIdentifier(param.name.getText(node))))),
|
|
57
|
+
])
|
|
58
|
+
: typescript_1.default.factory.createArrayLiteralExpression([])))),
|
|
59
|
+
], false)),
|
|
60
|
+
typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("queryFn"), typescript_1.default.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier(className), typescript_1.default.factory.createIdentifier(methodName)), undefined, method.parameters.map((param) => typescript_1.default.factory.createIdentifier(param.name.getText(node)))))),
|
|
61
|
+
typescript_1.default.factory.createSpreadAssignment(typescript_1.default.factory.createIdentifier("options")),
|
|
62
|
+
]),
|
|
57
63
|
]))),
|
|
58
|
-
], typescript_1.default.NodeFlags.Const))
|
|
64
|
+
], typescript_1.default.NodeFlags.Const)),
|
|
59
65
|
];
|
|
60
66
|
};
|
|
61
67
|
exports.createUseQuery = createUseQuery;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@7nohe/openapi-react-query-codegen",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"description": "OpenAPI React Query Codegen",
|
|
5
5
|
"bin": {
|
|
6
6
|
"openapi-rq": "dist/src/cli.js"
|
|
@@ -26,14 +26,14 @@
|
|
|
26
26
|
"author": "Daiki Urata (@7nohe)",
|
|
27
27
|
"license": "MIT",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@types/node": "^18.
|
|
30
|
-
"commander": "^
|
|
31
|
-
"glob": "^10.
|
|
32
|
-
"openapi-typescript-codegen": "^0.
|
|
29
|
+
"@types/node": "^18.16.0",
|
|
30
|
+
"commander": "^11.1.0",
|
|
31
|
+
"glob": "^10.2.5",
|
|
32
|
+
"openapi-typescript-codegen": "^0.25.0",
|
|
33
33
|
"typescript": "^5.0.4"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"commander": ">=
|
|
36
|
+
"commander": ">= 11 < 12",
|
|
37
37
|
"glob": ">= 10",
|
|
38
38
|
"openapi-typescript-codegen": "^0.24.0",
|
|
39
39
|
"typescript": ">= 4.8.3"
|