@simplysm/sd-cli 11.1.16 → 11.1.17

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 (10) hide show
  1. package/dist/build-tools/SdNgBundler.js +3 -38
  2. package/dist/build-tools/SdNgBundler.js.map +1 -1
  3. package/dist/builders/SdCliClientBuilder.js +4 -4
  4. package/dist/builders/SdCliClientBuilder.js.map +1 -1
  5. package/dist/bundle-plugins/sdNgPlugin.js +33 -28
  6. package/dist/bundle-plugins/sdNgPlugin.js.map +1 -1
  7. package/package.json +6 -5
  8. package/src/build-tools/SdNgBundler.ts +4 -40
  9. package/src/builders/SdCliClientBuilder.ts +4 -4
  10. package/src/bundle-plugins/sdNgPlugin.ts +51 -30
package/dist/build-tools/SdNgBundler.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import path from "path";
2
2
  import { BuildOutputFileType } from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
3
- import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
3
+ import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
4
4
  import { fileURLToPath } from "url";
5
5
  import { createVirtualModulePlugin } from "@angular-devkit/build-angular/src/tools/esbuild/virtual-module-plugin";
6
6
  import { createSourcemapIgnorelistPlugin } from "@angular-devkit/build-angular/src/tools/esbuild/sourcemap-ignorelist-plugin";
@@ -54,6 +54,7 @@ export class SdNgBundler {
54
54
  // this._sourceFileCache.invalidate(filePaths);
55
55
  }
