@openapi-qraft/tanstack-query-react-plugin 1.14.0-beta.5 → 2.0.0-next.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/CHANGELOG.md CHANGED
@@ -1,5 +1,30 @@
1
1
  # @openapi-qraft/tanstack-query-react-plugin
2
2
 
3
+ ## 2.0.0-next.0
4
+
5
+ ### Major Changes
6
+
7
+ - 266611a: Enhance `createAPIClient` to accept `requestFn`, `baseUrl`, and optionally `queryClient`.
8
+
9
+ ### Minor Changes
10
+
11
+ - 0b3cda1: Updated the `qraftAPIClient(...)` to return only the set of services corresponding to the methods for which callbacks were passed.
12
+
13
+ ### Patch Changes
14
+
15
+ - @openapi-qraft/plugin@2.0.0-next.0
16
+
17
+ ## 1.14.0
18
+
19
+ ### Patch Changes
20
+
21
+ - 49dc44f: Added Operation comments to service variable declarations.
22
+ - Updated dependencies [77f0812]
23
+ - Updated dependencies [7430754]
24
+ - Updated dependencies [346a408]
25
+ - Updated dependencies [787f568]
26
+ - @openapi-qraft/plugin@1.14.0
27
+
3
28
  ## 1.14.0-beta.5
4
29
 
5
30
  ### Patch Changes
@@ -3,6 +3,6 @@ type Options = {
3
3
  servicesDirName: string;
4
4
  explicitImportExtensions: boolean;
5
5
  };
6
- export declare const getClientFactory: (options: Options) => (ts.ImportDeclaration | ts.FunctionDeclaration)[];
6
+ export declare const getClientFactory: (options: Options) => (ts.ImportDeclaration | ts.FunctionDeclaration | ts.TypeAliasDeclaration)[];
7
7
  export {};
8
8
  //# sourceMappingURL=getClientFactory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getClientFactory.d.ts","sourceRoot":"","sources":["../../src/ts-factory/getClientFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,OAAO,sDAKhD,CAAC"}
1
+ {"version":3,"file":"getClientFactory.d.ts","sourceRoot":"","sources":["../../src/ts-factory/getClientFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,OAAO,gFAKhD,CAAC"}
@@ -2,7 +2,7 @@ import ts from 'typescript';
2
2
  export const getClientFactory = (options) => {
3
3
  return [
4
4
  ...getClientImportsFactory(options),
5
- getCreateClientFunctionFactory(),
5
+ ...getCreateClientFunctionFactory(),
6
6
  ];
7
7
  };
8
8
  const getClientImportsFactory = ({ servicesDirName, explicitImportExtensions, }) => {
@@ -10,28 +10,51 @@ const getClientImportsFactory = ({ servicesDirName, explicitImportExtensions, })
10
10
  return [
11
11
  factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
12
12
  factory.createImportSpecifier(false, undefined, factory.createIdentifier('qraftAPIClient')),
13
- factory.createImportSpecifier(false, undefined, factory.createIdentifier('QraftClientOptions')),
13
+ ...[
14
+ 'APIBasicClientServices',
15
+ 'CreateAPIBasicClientOptions',
16
+ 'CreateAPIClientOptions',
17
+ 'CreateAPIQueryClientOptions',
18
+ ].map((name) => factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))),
14
19
  ])), factory.createStringLiteral('@openapi-qraft/react'), undefined),
15
20
  factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier('callbacks'))), factory.createStringLiteral('@openapi-qraft/react/callbacks/index'), undefined),
16
21
  factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
17
22
  factory.createImportSpecifier(false, undefined, factory.createIdentifier('services')),
18
- factory.createImportSpecifier(false, undefined, factory.createIdentifier('Services')),
23
+ factory.createImportSpecifier(true, undefined, factory.createIdentifier('Services')),
19
24
  ])), factory.createStringLiteral(`./${servicesDirName}/index${explicitImportExtensions ? '.js' : ''}`), undefined),
20
25
  ];
21
26
  };
