@simplysm/sd-cli 11.1.1 → 11.1.3

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 (16) hide show
  1. package/dist/build-tools/SdNgBundler.d.ts +0 -1
  2. package/dist/build-tools/SdNgBundler.js +39 -50
  3. package/dist/build-tools/SdNgBundler.js.map +1 -1
  4. package/dist/build-tools/SdNgBundlerContext.d.ts +0 -1
  5. package/dist/build-tools/SdNgBundlerContext.js +11 -11
  6. package/dist/build-tools/SdNgBundlerContext.js.map +1 -1
  7. package/dist/utils/SdMemoryLoadResultCache.d.ts +1 -0
  8. package/dist/utils/SdMemoryLoadResultCache.js +3 -1
  9. package/dist/utils/SdMemoryLoadResultCache.js.map +1 -1
  10. package/dist/utils/SdSourceFileCache.js +8 -1
  11. package/dist/utils/SdSourceFileCache.js.map +1 -1
  12. package/package.json +9 -9
  13. package/src/build-tools/SdNgBundler.ts +16 -31
  14. package/src/build-tools/SdNgBundlerContext.ts +11 -11
  15. package/src/utils/SdMemoryLoadResultCache.ts +4 -1
  16. package/src/utils/SdSourceFileCache.ts +9 -2
