@openapi-qraft/tanstack-query-react-plugin 2.6.0 → 2.6.2-beta.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,19 @@
1
1
  # @openapi-qraft/tanstack-query-react-plugin
2
2
 
3
+ ## 2.6.2-beta.0
4
+
5
+ ### Patch Changes
6
+
7
+ - @openapi-qraft/plugin@2.6.2-beta.0
8
+
9
+ ## 2.6.1
10
+
11
+ ### Patch Changes
12
+
13
+ - 8d6385a: Added `operationInvokeFn` as an allowed callback.
14
+ - 64e5860: Do not generate default `createAPIClient` when custom is provided.
15
+ - @openapi-qraft/plugin@2.6.1
16
+
3
17
  ## 2.6.0
4
18
 
5
19
  ### Minor Changes
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAOlF,eAAO,MAAM,MAAM,EAAE,kBA0EpB,CAAC"}
1
+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAOlF,eAAO,MAAM,MAAM,EAAE,kBAiEpB,CAAC"}
package/dist/plugin.js CHANGED
@@ -16,16 +16,7 @@ export const plugin = {
16
16
  .option('--queryable-write-operations [bool]', 'Enable generation of query hooks (useQuery, useSuspenseQuery, etc.) for writable HTTP methods like POST, PUT, PATCH. By default, only mutation hooks are generated for writable operations.', parseBooleanOption)
17
17
  .addOption(new Option('--create-api-client-fn [name...]', 'Name, default callbacks and services of the generated `createAPIClient` function')
18
18
  .argParser(parseCreateApiClientFn)
19
- .default([
20
- [
21
- 'createAPIClient',
22
- {
23
- services: ['all'],
24
- callbacks: ['all'],
25
- filename: ['create-api-client'],
26
- },
27
- ],
28
- ]))
19
+ .default(createApiClientFnDefault))
29
20
  .action(async ({ spinner, output, args, services, schema }, resolve) => {
30
21
  return void (await generateCode({
31
22
  spinner,
@@ -63,6 +54,10 @@ function normalizeCreateApiClientFn(value) {
63
54
  ]);
64
55
  }
65
56
  function parseCreateApiClientFn(value, previous) {
57
+ if (Array.isArray(previous) &&
58
+ JSON.stringify(previous) === JSON.stringify(createApiClientFnDefault)) {
59
+ previous = [];
60
+ }
66
61
  const nextValue = parseOptionSubValues(value, Array.isArray(previous) ? previous : undefined);
67
62
  const lastOptionConfig = nextValue.at(-1)?.[1];
68
63
  if (!lastOptionConfig)
@@ -72,6 +67,7 @@ function parseCreateApiClientFn(value, previous) {
72
67
  const availableCallbackNames = [
73
68
  'all',
74
69
  'none',
70
+ 'operationInvokeFn',
75
71
  ...getAllAvailableCallbackNames(),
76
72
  ];
77
73
  const unknownCallback = lastOptionConfig.callbacks.find((callbackName) => !availableCallbackNames.includes(callbackName));
@@ -98,4 +94,14 @@ function parseCreateApiClientFn(value, previous) {
98
94
  }
99
95
  return nextValue;
100
96
  }
97
+ const createApiClientFnDefault = [
98
+ [
99
+ 'createAPIClient',
100
+ {
101
+ services: ['all'],
102
+ callbacks: ['all'],
103
+ filename: ['create-api-client'],
104
+ },
105
+ ],
106
+ ];
101
107
  //# sourceMappingURL=plugin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceOperationMutationFn.d.ts","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationMutationFn.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,eAAO,MAAM,qCAAqC,0DA4KjD,CAAC"}
1
+ {"version":3,"file":"ServiceOperationMutationFn.d.ts","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationMutationFn.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,eAAO,MAAM,qCAAqC,0DAqNjD,CAAC"}
@@ -15,16 +15,26 @@ export const createServiceOperationMutationFnNodes = () => [
15
15
  factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("TMutationData"), undefined, undefined),
16
16
  factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("TMutationParams"), undefined, undefined),
17
17
  factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("TError"), undefined, undefined)
18
- ], undefined, [factory.createCallSignature(undefined, [
18
+ ], undefined, [factory.createCallSignature([
19
+ factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("TMeta"), factory.createTypeReferenceNode(factory.createIdentifier("Record"), [
20
+ factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
21
+ factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
22
+ ]), undefined),
23
+ factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("TSignal"), factory.createTypeReferenceNode(factory.createIdentifier("AbortSignal"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("AbortSignal"), undefined))
24
+ ], [
19
25
  factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("options"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("ServiceOperationMutationFnOptions"), [
20
26
  factory.createTypeReferenceNode(factory.createIdentifier("TBody"), undefined),
21
- factory.createTypeReferenceNode(factory.createIdentifier("TMutationParams"), undefined)
27
+ factory.createTypeReferenceNode(factory.createIdentifier("TMutationParams"), undefined),
28
+ factory.createTypeReferenceNode(factory.createIdentifier("TMeta"), undefined),
29
+ factory.createTypeReferenceNode(factory.createIdentifier("TSignal"), undefined)
22
30
  ]), undefined),
23
31
  factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("client"), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createFunctionTypeNode(undefined, [
24
32
  factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("schema"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("TSchema"), undefined), undefined),
25
33
  factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("options"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("ServiceOperationMutationFnOptions"), [
26
34
  factory.createTypeReferenceNode(factory.createIdentifier("TBody"), undefined),
27
- factory.createTypeReferenceNode(factory.createIdentifier("TMutationParams"), undefined)
35
+ factory.createTypeReferenceNode(factory.createIdentifier("TMutationParams"), undefined),
36
+ factory.createTypeReferenceNode(factory.createIdentifier("TMeta"), undefined),
37
+ factory.createTypeReferenceNode(factory.createIdentifier("TSignal"), undefined)
28
38
  ]), undefined)
29
39
  ], factory.createTypeReferenceNode(factory.createIdentifier("Promise"), [factory.createTypeReferenceNode(factory.createIdentifier("RequestFnResponse"), [
30
40
  factory.createTypeReferenceNode(factory.createIdentifier("TMutationData"), undefined),
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceOperationMutationFn.js","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationMutationFn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ServiceOperationMutationFn.js","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationMutationFn.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;AAC3B,MAAM,CAAC,MAAM,qCAAqC,GAAG,GAAG,EAAE,CAAC;IACzD,OAAO,CAAC,uBAAuB,CAC7B,SAAS,EACT,OAAO,CAAC,kBAAkB,CACxB,IAAI,EACJ,SAAS,EACT,OAAO,CAAC,kBAAkB,CAAC;QACzB,OAAO,CAAC,qBAAqB,CAC3B,KAAK,EACL,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAC9C;QACD,OAAO,CAAC,qBAAqB,CAC3B,KAAK,EACL,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,CAC9D;KACF,CAAC,CACH,EACD,OAAO,CAAC,mBAAmB,CAAC,2CAA2C,CAAC,EACxE,SAAS,CACV;IACD,OAAO,CAAC,0BAA0B,CAChC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAClD,OAAO,CAAC,gBAAgB,CAAC,4BAA4B,CAAC,EACtD;QACE,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,OAAO,CAAC,qBAAqB,CAAC;YAC5B,OAAO,CAAC,uBAAuB,CAC7B,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAC/B,SAAS,EACT,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAC3D;YACD,OAAO,CAAC,uBAAuB,CAC7B,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAC3D;SACF,CAAC,EACF,SAAS,CACV;QACD,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,SAAS,EACT,SAAS,CACV;QACD,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,SAAS,CACV;QACD,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAC3C,SAAS,EACT,SAAS,CACV;QACD,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,SAAS,CACV;KACF,EACD,SAAS,EACT,CAAC,OAAO,CAAC,mBAAmB,CAC1B;YACE,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC;gBACE,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;gBAC1D,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;aACxD,CACF,EACD,SAAS,CACV;YACD,OAAO,CAAC,8BAA8B,CACpC,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,EACvC,SAAS,CACV,EACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,EACvC,SAAS,CACV,CACF;SACF,EACD;YACE,OAAO,CAAC,0BAA0B,CAChC,SAAS,EACT,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,EACT,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,EAC7D;gBACE,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,SAAS,CACV;gBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAC3C,SAAS,CACV;gBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,SAAS,CACV;gBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,CACV;aACF,CACF,EACD,SAAS,CACV;YACD,OAAO,CAAC,0BAA0B,CAChC,SAAS,EACT,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAChD,OAAO,CAAC,sBAAsB,CAC5B,SAAS,EACT;gBACE,OAAO,CAAC,0BAA0B,CAChC,SAAS,EACT,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,CACV,EACD,SAAS,CACV;gBACD,OAAO,CAAC,0BAA0B,CAChC,SAAS,EACT,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,EACT,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,EAC7D;oBACE,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,SAAS,CACV;oBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAC3C,SAAS,CACV;oBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,SAAS,CACV;oBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,CACV;iBACF,CACF,EACD,SAAS,CACV;aACF,EACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,CAAC,OAAO,CAAC,uBAAuB,CAC9B,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAC7C;oBACE,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,CACV;oBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,CACV;iBACF,CACF,CAAC,CACH,CACF,EACD,SAAS,CACV;SACF,EACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,CAAC,OAAO,CAAC,uBAAuB,CAC9B,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAC7C;gBACE,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,CACV;gBACD,OAAO,CAAC,uBAAuB,CAC7B,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,CACV;aACF,CACF,CAAC,CACH,CACF,CAAC,CACH;CACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openapi-qraft/tanstack-query-react-plugin",
3
- "version": "2.6.0",
3
+ "version": "2.6.2-beta.0",
4
4
  "type": "module",
5
5
  "scripts": {
6
6
  "build": "tsc --project tsconfig.build.json",
@@ -35,12 +35,12 @@
35
35
  }
36
36
  },
37
37
  "dependencies": {
38
- "@openapi-qraft/plugin": "^2.6.0",
38
+ "@openapi-qraft/plugin": "^2.6.2-beta.0",
39
39
  "typescript": "^5.6.2"
40
40
  },
41
41
  "devDependencies": {
42
42
  "@openapi-qraft/eslint-config": "1.0.1",
43
- "@openapi-qraft/tanstack-query-react-types": "2.6.0",
43
+ "@openapi-qraft/tanstack-query-react-types": "2.6.2-beta.0",
44
44
  "@openapi-qraft/test-fixtures": "1.1.0",
45
45
  "@openapi-qraft/ts-factory-code-generator": "1.0.2",
46
46
  "camelcase": "^8.0.0",
package/src/plugin.ts CHANGED
@@ -45,16 +45,7 @@ export const plugin: QraftCommandPlugin = {
45
45
  'Name, default callbacks and services of the generated `createAPIClient` function'
46
46
  )
47
47
  .argParser(parseCreateApiClientFn)
48
- .default([
49
- [
50
- 'createAPIClient',
51
- {
52
- services: ['all'],
53
- callbacks: ['all'],
54
- filename: ['create-api-client'],
55
- },
56
- ],
57
- ])
48
+ .default(createApiClientFnDefault)
58
49
  )
59
50
  .action(async ({ spinner, output, args, services, schema }, resolve) => {
60
51
  return void (await generateCode({
@@ -108,6 +99,13 @@ function parseCreateApiClientFn(
108
99
  value: string,
109
100
  previous: unknown
110
101
  ): CreateAPIClientFnArg[] {
102
+ if (
103
+ Array.isArray(previous) &&
104
+ JSON.stringify(previous) === JSON.stringify(createApiClientFnDefault)
105
+ ) {
106
+ previous = [];
107
+ }
108
+
111
109
  const nextValue = parseOptionSubValues(
112
110
  value,
113
111
  Array.isArray(previous) ? previous : undefined
@@ -129,6 +127,7 @@ function parseCreateApiClientFn(
129
127
  const availableCallbackNames = [
130
128
  'all',
131
129
  'none',
130
+ 'operationInvokeFn',
132
131
  ...getAllAvailableCallbackNames(),
133
132
  ];
134
133
  const unknownCallback = lastOptionConfig.callbacks.find(
@@ -190,3 +189,14 @@ type CreateAPIClientFnArg = [
190
189
  functionName: string,
191
190
  value: Partial<CreateAPIClientFnOptions>,
192
191
  ];
192
+
193
+ const createApiClientFnDefault = [
194
+ [
195
+ 'createAPIClient',
196
+ {
197
+ services: ['all'],
198
+ callbacks: ['all'],
199
+ filename: ['create-api-client'],
200
+ },
201
+ ],
202
+ ] as const;