Skip to content

Commit 8621632

Browse files
HimenonHimenon
committed
fix: confilict
1 parent 38e9e8b commit 8621632

68 files changed

Lines changed: 37 additions & 373 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
22
"name": "@himenon/openapi-typescript-code-generator",
3-
<<<<<<< HEAD
4-
"version": "1.1.1",
5-
"description": "OpenAPI Code Generator using Template literals.",
6-
=======
73
"version": "1.1.3",
8-
"description": "OpenAPI Code Generator using TypeScript AST.",
9-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
4+
"description": "OpenAPI Code Generator using Template literals.",
105
"keywords": [
116
"openapi",
127
"openapi3",

‎scripts/tools/shell.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
import { type ResultPromise, execa } from "execa";
3-
=======
41
import { execa, type ResultPromise } from "execa";
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
62

73
export const shell = (command: string, cwd: string = process.cwd()): ResultPromise => {
84
return execa(command, {

‎src/code-templates/_shared/ApiClientArgument.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../api";
72
import type { CodeGenerator } from "../../types";
83

‎src/code-templates/_shared/MethodBody/CallRequest.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../../api";
72
import type { CodeGenerator } from "../../../types";
83
import * as Utils from "../utils";

‎src/code-templates/_shared/MethodBody/HeaderParameter.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../../api";
72
import * as Utils from "../utils";
83

‎src/code-templates/_shared/MethodBody/PathParameter.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../../api";
72
import type { CodeGenerator } from "../../../types";
83
import { escapeText2 as escapeText } from "../../../utils";

‎src/code-templates/_shared/MethodBody/__tests__/PathParameter-test.ts‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import ts from "typescript";
4-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
51
import { describe, expect, test } from "vitest";
62

73
import { TsGenerator } from "../../../../api";
@@ -16,78 +12,78 @@ describe("PathParameter Test", () => {
1612
return Utils.generateTemplateExpression(factory, urlTemplates);
1713
};
1814
test("generateUrlTemplateExpression", () => {
19-
expect(generate("/{a}", [{ in: "path", name: "a", required: true }])).toEqual(`\`/\${encodeURIComponent(params.parameter.a)}\``);
20-
expect(generate("/{a}/", [{ in: "path", name: "a", required: true }])).toEqual(`\`/\${encodeURIComponent(params.parameter.a)}/\``);
21-
expect(generate("/a/{b}", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${encodeURIComponent(params.parameter.b)}\``);
22-
expect(generate("/a/{b}/", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${encodeURIComponent(params.parameter.b)}/\``);
23-
expect(generate("/a/{b}/c", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${encodeURIComponent(params.parameter.b)}/c\``);
24-
expect(generate("/a/{b}/c/", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${encodeURIComponent(params.parameter.b)}/c/\``);
25-
expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${encodeURIComponent(params.parameter.c)}\``);
26-
expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${encodeURIComponent(params.parameter.c)}\``);
27-
expect(generate("/a/b/{c}/", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${encodeURIComponent(params.parameter.c)}/\``);
15+
expect(generate("/{a}", [{ in: "path", name: "a", required: true }])).toEqual("`/${encodeURIComponent(params.parameter.a)}`");
16+
expect(generate("/{a}/", [{ in: "path", name: "a", required: true }])).toEqual("`/${encodeURIComponent(params.parameter.a)}/`");
17+
expect(generate("/a/{b}", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${encodeURIComponent(params.parameter.b)}`");
18+
expect(generate("/a/{b}/", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${encodeURIComponent(params.parameter.b)}/`");
19+
expect(generate("/a/{b}/c", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${encodeURIComponent(params.parameter.b)}/c`");
20+
expect(generate("/a/{b}/c/", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${encodeURIComponent(params.parameter.b)}/c/`");
21+
expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${encodeURIComponent(params.parameter.c)}`");
22+
expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${encodeURIComponent(params.parameter.c)}`");
23+
expect(generate("/a/b/{c}/", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${encodeURIComponent(params.parameter.c)}/`");
2824
expect(generate("/a/b/{c}.json", [{ in: "path", name: "c", required: true }])).toEqual(
29-
`\`/a/b/\${encodeURIComponent(params.parameter.c)}.json\``,
25+
"`/a/b/${encodeURIComponent(params.parameter.c)}.json`",
3026
);
3127
expect(generate("/{a}.json/{a}.json/{a}.json", [{ in: "path", name: "a", required: true }])).toEqual(
32-
`\`/\${encodeURIComponent(params.parameter.a)}.json/\${encodeURIComponent(params.parameter.a)}.json/\${encodeURIComponent(params.parameter.a)}.json\``,
28+
"`/${encodeURIComponent(params.parameter.a)}.json/${encodeURIComponent(params.parameter.a)}.json/${encodeURIComponent(params.parameter.a)}.json`",
3329
);
3430
expect(generate("/.json.{a}.json/{a}.json.{a}", [{ in: "path", name: "a", required: true }])).toEqual(
35-
`\`/.json.\${encodeURIComponent(params.parameter.a)}.json/\${encodeURIComponent(params.parameter.a)}.json.\${encodeURIComponent(params.parameter.a)}\``,
31+
"`/.json.${encodeURIComponent(params.parameter.a)}.json/${encodeURIComponent(params.parameter.a)}.json.${encodeURIComponent(params.parameter.a)}`",
3632
);
3733

3834
expect(
3935
generate("/{a}/{b}", [
4036
{ in: "path", name: "a", required: true },
4137
{ in: "path", name: "b", required: true },
4238
]),
43-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/\${encodeURIComponent(params.parameter.b)}\``);
39+
).toBe("`/${encodeURIComponent(params.parameter.a)}/${encodeURIComponent(params.parameter.b)}`");
4440
expect(
4541
generate("/{a}/{b}/", [
4642
{ in: "path", name: "a", required: true },
4743
{ in: "path", name: "b", required: true },
4844
]),
49-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/\${encodeURIComponent(params.parameter.b)}/\``);
45+
).toBe("`/${encodeURIComponent(params.parameter.a)}/${encodeURIComponent(params.parameter.b)}/`");
5046
expect(
5147
generate("/{a}/{b}/c", [
5248
{ in: "path", name: "a", required: true },
5349
{ in: "path", name: "b", required: true },
5450
]),
55-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/\${encodeURIComponent(params.parameter.b)}/c\``);
51+
).toBe("`/${encodeURIComponent(params.parameter.a)}/${encodeURIComponent(params.parameter.b)}/c`");
5652
expect(
5753
generate("/{a}/{b}/c/", [
5854
{ in: "path", name: "a", required: true },
5955
{ in: "path", name: "b", required: true },
6056
]),
61-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/\${encodeURIComponent(params.parameter.b)}/c/\``);
57+
).toBe("`/${encodeURIComponent(params.parameter.a)}/${encodeURIComponent(params.parameter.b)}/c/`");
6258
expect(
6359
generate("/{a}/b/{c}", [
6460
{ in: "path", name: "a", required: true },
6561
{ in: "path", name: "c", required: true },
6662
]),
67-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/b/\${encodeURIComponent(params.parameter.c)}\``);
63+
).toBe("`/${encodeURIComponent(params.parameter.a)}/b/${encodeURIComponent(params.parameter.c)}`");
6864
expect(
6965
generate("/{a}/b/{c}/", [
7066
{ in: "path", name: "a", required: true },
7167
{ in: "path", name: "c", required: true },
7268
]),
73-
).toBe(`\`/\${encodeURIComponent(params.parameter.a)}/b/\${encodeURIComponent(params.parameter.c)}/\``);
69+
).toBe("`/${encodeURIComponent(params.parameter.a)}/b/${encodeURIComponent(params.parameter.c)}/`");
7470
expect(
7571
generate("/a/{b}/{c}", [
7672
{ in: "path", name: "b", required: true },
7773
{ in: "path", name: "c", required: true },
7874
]),
79-
).toBe(`\`/a/\${encodeURIComponent(params.parameter.b)}/\${encodeURIComponent(params.parameter.c)}\``);
75+
).toBe("`/a/${encodeURIComponent(params.parameter.b)}/${encodeURIComponent(params.parameter.c)}`");
8076
expect(
8177
generate("/a/{b}/{c}/", [
8278
{ in: "path", name: "b", required: true },
8379
{ in: "path", name: "c", required: true },
8480
]),
85-
).toBe(`\`/a/\${encodeURIComponent(params.parameter.b)}/\${encodeURIComponent(params.parameter.c)}/\``);
81+
).toBe("`/a/${encodeURIComponent(params.parameter.b)}/${encodeURIComponent(params.parameter.c)}/`");
8682
expect(
8783
generate("/a/{b}...{c}/", [
8884
{ in: "path", name: "b", required: true },
8985
{ in: "path", name: "c", required: true },
9086
]),
91-
).toBe(`\`/a/\${encodeURIComponent(params.parameter.b)}...\${encodeURIComponent(params.parameter.c)}/\``);
87+
).toBe("`/a/${encodeURIComponent(params.parameter.b)}...${encodeURIComponent(params.parameter.c)}/`");
9288
});
9389
});

‎src/code-templates/_shared/MethodBody/index.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../../api";
72
import type { CodeGenerator } from "../../../types";
83
import { escapeText2 as escapeText } from "../../../utils";

‎src/code-templates/_shared/__tests__/utils.test.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import { describe, expect, test } from "vitest";
2-
<<<<<<< HEAD
3-
4-
=======
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
62
import * as Utils from "../utils";
73

84
type OK = Utils.VariableElement;

‎src/code-templates/_shared/utils.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
import type ts from "typescript";
4-
5-
>>>>>>> 7b64d04cab4a272c3f6e680fa294110083ae3879
61
import type { TsGenerator } from "../../api";
72
import * as Utils from "../../utils";
83

0 commit comments

Comments
 (0)