22
27
  const getCreateClientFunctionFactory = () => {
23
28
  const factory = ts.factory;
24
- return factory.createFunctionDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], undefined, factory.createIdentifier('createAPIClient'), undefined, [
25
- factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier('options'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(factory.createIdentifier('QraftClientOptions'), undefined), undefined),
26
- ], factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined), factory.createBlock([
27
- factory.createReturnStatement(factory.createCallExpression(factory.createIdentifier('qraftAPIClient'), [
29
+ return [
30
+ factory.createFunctionDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], undefined, factory.createIdentifier('createAPIClient'), undefined, [
31
+ factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier('options'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('CreateAPIQueryClientOptions'), undefined), undefined),
32
+ ], factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined), undefined),
33
+ factory.createFunctionDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], undefined, factory.createIdentifier('createAPIClient'), undefined, [
34
+ factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier('options'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('CreateAPIBasicClientOptions'), undefined), undefined),
35
+ ], factory.createTypeReferenceNode(factory.createIdentifier('APIBasicClientServices'), [
36
+ factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined),
37
+ factory.createTypeReferenceNode(factory.createIdentifier('ServiceMethods'), undefined),
38
+ ]), undefined),
39
+ factory.createFunctionDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], undefined, factory.createIdentifier('createAPIClient'), undefined, [
40
+ factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier('options'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('CreateAPIClientOptions'), undefined), undefined),
41
+ ], factory.createUnionTypeNode([
28
42
  factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined),
29
- factory.createTypeQueryNode(factory.createIdentifier('callbacks'), undefined),
30
- ], [
31
- factory.createIdentifier('services'),
32
- factory.createIdentifier('callbacks'),
33
- factory.createIdentifier('options'),
34
- ])),
35
- ], true));
43
+ factory.createTypeReferenceNode(factory.createIdentifier('APIBasicClientServices'), [
44
+ factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined),
45
+ factory.createTypeReferenceNode(factory.createIdentifier('ServiceMethods'), undefined),
46
+ ]),
47
+ ]), factory.createBlock([
48
+ factory.createReturnStatement(factory.createCallExpression(factory.createIdentifier('qraftAPIClient'), [
49
+ factory.createTypeReferenceNode(factory.createIdentifier('Services'), undefined),
50
+ factory.createTypeReferenceNode(factory.createIdentifier('ServiceMethods'), undefined),
51
+ ], [
52
+ factory.createIdentifier('services'),
53
+ factory.createIdentifier('callbacks'),
54
+ factory.createIdentifier('options'),
55
+ ])),
56
+ ], true)),
57
+ factory.createTypeAliasDeclaration(undefined, factory.createIdentifier('ServiceMethods'), undefined, factory.createTypeQueryNode(factory.createIdentifier('callbacks'), undefined)),
58
+ ];
36
59
  };
37
60
  //# sourceMappingURL=getClientFactory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getClientFactory.js","sourceRoot":"","sources":["../../src/ts-factory/getClientFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getClientFactory.js","sourceRoot":"","sources":["../../src/ts-factory/getClientFactory.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,6 @@ import ts from 'typescript';
3
3
  type Options = {
4
4
  explicitImportExtensions: boolean;
5
5
  };
6
- export declare const getServiceIndexFactory: (services: Service[], options: Options) => (ts.ImportDeclaration | ts.VariableStatement | ts.TypeAliasDeclaration)[];
6
+ export declare const getServiceIndexFactory: (services: Service[], options: Options) => (ts.ImportDeclaration | ts.TypeAliasDeclaration | ts.VariableStatement)[];
7
7
  export {};
8
8
  //# sourceMappingURL=getServiceIndexFactory.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openapi-qraft/tanstack-query-react-plugin",
3
- "version": "1.14.0-beta.5",
3
+ "version": "2.0.0-next.0",
4
4
  "type": "module",
5
5
  "scripts": {
6
6
  "build": "tsc --project tsconfig.build.json",
@@ -26,7 +26,7 @@
26
26
  }