56
56
  async bundleAsync() {
57
+ const logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler", "bundleAsync"]);
57
58
  if (!this._contexts) {
58
59
  this._contexts = [
59
60
  await this._getAppContextAsync(),
@@ -148,44 +149,8 @@ export class SdNgBundler {
148
149
  this._outputCache.set(assetFile.source, curr);
149
150
  }
150
151
  }
151
- // const filePathSet = new Set<string>([
152
- // ...this._sourceFileCache.typeScriptFileCache.keys(),
153
- // ...this._sourceFileCache.referencedFiles ?? [],
154
- // ...this._sourceFileCache.loadResultCache.watchFiles,
155
- // ...this.#loadFilePathSet
156
- // ]);
157
- //-- watchFilePaths
158
- // const watchFilePaths = [
159
- // ...this._sourceFileCache.typeScriptFileCache.keys(),
160
- // ...this._sourceFileCache.referencedFiles ?? [],
161
- // ...this._sourceFileCache.loadResultCache.watchFiles
162
- // ].map((item) => path.resolve(item)).distinct();
163
- //-- affectedSourceFilePaths
164
- // let affectedSourceFilePaths: string[];
165
- // if (this._sourceFileCache.modifiedFiles.size > 0) {
166
- // affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
167
- // .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
168
- // .map((item) => path.resolve(item))
169
- // .distinct();
170
- //
171
- // // const depMap = new Map<string, Set<string>>();
172
- // // for (const bundlingResult of bundlingResults) {
173
- // // for (const key of bundlingResult.dependencyMap.keys()) {
174
- // // const depSet = depMap.getOrCreate(key, new Set<string>());
175
- // // depSet.adds(...bundlingResult.dependencyMap.get(key)!);
176
- // // }
177
- // // }
178
- // // console.log(
179
- // // this._sourceFileCache.modifiedFiles,
180
- // // depMap.get("D:\\workspaces-11\\simplysm-ts\\packages\\client-admin\\src\\providers\\AppDataProvider.ts")
181
- // // );
182
- // }
183
- // else {
184
- // affectedSourceFilePaths = Array.from(filePathSet).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
185
- // }
152
+ logger.debug(`[${path.basename(this._opt.pkgPath)}] 번들링중 영향받은 파일`, Array.from(this.#ngResultCache.affectedFileSet));
186
153
  return {
187
- // filePaths: Array.from(filePathSet),
188
- // affectedFilePaths: affectedSourceFilePaths,
189
154
  filePaths: Array.from(this.#ngResultCache.watchFileSet),
190
155
  affectedFilePaths: Array.from(this.#ngResultCache.affectedFileSet),
191
156
  results
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
@@ -93,7 +93,7 @@ export class SdCliClientBuilder extends EventEmitter {
93
93
  this._debug(`BUILD & CHECK...`);
94
94
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
95
95
  const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
96
- // const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
96
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
97
97
  const results = buildResults.mapMany((item) => item.results).distinct();
98
98
  this._debug(`LINT...`);
99
99
  const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json"));
@@ -103,8 +103,8 @@ export class SdCliClientBuilder extends EventEmitter {
103
103
  options: parsedTsConfig.options,
104
104
  oldProgram: this.#program
105
105
  });
106
- const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
107
- const lintResults = await SdLinter.lintAsync(pkgFilePaths, this.#program);
106
+ // const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
107
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath)), this.#program);
108
108
  if (!opt.dev && this._cordova) {
109
109
  this._debug("CORDOVA BUILD...");
110
110
  await this._cordova.buildAsync(path.resolve(this._pkgPath, "dist"));
@@ -116,7 +116,7 @@ export class SdCliClientBuilder extends EventEmitter {
116
116
  localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)));
117
117
  return {
118
118
  watchFilePaths: watchFilePaths,
119
- affectedFilePaths: pkgFilePaths,
119
+ affectedFilePaths: affectedFilePaths,
120
120
  buildResults: [...results, ...lintResults]
121
121
  };
122
122
  }
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/dist/bundle-plugins/sdNgPlugin.js CHANGED
@@ -8,7 +8,8 @@ import browserslist from "browserslist";
8
8
  import { StringUtil } from "@simplysm/sd-core-common";
9
9
  import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
10
10
  import { createHash } from "crypto";
11
- import transformJavaScript from "@angular-devkit/build-angular/src/tools/esbuild/javascript-transformer-worker";
11
+ import { JavaScriptTransformer } from "@angular-devkit/build-angular/src/tools/esbuild/javascript-transformer";
12
+ import os from "os";
12
13
  export function sdNgPlugin(conf) {
13
14
  const tsConfigPath = path.resolve(conf.pkgPath, "tsconfig.json");
14
15
  const tsConfig = FsUtil.readJson(tsConfigPath);
@@ -23,9 +24,10 @@ export function sdNgPlugin(conf) {
23
24
  let resultCache = {
24
25
  watchFileSet: new Set(),
25
26
  affectedFileSet: new Set(),
26
- outputPrepareMap: new Map(),
27
27
  additionalResultMap: new Map()
28
28
  };
29
+ const tscPrepareMap = new Map();
30
+ const outputCacheMap = new Map();
29
31
  let stylesheetBundler;
30
32
  function createCompilerHost() {
31
33
  const compilerHost = ts.createIncrementalCompilerHost(parsedTsConfig.options);
@@ -110,6 +112,13 @@ export function sdNgPlugin(conf) {
110
112
  }, conf.dev);
111
113
  //-- compilerHost
112
114
  const compilerHost = createCompilerHost();
115
+ //-- js babel transformer
116
+ const javascriptTransformer = new JavaScriptTransformer({
117
+ thirdPartySourcemaps: conf.dev,
118
+ sourcemap: conf.dev,
119
+ jit: false,
120
+ advancedOptimizations: true
121
+ }, os.cpus().length);
113
122
  //-- vars
114
123
  //---------------------------
115
124
  build.onStart(async () => {
@@ -117,9 +126,11 @@ export function sdNgPlugin(conf) {
117
126
  stylesheetBundler.invalidate(conf.modifiedFileSet);
118
127
  for (const modifiedFile of conf.modifiedFileSet) {
119
128
  sourceFileCache.delete(modifiedFile);
129
+ outputCacheMap.delete(modifiedFile);
120
130
  if (referencingMap.has(modifiedFile)) {
121
131
  for (const referencingFile of referencingMap.get(modifiedFile)) {
122
132
  sourceFileCache.delete(referencingFile);
133
+ outputCacheMap.delete(modifiedFile);
123
134
  }
124
135
  }
125
136
  }
@@ -128,7 +139,6 @@ export function sdNgPlugin(conf) {
128
139
  resultCache = {
129
140
  watchFileSet: new Set(),
130
141
  affectedFileSet: new Set(),
131
- outputPrepareMap: new Map(),
132
142
  additionalResultMap: new Map()
133
143
  };
134
144
  //-- createBuilder
@@ -152,12 +162,12 @@ export function sdNgPlugin(conf) {
152
162
  // Deps -> refMap
153
163
  builder.getSourceFiles().filter(sf => !ngCompiler.ignoreForEmit.has(sf))
154
164
  .forEach(sf => {
155
- resultCache.watchFileSet.add(sf.fileName);
165
+ resultCache.watchFileSet.add(path.normalize(sf.fileName));
156
166
  const deps = ngCompiler.getResourceDependencies(sf);
157
167
  for (const dep of deps) {
158
168
  const ref = referencingMap.getOrCreate(dep, new Set());
159
169
  ref.add(dep);
160
- resultCache.watchFileSet.add(dep);
170
+ resultCache.watchFileSet.add(path.normalize(dep));
161
171
  }
162
172
  });
163
173
  // refMap, modFile -> affectedFileSet
@@ -190,7 +200,7 @@ export function sdNgPlugin(conf) {
190
200
  return;
191
201
  }
192
202
  ngCompiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
193
- resultCache.outputPrepareMap.set(path.normalize(sourceFile.fileName), text);
203
+ tscPrepareMap.set(path.normalize(sourceFile.fileName), text);
194
204
  }, undefined, undefined, ngProgram.compiler.prepareEmit().transformers);
195
205
  if (!affectedFileResult) {
196
206
  break;
@@ -210,39 +220,33 @@ export function sdNgPlugin(conf) {
210
220
  };
211
221
  });
212
222
  build.onLoad({ filter: /\.ts$/ }, async (args) => {
213
- const contents = resultCache.outputPrepareMap.get(path.normalize(args.path));
223
+ resultCache.watchFileSet.add(path.normalize(args.path));
224
+ const output = outputCacheMap.get(path.normalize(args.path));
225
+ if (output != null) {
226
+ return { contents: output, loader: "js" };
227
+ }
228
+ const contents = tscPrepareMap.get(path.normalize(args.path));
214
229
  const { sideEffects } = await build.resolve(args.path, {
215
230
  kind: 'import-statement',
216
231
  resolveDir: build.initialOptions.absWorkingDir ?? '',
217
232
  });
218
- const newContents = await transformJavaScript["default"]({
219
- filename: args.path,
220
- data: contents,
221
- sourcemap: conf.dev,
222
- thirdPartySourcemaps: conf.dev,
223
- advancedOptimizations: true,
224
- skipLinker: true,
225
- sideEffects,
226
- jit: false
227
- });
233
+ const newContents = await javascriptTransformer.transformData(args.path, contents, true, sideEffects);
234
+ outputCacheMap.set(path.normalize(args.path), newContents);
228
235
  return { contents: newContents, loader: "js" };
229
236
  });
230
237
  build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
238
+ resultCache.watchFileSet.add(path.normalize(args.path));
239
+ const output = outputCacheMap.get(path.normalize(args.path));
240
+ if (output != null) {
241
+ return { contents: output, loader: "js" };
242
+ }
231
243
  const { sideEffects } = await build.resolve(args.path, {
232
244
  kind: 'import-statement',
233
245
  resolveDir: build.initialOptions.absWorkingDir ?? '',
234
246
  });
235
- const contents = await FsUtil.readFileAsync(args.path);
236
- const newContents = await transformJavaScript["default"]({
237
- filename: args.path,
238
- data: contents,
239
- sourcemap: conf.dev,
240
- thirdPartySourcemaps: conf.dev,
241
- advancedOptimizations: true,
242
- skipLinker: false,
243
- sideEffects,
244
- jit: false
245
- });
247
+ // const contents = await FsUtil.readFileAsync(args.path);
248
+ const newContents = await javascriptTransformer.transformFile(args.path, false, sideEffects);
249
+ outputCacheMap.set(path.normalize(args.path), newContents);
246
250
  return {
247
251
  contents: newContents,
248
252
  loader: 'js',
@@ -260,6 +264,7 @@ export function sdNgPlugin(conf) {
260
264
  conf.result.affectedFileSet = resultCache.affectedFileSet;
261
265
  conf.result.outputFiles = result.outputFiles;
262
266
  conf.result.metafile = result.metafile;
267
+ conf.modifiedFileSet.clear();
263
268
  });
264
269
  }
265
270
  };
package/dist/bundle-plugins/sdNgPlugin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sdNgPlugin.js","sourceRoot":"","sources":["../../src/bundle-plugins/sdNgPlugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdNgPlugin.js","sourceRoot":"","sources":["../../src/bundle-plugins/sdNgPlugin.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.1.16",
3
+ "version": "11.1.17",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -23,10 +23,10 @@
23
23
  "@angular/compiler-cli": "^17.0.7",
24
24
  "@angular/core": "^17.0.7",
25
25
  "@electron/rebuild": "^3.4.1",
26
- "@simplysm/sd-core-common": "11.1.16",
27
- "@simplysm/sd-core-node": "11.1.16",
28
- "@simplysm/sd-service-server": "11.1.16",
29
- "@simplysm/sd-storage": "11.1.16",
26
+ "@simplysm/sd-core-common": "11.1.17",
27
+ "@simplysm/sd-core-node": "11.1.17",
28
+ "@simplysm/sd-service-server": "11.1.17",
29
+ "@simplysm/sd-storage": "11.1.17",
30
30
  "browserslist": "^4.22.2",
31
31
  "cordova": "^12.0.0",
32
32
  "electron": "^27.1.3",
@@ -36,6 +36,7 @@
36
36
  "eslint": "^8.56.0",
37
37
  "jszip": "^3.10.1",
38
38
  "node-stdlib-browser": "^1.2.0",
39
+ "piscina": "^4.2.1",
39
40
  "rxjs": "^7.8.1",
40
41
  "sass": "^1.69.5",
41
42
  "semver": "^7.5.4",
package/src/build-tools/SdNgBundler.ts CHANGED
@@ -5,7 +5,7 @@ import {
5
5
  InitialFileRecord
6
6
  } from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
7
7
  import esbuild, {Metafile} from "esbuild";
8
- import {FsUtil, PathUtil} from "@simplysm/sd-core-node";
8
+ import {FsUtil, Logger, PathUtil} from "@simplysm/sd-core-node";
9
9
  import {fileURLToPath} from "url";
10
10
  import {createVirtualModulePlugin} from "@angular-devkit/build-angular/src/tools/esbuild/virtual-module-plugin";
11
11
  import {
@@ -95,6 +95,8 @@ export class SdNgBundler {
95
95
  affectedFilePaths: string[],
96
96
  results: ISdCliPackageBuildResult[]
97
97
  }> {
98
+ const logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler", "bundleAsync"]);
99
+
98
100
  if (!this._contexts) {
99
101
  this._contexts = [
100
102
  await this._getAppContextAsync(),
@@ -203,47 +205,9 @@ export class SdNgBundler {
203
205
  }
204
206
  }
205
207
 
206
- // const filePathSet = new Set<string>([
207
- // ...this._sourceFileCache.typeScriptFileCache.keys(),
208
- // ...this._sourceFileCache.referencedFiles ?? [],
209
- // ...this._sourceFileCache.loadResultCache.watchFiles,
210
- // ...this.#loadFilePathSet
211
- // ]);
212
-
213
- //-- watchFilePaths
214
- // const watchFilePaths = [
215
- // ...this._sourceFileCache.typeScriptFileCache.keys(),
216
- // ...this._sourceFileCache.referencedFiles ?? [],
217
- // ...this._sourceFileCache.loadResultCache.watchFiles
218
- // ].map((item) => path.resolve(item)).distinct();
219
-
220
- //-- affectedSourceFilePaths
221
- // let affectedSourceFilePaths: string[];
222
- // if (this._sourceFileCache.modifiedFiles.size > 0) {
223
- // affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
224
- // .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
225
- // .map((item) => path.resolve(item))
226
- // .distinct();
227
- //
228
- // // const depMap = new Map<string, Set<string>>();
229
- // // for (const bundlingResult of bundlingResults) {
230
- // // for (const key of bundlingResult.dependencyMap.keys()) {
231
- // // const depSet = depMap.getOrCreate(key, new Set<string>());
232
- // // depSet.adds(...bundlingResult.dependencyMap.get(key)!);
233
- // // }
234
- // // }
235
- // // console.log(
236
- // // this._sourceFileCache.modifiedFiles,
237
- // // depMap.get("D:\\workspaces-11\\simplysm-ts\\packages\\client-admin\\src\\providers\\AppDataProvider.ts")
238
- // // );
239
- // }
240
- // else {
241
- // affectedSourceFilePaths = Array.from(filePathSet).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
242
- // }
208
+ logger.debug(`[${path.basename(this._opt.pkgPath)}] 번들링중 영향받은 파일`, Array.from(this.#ngResultCache.affectedFileSet!));
243
209
 
244
210
  return {
245
- // filePaths: Array.from(filePathSet),
246
- // affectedFilePaths: affectedSourceFilePaths,
247
211
  filePaths: Array.from(this.#ngResultCache.watchFileSet!),
248
212
  affectedFilePaths: Array.from(this.#ngResultCache.affectedFileSet!),
249
213
  results
package/src/builders/SdCliClientBuilder.ts CHANGED
@@ -132,7 +132,7 @@ export class SdCliClientBuilder extends EventEmitter {
132
132
  this._debug(`BUILD & CHECK...`);
133
133
  const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
134
134
  const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
135
- // const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
135
+ const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
136
136
  const results = buildResults.mapMany((item) => item.results).distinct();
137
137
 
138
138
  this._debug(`LINT...`);
@@ -143,8 +143,8 @@ export class SdCliClientBuilder extends EventEmitter {
143
143
  options: parsedTsConfig.options,
144
144
  oldProgram: this.#program
145
145
  });
146
- const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
147
- const lintResults = await SdLinter.lintAsync(pkgFilePaths, this.#program);
146
+ // const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
147
+ const lintResults = await SdLinter.lintAsync(affectedFilePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath)), this.#program);
148
148
 
149
149
  if (!opt.dev && this._cordova) {
150
150
  this._debug("CORDOVA BUILD...");
@@ -160,7 +160,7 @@ export class SdCliClientBuilder extends EventEmitter {
160
160
  );
161
161
  return {
162
162
  watchFilePaths: watchFilePaths,
163
- affectedFilePaths: pkgFilePaths,
163
+ affectedFilePaths: affectedFilePaths,
164
164
  buildResults: [...results, ...lintResults]
165
165
  };
166
166
  }
package/src/bundle-plugins/sdNgPlugin.ts CHANGED
@@ -12,7 +12,8 @@ import browserslist from "browserslist";
12
12
  import {StringUtil} from "@simplysm/sd-core-common";
13
13
  import {NgtscProgram, OptimizeFor} from "@angular/compiler-cli";
14
14
  import {createHash} from "crypto";
15
- import transformJavaScript from "@angular-devkit/build-angular/src/tools/esbuild/javascript-transformer-worker";
15
+ import {JavaScriptTransformer} from "@angular-devkit/build-angular/src/tools/esbuild/javascript-transformer";
16
+ import os from "os";
16
17
 
17
18
  export function sdNgPlugin(conf: {
18
19
  pkgPath: string;
@@ -36,9 +37,10 @@ export function sdNgPlugin(conf: {
36
37
  let resultCache: IResultCache = {
37
38
  watchFileSet: new Set<string>(),
38
39
  affectedFileSet: new Set<string>(),
39
- outputPrepareMap: new Map<string, string>(),
40
40
  additionalResultMap: new Map<string, IAdditionalResult>()
41
41
  };
42
+ const tscPrepareMap = new Map<string, string>();
43
+ const outputCacheMap = new Map<string, Uint8Array>();
42
44
 
43
45
  let stylesheetBundler: ComponentStylesheetBundler | undefined;
44
46
 
@@ -166,6 +168,14 @@ export function sdNgPlugin(conf: {
166
168
  //-- compilerHost
167
169
  const compilerHost = createCompilerHost();
168
170
 
171
+ //-- js babel transformer
172
+ const javascriptTransformer = new JavaScriptTransformer({
173
+ thirdPartySourcemaps: conf.dev,
174
+ sourcemap: conf.dev,
175
+ jit: false,
176
+ advancedOptimizations: true
177
+ }, os.cpus().length);
178
+
169
179
  //-- vars
170
180
 
171
181
  //---------------------------
@@ -175,10 +185,12 @@ export function sdNgPlugin(conf: {
175
185
  stylesheetBundler!.invalidate(conf.modifiedFileSet);
176
186
  for (const modifiedFile of conf.modifiedFileSet) {
177
187
  sourceFileCache.delete(modifiedFile);
188
+ outputCacheMap.delete(modifiedFile);
178
189
 
179
190
  if (referencingMap.has(modifiedFile)) {
180
191
  for (const referencingFile of referencingMap.get(modifiedFile)!) {
181
192
  sourceFileCache.delete(referencingFile);
193
+ outputCacheMap.delete(modifiedFile);
182
194
  }
183
195
  }
184
196
  }
@@ -189,7 +201,6 @@ export function sdNgPlugin(conf: {
189
201
  resultCache = {
190
202
  watchFileSet: new Set<string>(),
191
203
  affectedFileSet: new Set<string>(),
192
- outputPrepareMap: new Map<string, string>(),
193
204
  additionalResultMap: new Map<string, IAdditionalResult>()
194
205
  };
195
206
 
@@ -232,14 +243,14 @@ export function sdNgPlugin(conf: {
232
243
  // Deps -> refMap
233
244
  builder.getSourceFiles().filter(sf => !ngCompiler.ignoreForEmit.has(sf))
234
245
  .forEach(sf => {
235
- resultCache.watchFileSet.add(sf.fileName);
246
+ resultCache.watchFileSet.add(path.normalize(sf.fileName));
236
247
 
237
248
  const deps = ngCompiler.getResourceDependencies(sf);
238
249
  for (const dep of deps) {
239
250
  const ref = referencingMap.getOrCreate(dep, new Set<string>());
240
251
  ref.add(dep);
241
252
 
242
- resultCache.watchFileSet.add(dep);
253
+ resultCache.watchFileSet.add(path.normalize(dep));
243
254
  }
244
255
  });
245
256
 
@@ -293,7 +304,7 @@ export function sdNgPlugin(conf: {
293
304
  }
294
305
 
295
306
  ngCompiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
296
- resultCache.outputPrepareMap.set(path.normalize(sourceFile.fileName), text);
307
+ tscPrepareMap.set(path.normalize(sourceFile.fileName), text);
297
308
  }, undefined, undefined, ngProgram.compiler.prepareEmit().transformers);
298
309
 
299
310
  if (!affectedFileResult) {
@@ -318,23 +329,28 @@ export function sdNgPlugin(conf: {
318
329
  });
319
330
 
320
331
  build.onLoad({filter: /\.ts$/}, async (args) => {
321
- const contents = resultCache.outputPrepareMap.get(path.normalize(args.path));
332
+ resultCache.watchFileSet.add(path.normalize(args.path));
333
+
334
+ const output = outputCacheMap.get(path.normalize(args.path));
335
+ if (output != null) {
336
+ return {contents: output, loader: "js"};
337
+ }
338
+
339
+ const contents = tscPrepareMap.get(path.normalize(args.path));
322
340
 
323
341
  const {sideEffects} = await build.resolve(args.path, {
324
342
  kind: 'import-statement',
325
343
  resolveDir: build.initialOptions.absWorkingDir ?? '',
326
344
  });
327
345
 
328
- const newContents = await transformJavaScript["default"]({
329
- filename: args.path,
330
- data: contents!,
331
- sourcemap: conf.dev,
332
- thirdPartySourcemaps: conf.dev,
333
- advancedOptimizations: true,
334
- skipLinker: true,
335
- sideEffects,
336
- jit: false
337
- });
346
+ const newContents = await javascriptTransformer.transformData(
347
+ args.path,
348
+ contents!,
349
+ true,
350
+ sideEffects
351
+ );
352
+
353
+ outputCacheMap.set(path.normalize(args.path), newContents);
338
354
 
339
355
  return {contents: newContents, loader: "js"};
340
356
  });
@@ -342,23 +358,27 @@ export function sdNgPlugin(conf: {
342
358
  build.onLoad(
343
359
  {filter: /\.[cm]?js$/},
344
360
  async (args) => {
361
+ resultCache.watchFileSet.add(path.normalize(args.path));
362
+
363
+ const output = outputCacheMap.get(path.normalize(args.path));
364
+ if (output != null) {
365
+ return {contents: output, loader: "js"};
366
+ }
367
+
345
368
  const {sideEffects} = await build.resolve(args.path, {
346
369
  kind: 'import-statement',
347
370
  resolveDir: build.initialOptions.absWorkingDir ?? '',
348
371
  });
349
372
 
350
- const contents = await FsUtil.readFileAsync(args.path);
351
-
352
- const newContents = await transformJavaScript["default"]({
353
- filename: args.path,
354
- data: contents!,
355
- sourcemap: conf.dev,
356
- thirdPartySourcemaps: conf.dev,
357
- advancedOptimizations: true,
358
- skipLinker: false,
359
- sideEffects,
360
- jit: false
361
- });
373
+ // const contents = await FsUtil.readFileAsync(args.path);
374
+
375
+ const newContents = await javascriptTransformer.transformFile(
376
+ args.path,
377
+ false,
378
+ sideEffects
379
+ );
380
+
381
+ outputCacheMap.set(path.normalize(args.path), newContents);
362
382
 
363
383
  return {
364
384
  contents: newContents,
@@ -381,6 +401,8 @@ export function sdNgPlugin(conf: {
381
401
  conf.result.affectedFileSet = resultCache.affectedFileSet;
382
402
  conf.result.outputFiles = result.outputFiles;
383
403
  conf.result.metafile = result.metafile;
404
+
405
+ conf.modifiedFileSet.clear();
384
406
  });
385
407
  }
386
408
  };
@@ -389,7 +411,6 @@ export function sdNgPlugin(conf: {
389
411
  interface IResultCache {
390
412
  watchFileSet: Set<string>;
391
413
  affectedFileSet: Set<string>;
392
- outputPrepareMap: Map<string, string>;
393
414
  additionalResultMap: Map<string, IAdditionalResult>;
394
415
  }
395
416