@openapi-qraft/plugin 1.14.0-beta.2 → 1.14.0-beta.4
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 +12 -0
- package/dist/lib/QraftCommand.js +1 -1
- package/dist/lib/QraftCommand.js.map +1 -1
- package/dist/lib/open-api/getOperationName.d.ts +2 -1
- package/dist/lib/open-api/getOperationName.d.ts.map +1 -1
- package/dist/lib/open-api/getOperationName.js +8 -6
- package/dist/lib/open-api/getOperationName.js.map +1 -1
- package/dist/lib/processOperationNameModifierOption.d.ts +1 -13
- package/dist/lib/processOperationNameModifierOption.d.ts.map +1 -1
- package/dist/lib/processOperationNameModifierOption.js +31 -23
- package/dist/lib/processOperationNameModifierOption.js.map +1 -1
- package/dist/lib/splitCommaSeparatedGlobs.d.ts +2 -1
- package/dist/lib/splitCommaSeparatedGlobs.d.ts.map +1 -1
- package/dist/lib/splitCommaSeparatedGlobs.js +15 -7
- package/dist/lib/splitCommaSeparatedGlobs.js.map +1 -1
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/package.json +1 -1
- package/src/lib/QraftCommand.ts +1 -1
- package/src/lib/open-api/getOperationName.ts +11 -9
- package/src/lib/processOperationNameModifierOption.ts +50 -37
- package/src/lib/splitCommaSeparatedGlobs.ts +17 -7
- package/src/packageVersion.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @openapi-qraft/plugin
|
|
2
2
|
|
|
3
|
+
## 1.14.0-beta.4
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 346a408: Added multiple patterns support to `--filter-services <patterns...>` option.
|
|
8
|
+
|
|
9
|
+
## 1.14.0-beta.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- c5c4426: Corrected the generation of operation names modified by `--operation-name-modifier` to ensure they follow the CamelCase style.
|
|
14
|
+
|
|
3
15
|
## 1.14.0-beta.2
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/lib/QraftCommand.js
CHANGED
|
@@ -23,7 +23,7 @@ export class QraftCommand extends Command {
|
|
|
23
23
|
.argument('[input]', 'Input OpenAPI Document file path, URL (json, yml)', null)
|
|
24
24
|
.requiredOption('-o, --output-dir <path>', 'Output directory for generated services')
|
|
25
25
|
.option('-rm, --clean', 'Clean output directory before generating services')
|
|
26
|
-
.option('--filter-services <glob-
|
|
26
|
+
.option('--filter-services <glob-patterns...>', 'Filter services to be generated by glob pattern. Eg: "/user/**,/post/**". See NPM `micromatch` package for more details.')
|
|
27
27
|
.option('--operation-predefined-parameters <patterns...>', 'Predefined parameters for services. The specified services parameters will be optional. Eg: "/**:header.x-monite-version,query.x-api-key" or "get /**:header.x-monite-entity-id"')
|
|
28
28
|
.option('--operation-name-modifier <patterns...>', 'Modifies operation names using a pattern. Use the `==>` operator to separate the regular expression (left) and the substitution string (right). For example: "post /**:[A-Za-z]+Id ==> createOne"')
|
|
29
29
|
.option('--postfix-services <string>', 'Postfix to be added to the generated service name (eg: Service)')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QraftCommand.js","sourceRoot":"","sources":["../../src/lib/QraftCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAO,MAAM,UAAU,CAAC;AAC9C,OAAO,CAAC,MAAM,aAAa,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,GAAY,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EACL,+BAA+B,EAC/B,wCAAwC,EACxC,yBAAyB,GAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,0BAA0B,EAC1B,kCAAkC,GACnC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,OAAO,YAAa,SAAQ,OAAO;IACpB,GAAG,CAAM;IAClB,uBAAuB,GAAiC,EAAE,CAAC;IAErE;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE9C,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;aAC5B,QAAQ,CACP,SAAS,EACT,mDAAmD,EACnD,IAAI,CACL;aACA,cAAc,CACb,yBAAyB,EACzB,yCAAyC,CAC1C;aACA,MAAM,CACL,cAAc,EACd,mDAAmD,CACpD;aACA,MAAM,CACL,
|
|
1
|
+
{"version":3,"file":"QraftCommand.js","sourceRoot":"","sources":["../../src/lib/QraftCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@
|
|
|
3
3
|
* This will use the operation ID - if available - and otherwise fallback
|
|
4
4
|
* on a generated name from the URL
|
|
5
5
|
*/
|
|
6
|
-
export declare const getOperationName: (url: string, method: string, operationId
|
|
6
|
+
export declare const getOperationName: (url: string, method: string, operationId: string | undefined) => string;
|
|
7
|
+
export declare const getOperationIdName: (operationId: string) => string;
|
|
7
8
|
//# sourceMappingURL=getOperationName.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOperationName.d.ts","sourceRoot":"","sources":["../../../src/lib/open-api/getOperationName.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QACtB,MAAM,UACH,MAAM,
|
|
1
|
+
{"version":3,"file":"getOperationName.d.ts","sourceRoot":"","sources":["../../../src/lib/open-api/getOperationName.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QACtB,MAAM,UACH,MAAM,eACD,MAAM,GAAG,SAAS,KAC9B,MASF,CAAC;AAEF,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,KAAG,MAOxD,CAAC"}
|
|
@@ -5,16 +5,18 @@ import camelCase from 'camelcase';
|
|
|
5
5
|
* on a generated name from the URL
|
|
6
6
|
*/
|
|
7
7
|
export const getOperationName = (url, method, operationId) => {
|
|
8
|
-
if (operationId)
|
|
9
|
-
return
|
|
10
|
-
.replace(/^[^a-zA-Z]+/g, '')
|
|
11
|
-
.replace(/[^\w-]+/g, '-')
|
|
12
|
-
.trim());
|
|
13
|
-
}
|
|
8
|
+
if (operationId)
|
|
9
|
+
return getOperationIdName(operationId);
|
|
14
10
|
const urlWithoutPlaceholders = url
|
|
15
11
|
.replace(/[^/]*?{api-version}.*?\//g, '')
|
|
16
12
|
.replace(/{(.*?)}/g, '')
|
|
17
13
|
.replace(/\//g, '-');
|
|
18
14
|
return camelCase(`${method}-${urlWithoutPlaceholders}`);
|
|
19
15
|
};
|
|
16
|
+
export const getOperationIdName = (operationId) => {
|
|
17
|
+
return camelCase(operationId
|
|
18
|
+
.replace(/^[^a-zA-Z]+/g, '')
|
|
19
|
+
.replace(/[^\w-]+/g, '-')
|
|
20
|
+
.trim());
|
|
21
|
+
};
|
|
20
22
|
//# sourceMappingURL=getOperationName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOperationName.js","sourceRoot":"","sources":["../../../src/lib/open-api/getOperationName.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAAW,EACX,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"getOperationName.js","sourceRoot":"","sources":["../../../src/lib/open-api/getOperationName.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAAW,EACX,MAAc,EACd,WAA+B,EACvB,EAAE;IACV,IAAI,WAAW;QAAE,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAExD,MAAM,sBAAsB,GAAG,GAAG;SAC/B,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC;SACxC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEvB,OAAO,SAAS,CAAC,GAAG,MAAM,IAAI,sBAAsB,EAAE,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAU,EAAE;IAChE,OAAO,SAAS,CACd,WAAW;SACR,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC;SACxB,IAAI,EAAE,CACV,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -8,19 +8,7 @@ export declare const processOperationNameModifierOption: (modifiers: OperationNa
|
|
|
8
8
|
modifiers: OperationNameModifier[];
|
|
9
9
|
}[];
|
|
10
10
|
services: {
|
|
11
|
-
operations:
|
|
12
|
-
name: string;
|
|
13
|
-
method: "get" | "put" | "post" | "patch" | "delete" | "options" | "head" | "trace";
|
|
14
|
-
path: string;
|
|
15
|
-
description: string | undefined;
|
|
16
|
-
summary: string | undefined;
|
|
17
|
-
deprecated: boolean | undefined;
|
|
18
|
-
mediaType: string | undefined;
|
|
19
|
-
errors: Record<string, string | undefined>;
|
|
20
|
-
success: Record<string, string | undefined>;
|
|
21
|
-
parameters: Record<string, any> | undefined;
|
|
22
|
-
security: Record<string, string[] | undefined>[] | undefined;
|
|
23
|
-
}[];
|
|
11
|
+
operations: import("./open-api/getServices.js").ServiceOperation[];
|
|
24
12
|
name: string;
|
|
25
13
|
variableName: string;
|
|
26
14
|
typeName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processOperationNameModifierOption.d.ts","sourceRoot":"","sources":["../../src/lib/processOperationNameModifierOption.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processOperationNameModifierOption.d.ts","sourceRoot":"","sources":["../../src/lib/processOperationNameModifierOption.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EACL,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAGlC,eAAO,MAAM,kCAAkC,cAClC,qBAAqB,EAAE,YACxB,OAAO,EAAE;;;;;;;;;;;;;;CAmIpB,CAAC;AAMF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAC5C;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,4BAA4B,EAAE,MAAM,CAAC;CACtC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,WAAW,EAAE,MAAM,EAAE,GACvB,qBAAqB,EAAE,CAwCzB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createServicePathMatch } from './createServicePathMatch.js';
|
|
2
|
+
import { getOperationIdName } from './open-api/getOperationName.js';
|
|
2
3
|
import { parseOperationGlobs, } from './parseOperationGlobs.js';
|
|
3
4
|
import { splitCommaSeparatedGlobs } from './splitCommaSeparatedGlobs.js';
|
|
4
5
|
export const processOperationNameModifierOption = (modifiers, services) => {
|
|
@@ -12,31 +13,38 @@ export const processOperationNameModifierOption = (modifiers, services) => {
|
|
|
12
13
|
isPathMatch: createServicePathMatch(splitCommaSeparatedGlobs(modifier.pathGlobs)),
|
|
13
14
|
}));
|
|
14
15
|
const serviceOperationReplacements = new Map();
|
|
15
|
-
const
|
|
16
|
+
for (const service of services) {
|
|
16
17
|
serviceOperationReplacements.set(service.name, new Map());
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
18
|
+
for (const operation of service.operations) {
|
|
19
|
+
const operationReplacements = serviceOperationReplacements.get(service.name);
|
|
20
|
+
if (!operationReplacements)
|
|
21
|
+
throw new Error('operationReplacements not found');
|
|
22
|
+
const operationModifiers = operationNameModifiers.filter((modifier) => modifier.isPathMatch(operation.path) &&
|
|
23
|
+
(modifier.methods === undefined ||
|
|
24
|
+
modifier.methods.includes(operation.method)) &&
|
|
25
|
+
normalizeOperationNameModifierRegex(modifier.operationNameModifierRegex).test(operation.name));
|
|
26
|
+
const replacedOperationName = getOperationIdName(operationModifiers.reduce((operationName, modifier) => operationName.replace(normalizeOperationNameModifierRegex(modifier.operationNameModifierRegex), modifier.operationNameModifierReplace), operation.name));
|
|
27
|
+
if (replacedOperationName !== operation.name) {
|
|
28
|
+
if (!operationReplacements.has(replacedOperationName))
|
|
29
|
+
operationReplacements.set(replacedOperationName, new Map());
|
|
30
|
+
operationReplacements.get(replacedOperationName)?.set(operation.name, operationModifiers.map(({ isPathMatch: _, ...operationModifiersRest }) => operationModifiersRest));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const replacedOperationNamesServices = services.map((service) => ({
|
|
35
|
+
...service,
|
|
36
|
+
operations: service.operations.map((operation) => {
|
|
37
|
+
const operationReplacements = serviceOperationReplacements.get(service.name);
|
|
38
|
+
if (!operationReplacements)
|
|
39
|
+
return operation;
|
|
40
|
+
for (const [replacedName, originalMap] of operationReplacements) {
|
|
41
|
+
if (originalMap.has(operation.name)) {
|
|
42
|
+
return { ...operation, name: replacedName };
|
|
32
43
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}),
|
|
38
|
-
};
|
|
39
|
-
});
|
|
44
|
+
}
|
|
45
|
+
return operation;
|
|
46
|
+
}),
|
|
47
|
+
}));
|
|
40
48
|
const errors = Array.from(serviceOperationReplacements).flatMap(([serviceName, modifiedOperations]) => Array.from(modifiedOperations).flatMap(([replacedOperationName, operationModifierMap]) => {
|
|
41
49
|
if (operationModifierMap.size > 1) {
|
|
42
50
|
return Array.from(operationModifierMap).map(([originalOperationName, modifiers]) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processOperationNameModifierOption.js","sourceRoot":"","sources":["../../src/lib/processOperationNameModifierOption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"processOperationNameModifierOption.js","sourceRoot":"","sources":["../../src/lib/processOperationNameModifierOption.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Normalize a comma-separated list of globs
|
|
3
3
|
* @param commaSeparatedGlobs - Example: `/foo , /bar/**, ,`
|
|
4
4
|
* @returns Example: `/foo,/bar/**`
|
|
5
|
+
* @throws {Error} if input is invalid: not a `string` or `undefined` is provided
|
|
5
6
|
*/
|
|
6
|
-
export declare function splitCommaSeparatedGlobs(commaSeparatedGlobs: string | undefined): string[];
|
|
7
|
+
export declare function splitCommaSeparatedGlobs(commaSeparatedGlobs: Array<string | undefined> | string | undefined): string[];
|
|
7
8
|
//# sourceMappingURL=splitCommaSeparatedGlobs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitCommaSeparatedGlobs.d.ts","sourceRoot":"","sources":["../../src/lib/splitCommaSeparatedGlobs.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"splitCommaSeparatedGlobs.d.ts","sourceRoot":"","sources":["../../src/lib/splitCommaSeparatedGlobs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,mBAAmB,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,GAClE,MAAM,EAAE,CAiBV"}
|
|
@@ -2,15 +2,23 @@
|
|
|
2
2
|
* Normalize a comma-separated list of globs
|
|
3
3
|
* @param commaSeparatedGlobs - Example: `/foo , /bar/**, ,`
|
|
4
4
|
* @returns Example: `/foo,/bar/**`
|
|
5
|
+
* @throws {Error} if input is invalid: not a `string` or `undefined` is provided
|
|
5
6
|
*/
|
|
6
7
|
export function splitCommaSeparatedGlobs(commaSeparatedGlobs) {
|
|
7
|
-
|
|
8
|
+
const flattenCommaSeparatedGlobs = Array.isArray(commaSeparatedGlobs)
|
|
9
|
+
? commaSeparatedGlobs
|
|
10
|
+
: [commaSeparatedGlobs].filter((glob) => {
|
|
11
|
+
if (typeof glob !== 'string' && typeof glob !== 'undefined')
|
|
12
|
+
throw new Error('Invalid input');
|
|
13
|
+
return Boolean(glob);
|
|
14
|
+
});
|
|
15
|
+
if (!flattenCommaSeparatedGlobs.length)
|
|
8
16
|
return [];
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
.
|
|
13
|
-
|
|
14
|
-
|
|
17
|
+
return flattenCommaSeparatedGlobs
|
|
18
|
+
.flatMap((path) => path?.split(','))
|
|
19
|
+
.map((path) => path?.trim())
|
|
20
|
+
.filter((path, index, array) => {
|
|
21
|
+
return Boolean(path) && array.lastIndexOf(path) === index;
|
|
22
|
+
});
|
|
15
23
|
}
|
|
16
24
|
//# sourceMappingURL=splitCommaSeparatedGlobs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitCommaSeparatedGlobs.js","sourceRoot":"","sources":["../../src/lib/splitCommaSeparatedGlobs.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"splitCommaSeparatedGlobs.js","sourceRoot":"","sources":["../../src/lib/splitCommaSeparatedGlobs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CACtC,mBAAmE;IAEnE,MAAM,0BAA0B,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACnE,CAAC,CAAC,mBAAmB;QACrB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACpC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,WAAW;gBACzD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YACnC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IAEP,IAAI,CAAC,0BAA0B,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAElD,OAAO,0BAA0B;SAC9B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;SACnC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;SAC3B,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAoC,EAAE;QAC/D,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/packageVersion.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const packageVersion = "1.14.0-beta.
|
|
1
|
+
export declare const packageVersion = "1.14.0-beta.4";
|
|
2
2
|
//# sourceMappingURL=packageVersion.d.ts.map
|
package/dist/packageVersion.js
CHANGED
package/package.json
CHANGED
package/src/lib/QraftCommand.ts
CHANGED
|
@@ -49,7 +49,7 @@ export class QraftCommand extends Command {
|
|
|
49
49
|
'Clean output directory before generating services'
|
|
50
50
|
)
|
|
51
51
|
.option(
|
|
52
|
-
'--filter-services <glob-
|
|
52
|
+
'--filter-services <glob-patterns...>',
|
|
53
53
|
'Filter services to be generated by glob pattern. Eg: "/user/**,/post/**". See NPM `micromatch` package for more details.'
|
|
54
54
|
)
|
|
55
55
|
.option(
|
|
@@ -8,16 +8,9 @@ import camelCase from 'camelcase';
|
|
|
8
8
|
export const getOperationName = (
|
|
9
9
|
url: string,
|
|
10
10
|
method: string,
|
|
11
|
-
operationId
|
|
11
|
+
operationId: string | undefined
|
|
12
12
|
): string => {
|
|
13
|
-
if (operationId)
|
|
14
|
-
return camelCase(
|
|
15
|
-
operationId
|
|
16
|
-
.replace(/^[^a-zA-Z]+/g, '')
|
|
17
|
-
.replace(/[^\w-]+/g, '-')
|
|
18
|
-
.trim()
|
|
19
|
-
);
|
|
20
|
-
}
|
|
13
|
+
if (operationId) return getOperationIdName(operationId);
|
|
21
14
|
|
|
22
15
|
const urlWithoutPlaceholders = url
|
|
23
16
|
.replace(/[^/]*?{api-version}.*?\//g, '')
|
|
@@ -26,3 +19,12 @@ export const getOperationName = (
|
|
|
26
19
|
|
|
27
20
|
return camelCase(`${method}-${urlWithoutPlaceholders}`);
|
|
28
21
|
};
|
|
22
|
+
|
|
23
|
+
export const getOperationIdName = (operationId: string): string => {
|
|
24
|
+
return camelCase(
|
|
25
|
+
operationId
|
|
26
|
+
.replace(/^[^a-zA-Z]+/g, '')
|
|
27
|
+
.replace(/[^\w-]+/g, '-')
|
|
28
|
+
.trim()
|
|
29
|
+
);
|
|
30
|
+
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createServicePathMatch } from './createServicePathMatch.js';
|
|
2
|
+
import { getOperationIdName } from './open-api/getOperationName.js';
|
|
2
3
|
import { Service } from './open-api/getServices.js';
|
|
3
4
|
import {
|
|
4
5
|
OperationGlobMethods,
|
|
@@ -35,30 +36,29 @@ export const processOperationNameModifierOption = (
|
|
|
35
36
|
>
|
|
36
37
|
>();
|
|
37
38
|
|
|
38
|
-
const
|
|
39
|
+
for (const service of services) {
|
|
39
40
|
serviceOperationReplacements.set(service.name, new Map());
|
|
40
41
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
service.name
|
|
46
|
-
);
|
|
42
|
+
for (const operation of service.operations) {
|
|
43
|
+
const operationReplacements = serviceOperationReplacements.get(
|
|
44
|
+
service.name
|
|
45
|
+
);
|
|
47
46
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
47
|
+
if (!operationReplacements)
|
|
48
|
+
throw new Error('operationReplacements not found');
|
|
49
|
+
|
|
50
|
+
const operationModifiers = operationNameModifiers.filter(
|
|
51
|
+
(modifier) =>
|
|
52
|
+
modifier.isPathMatch(operation.path) &&
|
|
53
|
+
(modifier.methods === undefined ||
|
|
54
|
+
modifier.methods.includes(operation.method)) &&
|
|
55
|
+
normalizeOperationNameModifierRegex(
|
|
56
|
+
modifier.operationNameModifierRegex
|
|
57
|
+
).test(operation.name)
|
|
58
|
+
);
|
|
60
59
|
|
|
61
|
-
|
|
60
|
+
const replacedOperationName = getOperationIdName(
|
|
61
|
+
operationModifiers.reduce(
|
|
62
62
|
(operationName, modifier) =>
|
|
63
63
|
operationName.replace(
|
|
64
64
|
normalizeOperationNameModifierRegex(
|
|
@@ -67,27 +67,40 @@ export const processOperationNameModifierOption = (
|
|
|
67
67
|
modifier.operationNameModifierReplace
|
|
68
68
|
),
|
|
69
69
|
operation.name
|
|
70
|
+
)
|
|
71
|
+
);
|
|
72
|
+
|
|
73
|
+
if (replacedOperationName !== operation.name) {
|
|
74
|
+
if (!operationReplacements.has(replacedOperationName))
|
|
75
|
+
operationReplacements.set(replacedOperationName, new Map());
|
|
76
|
+
operationReplacements.get(replacedOperationName)?.set(
|
|
77
|
+
operation.name,
|
|
78
|
+
operationModifiers.map(
|
|
79
|
+
({ isPathMatch: _, ...operationModifiersRest }) =>
|
|
80
|
+
operationModifiersRest
|
|
81
|
+
)
|
|
70
82
|
);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
const replacedOperationNamesServices = services.map((service) => ({
|
|
88
|
+
...service,
|
|
89
|
+
operations: service.operations.map((operation) => {
|
|
90
|
+
const operationReplacements = serviceOperationReplacements.get(
|
|
91
|
+
service.name
|
|
92
|
+
);
|
|
93
|
+
if (!operationReplacements) return operation;
|
|
71
94
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
operationReplacements.get(replacedOperationName)?.set(
|
|
76
|
-
operation.name,
|
|
77
|
-
operationModifiers.map(
|
|
78
|
-
({ isPathMatch: _, ...operationModifiersRest }) =>
|
|
79
|
-
operationModifiersRest
|
|
80
|
-
)
|
|
81
|
-
);
|
|
95
|
+
for (const [replacedName, originalMap] of operationReplacements) {
|
|
96
|
+
if (originalMap.has(operation.name)) {
|
|
97
|
+
return { ...operation, name: replacedName };
|
|
82
98
|
}
|
|
99
|
+
}
|
|
83
100
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
};
|
|
88
|
-
}),
|
|
89
|
-
};
|
|
90
|
-
});
|
|
101
|
+
return operation;
|
|
102
|
+
}),
|
|
103
|
+
}));
|
|
91
104
|
|
|
92
105
|
const errors = Array.from(serviceOperationReplacements).flatMap(
|
|
93
106
|
([serviceName, modifiedOperations]) =>
|
|
@@ -2,15 +2,25 @@
|
|
|
2
2
|
* Normalize a comma-separated list of globs
|
|
3
3
|
* @param commaSeparatedGlobs - Example: `/foo , /bar/**, ,`
|
|
4
4
|
* @returns Example: `/foo,/bar/**`
|
|
5
|
+
* @throws {Error} if input is invalid: not a `string` or `undefined` is provided
|
|
5
6
|
*/
|
|
6
7
|
export function splitCommaSeparatedGlobs(
|
|
7
|
-
commaSeparatedGlobs: string | undefined
|
|
8
|
+
commaSeparatedGlobs: Array<string | undefined> | string | undefined
|
|
8
9
|
): string[] {
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
const flattenCommaSeparatedGlobs = Array.isArray(commaSeparatedGlobs)
|
|
11
|
+
? commaSeparatedGlobs
|
|
12
|
+
: [commaSeparatedGlobs].filter((glob) => {
|
|
13
|
+
if (typeof glob !== 'string' && typeof glob !== 'undefined')
|
|
14
|
+
throw new Error('Invalid input');
|
|
15
|
+
return Boolean(glob);
|
|
16
|
+
});
|
|
11
17
|
|
|
12
|
-
return
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
.
|
|
18
|
+
if (!flattenCommaSeparatedGlobs.length) return [];
|
|
19
|
+
|
|
20
|
+
return flattenCommaSeparatedGlobs
|
|
21
|
+
.flatMap((path) => path?.split(','))
|
|
22
|
+
.map((path) => path?.trim())
|
|
23
|
+
.filter((path, index, array): path is NonNullable<typeof path> => {
|
|
24
|
+
return Boolean(path) && array.lastIndexOf(path) === index;
|
|
25
|
+
});
|
|
16
26
|
}
|
package/src/packageVersion.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// This file was generated automatically
|
|
2
|
-
export const packageVersion = '1.14.0-beta.
|
|
2
|
+
export const packageVersion = '1.14.0-beta.4';
|