package/dist/build-tools/SdNgBundler.d.ts CHANGED
@@ -4,7 +4,6 @@ export declare class SdNgBundler {
4
4
  private readonly _sourceFileCache;
5
5
  private _contexts;
6
6
  private readonly _outputCache;
7
- private readonly _customDepsCache;
8
7
  private readonly _pkgNpmConf;
9
8
  private readonly _mainFilePath;
10
9
  private readonly _tsConfigFilePath;
package/dist/build-tools/SdNgBundler.js CHANGED
@@ -26,7 +26,6 @@ export class SdNgBundler {
26
26
  this._opt = _opt;
27
27
  this._sourceFileCache = new SdSourceFileCache(path.resolve(this._opt.pkgPath, ".cache"));
28
28
  this._outputCache = new Map();
29
- this._customDepsCache = new Map();
30
29
  this._pkgNpmConf = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
31
30
  this._mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
32
31
  this._tsConfigFilePath = path.resolve(this._opt.pkgPath, "tsconfig.json");
@@ -37,17 +36,7 @@ export class SdNgBundler {
37
36
  this._baseHref = this._opt.builderType === "web" ? `/${this._pkgName}/` : this._opt.dev ? `/${this._pkgName}/${this._opt.builderType}/` : ``;
38
37
  }
39
38
  removeCache(filePaths) {
40
- for (const filePath of filePaths) {
41
- const depsSet = this._customDepsCache.get(filePath);
42
- if (depsSet) {
43
- for (const depFile of depsSet) {
44
- this._sourceFileCache.invalidate([depFile]);
45
- }
46
- }
47
- else {
48
- this._sourceFileCache.invalidate([filePath]);
49
- }
50
- }
39
+ this._sourceFileCache.invalidate(filePaths);
51
40
  }
52
41
  async bundleAsync() {
53
42
  if (!this._contexts) {
@@ -59,54 +48,54 @@ export class SdNgBundler {
59
48
  const bundlingResults = await this._contexts.mapAsync(async (ctx) => await ctx.bundleAsync());
60
49
  const results = bundlingResults.mapMany(bundlingResult => bundlingResult.results);
61
50
  const watchFilePaths = [
62
- ...this._sourceFileCache.keys(),
51
+ ...Array.from(this._sourceFileCache.typeScriptFileCache.keys()).map(item => fileURLToPath(item)),
52
+ ...this._sourceFileCache.referencedFiles ?? [],
63
53
  ...this._sourceFileCache.babelFileCache.keys(),
64
- ...this._sourceFileCache.loadResultCache.fileDependencies.keys(),
65
- ...this._customDepsCache.keys()
54
+ ...this._sourceFileCache.loadResultCache.watchFiles
66
55
  ].map((item) => path.resolve(item)).distinct();
67
56
  let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
68
57
  if (this._sourceFileCache.modifiedFiles.size > 0) {
69
- const depMap = new Map();
58
+ affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
59
+ .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
60
+ .map((item) => path.resolve(item))
61
+ .distinct();
62
+ /*const depMap = new Map<string, Set<string>>();
70
63
  for (const bundlingResult of bundlingResults) {
71
- for (const [k, v] of bundlingResult.dependencyMap) {
72
- const currSet = depMap.getOrCreate(k, new Set());
73
- currSet.adds(...v);
74
- }
64
+ for (const [k, v] of bundlingResult.dependencyMap) {
65
+ const currSet = depMap.getOrCreate(k, new Set<string>());
66
+ currSet.adds(...v);
67
+ }
75
68
  }
76
69
  for (const [k, v] of this._sourceFileCache.loadResultCache.fileDependencies) {
77
- const currSet = depMap.getOrCreate(k, new Set());
78
- currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
79
- }
80
- for (const [k, v] of this._customDepsCache) {
81
- const currSet = depMap.getOrCreate(k, new Set());
82
- currSet.adds(...v);
70
+ const currSet = depMap.getOrCreate(k, new Set<string>());
71
+ currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
83
72
  }
84
- const searchAffectedFiles = (filePath, prev) => {
85
- const result = new Set(prev);
86
- const importerPaths = depMap.get(filePath);
87
- if (!importerPaths)
88
- return result;
89
- for (const importerPath of importerPaths) {
90
- if (result.has(importerPath))
91
- continue;
92
- result.adds(importerPath);
93
- result.adds(...searchAffectedFiles(importerPath, result));
94
- }
95
- return result;
73
+
74
+ const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
75
+ const result = new Set<string>(prev);
76
+
77
+ const importerPaths = depMap.get(filePath);
78
+ if (!importerPaths) return result;
79
+
80
+ for (const importerPath of importerPaths) {
81
+ if (result.has(importerPath)) continue;
82
+ result.adds(importerPath);
83
+ result.adds(...searchAffectedFiles(importerPath, result));
84
+ }
85
+
86
+ return result;
96
87
  };
97
- const affectedFilePathSet = new Set();
88
+
89
+ const affectedFilePathSet = new Set<string>();
98
90
  for (const modFile of this._sourceFileCache.modifiedFiles) {
99
- affectedFilePathSet.add(path.resolve(modFile));
100
- affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
91
+ affectedFilePathSet.add(path.resolve(modFile));
92
+ affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
101
93
  }
102
- affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
94
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));*/
103
95
  }
104
96
  /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
105
97
  executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
106
- const outputFiles = bundlingResults.mapMany(item => item.outputFiles?.map(file => {
107
- const fileType = path.dirname(file.path) === 'media' ? BuildOutputFileType.Media : BuildOutputFileType.Browser;
108
- return convertOutputFile(file, fileType);
109
- }) ?? []);
98
+ const outputFiles = bundlingResults.mapMany(item => item.outputFiles?.map(file => convertOutputFile(file, BuildOutputFileType.Root)) ?? []);
110
99
  const initialFiles = new Map();
111
100
  const metafile = {
112
101
  inputs: {},
@@ -135,7 +124,7 @@ export class SdNgBundler {
135
124
  // }
136
125
  //-- cordova empty
137
126
  if (this._opt.cordovaConfig?.plugins) {
138
- outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Browser));
127
+ outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
139
128
  }
140
129
  //-- index
141
130
  const genIndexHtmlResult = await this._genIndexHtmlAsync(outputFiles, initialFiles);
@@ -161,7 +150,7 @@ export class SdNgBundler {
161
150
  type: "build",
162
151
  });
163
152
  }
164
- outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Browser));
153
+ outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Root));
165
154
  //-- copy assets