27
27
  },
28
28
  "dependencies": {
29
- "@openapi-qraft/plugin": "^1.14.0-beta.5",
29
+ "@openapi-qraft/plugin": "^2.0.0-next.0",
30
30
  "typescript": "^5.3.3"
31
31
  },
32
32
  "devDependencies": {
@@ -34,7 +34,7 @@
34
34
  "@openapi-qraft/test-fixtures": "1.0.0",
35
35
  "eslint": "^9.0.0",
36
36
  "memfs": "^4.9.2",
37
- "rimraf": "^5.0.5",
37
+ "rimraf": "^5.0.10",
38
38
  "vitest": "^1.4.0"
39
39
  },
40
40
  "files": [
@@ -8,7 +8,7 @@ type Options = {
8
8
  export const getClientFactory = (options: Options) => {
9
9
  return [
10
10
  ...getClientImportsFactory(options),
11
- getCreateClientFunctionFactory(),
11
+ ...getCreateClientFunctionFactory(),
12
12
  ];
13
13
  };
14
14
 
@@ -30,10 +30,17 @@ const getClientImportsFactory = ({
30
30
  undefined,
31
31
  factory.createIdentifier('qraftAPIClient')
32
32
  ),
33
- factory.createImportSpecifier(
34
- false,
35
- undefined,
36
- factory.createIdentifier('QraftClientOptions')
33
+ ...[
34
+ 'APIBasicClientServices',
35
+ 'CreateAPIBasicClientOptions',
36
+ 'CreateAPIClientOptions',
37
+ 'CreateAPIQueryClientOptions',
38
+ ].map((name) =>
39
+ factory.createImportSpecifier(
40
+ true,
41
+ undefined,
42
+ factory.createIdentifier(name)
43
+ )
37
44
  ),
38
45
  ])
39
46
  ),
@@ -62,7 +69,7 @@ const getClientImportsFactory = ({
62
69
  factory.createIdentifier('services')
63
70
  ),
64
71
  factory.createImportSpecifier(
65
- false,
72
+ true,
66
73
  undefined,
67
74
  factory.createIdentifier('Services')
68
75
  ),
@@ -79,52 +86,135 @@ const getClientImportsFactory = ({
79
86
  const getCreateClientFunctionFactory = () => {
80
87
  const factory = ts.factory;
81
88
 
82
- return factory.createFunctionDeclaration(
83
- [factory.createToken(ts.SyntaxKind.ExportKeyword)],
84
- undefined,
85
- factory.createIdentifier('createAPIClient'),
86
- undefined,
87
- [
88
- factory.createParameterDeclaration(
89
- undefined,
90
- undefined,
91
- factory.createIdentifier('options'),
92
- factory.createToken(ts.SyntaxKind.QuestionToken),
93
- factory.createTypeReferenceNode(
94
- factory.createIdentifier('QraftClientOptions'),
89
+ return [
90
+ factory.createFunctionDeclaration(
91
+ [factory.createToken(ts.SyntaxKind.ExportKeyword)],
92
+ undefined,
93
+ factory.createIdentifier('createAPIClient'),
94
+ undefined,
95
+ [
96
+ factory.createParameterDeclaration(
97
+ undefined,
98
+ undefined,
99
+ factory.createIdentifier('options'),
100
+ undefined,
101
+ factory.createTypeReferenceNode(
102
+ factory.createIdentifier('CreateAPIQueryClientOptions'),
103
+ undefined
104
+ ),
95
105
  undefined
96
106
  ),
107
+ ],
108
+ factory.createTypeReferenceNode(
109
+ factory.createIdentifier('Services'),
97
110
  undefined
98
111
  ),
99
- ],
100
- factory.createTypeReferenceNode(
101
- factory.createIdentifier('Services'),
102
112
  undefined
103
113
  ),
104
- factory.createBlock(
114
+ factory.createFunctionDeclaration(
115
+ [factory.createToken(ts.SyntaxKind.ExportKeyword)],
116
+ undefined,
117
+ factory.createIdentifier('createAPIClient'),
118
+ undefined,
105
119
  [
106
- factory.createReturnStatement(
107
- factory.createCallExpression(
108
- factory.createIdentifier('qraftAPIClient'),
109
- [
110
- factory.createTypeReferenceNode(
111
- factory.createIdentifier('Services'),
112
- undefined
113
- ),
114
- factory.createTypeQueryNode(
115
- factory.createIdentifier('callbacks'),
116
- undefined
117
- ),
118
- ],
119
- [
120
- factory.createIdentifier('services'),
121
- factory.createIdentifier('callbacks'),
122
- factory.createIdentifier('options'),
123
- ]
124
- )
120
+ factory.createParameterDeclaration(
121
+ undefined,
122
+ undefined,
123
+ factory.createIdentifier('options'),
124
+ undefined,
125
+ factory.createTypeReferenceNode(
126
+ factory.createIdentifier('CreateAPIBasicClientOptions'),
127
+ undefined
128
+ ),
129
+ undefined
125
130
  ),
126
131
  ],
127
- true
128
- )
129
- );
132
+ factory.createTypeReferenceNode(
133
+ factory.createIdentifier('APIBasicClientServices'),
134
+ [
135
+ factory.createTypeReferenceNode(
136
+ factory.createIdentifier('Services'),
137
+ undefined
138
+ ),
139
+ factory.createTypeReferenceNode(
140
+ factory.createIdentifier('ServiceMethods'),
141
+ undefined
142
+ ),
143
+ ]
144
+ ),
145
+ undefined
146
+ ),
147
+ factory.createFunctionDeclaration(
148
+ [factory.createToken(ts.SyntaxKind.ExportKeyword)],
149
+ undefined,
150
+ factory.createIdentifier('createAPIClient'),
151
+ undefined,
152
+ [
153
+ factory.createParameterDeclaration(
154
+ undefined,
155
+ undefined,
156
+ factory.createIdentifier('options'),
157
+ undefined,
158
+ factory.createTypeReferenceNode(
159
+ factory.createIdentifier('CreateAPIClientOptions'),
160
+ undefined
161
+ ),
162
+ undefined
163
+ ),
164
+ ],
165
+ factory.createUnionTypeNode([
166
+ factory.createTypeReferenceNode(
167
+ factory.createIdentifier('Services'),
168
+ undefined
169
+ ),
170
+ factory.createTypeReferenceNode(
171
+ factory.createIdentifier('APIBasicClientServices'),
172
+ [
173
+ factory.createTypeReferenceNode(
174
+ factory.createIdentifier('Services'),
175
+ undefined
176
+ ),
177
+ factory.createTypeReferenceNode(
178
+ factory.createIdentifier('ServiceMethods'),
179
+ undefined
180
+ ),
181
+ ]
182
+ ),
183
+ ]),
184
+ factory.createBlock(
185
+ [
186
+ factory.createReturnStatement(
187
+ factory.createCallExpression(
188
+ factory.createIdentifier('qraftAPIClient'),
189
+ [
190
+ factory.createTypeReferenceNode(
191
+ factory.createIdentifier('Services'),
192
+ undefined
193
+ ),
194
+ factory.createTypeReferenceNode(
195
+ factory.createIdentifier('ServiceMethods'),
196
+ undefined
197
+ ),
198
+ ],
199
+ [
200
+ factory.createIdentifier('services'),
201
+ factory.createIdentifier('callbacks'),
202
+ factory.createIdentifier('options'),
203
+ ]
204
+ )
205
+ ),
206
+ ],
207
+ true
208
+ )
209
+ ),
210
+ factory.createTypeAliasDeclaration(
211
+ undefined,
212
+ factory.createIdentifier('ServiceMethods'),
213
+ undefined,
214
+ factory.createTypeQueryNode(
215
+ factory.createIdentifier('callbacks'),
216
+ undefined
217
+ )
218
+ ),
219
+ ];
130
220
  };