@simplysm/sd-cli 11.0.5 → 11.0.6

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.
Files changed (12) hide show
  1. package/dist/build-tools/SdLinter.d.ts +1 -1
  2. package/dist/build-tools/SdLinter.js +17 -7
  3. package/dist/build-tools/SdLinter.js.map +1 -1
  4. package/dist/build-tools/SdNgBundler.d.ts +1 -0
  5. package/dist/build-tools/SdNgBundler.js +38 -12
  6. package/dist/build-tools/SdNgBundler.js.map +1 -1
  7. package/dist/builders/SdCliClientBuilder.js +8 -14
  8. package/dist/builders/SdCliClientBuilder.js.map +1 -1
  9. package/package.json +5 -5
  10. package/src/build-tools/SdLinter.ts +17 -7
  11. package/src/build-tools/SdNgBundler.ts +43 -12
  12. package/src/builders/SdCliClientBuilder.ts +8 -15
package/dist/build-tools/SdLinter.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { ISdCliPackageBuildResult } from "../commons";
2
2
  import ts from "typescript";
3
3
  export declare class SdLinter {
4
- static lintAsync(filePaths: string[], program?: ts.Program): Promise<ISdCliPackageBuildResult[]>;
4
+ static lintAsync(filePaths: string[], programOrPkgPath?: ts.Program | string): Promise<ISdCliPackageBuildResult[]>;
5
5
  }
package/dist/build-tools/SdLinter.js CHANGED
@@ -1,21 +1,31 @@
1
1
  import { ESLint } from "eslint";