166
155
  assetFiles.push(...(await this._copyAssetsAsync()));
167
156
  //-- extract 3rdpartylicenses
@@ -172,7 +161,7 @@ export class SdNgBundler {
172
161
  if (FsUtil.exists(this._swConfFilePath)) {
173
162
  try {
174
163
  const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
175
- outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Browser));
164
+ outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Root));
176
165
  assetFiles.push(...serviceWorkerResult.assetFiles);
177
166
  }
178
167
  catch (err) {
@@ -189,7 +178,7 @@ export class SdNgBundler {
189
178
  }
190
179
  //-- write
191
180
  for (const outputFile of outputFiles) {
192
- const distFilePath = path.resolve(this._opt.outputPath, outputFile.path);
181
+ const distFilePath = path.resolve(this._opt.outputPath, outputFile.fullOutputPath);
193
182
  const prev = this._outputCache.get(distFilePath);
194
183
  if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
195
184
  await FsUtil.writeFileAsync(distFilePath, outputFile.contents);
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/build-tools/SdNgBundlerContext.d.ts CHANGED
@@ -10,7 +10,6 @@ export declare class SdNgBundlerContext {
10
10
  results: ISdCliPackageBuildResult[];
11
11
  initialFiles: Map<string, InitialFileRecord>;
12
12
  outputFiles: esbuild.OutputFile[] | undefined;
13
- dependencyMap: Map<string, Set<string>>;
14
13
  metafile: esbuild.Metafile | undefined;
15
14
  }>;
16
15
  }
package/dist/build-tools/SdNgBundlerContext.js CHANGED
@@ -43,7 +43,7 @@ export class SdNgBundlerContext {
43
43
  ];
44
44
  const initialFiles = new Map();
45
45
  for (const outputFile of buildResult.outputFiles ?? []) {
46
- const relativeFilePath = path.relative(this._pkgPath, outputFile.path);
46
+ const relativeFilePath = path.isAbsolute(outputFile.path) ? path.relative(this._pkgPath, outputFile.path) : outputFile.path;
47
47
  const entryPoint = buildResult.metafile?.outputs[relativeFilePath]?.entryPoint;
48
48
  outputFile.path = relativeFilePath;
49
49
  if (entryPoint != null) {
@@ -77,20 +77,20 @@ export class SdNgBundlerContext {
77
77
  }
78
78
  }
79
79
  }
80
- const dependencyMap = new Map();
81
- if (buildResult.metafile) {
82
- for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
83
- for (const imp of val.imports) {
84
- const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set());
85
- deps.add(path.resolve(this._pkgPath, key));
86
- }
87
- }
88
- }
80
+ // const dependencyMap = new Map<string, Set<string>>();
81
+ // if (buildResult.metafile) {
82
+ // for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
83
+ // for (const imp of val.imports) {
84
+ // const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
85
+ // deps.add(path.resolve(this._pkgPath, key));
86
+ // }
87
+ // }
88
+ // }
89
89
  return {
90
90
  results,
91
91
  initialFiles,
92
92
  outputFiles: buildResult.outputFiles,
93
- dependencyMap,
93
+ // dependencyMap,
94
94
  metafile: buildResult.metafile
95
95
  };
96
96
  }
