@simplysm/sd-cli 12.12.7 → 12.12.8
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/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.d.ts +5 -2
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js +15 -11
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -1
- package/dist/pkg-builders/client/sd-client.build-runner.js +26 -31
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.d.ts +5 -2
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js +15 -16
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js.map +1 -1
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.d.ts +5 -2
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js +14 -9
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +34 -19
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
- package/dist/ts-compiler/sd-dependency-cache.d.ts +1 -0
- package/dist/ts-compiler/sd-dependency-cache.js +7 -1
- package/dist/ts-compiler/sd-dependency-cache.js.map +1 -1
- package/dist/ts-compiler/sd-ts-compiler.js +23 -18
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -1
- package/package.json +9 -9
- package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts +8 -7
- package/src/pkg-builders/client/sd-client.build-runner.ts +38 -48
- package/src/pkg-builders/lib/sd-cli-db-context.file-generator.ts +8 -12
- package/src/pkg-builders/lib/sd-cli-index.file-generator.ts +9 -10
- package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +19 -10
- package/src/ts-compiler/sd-dependency-cache.ts +12 -12
- package/src/ts-compiler/sd-ts-compiler.ts +53 -106
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export declare class SdCliNgRoutesFileGenerator {
|
|
2
2
|
cachedHash?: string;
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
run(pkgPath: string, noLazyRoute?: boolean): {
|
|
4
|
+
changed: boolean;
|
|
5
|
+
filePath: string;
|
|
6
|
+
content: string;
|
|
7
|
+
};
|
|
5
8
|
}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import { FsUtils, HashUtils, PathUtils
|
|
2
|
+
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
3
3
|
import { StringUtils } from "@simplysm/sd-core-common";
|
|
4
4
|
export class SdCliNgRoutesFileGenerator {
|
|
5
|
-
watch(pkgPath, noLazyRoute) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
});
|
|
5
|
+
/*watch(pkgPath: string, noLazyRoute?: boolean) {
|
|
6
|
+
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
7
|
+
this.cachedHash = FsUtils.exists(routesFilePath) ? HashUtils.get(FsUtils.readFile(routesFilePath)) : undefined;
|
|
8
|
+
|
|
9
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
11
10
|
this.run(pkgPath, noLazyRoute);
|
|
12
|
-
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
this.run(pkgPath, noLazyRoute);
|
|
14
|
+
}*/
|
|
13
15
|
run(pkgPath, noLazyRoute) {
|
|
14
16
|
const appDirPath = path.resolve(pkgPath, "src/app");
|
|
15
17
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
@@ -43,9 +45,7 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
43
45
|
cont += indentStr + ` path: "${key}",\n`;
|
|
44
46
|
if (val.relModulePath != null) {
|
|
45
47
|
if (noLazyRoute) {
|
|
46
|
-
cont +=
|
|
47
|
-
indentStr +
|
|
48
|
-
` component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
|
|
48
|
+
cont += indentStr + ` component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
|
|
49
49
|
imports.push(`import { ${StringUtils.toPascalCase(path.basename(val.relModulePath))} } from "./app/${val.relModulePath}";`);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
@@ -74,6 +74,10 @@ ${routes}
|
|
|
74
74
|
if (currHash !== this.cachedHash) {
|
|
75
75
|
FsUtils.writeFile(routesFilePath, content);
|
|
76
76
|
this.cachedHash = currHash;
|
|
77
|
+
return { changed: true, filePath: routesFilePath, content };
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
return { changed: false, filePath: routesFilePath, content };
|
|
77
81
|
}
|
|
78
82
|
}
|
|
79
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-ng-routes.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"sd-cli-ng-routes.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,40 +15,24 @@ export class SdClientBuildRunner extends BuildRunnerBase {
|
|
|
15
15
|
#ngBundlers;
|
|
16
16
|
#cordova;
|
|
17
17
|
async _runAsync(dev, modifiedFileSet) {
|
|
18
|
-
// 최초
|
|
18
|
+
// 최초 한번
|
|
19
19
|
if (!modifiedFileSet) {
|
|
20
|
+
// config
|
|
20
21
|
this._debug("GEN .config...");
|
|
21
22
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
22
23
|
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
23
|
-
|
|
24
|
-
if (
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
this
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
this.#routeGenerator.watch(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
32
|
-
}
|
|
24
|
+
// cordova
|
|
25
|
+
if (this._pkgConf.builder?.cordova) {
|
|
26
|
+
this._debug("CORDOVA 준비...");
|
|
27
|
+
this.#cordova = new SdCliCordova({
|
|
28
|
+
pkgPath: this._pkgPath,
|
|
29
|
+
config: this._pkgConf.builder.cordova,
|
|
30
|
+
});
|
|
31
|
+
await this.#cordova.initializeAsync();
|
|
33
32
|
}
|
|
34
|
-
|
|
35
|
-
// watch
|
|
36
|
-
else {
|
|
37
|
-
for (const ngBundler of this.#ngBundlers) {
|
|
38
|
-
ngBundler.markForChanges(Array.from(modifiedFileSet));
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} });
|
|
42
|
-
if (this._pkgConf.builder?.cordova && !this.#cordova) {
|
|
43
|
-
this._debug("CORDOVA 준비...");
|
|
44
|
-
this.#cordova = new SdCliCordova({
|
|
45
|
-
pkgPath: this._pkgPath,
|
|
46
|
-
config: this._pkgConf.builder.cordova,
|
|
47
|
-
});
|
|
48
|
-
await this.#cordova.initializeAsync();
|
|
49
|
-
}
|
|
50
|
-
if (!this.#ngBundlers) {
|
|
33
|
+
// ng
|
|
51
34
|
this._debug(`BUILD 준비...`);
|
|
35
|
+
const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} });
|
|
52
36
|
this.#ngBundlers = ngBundlerBuilderTypes.map((ngBundlerBuilderType) => new SdNgBundler({
|
|
53
37
|
dev,
|
|
54
38
|
builderType: ngBundlerBuilderType,
|
|
@@ -64,13 +48,24 @@ export class SdClientBuildRunner extends BuildRunnerBase {
|
|
|
64
48
|
...this._pkgConf.env,
|
|
65
49
|
...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
|
|
66
50
|
},
|
|
67
|
-
external: ngBundlerBuilderType === "electron"
|
|
68
|
-
? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
|
|
69
|
-
: [],
|
|
51
|
+
external: ngBundlerBuilderType === "electron" ? (this._pkgConf.builder?.electron?.reinstallDependencies ?? []) : [],
|
|
70
52
|
cordovaConfig: ngBundlerBuilderType === "cordova" ? this._pkgConf.builder.cordova : undefined,
|
|
71
53
|
watchScopePathSet: this._watchScopePathSet,
|
|
72
54
|
}));
|
|
73
55
|
}
|
|
56
|
+
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json"));
|
|
57
|
+
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
58
|
+
this._debug(`GEN routes.ts...`);
|
|
59
|
+
const genRoutesResult = this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
60
|
+
if (modifiedFileSet && genRoutesResult.changed) {
|
|
61
|
+
modifiedFileSet.add(PathUtils.norm(genRoutesResult.filePath));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
if (modifiedFileSet) {
|
|
65
|
+
for (const ngBundler of this.#ngBundlers) {
|
|
66
|
+
ngBundler.markForChanges(Array.from(modifiedFileSet));
|
|
67
|
+
}
|
|
68
|
+
}
|
|
74
69
|
this._debug(`BUILD...`);
|
|
75
70
|
const buildResults = await Promise.all(this.#ngBundlers.map((builder) => builder.bundleAsync()));
|
|
76
71
|
const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-client.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-client.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,MAAM,OAAO,mBAAoB,SAAQ,eAAyB;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAEzF,oBAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-client.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-client.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export declare class SdCliDbContextFileGenerator {
|
|
2
2
|
cachedHash?: string;
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
run(pkgPath: string, kebabName: string): {
|
|
4
|
+
changed: boolean;
|
|
5
|
+
filePath: string;
|
|
6
|
+
content: string;
|
|
7
|
+
};
|
|
5
8
|
}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
import { FsUtils, HashUtils, PathUtils
|
|
1
|
+
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { StringUtils } from "@simplysm/sd-core-common";
|
|
4
4
|
export class SdCliDbContextFileGenerator {
|
|
5
|
-
watch(pkgPath, kebabName) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
});
|
|
5
|
+
/*watch(pkgPath: string, kebabName: string) {
|
|
6
|
+
const targetFilePath = path.resolve(pkgPath, `src/${kebabName}.ts`);
|
|
7
|
+
this.cachedHash = FsUtils.exists(targetFilePath) ? HashUtils.get(FsUtils.readFile(targetFilePath)) : undefined;
|
|
8
|
+
|
|
9
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
11
10
|
this.run(pkgPath, kebabName);
|
|
12
|
-
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
this.run(pkgPath, kebabName);
|
|
14
|
+
}*/
|
|
13
15
|
run(pkgPath, kebabName) {
|
|
14
16
|
const npmConfig = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
|
|
15
17
|
const useExt = npmConfig.dependencies?.["@simplysm/sd-orm-common-ext"] != null;
|
|
@@ -50,14 +52,7 @@ export class SdCliDbContextFileGenerator {
|
|
|
50
52
|
const className = fileName.includes("_") ? fileName : StringUtils.toPascalCase(fileName);
|
|
51
53
|
importTexts.push(`import { ${className} } from "./${requirePath}";`);
|
|
52
54
|
if (useExt &&
|
|
53
|
-
[
|
|
54
|
-
"systemDataLog",
|
|
55
|
-
"systemLog",
|
|
56
|
-
"authentication",
|
|
57
|
-
"user",
|
|
58
|
-
"userConfig",
|
|
59
|
-
"userPermission",
|
|
60
|
-
].includes(varName)) {
|
|
55
|
+
["systemDataLog", "systemLog", "authentication", "user", "userConfig", "userPermission"].includes(varName)) {
|
|
61
56
|
modelTexts.push(`override ${varName} = new Queryable(this, ${className})`);
|
|
62
57
|
}
|
|
63
58
|
else {
|
|
@@ -119,6 +114,10 @@ ${spTexts.length > 0 ? "\n // StoredProcedures\n" + spTexts.map((item) => " "
|
|
|
119
114
|
if (currHash !== this.cachedHash) {
|
|
120
115
|
FsUtils.writeFile(targetFilePath, content);
|
|
121
116
|
this.cachedHash = currHash;
|
|
117
|
+
return { changed: true, filePath: targetFilePath, content };
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
return { changed: false, filePath: targetFilePath, content };
|
|
122
121
|
}
|
|
123
122
|
}
|
|
124
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
export declare class SdCliIndexFileGenerator {
|
|
2
2
|
#private;
|
|
3
3
|
cachedHash?: string;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
run(pkgPath: string, polyfills?: string[]): {
|
|
5
|
+
changed: boolean;
|
|
6
|
+
filePath: string;
|
|
7
|
+
content: string;
|
|
8
|
+
};
|
|
6
9
|
}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
import { FsUtils, HashUtils, PathUtils
|
|
1
|
+
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
export class SdCliIndexFileGenerator {
|
|
4
|
-
watch(pkgPath, polyfills) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
});
|
|
4
|
+
/*watch(pkgPath: string, polyfills?: string[]) {
|
|
5
|
+
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
6
|
+
this.cachedHash = FsUtils.exists(indexFilePath) ? FsUtils.readFile(indexFilePath) : undefined;
|
|
7
|
+
|
|
8
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
10
9
|
this.run(pkgPath, polyfills);
|
|
11
|
-
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
this.run(pkgPath, polyfills);
|
|
13
|
+
}*/
|
|
12
14
|
run(pkgPath, polyfills) {
|
|
13
15
|
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
14
16
|
const importTexts = [];
|
|
@@ -37,8 +39,11 @@ export class SdCliIndexFileGenerator {
|
|
|
37
39
|
if (currHash !== this.cachedHash) {
|
|
38
40
|
FsUtils.writeFile(indexFilePath, content);
|
|
39
41
|
this.cachedHash = currHash;
|
|
42
|
+
return { changed: true, filePath: indexFilePath, content };
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
return { changed: false, filePath: indexFilePath, content };
|
|
40
46
|
}
|
|
41
|
-
return content;
|
|
42
47
|
}
|
|
43
48
|
#getFilePaths(pkgPath) {
|
|
44
49
|
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-index.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-index.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"sd-cli-index.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-index.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,26 +14,41 @@ export class SdTsLibBuildRunner extends BuildRunnerBase {
|
|
|
14
14
|
#dbContextGenerator;
|
|
15
15
|
#builder;
|
|
16
16
|
async _runAsync(dev, modifiedFileSet) {
|
|
17
|
-
if (!modifiedFileSet) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
if (this._pkgConf.dbContext != null) {
|
|
24
|
-
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
25
|
-
this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
26
|
-
}
|
|
17
|
+
/*if (!modifiedFileSet) {
|
|
18
|
+
if (!dev) {
|
|
19
|
+
if (!this._pkgConf.noGenIndex) {
|
|
20
|
+
this._debug("GEN index.ts...");
|
|
21
|
+
this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
27
22
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
23
|
+
|
|
24
|
+
if (this._pkgConf.dbContext != null) {
|
|
25
|
+
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
26
|
+
this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
27
|
+
}
|
|
28
|
+
} else {
|
|
29
|
+
if (!this._pkgConf.noGenIndex) {
|
|
30
|
+
this._debug("Watch for GEN index.ts...");
|
|
31
|
+
this.#indexFileGenerator.watch(this._pkgPath, this._pkgConf.polyfills);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (this._pkgConf.dbContext != null) {
|
|
35
|
+
this._debug(`Watch for GEN ${this._pkgConf.dbContext}.ts...`);
|
|
36
|
+
this.#dbContextGenerator.watch(this._pkgPath, this._pkgConf.dbContext);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}*/
|
|
40
|
+
if (!this._pkgConf.noGenIndex) {
|
|
41
|
+
this._debug("GEN index.ts...");
|
|
42
|
+
const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
43
|
+
if (modifiedFileSet && genIndexResult.changed) {
|
|
44
|
+
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (this._pkgConf.dbContext != null) {
|
|
48
|
+
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
49
|
+
const genDbContextResult = this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
50
|
+
if (modifiedFileSet && genDbContextResult.changed) {
|
|
51
|
+
modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
|
|
37
52
|
}
|
|
38
53
|
}
|
|
39
54
|
this._debug(`BUILD...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-ts-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF,MAAM,OAAO,kBAAmB,SAAQ,eAA0B;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAExF,wBAAmB,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,wBAAmB,GAAG,IAAI,2BAA2B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-ts-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF,MAAM,OAAO,kBAAmB,SAAQ,eAA0B;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAExF,wBAAmB,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,wBAAmB,GAAG,IAAI,2BAA2B,EAAE,CAAC;IA4D1D,CAAC;IA7DC,mBAAmB,CAAiC;IACpD,mBAAmB,CAAqC;IACxD,QAAQ,CAAkB;IAEP,KAAK,CAAC,SAAS,CAAC,GAAY,EAAE,eAAgC;QAC/E;;;;;;;;;;;;;;;;;;;;;;WAsBG;QAEH,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC5F,IAAI,eAAe,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC9C,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,QAAQ,CAAC,CAAC;YACpD,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAChG,IAAI,eAAe,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBAClD,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,KAAK,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;QAEjF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7F,CAAC;QAEF,OAAO;YACL,YAAY;YACZ,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,aAAa,EAAE,WAAW,CAAC,OAAO;YAClC,WAAW,EAAE,WAAW,CAAC,WAAW;SACrC,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -27,6 +27,7 @@ export class SdDependencyCache {
|
|
|
27
27
|
* 분석이 완료된 파일 경로
|
|
28
28
|
*/
|
|
29
29
|
this._collectedCache = new Set();
|
|
30
|
+
this._exportSymbolCache = new Map();
|
|
30
31
|
}
|
|
31
32
|
/**
|
|
32
33
|
* .d.ts 또는 .js가 입력되었을 때 쌍으로 존재하는 파일 경로를 반환
|
|
@@ -195,6 +196,7 @@ export class SdDependencyCache {
|
|
|
195
196
|
this._reexportCache.delete(fileNPath);
|
|
196
197
|
this._collectedCache.delete(fileNPath);
|
|
197
198
|
this._revDepCache.delete(fileNPath); // 자신이 key인 경우
|
|
199
|
+
this._exportSymbolCache.delete(fileNPath);
|
|
198
200
|
}
|
|
199
201
|
for (const [targetNPath, infoMap] of this._revDepCache) {
|
|
200
202
|
for (const fileNPath of affectedFiles) {
|
|
@@ -221,6 +223,9 @@ export class SdDependencyCache {
|
|
|
221
223
|
* 해당 파일에서 export된 모든 심볼 (직접 + 재export 포함)
|
|
222
224
|
*/
|
|
223
225
|
#getExportSymbols(fileNPath) {
|
|
226
|
+
if (this._exportSymbolCache.has(fileNPath)) {
|
|
227
|
+
return this._exportSymbolCache.get(fileNPath);
|
|
228
|
+
}
|
|
224
229
|
const result = new Set();
|
|
225
230
|
for (const path of this.#getRelatedNPaths(fileNPath)) {
|
|
226
231
|
const set = this._exportCache.get(path);
|
|
@@ -233,11 +238,12 @@ export class SdDependencyCache {
|
|
|
233
238
|
result.adds(...this.#getExportSymbols(key));
|
|
234
239
|
}
|
|
235
240
|
else {
|
|
236
|
-
result.adds(...val.map(item => item.exportSymbol));
|
|
241
|
+
result.adds(...val.map((item) => item.exportSymbol));
|
|
237
242
|
}
|
|
238
243
|
}
|
|
239
244
|
}
|
|
240
245
|
}
|
|
246
|
+
this._exportSymbolCache.set(fileNPath, result);
|
|
241
247
|
return result;
|
|
242
248
|
}
|
|
243
249
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-dependency-cache.js","sourceRoot":"","sources":["../../src/ts-compiler/sd-dependency-cache.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,iBAAiB;IAA9B;QACE;;WAEG;QACK,iBAAY,GAAG,IAAI,GAAG,EAA0B,CAAC;QAEzD;;;;WAIG;QACK,iBAAY,GAAG,IAAI,GAAG,EAA8C,CAAC;QAE7E;;;;;WAKG;QACK,mBAAc,GAAG,IAAI,GAAG,EAU7B,CAAC;QAEJ;;;;WAIG;QACK,iBAAY,GAAG,IAAI,GAAG,EAA8C,CAAC;QAE7E;;WAEG;QACK,oBAAe,GAAG,IAAI,GAAG,EAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-dependency-cache.js","sourceRoot":"","sources":["../../src/ts-compiler/sd-dependency-cache.ts"],"names":[],"mappings":"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"}
|