subaya 1.0.2 → 1.0.5
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/README.md +1 -0
- package/dist/commands/api/OrpcGeneratorCommand.d.ts.map +1 -1
- package/dist/commands/api/OrpcGeneratorCommand.js +7 -4
- package/dist/commands/api/OrpcGeneratorCommand.js.map +1 -1
- package/dist/commands/api/generators/SchemaGenerator.d.ts.map +1 -1
- package/dist/commands/api/generators/SchemaGenerator.js +5 -7
- package/dist/commands/api/generators/SchemaGenerator.js.map +1 -1
- package/dist/commands/api/services/ApiFileWriter.d.ts +5 -4
- package/dist/commands/api/services/ApiFileWriter.d.ts.map +1 -1
- package/dist/commands/api/services/ApiFileWriter.js +9 -9
- package/dist/commands/api/services/ApiFileWriter.js.map +1 -1
- package/dist/commands/axios/AxiosGeneratorCommand.d.ts.map +1 -1
- package/dist/commands/axios/AxiosGeneratorCommand.js +4 -0
- package/dist/commands/axios/AxiosGeneratorCommand.js.map +1 -1
- package/dist/commands/git/PushGeneratorCommand.d.ts +5 -0
- package/dist/commands/git/PushGeneratorCommand.d.ts.map +1 -0
- package/dist/commands/git/PushGeneratorCommand.js +51 -0
- package/dist/commands/git/PushGeneratorCommand.js.map +1 -0
- package/dist/commands/localstorage/LocalstorageGeneratorCommand.js +1 -1
- package/dist/commands/localstorage/LocalstorageGeneratorCommand.js.map +1 -1
- package/dist/config/defaultConfig.d.ts.map +1 -1
- package/dist/config/defaultConfig.js +1 -0
- package/dist/config/defaultConfig.js.map +1 -1
- package/dist/template/api/gen/httpClient.d.ts +1 -1
- package/dist/template/api/gen/httpClient.d.ts.map +1 -1
- package/dist/template/api/gen/httpClient.js +10 -2
- package/dist/template/api/gen/httpClient.js.map +1 -1
- package/dist/template/api/gen/queryApiClient.d.ts +2 -1
- package/dist/template/api/gen/queryApiClient.d.ts.map +1 -1
- package/dist/template/api/gen/queryApiClient.js +6 -5
- package/dist/template/api/gen/queryApiClient.js.map +1 -1
- package/dist/template/api/gen/queryReactQueryClient.d.ts +2 -1
- package/dist/template/api/gen/queryReactQueryClient.d.ts.map +1 -1
- package/dist/template/api/gen/queryReactQueryClient.js +7 -6
- package/dist/template/api/gen/queryReactQueryClient.js.map +1 -1
- package/dist/template/axios/instance.d.ts +1 -1
- package/dist/template/axios/instance.d.ts.map +1 -1
- package/dist/template/axios/instance.js +1 -1
- package/dist/template/axios/refresh.d.ts.map +1 -1
- package/dist/template/axios/refresh.js +46 -59
- package/dist/template/axios/refresh.js.map +1 -1
- package/dist/types/config.d.ts +1 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/utils/validateConfig.d.ts.map +1 -1
- package/dist/utils/validateConfig.js +3 -0
- package/dist/utils/validateConfig.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrpcGeneratorCommand.d.ts","sourceRoot":"","sources":["../../../src/commands/api/OrpcGeneratorCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAc9D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE;IAMzE,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAwCvF,gBAAgB;
|
|
1
|
+
{"version":3,"file":"OrpcGeneratorCommand.d.ts","sourceRoot":"","sources":["../../../src/commands/api/OrpcGeneratorCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAc9D,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE;IAMzE,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAwCvF,gBAAgB;IAQxB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;YAIrD,iBAAiB;IAgBzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAwB/B"}
|
|
@@ -49,16 +49,19 @@ export class OrpcGeneratorCommand extends BaseApiCommand {
|
|
|
49
49
|
return allEnumTypes;
|
|
50
50
|
}
|
|
51
51
|
async writeAllApiFiles(categorizedQueries) {
|
|
52
|
+
const config = this.getConfig();
|
|
52
53
|
for (const [tag, data] of Object.entries(categorizedQueries)) {
|
|
53
|
-
await ApiFileWriter.writeApiClient(tag, data.queries, data.importTypeArr);
|
|
54
|
-
await ApiFileWriter.writeReactQueryHooks(tag, data.methods, data.errorTypeArr);
|
|
54
|
+
await ApiFileWriter.writeApiClient(tag, data.queries, data.importTypeArr, config);
|
|
55
|
+
await ApiFileWriter.writeReactQueryHooks(tag, data.methods, data.errorTypeArr, config);
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
58
|
async generateHttpClient() {
|
|
58
|
-
|
|
59
|
+
const config = this.getConfig();
|
|
60
|
+
await ApiFileWriter.writeHttpClient(config);
|
|
59
61
|
}
|
|
60
62
|
async generateReactQueryTypes() {
|
|
61
|
-
|
|
63
|
+
const config = this.getConfig();
|
|
64
|
+
await ApiFileWriter.writeReactQueryTypes(config);
|
|
62
65
|
}
|
|
63
66
|
async generateApiClass(content) {
|
|
64
67
|
await ApiFileWriter.writeDataContracts(content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrpcGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/api/OrpcGeneratorCommand.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OrpcGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/api/OrpcGeneratorCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaGenerator.d.ts","sourceRoot":"","sources":["../../../../src/commands/api/generators/SchemaGenerator.ts"],"names":[],"mappings":"AAIA,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAkDrD,OAAO,CAAC,MAAM,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"SchemaGenerator.d.ts","sourceRoot":"","sources":["../../../../src/commands/api/generators/SchemaGenerator.ts"],"names":[],"mappings":"AAIA,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAkDrD,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAmBhC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { coverHyphenToQuotes } from "../../../utils/coverHyphenToQuotes.js";
|
|
1
2
|
import { CommentGenerator } from "../utils/CommentGenerator.js";
|
|
2
3
|
import { TypeResolver } from "../utils/TypeResolver.js";
|
|
3
|
-
import { coverHyphenToQuotes } from "../../../utils/coverHyphenToQuotes.js";
|
|
4
4
|
export class SchemaGenerator {
|
|
5
5
|
static generate(schemas) {
|
|
6
6
|
let output = "";
|
|
@@ -45,15 +45,13 @@ export class SchemaGenerator {
|
|
|
45
45
|
enumOutput = CommentGenerator.generate(enumComments);
|
|
46
46
|
}
|
|
47
47
|
if (prop["x-enumNames"]?.length > 0 && prop["x-enumNames"].length === prop.enum.length) {
|
|
48
|
-
enumOutput += `export
|
|
49
|
-
export const ${enumPropName}Map = {
|
|
48
|
+
enumOutput += `export const ${enumPropName}Map = {
|
|
50
49
|
${prop.enum.map((e, index) => `${coverHyphenToQuotes(e)}: '${prop["x-enumNames"][index]}'`).join(",\n ")},
|
|
51
|
-
} as const
|
|
50
|
+
} as const;
|
|
51
|
+
export type ${enumPropName} = keyof typeof ${enumPropName}Map;`;
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
|
-
enumOutput += `export type ${enumPropName}
|
|
55
|
-
${prop.enum.map((e) => `${e}`).join(" | ")},
|
|
56
|
-
};`;
|
|
54
|
+
enumOutput += `export type ${enumPropName} = ${prop.enum.map((e) => `'${e}'`).join(" | ")}`;
|
|
57
55
|
}
|
|
58
56
|
return enumOutput;
|
|
59
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../../../src/commands/api/generators/SchemaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../../../src/commands/api/generators/SchemaGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import type { DefaultConfigType } from "../../../types/config.js";
|
|
1
2
|
import type { ApiMethodInfo } from "../generators/ApiMethodGenerator.js";
|
|
2
3
|
export declare class ApiFileWriter {
|
|
3
|
-
static writeApiClient(tag: string, queries: string[], importTypeArr: string[]): Promise<void>;
|
|
4
|
-
static writeReactQueryHooks(tag: string, methods: ApiMethodInfo[], errorTypeArr: string[]): Promise<void>;
|
|
5
|
-
static writeHttpClient(): Promise<void>;
|
|
6
|
-
static writeReactQueryTypes(): Promise<void>;
|
|
4
|
+
static writeApiClient(tag: string, queries: string[], importTypeArr: string[], config: DefaultConfigType): Promise<void>;
|
|
5
|
+
static writeReactQueryHooks(tag: string, methods: ApiMethodInfo[], errorTypeArr: string[], config: DefaultConfigType): Promise<void>;
|
|
6
|
+
static writeHttpClient(config: DefaultConfigType): Promise<void>;
|
|
7
|
+
static writeReactQueryTypes(config: DefaultConfigType): Promise<void>;
|
|
7
8
|
static writeDataContracts(content: string): Promise<void>;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=ApiFileWriter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiFileWriter.d.ts","sourceRoot":"","sources":["../../../../src/commands/api/services/ApiFileWriter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAExE,qBAAa,aAAa;WACX,cAAc,
|
|
1
|
+
{"version":3,"file":"ApiFileWriter.d.ts","sourceRoot":"","sources":["../../../../src/commands/api/services/ApiFileWriter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAExE,qBAAa,aAAa;WACX,cAAc,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EAAE,EACjB,aAAa,EAAE,MAAM,EAAE,EACvB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC;WAYH,oBAAoB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,aAAa,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC;WAYH,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;WAUzD,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;WAkE9D,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAShE"}
|
|
@@ -5,37 +5,37 @@ import { genApiHttpClient } from "../../../template/api/gen/httpClient.js";
|
|
|
5
5
|
import { genQueryApiClient } from "../../../template/api/gen/queryApiClient.js";
|
|
6
6
|
import { genQueryReactQueryClient } from "../../../template/api/gen/queryReactQueryClient.js";
|
|
7
7
|
export class ApiFileWriter {
|
|
8
|
-
static async writeApiClient(tag, queries, importTypeArr) {
|
|
8
|
+
static async writeApiClient(tag, queries, importTypeArr, config) {
|
|
9
9
|
const name = pascalCase(tag);
|
|
10
10
|
const outputDir = path.join("src", "generated", "api", name);
|
|
11
11
|
await FileSystemService.writeFileOrSkip({
|
|
12
12
|
dir: outputDir,
|
|
13
13
|
generateType: "overwrite",
|
|
14
14
|
file: `${name}.api`,
|
|
15
|
-
content: genQueryApiClient(name, queries, importTypeArr),
|
|
15
|
+
content: genQueryApiClient(name, queries, importTypeArr, config),
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
|
-
static async writeReactQueryHooks(tag, methods, errorTypeArr) {
|
|
18
|
+
static async writeReactQueryHooks(tag, methods, errorTypeArr, config) {
|
|
19
19
|
const name = pascalCase(tag);
|
|
20
20
|
const outputDir = path.join("src", "generated", "api", name);
|
|
21
21
|
await FileSystemService.writeFileOrSkip({
|
|
22
22
|
dir: outputDir,
|
|
23
23
|
generateType: "overwrite",
|
|
24
24
|
file: `${name}.query`,
|
|
25
|
-
content: genQueryReactQueryClient(name, methods, errorTypeArr),
|
|
25
|
+
content: genQueryReactQueryClient(name, methods, errorTypeArr, config),
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
|
-
static async writeHttpClient() {
|
|
28
|
+
static async writeHttpClient(config) {
|
|
29
29
|
const outputDir = path.join("src", "generated", "api", "@http-client");
|
|
30
30
|
await FileSystemService.writeFileOrSkip({
|
|
31
31
|
dir: outputDir,
|
|
32
32
|
generateType: "overwrite",
|
|
33
33
|
file: "index",
|
|
34
|
-
content: genApiHttpClient,
|
|
34
|
+
content: genApiHttpClient(config.api.consistentTypeImports),
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
static async writeReactQueryTypes() {
|
|
38
|
-
const content = `import {
|
|
37
|
+
static async writeReactQueryTypes(config) {
|
|
38
|
+
const content = `import${config.api.consistentTypeImports ? " type " : " "}{
|
|
39
39
|
DefaultError,
|
|
40
40
|
InfiniteData,
|
|
41
41
|
QueryKey,
|
|
@@ -43,7 +43,7 @@ export class ApiFileWriter {
|
|
|
43
43
|
UseMutationOptions,
|
|
44
44
|
UseQueryOptions,
|
|
45
45
|
} from "@tanstack/react-query"
|
|
46
|
-
import { AxiosError } from 'axios'
|
|
46
|
+
import${config.api.consistentTypeImports ? " type " : " "}{ AxiosError } from 'axios'
|
|
47
47
|
|
|
48
48
|
export type QueryHookParams<
|
|
49
49
|
T extends CustomRequestFn,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiFileWriter.js","sourceRoot":"","sources":["../../../../src/commands/api/services/ApiFileWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAA;
|
|
1
|
+
{"version":3,"file":"ApiFileWriter.js","sourceRoot":"","sources":["../../../../src/commands/api/services/ApiFileWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosGeneratorCommand.d.ts","sourceRoot":"","sources":["../../../src/commands/axios/AxiosGeneratorCommand.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAEvE,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"AxiosGeneratorCommand.d.ts","sourceRoot":"","sources":["../../../src/commands/axios/AxiosGeneratorCommand.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAEvE,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAqIxD"}
|
|
@@ -93,7 +93,11 @@ export class AxiosGeneratorCommand extends BaseAxiosCommand {
|
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
95
|
const storeDir = FileSystemService.getOutputPath("store");
|
|
96
|
+
// spinner를 잠시 멈추기 (stop 혹은 pause)
|
|
97
|
+
spinner?.stop && spinner.stop();
|
|
96
98
|
await EnsureSystem.ensureLocalStorage(storeDir, true);
|
|
99
|
+
// spinner를 다시 시작 (resume 혹은 start)
|
|
100
|
+
spinner?.start && spinner.start();
|
|
97
101
|
await FileSystemService.writeFileOrSkip({
|
|
98
102
|
dir: axiosDir,
|
|
99
103
|
file: "refresh",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/axios/AxiosGeneratorCommand.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AxiosGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/axios/AxiosGeneratorCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PushGeneratorCommand.d.ts","sourceRoot":"","sources":["../../../src/commands/git/PushGeneratorCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,qBAAa,oBAAqB,SAAQ,WAAW;IAC7C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAkD/B"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import fs from "fs-extra";
|
|
2
|
+
import { execSync } from "node:child_process";
|
|
3
|
+
import { cwd } from "node:process";
|
|
4
|
+
import { BaseCommand } from "../../core/BaseCommand.js";
|
|
5
|
+
export class PushGeneratorCommand extends BaseCommand {
|
|
6
|
+
async execute() {
|
|
7
|
+
await this.getContext();
|
|
8
|
+
const targetCwd = cwd();
|
|
9
|
+
try {
|
|
10
|
+
// Track untracked files in diff without staging actual content.
|
|
11
|
+
execSync("git add -N .", { cwd: targetCwd, stdio: "pipe" });
|
|
12
|
+
const statusSummary = execSync("git status --porcelain", { cwd: targetCwd, stdio: "pipe" }).toString().split("\n");
|
|
13
|
+
let finalReport = "";
|
|
14
|
+
for (const line of statusSummary) {
|
|
15
|
+
if (!line.trim())
|
|
16
|
+
continue;
|
|
17
|
+
const status = line.substring(0, 2).trim();
|
|
18
|
+
const filePath = line.substring(3).trim();
|
|
19
|
+
if (!filePath)
|
|
20
|
+
continue;
|
|
21
|
+
finalReport += `\n[${status}] FILE: ${filePath}\n`;
|
|
22
|
+
finalReport += "-------------------------------------------\n";
|
|
23
|
+
try {
|
|
24
|
+
const escapedPath = filePath.replace(/(["\\$`])/g, "\\$1");
|
|
25
|
+
const diff = execSync(`git diff --unified=0 --no-color -- "${escapedPath}"`, {
|
|
26
|
+
cwd: targetCwd,
|
|
27
|
+
stdio: "pipe",
|
|
28
|
+
}).toString();
|
|
29
|
+
const contentOnly = diff
|
|
30
|
+
.split("\n")
|
|
31
|
+
.filter((l) => (l.startsWith("+") && !l.startsWith("+++")) || (l.startsWith("-") && !l.startsWith("---")))
|
|
32
|
+
.join("\n");
|
|
33
|
+
console.log(contentOnly);
|
|
34
|
+
finalReport += contentOnly ? `${contentOnly}\n` : "";
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
finalReport += "(내용을 불러올 수 없거나 바이너리 파일입니다.)\n";
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
const outputPath = `${targetCwd}/comprehensive_diff.txt`;
|
|
41
|
+
await fs.writeFile(outputPath, finalReport);
|
|
42
|
+
console.log(`✅ comprehensive_diff.txt 생성 완료! (${outputPath})`);
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
46
|
+
console.error("오류 발생:", message);
|
|
47
|
+
throw err;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=PushGeneratorCommand.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PushGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/git/PushGeneratorCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export class LocalstorageGeneratorCommand extends BaseLocalstorageCommand {
|
|
|
11
11
|
const spinner = !isSilent ? ora(`Generating Localstorage files... 🚀`).start() : undefined;
|
|
12
12
|
const utilStorageDir = FileSystemService.joinWithEnsureDir(FileSystemService.getOutputPath("utils"), "storage");
|
|
13
13
|
const storeLocalStorageDir = FileSystemService.joinWithEnsureDir(FileSystemService.getOutputPath("store"), "local");
|
|
14
|
-
const hooksDir = FileSystemService.getOutputPath("
|
|
14
|
+
const hooksDir = FileSystemService.getOutputPath("hooks");
|
|
15
15
|
const typesDir = FileSystemService.getOutputPath("types");
|
|
16
16
|
await FileSystemService.writeFileOrSkip({
|
|
17
17
|
dir: hooksDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalstorageGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/localstorage/LocalstorageGeneratorCommand.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAA;AAE9E,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IACvE,KAAK,CAAC,OAAO,CAAC,WAAoB,KAAK;QACrC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QAEvB,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QAC1F,MAAM,cAAc,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;QAC/G,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAA;QACnH,MAAM,QAAQ,GAAG,iBAAiB,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"LocalstorageGeneratorCommand.js","sourceRoot":"","sources":["../../../src/commands/localstorage/LocalstorageGeneratorCommand.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAA;AAE9E,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IACvE,KAAK,CAAC,OAAO,CAAC,WAAoB,KAAK;QACrC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QAEvB,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QAC1F,MAAM,cAAc,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;QAC/G,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAA;QACnH,MAAM,QAAQ,GAAG,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QACzD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAEzD,MAAM,iBAAiB,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,gBAAgB;YACzB,QAAQ;SACT,CAAC,CAAA;QAEF,MAAM,iBAAiB,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,cAAc;YACnB,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,mBAAmB;YAC5B,QAAQ;SACT,CAAC,CAAA;QAEF,MAAM,iBAAiB,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,gBAAgB;YACzB,QAAQ;SACT,CAAC,CAAA;QAEF,MAAM,iBAAiB,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,oBAAoB;YACzB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,YAAY;YACrB,QAAQ;SACT,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,CAAC,8CAA8C,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../../src/config/defaultConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,QAAA,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../../src/config/defaultConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,QAAA,MAAM,MAAM,EAaP,iBAAiB,CAAA;AAEtB,OAAO,EAAE,MAAM,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../src/config/defaultConfig.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG;IACb,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,QAAQ,EAAE,EAAE;SACb;QACD,QAAQ,EAAE;YACR,cAAc,EAAE,IAAI;SACrB;KACF;IACD,GAAG,EAAE;QACH,OAAO,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../src/config/defaultConfig.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG;IACb,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,QAAQ,EAAE,EAAE;SACb;QACD,QAAQ,EAAE;YACR,cAAc,EAAE,IAAI;SACrB;KACF;IACD,GAAG,EAAE;QACH,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,IAAI;KAC5B;CACmB,CAAA;AAEtB,OAAO,EAAE,MAAM,EAAE,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const genApiHttpClient
|
|
1
|
+
export declare const genApiHttpClient: (consistentTypeImports: boolean | null) => string;
|
|
2
2
|
//# sourceMappingURL=httpClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/httpClient.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/httpClient.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,GAAI,uBAAuB,OAAO,GAAG,IAAI,WAyLpE,CAAA"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
|
-
export const genApiHttpClient =
|
|
1
|
+
export const genApiHttpClient = (consistentTypeImports) => `${!consistentTypeImports
|
|
2
|
+
? `import axios, {
|
|
2
3
|
AxiosInstance,
|
|
3
4
|
AxiosRequestConfig,
|
|
4
5
|
HeadersDefaults,
|
|
5
6
|
ResponseType,
|
|
6
|
-
} from 'axios'
|
|
7
|
+
} from 'axios';`
|
|
8
|
+
: `import type {
|
|
9
|
+
AxiosInstance,
|
|
10
|
+
AxiosRequestConfig,
|
|
11
|
+
HeadersDefaults,
|
|
12
|
+
ResponseType,
|
|
13
|
+
} from 'axios'
|
|
14
|
+
import axios from 'axios'`}
|
|
7
15
|
|
|
8
16
|
export type QueryParamsType = Record<string | number, any>;
|
|
9
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/httpClient.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/httpClient.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,qBAAqC,EAAE,EAAE,CAAC,GACzE,CAAC,qBAAqB;IACpB,CAAC,CAAC;;;;;gBAKU;IACZ,CAAC,CAAC;;;;;;0BAON;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0KE,CAAA"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import type { DefaultConfigType } from "../../../types/config.js";
|
|
2
|
+
export declare const genQueryApiClient: (apiName: string, queries: string[], importTypeArr: string[], config: DefaultConfigType) => string;
|
|
2
3
|
//# sourceMappingURL=queryApiClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryApiClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/queryApiClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queryApiClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/queryApiClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,eAAe,MAAM,EAAE,EACvB,QAAQ,iBAAiB,WA4B1B,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { camelCase } from "change-case";
|
|
2
|
-
export const genQueryApiClient = (apiName, queries, importTypeArr) => {
|
|
2
|
+
export const genQueryApiClient = (apiName, queries, importTypeArr, config) => {
|
|
3
|
+
const { consistentTypeImports } = config.api;
|
|
3
4
|
const genImportArr = () => {
|
|
4
5
|
if (importTypeArr.length === 0) {
|
|
5
6
|
return "";
|
|
@@ -7,14 +8,14 @@ export const genQueryApiClient = (apiName, queries, importTypeArr) => {
|
|
|
7
8
|
const sortedImportTypeArr = importTypeArr.sort((a, b) => a.localeCompare(b));
|
|
8
9
|
const importStrSet = [...new Set(sortedImportTypeArr)];
|
|
9
10
|
if (importStrSet.length < 5) {
|
|
10
|
-
return `import { ${importStrSet.join(", ")} } from '../@types/data-contracts'
|
|
11
|
+
return `import${consistentTypeImports ? " type " : " "}{ ${importStrSet.join(", ")} } from '../@types/data-contracts';\n`;
|
|
11
12
|
}
|
|
12
|
-
return `import {
|
|
13
|
+
return `import${consistentTypeImports ? " type " : " "}{
|
|
13
14
|
${importStrSet.join(",\n ")}
|
|
14
|
-
} from '../@types/data-contracts'
|
|
15
|
+
} from '../@types/data-contracts';\n`;
|
|
15
16
|
};
|
|
16
17
|
return `import { instance } from "@/configs/axios/instance"
|
|
17
|
-
import { ContentType, HttpClient, RequestParams } from '../@http-client';
|
|
18
|
+
${consistentTypeImports ? "import type { RequestParams } from '../@http-client'\nimport { ContentType, HttpClient } from '../@http-client'" : "import { ContentType, HttpClient, RequestParams } from '../@http-client';"};
|
|
18
19
|
${importTypeArr.length === 0 ? "" : `${genImportArr()}`}
|
|
19
20
|
export class ${apiName}Api<
|
|
20
21
|
SecurityDataType = unknown,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryApiClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/queryApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"queryApiClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/queryApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAe,EACf,OAAiB,EACjB,aAAuB,EACvB,MAAyB,EACzB,EAAE;IACF,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC,GAAG,CAAA;IAC5C,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAA;QACX,CAAC;QAED,MAAM,mBAAmB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5E,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAA;QACtD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,SAAS,qBAAqB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,uCAAuC,CAAA;QAC3H,CAAC;QACD,OAAO,SAAS,qBAAqB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG;IACtD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;qCACO,CAAA;IACnC,CAAC,CAAA;IAED,OAAO;EACP,qBAAqB,CAAC,CAAC,CAAC,iHAAiH,CAAC,CAAC,CAAC,2EAA2E;EACvN,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,EAAE;eACxC,OAAO;;;GAGnB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;;;eAGN,SAAS,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,aAAa,OAAO,oBAAoB,CAAA;AAC7F,CAAC,CAAA"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DefaultConfigType } from "../../../types/config.js";
|
|
1
2
|
type QueryMethodInfo = {
|
|
2
3
|
operationId: string;
|
|
3
4
|
method: string;
|
|
@@ -8,6 +9,6 @@ type QueryMethodInfo = {
|
|
|
8
9
|
comments: string[];
|
|
9
10
|
isInfinite: boolean;
|
|
10
11
|
};
|
|
11
|
-
export declare const genQueryReactQueryClient: (apiName: string, methods: QueryMethodInfo[], importErrorTypeArr: string[]) => string;
|
|
12
|
+
export declare const genQueryReactQueryClient: (apiName: string, methods: QueryMethodInfo[], importErrorTypeArr: string[], config: DefaultConfigType) => string;
|
|
12
13
|
export {};
|
|
13
14
|
//# sourceMappingURL=queryReactQueryClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryReactQueryClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/queryReactQueryClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queryReactQueryClient.d.ts","sourceRoot":"","sources":["../../../../src/template/api/gen/queryReactQueryClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,aAAa,EAAE,OAAO,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,SAAS,eAAe,EAAE,EAC1B,oBAAoB,MAAM,EAAE,EAC5B,QAAQ,iBAAiB,WAsK1B,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { camelCase, constantCase, pascalCase } from "change-case";
|
|
2
|
-
export const genQueryReactQueryClient = (apiName, methods, importErrorTypeArr) => {
|
|
2
|
+
export const genQueryReactQueryClient = (apiName, methods, importErrorTypeArr, config) => {
|
|
3
|
+
const { consistentTypeImports } = config.api;
|
|
3
4
|
const apiInstance = camelCase(apiName.toLocaleLowerCase()) + "Api";
|
|
4
5
|
const constantPrefix = constantCase(apiName);
|
|
5
6
|
const genImportArr = () => {
|
|
@@ -11,11 +12,11 @@ export const genQueryReactQueryClient = (apiName, methods, importErrorTypeArr) =
|
|
|
11
12
|
.sort((a, b) => a.localeCompare(b));
|
|
12
13
|
const importStrSet = [...new Set(sortedImportTypeArr)];
|
|
13
14
|
if (importStrSet.length < 5) {
|
|
14
|
-
return `import { ${importStrSet.join(", ")} } from "../@types/data-contracts"
|
|
15
|
+
return `import${consistentTypeImports ? " type " : " "}{ ${importStrSet.join(", ")} } from "../@types/data-contracts";\n`;
|
|
15
16
|
}
|
|
16
|
-
return `import {
|
|
17
|
+
return `import${consistentTypeImports ? " type " : " "}{
|
|
17
18
|
${importStrSet.join(",\n ")},
|
|
18
|
-
} from "../@types/data-contracts"
|
|
19
|
+
} from "../@types/data-contracts";\n`;
|
|
19
20
|
};
|
|
20
21
|
let isNeedInfiniteQueryInFile = false;
|
|
21
22
|
let isNeedMutationInFile = false;
|
|
@@ -144,8 +145,8 @@ export const genQueryReactQueryClient = (apiName, methods, importErrorTypeArr) =
|
|
|
144
145
|
return importArr.join(", ");
|
|
145
146
|
};
|
|
146
147
|
return `import { ${importFromTanstackQuery()} } from "@tanstack/react-query"
|
|
147
|
-
import { AxiosError } from "axios"
|
|
148
|
-
import { ${importFromReactQueryType()} } from "../@types/react-query-type"
|
|
148
|
+
import${consistentTypeImports ? " type " : " "}{ AxiosError } from "axios"
|
|
149
|
+
import${consistentTypeImports ? " type " : " "}{ ${importFromReactQueryType()} } from "../@types/react-query-type"
|
|
149
150
|
import { ${apiInstance} } from "./${apiName}.api"
|
|
150
151
|
${importErrorTypeArr.length === 0 ? "" : `\n${genImportArr()}`}
|
|
151
152
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryReactQueryClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/queryReactQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"queryReactQueryClient.js","sourceRoot":"","sources":["../../../../src/template/api/gen/queryReactQueryClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const axiosInstanceWithLocalStorageRefreshToken = "import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from \"axios\"\nimport qs from \"qs\"\n\nimport { ENV } from \"@/configs/env\"\nimport { apiLogger } from \"@/utils/logger/api-logger\"\nimport styledConsole from \"@/utils/logger/styled-console\"\nimport { tokenStorage } from \"@/store/local/index\"\nimport { refresh } from \"./refresh\"\n\nconst isDev = ENV.NODE_ENV === \"development\"\n\nexport class HttpClient {\n private instance: AxiosInstance\n\n constructor(config?: AxiosRequestConfig) {\n this.instance = axios.create({\n baseURL: ENV.API_BASE_URL,\n timeout: 5000,\n headers: {\n \"Content-Type\": \"application/json\",\n },\n ...config,\n })\n this.setupInterceptors()\n }\n\n private setupInterceptors() {\n this.instance.interceptors.request.use(\n (config) => {\n const token = tokenStorage?.get()\n const isAccess = !!token && !!token.access\n if (isAccess) {\n config.headers.setAuthorization(`Bearer ${token.access}`);\n }\n return config\n },\n (error) => {\n return Promise.reject(error)\n },\n )\n\n this.instance.interceptors.response.use(\n (res) => {\n const { status, config: reqData, data: resData } = res\n if (isDev) apiLogger({ status, reqData, resData })\n return res\n },\n async (error: AxiosError) => {\n try {\n const { response: res, config: reqData } = error || {}\n const { status } = res || { status: 400 }\n const isUnAuthError = status === 401\n const isExpiredToken = status === 444\n\n if (isDev) apiLogger({ status, reqData, resData: error, method: \"error\" })\n\n if (isExpiredToken && reqData) {\n const refreshedConfig = await refresh(reqData)\n if (refreshedConfig) {\n return this.instance.request(refreshedConfig)\n }\n }\n\n if (isUnAuthError) {\n tokenStorage?.remove()\n }\n\n return Promise.reject(error)\n } catch (e) {\n styledConsole({\n method: \"error\",\n topic: \"UN_HANDLED\",\n title: \"axios-interceptor\",\n data: e,\n })\n return Promise.reject(e)\n }\n },\n )\n\n this.instance.defaults.paramsSerializer = (params) => {\n return qs.stringify(params, { arrayFormat: \"repeat\" })\n }\n }\n\n public getInstance(): AxiosInstance {\n return this.instance\n }\n}\n\nexport const instance = new HttpClient().getInstance()";
|
|
2
|
-
export declare const axiosInstanceWithNextServerJwt = "import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from \"axios\"\nimport qs from \"qs\"\n\nimport { ENV } from \"@/configs/env\"\nimport { apiLogger } from \"@/utils/logger/api-logger\"\nimport styledConsole from \"@/utils/logger/styled-console\"\nimport { clearTokens } from \"@/utils/jwt\"\n\nconst isDev = ENV.NODE_ENV === \"development\"\n\nlet isRefreshing = false;\nlet refreshSubscribers: ((token: string) => void)[] = [];\n\nconst onRefreshed = (token: string) => {\n refreshSubscribers.forEach((callback) => callback(token));\n refreshSubscribers = [];\n};\n\nconst addRefreshSubscriber = (callback: (token: string) => void) => {\n refreshSubscribers.push(callback);\n};\n\nexport class HttpClient {\n private instance: AxiosInstance\n\n constructor(config?: AxiosRequestConfig) {\n this.instance = axios.create({\n baseURL: ENV.API_BASE_URL,\n timeout: 5000,\n withCredentials: true, \n headers: {\n \"Content-Type\": \"application/json\",\n },\n ...config,\n })\n this.setupInterceptors()\n }\n\n private setupInterceptors() {\n this.instance.interceptors.request.use(\n (config) => config,\n (error) => Promise.reject(error),\n )\n\n this.instance.interceptors.response.use(\n (res) => {\n const { status, config: reqData, data: resData } = res\n if (isDev) apiLogger({ status, reqData, resData })\n return res\n },\n async (error: AxiosError) => {\n const { response: res, config: reqData } = error
|
|
2
|
+
export declare const axiosInstanceWithNextServerJwt = "import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from \"axios\"\nimport qs from \"qs\"\n\nimport { ENV } from \"@/configs/env\"\nimport { apiLogger } from \"@/utils/logger/api-logger\"\nimport styledConsole from \"@/utils/logger/styled-console\"\nimport { clearTokens } from \"@/utils/jwt\"\n\nconst isDev = ENV.NODE_ENV === \"development\"\n\nlet isRefreshing = false;\nlet refreshSubscribers: ((token: string) => void)[] = [];\n\nconst onRefreshed = (token: string) => {\n refreshSubscribers.forEach((callback) => callback(token));\n refreshSubscribers = [];\n};\n\nconst addRefreshSubscriber = (callback: (token: string) => void) => {\n refreshSubscribers.push(callback);\n};\n\nexport class HttpClient {\n private instance: AxiosInstance\n\n constructor(config?: AxiosRequestConfig) {\n this.instance = axios.create({\n baseURL: ENV.API_BASE_URL,\n timeout: 5000,\n withCredentials: true, \n headers: {\n \"Content-Type\": \"application/json\",\n },\n ...config,\n })\n this.setupInterceptors()\n }\n\n private setupInterceptors() {\n this.instance.interceptors.request.use(\n (config) => config,\n (error) => Promise.reject(error),\n )\n\n this.instance.interceptors.response.use(\n (res) => {\n const { status, config: reqData, data: resData } = res\n if (isDev) apiLogger({ status, reqData, resData })\n return res\n },\n async (error: AxiosError) => {\n const { response: res, config: reqData } = error\n const { status } = res || { status: 400 }\n const originalRequest = reqData as AxiosRequestConfig & { _retry?: boolean }\n const isBrowser = typeof window !== 'undefined'\n const isUnAuthError = status === 401\n const isExpiredToken = status === 444\n\n if (isExpiredToken && originalRequest && !originalRequest._retry && isBrowser) {\n originalRequest._retry = true;\n\n if (isRefreshing) {\n return new Promise((resolve) => {\n addRefreshSubscriber(() => {\n resolve(this.instance(originalRequest));\n });\n });\n }\n\n isRefreshing = true;\n\n try {\n await axios.post('/api/auth/refresh'); \n \n isRefreshing = false;\n onRefreshed('success');\n return this.instance(originalRequest);\n } catch (refreshError) {\n isRefreshing = false;\n refreshSubscribers = [];\n if (typeof window !== 'undefined') {\n window.location.href = '/login'; \n }\n return Promise.reject(refreshError);\n }\n }\n\n if (isUnAuthError) {\n await clearTokens();\n }\n\n styledConsole({\n method: \"error\",\n topic: \"UN_HANDLED\",\n title: \"axios-interceptor\",\n data: error,\n })\n return Promise.reject(error)\n },\n )\n\n this.instance.defaults.paramsSerializer = (params) => {\n return qs.stringify(params, { arrayFormat: \"repeat\" })\n }\n }\n\n public getInstance(): AxiosInstance {\n return this.instance\n }\n}\n\nexport const instance = new HttpClient().getInstance()";
|
|
3
3
|
export declare const axiosInstance = "import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from \"axios\"\nimport qs from \"qs\"\n\nimport { ENV } from \"@/configs/env\"\nimport { apiLogger } from \"@/utils/logger/api-logger\"\nimport styledConsole from \"@/utils/logger/styled-console\"\n\nconst isDev = ENV.NODE_ENV === \"development\"\n\nexport class HttpClient {\n private instance: AxiosInstance\n\n constructor(config?: AxiosRequestConfig) {\n this.instance = axios.create({\n baseURL: ENV.API_BASE_URL,\n timeout: 5000,\n headers: {\n \"Content-Type\": \"application/json\",\n },\n ...config,\n })\n this.setupInterceptors()\n }\n\n private setupInterceptors() {\n this.instance.interceptors.request.use(\n (config) => {\n return config\n },\n (error) => {\n return Promise.reject(error)\n },\n )\n\n this.instance.interceptors.response.use(\n (res) => {\n const { status, config: reqData, data: resData } = res\n if (isDev) apiLogger({ status, reqData, resData })\n return res\n },\n async (error: AxiosError) => {\n try {\n const { response: res, config: reqData } = error || {}\n const { status } = res || { status: 400 }\n\n if (isDev) apiLogger({ status, reqData, resData: error, method: \"error\" })\n\n return Promise.reject(error)\n } catch (e) {\n styledConsole({\n method: \"error\",\n topic: \"UN_HANDLED\",\n title: \"axios-interceptor\",\n data: e,\n })\n return Promise.reject(e)\n }\n },\n )\n\n this.instance.defaults.paramsSerializer = (params) => {\n return qs.stringify(params, { arrayFormat: \"repeat\" })\n }\n }\n\n public getInstance(): AxiosInstance {\n return this.instance\n }\n}\n\nexport const instance = new HttpClient().getInstance()\n";
|
|
4
4
|
//# sourceMappingURL=instance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../../src/template/axios/instance.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yCAAyC,skFA0FC,CAAA;AAEvD,eAAO,MAAM,8BAA8B,
|
|
1
|
+
{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../../src/template/axios/instance.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yCAAyC,skFA0FC,CAAA;AAEvD,eAAO,MAAM,8BAA8B,8uGA+GY,CAAA;AAEvD,eAAO,MAAM,aAAa,u4DAuEzB,CAAA"}
|
|
@@ -140,7 +140,7 @@ export class HttpClient {
|
|
|
140
140
|
return res
|
|
141
141
|
},
|
|
142
142
|
async (error: AxiosError) => {
|
|
143
|
-
const { response: res, config: reqData } = error
|
|
143
|
+
const { response: res, config: reqData } = error
|
|
144
144
|
const { status } = res || { status: 400 }
|
|
145
145
|
const originalRequest = reqData as AxiosRequestConfig & { _retry?: boolean }
|
|
146
146
|
const isBrowser = typeof window !== 'undefined'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../../src/template/axios/refresh.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../../src/template/axios/refresh.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,cAkExB,CAAA"}
|
|
@@ -1,81 +1,68 @@
|
|
|
1
|
-
export const axiosRefresh = () => `import {
|
|
2
|
-
import
|
|
3
|
-
import { TokenType } from "@/types/localStorageType"
|
|
4
|
-
import axios, { InternalAxiosRequestConfig } from "axios"
|
|
1
|
+
export const axiosRefresh = () => `import type { AxiosRequestConfig } from 'axios'
|
|
2
|
+
import axios from 'axios'
|
|
5
3
|
|
|
6
|
-
|
|
4
|
+
import { ENV } from '@/configs/env'
|
|
5
|
+
import { tokenStorage } from '@/store/local'
|
|
6
|
+
import type { TokenType } from '@/types/localStorageType'
|
|
7
|
+
|
|
8
|
+
import { instance } from './instance'
|
|
9
|
+
|
|
10
|
+
type Request = (access: string) => void
|
|
7
11
|
|
|
8
12
|
let isTokenRefreshing = false
|
|
9
|
-
let refreshSubscribers:
|
|
13
|
+
let refreshSubscribers: Request[] = []
|
|
10
14
|
|
|
11
15
|
const onTokenRefreshed = (access: string) => {
|
|
12
|
-
refreshSubscribers.forEach((callback) => callback(access))
|
|
13
|
-
refreshSubscribers = []
|
|
16
|
+
refreshSubscribers.forEach((callback: Request) => callback(access))
|
|
14
17
|
}
|
|
15
18
|
|
|
16
|
-
const
|
|
17
|
-
refreshSubscribers.
|
|
18
|
-
refreshSubscribers = []
|
|
19
|
+
const addRefreshSubscriber = (callback: Request) => {
|
|
20
|
+
refreshSubscribers.push(callback)
|
|
19
21
|
}
|
|
20
22
|
|
|
21
|
-
const refreshToken = async ()
|
|
23
|
+
const refreshToken = async () => {
|
|
22
24
|
try {
|
|
23
|
-
const token = tokenStorage
|
|
24
|
-
if (!token
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
})
|
|
31
|
-
|
|
32
|
-
const updatedToken = { ...token, ...newToken }
|
|
33
|
-
tokenStorage?.set(updatedToken)
|
|
34
|
-
|
|
25
|
+
const token = tokenStorage.get()
|
|
26
|
+
if (!token.refresh) throw new Error('not found refresh-token')
|
|
27
|
+
const { data: newToken }: { data: TokenType } = await axios.post(
|
|
28
|
+
\`\${ENV.API_BASE_URL}/v1/user/refresh/\`,
|
|
29
|
+
{ refresh: token.refresh },
|
|
30
|
+
)
|
|
31
|
+
tokenStorage.set({ ...token, ...newToken })
|
|
35
32
|
return newToken
|
|
36
33
|
} catch (err) {
|
|
37
|
-
tokenStorage
|
|
38
|
-
|
|
39
|
-
if (typeof window !== "undefined") {
|
|
40
|
-
window.location.href = "/login"
|
|
41
|
-
}
|
|
34
|
+
tokenStorage.remove()
|
|
42
35
|
throw err
|
|
43
36
|
}
|
|
44
37
|
}
|
|
45
38
|
|
|
46
|
-
export const refresh = async (
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
return new Promise((resolve, reject) => {
|
|
54
|
-
refreshSubscribers.push((access: string | null) => {
|
|
55
|
-
if (access) {
|
|
56
|
-
if (originalRequest.headers) {
|
|
57
|
-
originalRequest.headers.set("Authorization", \`Bearer \${access}\`)
|
|
58
|
-
}
|
|
59
|
-
resolve(originalRequest)
|
|
60
|
-
} else {
|
|
61
|
-
reject(new Error("Refresh token failed and cleared"))
|
|
39
|
+
export const refresh = async (reqData?: AxiosRequestConfig) => {
|
|
40
|
+
const retriedOriginalRequest = new Promise((resolve) => {
|
|
41
|
+
addRefreshSubscriber((access: string) => {
|
|
42
|
+
if (reqData?.headers) {
|
|
43
|
+
reqData.headers.Authorization = 'Bearer ' + access
|
|
44
|
+
resolve(instance(reqData))
|
|
45
|
+
return
|
|
62
46
|
}
|
|
47
|
+
resolve(null)
|
|
63
48
|
})
|
|
49
|
+
})
|
|
64
50
|
|
|
65
|
-
|
|
51
|
+
if (!isTokenRefreshing) {
|
|
52
|
+
try {
|
|
66
53
|
isTokenRefreshing = true
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
.finally(() => {
|
|
76
|
-
isTokenRefreshing = false
|
|
77
|
-
})
|
|
54
|
+
const token = await refreshToken()
|
|
55
|
+
onTokenRefreshed(token.access)
|
|
56
|
+
refreshSubscribers = []
|
|
57
|
+
} catch (error) {
|
|
58
|
+
console.log(error)
|
|
59
|
+
throw error
|
|
60
|
+
} finally {
|
|
61
|
+
isTokenRefreshing = false
|
|
78
62
|
}
|
|
79
|
-
}
|
|
80
|
-
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
return retriedOriginalRequest
|
|
66
|
+
}
|
|
67
|
+
`;
|
|
81
68
|
//# sourceMappingURL=refresh.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/template/axios/refresh.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/template/axios/refresh.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEjC,CAAA"}
|
package/dist/types/config.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,QAAQ,EAAE;gBACR,EAAE,CAAC,EAAE,MAAM,CAAA;gBACX,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,IAAI,CAAC,EAAE,MAAM,CAAA;aACd,CAAA;SACF,CAAA;QACD,QAAQ,EAAE;YACR,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;SAC9B,CAAA;KACF,CAAA;IACD,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,QAAQ,EAAE;gBACR,EAAE,CAAC,EAAE,MAAM,CAAA;gBACX,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,IAAI,CAAC,EAAE,MAAM,CAAA;aACd,CAAA;SACF,CAAA;QACD,QAAQ,EAAE;YACR,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;SAC9B,CAAA;KACF,CAAA;IACD,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;QACtB,qBAAqB,EAAE,OAAO,GAAG,IAAI,CAAA;KACtC,CAAA;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateConfig.d.ts","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"validateConfig.d.ts","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAoD3D,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,OAAO,GAAG,iBAAiB,CAE3E"}
|
|
@@ -36,6 +36,9 @@ function mergeWithValidation(external, defaultVal) {
|
|
|
36
36
|
if (api.baseUrl === null || typeof api.baseUrl === "string") {
|
|
37
37
|
result.api.baseUrl = api.baseUrl;
|
|
38
38
|
}
|
|
39
|
+
if (typeof external.api.consistentTypeImports === "boolean") {
|
|
40
|
+
result.api.consistentTypeImports = external.api.consistentTypeImports;
|
|
41
|
+
}
|
|
39
42
|
}
|
|
40
43
|
return result;
|
|
41
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAGpE,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC7E,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAiB,EAAE,UAA6B;IAC3E,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,GAAG,UAAU,EAAE,CAAA;IAEhC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE,CAAA;QACtC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;YACxD,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpD,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAmC,CAAA;gBACtE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAA;gBAChD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,GAAG,EAAE,GAAG,KAAK,EAAE,CAC5C;gBAAC,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACvD,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;wBAC9B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;oBAC3C,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAmC,CAAA;YAC7D,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;YACxD,IAAI,EAAE,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,EAAE,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;gBACxE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,CAAA;YAC1D,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAA8B,CAAA;QACnD,MAAM,CAAC,GAAG,GAAG,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAA;QAClC,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC5D,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAClC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,QAAiB;IACtD,OAAO,mBAAmB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;AACrD,CAAC"}
|
|
1
|
+
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"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"}
|