package/dist/build-tools/SdNgBundlerContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdNgBundlerContext.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundlerContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdNgBundlerContext.js","sourceRoot":"","sources":["../../src/build-tools/SdNgBundlerContext.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,OAAO,kBAAkB;IAG7B,YAAoC,QAAgB,EAChB,eAAqC;QADrC,aAAQ,GAAR,QAAQ,CAAQ;QAChB,oBAAe,GAAf,eAAe,CAAsB;IACzE,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;YACzB,IAAI,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAC7D;QAED,IAAI,WAAgC,CAAC;QAErC,IAAI;YACF,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC7C;QACD,OAAO,GAAG,EAAE;YACV,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,EAAE;gBACxC,WAAW,GAAG,GAAG,CAAC;aACnB;iBACI;gBACH,MAAM,GAAG,CAAC;aACX;SACF;QAED,MAAM,OAAO,GAAG;YACd,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBACzG,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI;gBACzB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChD,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBACnH,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;YACH,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACnC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBACvG,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI;gBACxB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9E,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC9C,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,GAAG,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC/G,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;SAC0B,CAAC;QAEhC,MAAM,YAAY,GAAG,IAAI,GAAG,EAA6B,CAAC;QAE1D,KAAK,MAAM,UAAU,IAAI,WAAW,CAAC,WAAW,IAAI,EAAE,EAAE;YACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;YAC5H,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAC;YAE/E,UAAU,CAAC,IAAI,GAAG,gBAAgB,CAAC;YAEnC,IAAI,UAAU,IAAI,IAAI,EAAE;gBACtB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAE5E,IAAI,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;oBACpD,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE;wBACjC,IAAI;wBACJ,IAAI;wBACJ,UAAU,EAAE,IAAI;qBACjB,CAAC,CAAC;iBACJ;aACF;SACF;QAED,MAAM,KAAK,GAAG,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,KAAK,MAAM,aAAa,IAAI,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,EAAE;gBAC9E,IAAI,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS;iBACV;gBAED,IAAI,aAAa,CAAC,IAAI,KAAK,kBAAkB,IAAI,aAAa,CAAC,IAAI,KAAK,aAAa,EAAE;oBACrF,MAAM,MAAM,GAAsB;wBAChC,IAAI,EAAE,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;wBAC/D,UAAU,EAAE,KAAK;wBACjB,QAAQ,EAAE,aAAa,CAAC,QAAQ;qBACjC,CAAC;oBAEF,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAE7C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;wBAC3B,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;qBAChC;iBACF;aACF;SACF;QAED,wDAAwD;QACxD,8BAA8B;QAC9B,4EAA4E;QAC5E,uCAAuC;QACvC,0GAA0G;QAC1G,oDAAoD;QACpD,QAAQ;QACR,MAAM;QACN,IAAI;QAEJ,OAAO;YACL,OAAO;YACP,YAAY;YACZ,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,iBAAiB;YACjB,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC;CACF"}
package/dist/utils/SdMemoryLoadResultCache.d.ts CHANGED
@@ -6,4 +6,5 @@ export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
6
6
  get(getPath: string): OnLoadResult | undefined;
7
7
  put(putPath: string, result: OnLoadResult): Promise<void>;
8
8
  invalidate(invalidatePath: string): boolean;
9
+ get watchFiles(): string[];
9
10
  }
package/dist/utils/SdMemoryLoadResultCache.js CHANGED
@@ -13,7 +13,6 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
13
13
  this.loadResults.set(putPath, result);
14
14
  if (result.watchFiles) {
15
15
  for (const watchFile of result.watchFiles) {
16
- // Normalize the watch file path to ensure OS consistent paths
17
16
  const watchFilePath = path.resolve(watchFile);
18
17
  let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
19
18
  affected.add(putPath);
@@ -31,5 +30,8 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
31
30
  found ||= this.loadResults.delete(invalidatePath);
32
31
  return found;
33
32
  }
33
+ get watchFiles() {
34
+ return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
35
+ }
34
36
  }
35
37
  //# sourceMappingURL=SdMemoryLoadResultCache.js.map