2
+ import path from "path";
2
3
  export class SdLinter {
3
- static async lintAsync(filePaths, program) {
4
- const linter = new ESLint(program ? {
4
+ static async lintAsync(filePaths, programOrPkgPath) {
5
+ const linter = new ESLint(programOrPkgPath !== null ? {
5
6
  overrideConfig: {
6
7
  overrides: [
7
8
  {
8
9
  files: ["*.ts", "*.tsx"],
9
10
  parserOptions: {
10
- programs: [program],
11
- tsconfigRootDir: null,
12
- project: null
11
+ ...typeof programOrPkgPath === "string" ? {
12
+ tsconfigRootDir: programOrPkgPath,
13
+ project: "tsconfig.json"
14
+ } : {
15
+ programs: [programOrPkgPath],
16
+ tsconfigRootDir: null,
17
+ project: null
18
+ }
13
19
  },
14
20
  settings: {
15
21
  "import/resolver": {
16
22
  "typescript": {
17
- programs: [program],
18
- project: null
23
+ ...typeof programOrPkgPath === "string" ? {
24
+ project: path.resolve(programOrPkgPath, "tsconfig.json")
25
+ } : {
26
+ programs: [programOrPkgPath],
27
+ project: null
28
+ }
19
29
  }
20
30
  }
21
31
  }
package/dist/build-tools/SdLinter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdLinter.js","sourceRoot":"","sources":["../../src/build-tools/SdLinter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAG9B,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAmB,EAAE,OAAoB;QACrE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAClC,cAAc,EAAE;gBACd,SAAS,EAAE;oBACT;wBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;wBACxB,aAAa,EAAE;4BACb,QAAQ,EAAE,CAAC,OAAO,CAAC;4BACnB,eAAe,EAAE,IAAI;4BACrB,OAAO,EAAE,IAAI;yBACd;wBACD,QAAQ,EAAE;4BACR,iBAAiB,EAAE;gCACjB,YAAY,EAAE;oCACZ,QAAQ,EAAE,CAAC,OAAO,CAAC;oCACnB,OAAO,EAAE,IAAI;iCACd;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEf,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3E,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,OAAgB;YACpE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO;YACpE,IAAI,EAAE,MAAe;SACtB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF"}
1
+ {"version":3,"file":"SdLinter.js","sourceRoot":"","sources":["../../src/build-tools/SdLinter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAE9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAmB,EAAE,gBAAsC;QACvF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC;YACpD,cAAc,EAAE;gBACd,SAAS,EAAE;oBACT;wBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;wBACxB,aAAa,EAAE;4BACb,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC;gCACxC,eAAe,EAAE,gBAAgB;gCACjC,OAAO,EAAE,eAAe;6BACzB,CAAC,CAAC,CAAC;gCACF,QAAQ,EAAE,CAAC,gBAAgB,CAAC;gCAC5B,eAAe,EAAE,IAAI;gCACrB,OAAO,EAAE,IAAI;6BACd;yBACF;wBACD,QAAQ,EAAE;4BACR,iBAAiB,EAAE;gCACjB,YAAY,EAAE;oCACZ,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC;wCACxC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,CAAC;qCACzD,CAAC,CAAC,CAAC;wCACF,QAAQ,EAAE,CAAC,gBAAgB,CAAC;wCAC5B,OAAO,EAAE,IAAI;qCACd;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEf,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3E,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,OAAgB;YACpE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO;YACpE,IAAI,EAAE,MAAe;SACtB,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF"}
package/dist/build-tools/SdNgBundler.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare class SdNgBundler {
14
14
  removeCache(filePaths: string[]): void;
15
15
  bundleAsync(): Promise<{
16
16
  filePaths: string[];
17
+ affectedFilePaths: string[];
17
18
  results: ISdCliPackageBuildResult[];
18
19
  }>;
19
20
  private _getAppContextAsync;
package/dist/build-tools/SdNgBundler.js CHANGED
@@ -54,15 +54,45 @@ export class SdNgBundler {
54
54
  type: "build"
55
55
  })) ?? []
56
56
  ];
57
+ const watchFilePaths = [
58
+ ...this._sourceFileCache.typeScriptFileCache.keys(),
59
+ ...this._sourceFileCache.babelFileCache.keys()
60
+ ].map((item) => path.resolve(item));
61
+ let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
57
62
  if (bundlingResult.errors) {
58
63
  return {
59
- filePaths: [
60
- ...this._sourceFileCache.typeScriptFileCache.keys(),
61
- ...this._sourceFileCache.babelFileCache.keys()
62
- ],
64
+ filePaths: watchFilePaths,
65
+ affectedFilePaths: affectedSourceFilePaths,
63
66
  results
64
67
  };
65
68
  }
69
+ const depsMap = new Map();
70
+ for (const entry of Object.entries(bundlingResult.metafile.inputs)) {
71
+ for (const imp of entry[1].imports) {
72
+ const deps = depsMap.getOrCreate(path.resolve(this._opt.pkgPath, imp.path), new Set());
73
+ deps.add(path.resolve(this._opt.pkgPath, entry[0]));
74
+ }
75
+ }
76
+ const searchAffectedFiles = (filePath, prev) => {
77
+ const result = new Set(prev);
78
+ const importerPaths = depsMap.get(filePath);
79
+ if (!importerPaths)
80
+ return result;
81
+ for (const importerPath of importerPaths) {
82
+ if (result.has(importerPath))
83
+ continue;
84
+ result.adds(importerPath);
85
+ result.adds(...searchAffectedFiles(importerPath, result));
86
+ }
87
+ return result;
88
+ };
89
+ if (this._sourceFileCache.modifiedFiles.size > 0) {
90
+ const affectedFilePathSet = new Set();
91
+ for (const modFile of this._sourceFileCache.modifiedFiles) {
92
+ affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
93
+ }
94
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
95
+ }
66
96
  const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
67
97
  executionResult.outputFiles.push(...bundlingResult.outputFiles);
68
98
  //-- index
@@ -94,10 +124,8 @@ export class SdNgBundler {
94
124
  catch (error) {
95
125
  this._logger.error(error instanceof Error ? error.message : `${error}`);
96
126
  return {
97
- filePaths: [
98
- ...this._sourceFileCache.typeScriptFileCache.keys(),
99
- ...this._sourceFileCache.babelFileCache.keys()
100
- ],
127
+ filePaths: watchFilePaths,
128
+ affectedFilePaths: affectedSourceFilePaths,
101
129
  results
102
130
  };
103
131
  }
@@ -121,10 +149,8 @@ export class SdNgBundler {
121
149
  }
122
150
  }
123
151
  return {
124
- filePaths: [
125
- ...this._sourceFileCache.typeScriptFileCache.keys(),
126
- ...this._sourceFileCache.babelFileCache.keys()
127
- ],
152
+ filePaths: watchFilePaths,
153
+ affectedFilePaths: affectedSourceFilePaths,
128
154
  results
129
155
  };
130
156
  }
package/dist/build-tools/SdNgBundler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundler.ts"],"names":[],"mappings":"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"}
package/dist/builders/SdCliClientBuilder.js CHANGED
@@ -2,7 +2,6 @@ import { EventEmitter } from "events";
2
2
  import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
3
3
  import { FunctionQueue, Wait } from "@simplysm/sd-core-common";
4
4
  import path from "path";
5
- import { SdTsCompiler } from "../build-tools/SdTsCompiler";
6
5
  import { SdNgBundler } from "../build-tools/SdNgBundler";
7
6
  import { SdLinter } from "../build-tools/SdLinter";
8
7
  export class SdCliClientBuilder extends EventEmitter {
@@ -55,18 +54,13 @@ export class SdCliClientBuilder extends EventEmitter {
55
54
  builderType: builderType,
56
55
  pkgPath: this._pkgPath
57
56
  }));
58
- this._checker = this._checker ?? new SdTsCompiler({
59
- pkgPath: this._pkgPath,
60
- emit: false,
61
- emitDts: false,
62
- globalStyle: false
63
- });
64
- this._debug(`BUILD...`);
57
+ this._debug(`BUILD & CHECK...`);
65
58
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
66
- this._debug("CHECK...");
67
- const checkResult = await this._checker.buildAsync();
59
+ const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
60
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
61
+ const results = buildResults.mapMany((item) => item.results).distinct();
68
62
  this._debug(`LINT...`);
69
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, this._checker.program);
63
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths, this._pkgPath);
70
64
  if (opt.genConf) {
71
65
  this._debug("GEN .config...");
72
66
  if (opt.dev && this._pkgConf.server !== undefined) {
@@ -80,14 +74,14 @@ export class SdCliClientBuilder extends EventEmitter {
80
74
  }
81
75
  const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
82
76
  .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
83
- const watchFilePaths = buildResults.mapMany((item) => item.filePaths)
77
+ const watchFilePaths = filePaths
84
78
  .filter((item) => PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
85
79
  localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)));
86
80
  this._debug(`빌드 완료`);
87
81
  return {
88
82
  watchFilePaths: watchFilePaths,
89
- affectedFilePaths: checkResult.affectedFilePaths,
90
- buildResults: [...buildResults.mapMany((item) => item.results), ...checkResult.results, ...lintResults]
83
+ affectedFilePaths: affectedFilePaths,
84
+ buildResults: [...results, ...lintResults]
91
85
  };
92
86
  }
93
87
  _debug(msg) {
package/dist/builders/SdCliClientBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "11.0.5",
3
+ "version": "11.0.6",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -23,10 +23,10 @@
23
23
  "@angular/compiler-cli": "^16.2.8",
24
24
  "@angular/core": "^16.2.8",
25
25
  "@electron/rebuild": "^3.3.0",
26
- "@simplysm/sd-core-common": "11.0.5",
27
- "@simplysm/sd-core-node": "11.0.5",
28
- "@simplysm/sd-service-server": "11.0.5",
29
- "@simplysm/sd-storage": "11.0.5",
26
+ "@simplysm/sd-core-common": "11.0.6",
27
+ "@simplysm/sd-core-node": "11.0.6",
28
+ "@simplysm/sd-service-server": "11.0.6",
29
+ "@simplysm/sd-storage": "11.0.6",
30
30
  "browserslist": "^4.22.1",
31
31
  "electron": "^26.3.0",
32
32
  "electron-builder": "^24.7.0",
package/src/build-tools/SdLinter.ts CHANGED
@@ -1,24 +1,34 @@
1
1
  import {ISdCliPackageBuildResult} from "../commons";
2
2
  import {ESLint} from "eslint";
3
3
  import ts from "typescript";
4
+ import path from "path";
4
5
 
5
6
  export class SdLinter {
6
- public static async lintAsync(filePaths: string[], program?: ts.Program): Promise<ISdCliPackageBuildResult[]> {
7
- const linter = new ESLint(program ? {
7
+ public static async lintAsync(filePaths: string[], programOrPkgPath?: ts.Program | string): Promise<ISdCliPackageBuildResult[]> {
8
+ const linter = new ESLint(programOrPkgPath !== null ? {
8
9
  overrideConfig: {
9
10
  overrides: [
10
11
  {
11
12
  files: ["*.ts", "*.tsx"],
12
13
  parserOptions: {
13
- programs: [program],
14
- tsconfigRootDir: null,
15
- project: null
14
+ ...typeof programOrPkgPath === "string" ? {
15
+ tsconfigRootDir: programOrPkgPath,
16
+ project: "tsconfig.json"
17
+ } : {
18
+ programs: [programOrPkgPath],
19
+ tsconfigRootDir: null,
20
+ project: null
21
+ }
16
22
  },
17
23
  settings: {
18
24
  "import/resolver": {
19
25
  "typescript": {
20
- programs: [program],
21
- project: null
26
+ ...typeof programOrPkgPath === "string" ? {
27
+ project: path.resolve(programOrPkgPath, "tsconfig.json")
28
+ } : {
29
+ programs: [programOrPkgPath],
30
+ project: null
31
+ }
22
32
  }
23
33
  }
24
34
  }
package/src/build-tools/SdNgBundler.ts CHANGED
@@ -44,6 +44,7 @@ export class SdNgBundler {
44
44
 
45
45
  public async bundleAsync(): Promise<{
46
46
  filePaths: string[],
47
+ affectedFilePaths: string[],
47
48
  results: ISdCliPackageBuildResult[]
48
49
  }> {
49
50
  if (!this._contexts) {
@@ -75,16 +76,50 @@ export class SdNgBundler {
75
76
  type: "build" as const
76
77
  })) ?? []
77
78
  ];
79
+ const watchFilePaths = [
80
+ ...this._sourceFileCache.typeScriptFileCache.keys(),
81
+ ...this._sourceFileCache.babelFileCache.keys()
82
+ ].map((item) => path.resolve(item));
83
+ let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
78
84
  if (bundlingResult.errors) {
79
85
  return {
80
- filePaths: [
81
- ...this._sourceFileCache.typeScriptFileCache.keys(),
82
- ...this._sourceFileCache.babelFileCache.keys()
83
- ],
86
+ filePaths: watchFilePaths,
87
+ affectedFilePaths: affectedSourceFilePaths,
84
88
  results
85
89
  };
86
90
  }
87
91
 
92
+ const depsMap = new Map<string, Set<string>>();
93
+ for (const entry of Object.entries(bundlingResult.metafile.inputs)) {
94
+ for (const imp of entry[1].imports) {
95
+ const deps = depsMap.getOrCreate(path.resolve(this._opt.pkgPath, imp.path), new Set<string>());
96
+ deps.add(path.resolve(this._opt.pkgPath, entry[0]));
97
+ }
98
+ }
99
+
100
+ const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
101
+ const result = new Set<string>(prev);
102
+
103
+ const importerPaths = depsMap.get(filePath);
104
+ if (!importerPaths) return result;
105
+
106
+ for (const importerPath of importerPaths) {
107
+ if (result.has(importerPath)) continue;
108
+ result.adds(importerPath);
109
+ result.adds(...searchAffectedFiles(importerPath, result));
110
+ }
111
+
112
+ return result;
113
+ };
114
+
115
+ if (this._sourceFileCache.modifiedFiles.size > 0) {
116
+ const affectedFilePathSet = new Set<string>();
117
+ for (const modFile of this._sourceFileCache.modifiedFiles) {
118
+ affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
119
+ }
120
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
121
+ }
122
+
88
123
  const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
89
124
  executionResult.outputFiles.push(...bundlingResult.outputFiles);
90
125
 
@@ -132,10 +167,8 @@ export class SdNgBundler {
132
167
  this._logger.error(error instanceof Error ? error.message : `${error}`);
133
168
 
134
169
  return {
135
- filePaths: [
136
- ...this._sourceFileCache.typeScriptFileCache.keys(),
137
- ...this._sourceFileCache.babelFileCache.keys()
138
- ],
170
+ filePaths: watchFilePaths,
171
+ affectedFilePaths: affectedSourceFilePaths,
139
172
  results
140
173
  };
141
174
  }
@@ -163,10 +196,8 @@ export class SdNgBundler {
163
196
  }
164
197
 
165
198
  return {
166
- filePaths: [
167
- ...this._sourceFileCache.typeScriptFileCache.keys(),
168
- ...this._sourceFileCache.babelFileCache.keys()
169
- ],
199
+ filePaths: watchFilePaths,
200
+ affectedFilePaths: affectedSourceFilePaths,
170
201
  results
171
202
  };
172
203
  }
package/src/builders/SdCliClientBuilder.ts CHANGED
@@ -81,21 +81,14 @@ export class SdCliClientBuilder extends EventEmitter {
81
81
  pkgPath: this._pkgPath
82
82
  }));
83
83
 
84
- this._checker = this._checker ?? new SdTsCompiler({
85
- pkgPath: this._pkgPath,
86
- emit: false,
87
- emitDts: false,
88
- globalStyle: false
89
- });
90
-
91
- this._debug(`BUILD...`);
84
+ this._debug(`BUILD & CHECK...`);
92
85
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
93
-
94
- this._debug("CHECK...");
95
- const checkResult = await this._checker.buildAsync();
86
+ const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
87
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
88
+ const results = buildResults.mapMany((item) => item.results).distinct();
96
89
 
97
90
  this._debug(`LINT...`);
98
- const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, this._checker.program);
91
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths, this._pkgPath);
99
92
 
100
93
  if (opt.genConf) {
101
94
  this._debug("GEN .config...");
@@ -111,7 +104,7 @@ export class SdCliClientBuilder extends EventEmitter {
111
104
 
112
105
  const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
113
106
  .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
114
- const watchFilePaths = buildResults.mapMany((item) => item.filePaths)
107
+ const watchFilePaths = filePaths
115
108
  .filter((item) =>
116
109
  PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
117
110
  localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
@@ -120,8 +113,8 @@ export class SdCliClientBuilder extends EventEmitter {
120
113
  this._debug(`빌드 완료`);
121
114
  return {
122
115
  watchFilePaths: watchFilePaths,
123
- affectedFilePaths: checkResult.affectedFilePaths,
124
- buildResults: [...buildResults.mapMany((item) => item.results), ...checkResult.results, ...lintResults]
116
+ affectedFilePaths: affectedFilePaths,
117
+ buildResults: [...results, ...lintResults]
125
118
  };
126
119
  }
127
120