package/dist/utils/SdMemoryLoadResultCache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdMemoryLoadResultCache.js","sourceRoot":"","sources":["../../src/utils/SdMemoryLoadResultCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,mEAAmE,CAAC;AAExG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAAlE;;QACE,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC9C,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAiCpD,CAAC;IA/BU,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEQ,GAAG,CAAC,OAAe,EAAE,MAAoB;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzC,8DAA8D;gBAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEQ,UAAU,CAAC,cAAsB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC9C;QAED,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
1
+ {"version":3,"file":"SdMemoryLoadResultCache.js","sourceRoot":"","sources":["../../src/utils/SdMemoryLoadResultCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,mEAAmE,CAAC;AAExG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAAlE;;QACE,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC9C,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAoCpD,CAAC;IAlCU,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEQ,GAAG,CAAC,OAAe,EAAE,MAAoB;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEQ,UAAU,CAAC,cAAsB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC9C;QAED,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAa,UAAU;QACrB,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;CACF"}
package/dist/utils/SdSourceFileCache.js CHANGED
@@ -1,14 +1,21 @@
1
1
  import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
2
2
  import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
3
+ import { pathToFileURL } from "url";
3
4
  export class SdSourceFileCache extends SourceFileCache {
4
5
  constructor() {
5
6
  super(...arguments);
6
7
  this.loadResultCache = new SdMemoryLoadResultCache();
7
8
  }
8
9
  invalidate(files) {
9
- super.invalidate(files);
10
+ if (files !== this.modifiedFiles) {
11
+ this.modifiedFiles.clear();
12
+ }
10
13
  for (let file of files) {
14
+ this.babelFileCache.delete(file);
15
+ this.typeScriptFileCache.delete(pathToFileURL(file).href);
11
16
  this.loadResultCache.invalidate(file);
17
+ this.delete(file);
18
+ this.modifiedFiles.add(file);
12
19
  }
13
20
  }
14
21
  }
package/dist/utils/SdSourceFileCache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,2EAA2E,CAAC;AAE1G,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IASpE,CAAC;IAPU,UAAU,CAAC,KAAuB;QACzC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAExB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,2EAA2E,CAAC;AAC1G,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAElC,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAepE,CAAC;IAbU,UAAU,CAAC,KAAuB;QACzC,IAAI,KAAK,KAAK,IAAI,CAAC,aAAa,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;SAC5B;QACD,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "11.1.1",
3
+ "version": "11.1.3",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -18,15 +18,15 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@angular-devkit/build-angular": "^17.0.0",
21
- "@angular/common": "^17.0.1",
22
- "@angular/compiler": "^17.0.1",
23
- "@angular/compiler-cli": "^17.0.1",
24
- "@angular/core": "^17.0.1",
21
+ "@angular/common": "^17.0.2",
22
+ "@angular/compiler": "^17.0.2",
23
+ "@angular/compiler-cli": "^17.0.2",
24
+ "@angular/core": "^17.0.2",
25
25
  "@electron/rebuild": "^3.3.0",
26
- "@simplysm/sd-core-common": "11.1.1",
27
- "@simplysm/sd-core-node": "11.1.1",
28
- "@simplysm/sd-service-server": "11.1.1",
29
- "@simplysm/sd-storage": "11.1.1",
26
+ "@simplysm/sd-core-common": "11.1.3",
27
+ "@simplysm/sd-core-node": "11.1.3",
28
+ "@simplysm/sd-service-server": "11.1.3",
29
+ "@simplysm/sd-storage": "11.1.3",
30
30
  "browserslist": "^4.22.1",
31
31
  "cordova": "^12.0.0",
32
32
  "electron": "^27.0.4",
package/src/build-tools/SdNgBundler.ts CHANGED
@@ -50,8 +50,6 @@ export class SdNgBundler {
50
50
 
51
51
  private readonly _outputCache = new Map<string, string | number>();
52
52
 
53
- private readonly _customDepsCache = new Map<string, Set<string>>();
54
-
55
53
  private readonly _pkgNpmConf: INpmConfig;
56
54
  private readonly _mainFilePath: string;
57
55
  private readonly _tsConfigFilePath: string;
@@ -80,17 +78,7 @@ export class SdNgBundler {
80
78
  }
81
79
 
82
80
  public removeCache(filePaths: string[]): void {
83
- for (const filePath of filePaths) {
84
- const depsSet = this._customDepsCache.get(filePath);
85
- if (depsSet) {
86
- for (const depFile of depsSet) {
87
- this._sourceFileCache.invalidate([depFile]);
88
- }
89
- }
90
- else {
91
- this._sourceFileCache.invalidate([filePath]);
92
- }
93
- }
81
+ this._sourceFileCache.invalidate(filePaths);
94
82
  }
95
83
 
96
84
  public async bundleAsync(): Promise<{
@@ -110,16 +98,21 @@ export class SdNgBundler {
110
98
  const results = bundlingResults.mapMany(bundlingResult => bundlingResult.results);
111
99
 
112
100
  const watchFilePaths = [
113
- ...this._sourceFileCache.keys(),
101
+ ...Array.from(this._sourceFileCache.typeScriptFileCache.keys()).map(item => fileURLToPath(item)),
102
+ ...this._sourceFileCache.referencedFiles ?? [],
114
103
  ...this._sourceFileCache.babelFileCache.keys(),
115
- ...this._sourceFileCache.loadResultCache.fileDependencies.keys(),
116
- ...this._customDepsCache.keys()
104
+ ...this._sourceFileCache.loadResultCache.watchFiles
117
105
  ].map((item) => path.resolve(item)).distinct();
118
106
 
119
107
  let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
120
108
 
121
109
  if (this._sourceFileCache.modifiedFiles.size > 0) {
122
- const depMap = new Map<string, Set<string>>();
110
+ affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
111
+ .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
112
+ .map((item) => path.resolve(item))
113
+ .distinct();
114
+
115
+ /*const depMap = new Map<string, Set<string>>();
123
116
  for (const bundlingResult of bundlingResults) {
124
117
  for (const [k, v] of bundlingResult.dependencyMap) {
125
118
  const currSet = depMap.getOrCreate(k, new Set<string>());
@@ -130,10 +123,6 @@ export class SdNgBundler {
130
123
  const currSet = depMap.getOrCreate(k, new Set<string>());
131
124
  currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
132
125
  }
133
- for (const [k, v] of this._customDepsCache) {
134
- const currSet = depMap.getOrCreate(k, new Set<string>());
135
- currSet.adds(...v);
136
- }
137
126
 
138
127
  const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
139
128
  const result = new Set<string>(prev);
@@ -155,16 +144,13 @@ export class SdNgBundler {
155
144
  affectedFilePathSet.add(path.resolve(modFile));
156
145
  affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
157
146
  }
158
- affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
147
+ affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));*/
159
148
  }
160
149
 
161
150
  /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
162
151
  executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
163
152
 
164
- const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(item => item.outputFiles?.map(file => {
165
- const fileType = path.dirname(file.path) === 'media' ? BuildOutputFileType.Media : BuildOutputFileType.Browser;
166
- return convertOutputFile(file, fileType);
167
- }) ?? []);
153
+ const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(item => item.outputFiles?.map(file => convertOutputFile(file, BuildOutputFileType.Root)) ?? []);
168
154
  const initialFiles = new Map<string, InitialFileRecord>();
169
155
  const metafile: {
170
156
  inputs: Metafile["inputs"],
@@ -198,7 +184,7 @@ export class SdNgBundler {
198
184
 
199
185
  //-- cordova empty
200
186
  if (this._opt.cordovaConfig?.plugins) {
201
- outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Browser));
187
+ outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
202
188
  }
203
189
 
204
190
  //-- index
@@ -226,7 +212,7 @@ export class SdNgBundler {
226
212
  type: "build",
227
213
  });
228
214
  }
229
- outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Browser));
215
+ outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Root));
230
216
 
231
217
  //-- copy assets
232
218
  assetFiles.push(...(await this._copyAssetsAsync()));
@@ -240,7 +226,7 @@ export class SdNgBundler {
240
226
  if (FsUtil.exists(this._swConfFilePath)) {
241
227
  try {
242
228
  const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
243
- outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Browser));
229
+ outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Root));
244
230
  assetFiles.push(...serviceWorkerResult.assetFiles);
245
231
  }
246
232
  catch (err) {
@@ -258,8 +244,7 @@ export class SdNgBundler {
258
244
 
259
245
  //-- write
260
246
  for (const outputFile of outputFiles) {
261
- const distFilePath = path.resolve(this._opt.outputPath, outputFile.path);
262
-
247
+ const distFilePath = path.resolve(this._opt.outputPath, outputFile.fullOutputPath);
263
248
  const prev = this._outputCache.get(distFilePath);
264
249
  if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
265
250
  await FsUtil.writeFileAsync(distFilePath, outputFile.contents);
package/src/build-tools/SdNgBundlerContext.ts CHANGED
@@ -53,7 +53,7 @@ export class SdNgBundlerContext {
53
53
  const initialFiles = new Map<string, InitialFileRecord>();
54
54
 
55
55
  for (const outputFile of buildResult.outputFiles ?? []) {
56
- const relativeFilePath = path.relative(this._pkgPath, outputFile.path);
56
+ const relativeFilePath = path.isAbsolute(outputFile.path) ? path.relative(this._pkgPath, outputFile.path) : outputFile.path;
57
57
  const entryPoint = buildResult.metafile?.outputs[relativeFilePath]?.entryPoint;
58
58
 
59
59
  outputFile.path = relativeFilePath;
@@ -95,21 +95,21 @@ export class SdNgBundlerContext {
95
95
  }
96
96
  }
97
97
 
98
- const dependencyMap = new Map<string, Set<string>>();
99
- if (buildResult.metafile) {
100
- for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
101
- for (const imp of val.imports) {
102
- const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
103
- deps.add(path.resolve(this._pkgPath, key));
104
- }
105
- }
106
- }
98
+ // const dependencyMap = new Map<string, Set<string>>();
99
+ // if (buildResult.metafile) {
100
+ // for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
101
+ // for (const imp of val.imports) {
102
+ // const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
103
+ // deps.add(path.resolve(this._pkgPath, key));
104
+ // }
105
+ // }
106
+ // }
107
107
 
108
108
  return {
109
109
  results,
110
110
  initialFiles,
111
111
  outputFiles: buildResult.outputFiles,
112
- dependencyMap,
112
+ // dependencyMap,
113
113
  metafile: buildResult.metafile
114
114
  };
115
115
  }
package/src/utils/SdMemoryLoadResultCache.ts CHANGED
@@ -14,7 +14,6 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
14
14
  this.loadResults.set(putPath, result);
15
15
  if (result.watchFiles) {
16
16
  for (const watchFile of result.watchFiles) {
17
- // Normalize the watch file path to ensure OS consistent paths
18
17
  const watchFilePath = path.resolve(watchFile);
19
18
  let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
20
19
  affected.add(putPath);
@@ -37,4 +36,8 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
37
36
 
38
37
  return found;
39
38
  }
39
+
40
+ override get watchFiles(): string[] {
41
+ return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
42
+ }
40
43
  }
package/src/utils/SdSourceFileCache.ts CHANGED
@@ -1,14 +1,21 @@
1
1
  import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
2
2
  import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
3
+ import {pathToFileURL} from "url";
3
4
 
4
5
  export class SdSourceFileCache extends SourceFileCache {
5
6
  override readonly loadResultCache = new SdMemoryLoadResultCache();
6
7
 
7
8
  override invalidate(files: Iterable<string>): void {
8
- super.invalidate(files);
9
-
9
+ if (files !== this.modifiedFiles) {
10
+ this.modifiedFiles.clear();
11
+ }
10
12
  for (let file of files) {
13
+ this.babelFileCache.delete(file);
14
+ this.typeScriptFileCache.delete(pathToFileURL(file).href);
11
15
  this.loadResultCache.invalidate(file);
16
+
17
+ this.delete(file);
18
+ this.modifiedFiles.add(file);
12
19
  }
13
20
  }
14
21
  }