@simplysm/sd-cli 12.5.17 → 12.5.18

package/src/build-tools/SdTsCompiler.ts

@@ -1,7 +1,7 @@
 import ts, { CompilerOptions } from "typescript";
 import path from "path";
 import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
-import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
+import { StringUtil } from "@simplysm/sd-core-common";
 import esbuild from "esbuild";
 import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
 import { createHash } from "crypto";
@@ -18,7 +18,7 @@ export class SdTsCompiler {
   readonly #parsedTsconfig: ts.ParsedCommandLine;
   readonly #isForAngular: boolean;
 
-  readonly #revDependencyCacheMap = new Map<string, Set<string>>();
+  // readonly #revDependencyCacheMap = new Map<string, Set<string>>();
   readonly #resourceDependencyCacheMap = new Map<string, Set<string>>();
   readonly #sourceFileCacheMap = new Map<string, ts.SourceFile>();
   readonly #emittedFilesCacheMap = new Map<
@@ -34,6 +34,7 @@ export class SdTsCompiler {
 
   #ngProgram: NgtscProgram | undefined;
   #program: ts.Program | undefined;
+  #builder: ts.EmitAndSemanticDiagnosticsBuilderProgram | undefined;
 
   readonly #modifiedFileSet = new Set<string>();
 
@@ -196,34 +197,41 @@ export class SdTsCompiler {
   }
 
   invalidate(modifiedFileSet: Set<string>) {
-    this.#modifiedFileSet.adds(...Array.from(modifiedFileSet).map((item) => path.normalize(item)));
+    for (const modifiedFile of Array.from(modifiedFileSet).map((item) => path.normalize(item))) {
+      this.#modifiedFileSet.add(modifiedFile);
+      this.#modifiedFileSet.adds(...(this.#resourceDependencyCacheMap.get(modifiedFile) ?? []));
+    }
   }
 
   async buildAsync(): Promise<ISdTsCompilerResult> {
-    const affectedFileSet = new Set<string>();
+    const affectedSourceFileSet = new Set<ts.SourceFile>();
     const emitFileSet = new Set<string>();
 
     this.#debug(`get affected (old deps & old res deps)...`);
 
     for (const modifiedFile of this.#modifiedFileSet) {
-      affectedFileSet.add(modifiedFile);
-      affectedFileSet.adds(...(this.#revDependencyCacheMap.get(modifiedFile) ?? []));
-      affectedFileSet.adds(...(this.#resourceDependencyCacheMap.get(modifiedFile) ?? []));
+      // affectedFileSet.add(modifiedFile);
+      // affectedFileSet.adds(...(this.#revDependencyCacheMap.get(modifiedFile) ?? []));
+      // affectedFileSet.adds(...(this.#resourceDependencyCacheMap.get(modifiedFile) ?? []));
 
       this.#emittedFilesCacheMap.delete(path.normalize(modifiedFile));
+      this.#sourceFileCacheMap.delete(path.normalize(modifiedFile));
+      this.#stylesheetBundlingResultMap.delete(path.normalize(modifiedFile));
+      this.#watchFileSet.delete(path.normalize(modifiedFile));
     }
+    this.#stylesheetBundler?.invalidate(this.#modifiedFileSet);
 
-    this.#debug(`invalidate & clear cache...`);
+    // this.#debug(`invalidate & clear cache...`);
 
-    this.#stylesheetBundler?.invalidate(this.#modifiedFileSet);
+    // this.#stylesheetBundler?.invalidate(affectedFileSet);
 
-    for (const affectedFile of affectedFileSet) {
-      this.#sourceFileCacheMap.delete(path.normalize(affectedFile));
-      this.#stylesheetBundlingResultMap.delete(path.normalize(affectedFile));
-      this.#watchFileSet.delete(path.normalize(affectedFile));
-    }
+    // for (const affectedFile of affectedFileSet) {
+    //   this.#sourceFileCacheMap.delete(path.normalize(affectedFile));
+    //   this.#stylesheetBundlingResultMap.delete(path.normalize(affectedFile));
+    //   this.#watchFileSet.delete(path.normalize(affectedFile));
+    // }
 
-    this.#revDependencyCacheMap.clear();
+    // this.#revDependencyCacheMap.clear();
     this.#resourceDependencyCacheMap.clear();
 
     this.#debug(`create program...`);
@@ -245,6 +253,8 @@ export class SdTsCompiler {
       );
     }
 
+    this.#debug(`create builder...`);
+
     const baseGetSourceFiles = this.#program.getSourceFiles;
     this.#program.getSourceFiles = function (...parameters) {
       const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);
@@ -258,7 +268,7 @@ export class SdTsCompiler {
       return files;
     };
 
-    this.#debug(`create builder...`);
+    this.#builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(this.#program, this.#compilerHost, this.#builder);
 
     if (this.#ngProgram) {
       await this.#ngProgram.compiler.analyzeAsync();
@@ -275,113 +285,169 @@ export class SdTsCompiler {
 
     this.#debug(`get affected (new deps)...`);
 
-    const sourceFileSet = new Set(
-      this.#program
-        .getSourceFiles()
-        .map((sf) => getOrgSourceFile(sf))
-        .filterExists(),
-    );
-
-    const depMap = new Map<
-      string,
-      {
-        fileName: string;
-        importName: string;
-        exportName?: string;
-      }[]
-    >();
-    for (const sf of sourceFileSet) {
-      const refs = this.#findDeps(sf);
-      depMap.set(path.normalize(sf.fileName), refs);
-    }
+    // const sourceFileSet = new Set(
+    //   this.#program
+    //     .getSourceFiles()
+    //     .map((sf) => getOrgSourceFile(sf))
+    //     .filterExists(),
+    // );
+
+    // const depMap = new Map<
+    //   string,
+    //   {
+    //     fileName: string;
+    //     importName: string;
+    //     exportName?: string;
+    //   }[]
+    // >();
+    // for (const sf of sourceFileSet) {
+    //   const refs = this.#findDeps(sf);
+    //   depMap.set(path.normalize(sf.fileName), refs);
+    // }
+    //
+    // const allDepMap = new Map<string, Set<string>>();
+    // const getAllDeps = (fileName: string, prevSet?: Set<string>) => {
+    //   if (allDepMap.has(fileName)) {
+    //     return allDepMap.get(fileName)!;
+    //   }
+    //
+    //   const result = new Set<string>();
+    //
+    //   const deps = depMap.get(fileName) ?? [];
+    //   result.adds(...deps.map((item) => item.fileName));
+    //
+    //   for (const dep of deps) {
+    //     const targetDeps = depMap.get(dep.fileName) ?? [];
+    //
+    //     if (dep.importName === "*") {
+    //       for (const targetRefItem of targetDeps.filter((item) => item.exportName != null)) {
+    //         if (prevSet?.has(targetRefItem.fileName)) continue;
+    //
+    //         result.add(targetRefItem.fileName);
+    //         result.adds(...getAllDeps(targetRefItem.fileName, new Set<string>(prevSet).adds(...result)));
+    //       }
+    //     } else {
+    //       for (const targetRefItem of targetDeps.filter((item) => item.exportName === dep.importName)) {
+    //         if (prevSet?.has(targetRefItem.fileName)) continue;
+    //
+    //         result.add(targetRefItem.fileName);
+    //         result.adds(...getAllDeps(targetRefItem.fileName, new Set<string>(prevSet).adds(...result)));
+    //       }
+    //     }
+    //   }
+    //
+    //   return result;
+    // };
+
+    // for (const sf of sourceFileSet) {
+    //   const deps = getAllDeps(path.normalize(sf.fileName));
+    //   allDepMap.set(path.normalize(sf.fileName), deps);
+    //
+    //   for (const dep of getAllDeps(path.normalize(sf.fileName))) {
+    //     const depCache = this.#revDependencyCacheMap.getOrCreate(path.normalize(dep), new Set<string>());
+    //     depCache.add(path.normalize(sf.fileName));
+    //     if (this.#modifiedFileSet.has(path.normalize(dep))) {
+    //       affectedFileSet.add(path.normalize(sf.fileName));
+    //     }
+    //   }
+    //
+    //   if (this.#ngProgram) {
+    //     if (this.#ngProgram.compiler.ignoreForEmit.has(sf)) {
+    //       continue;
+    //     }
+    //
+    //     for (const dep of this.#ngProgram.compiler.getResourceDependencies(sf)) {
+    //       const ref = this.#resourceDependencyCacheMap.getOrCreate(path.normalize(dep), new Set<string>());
+    //       ref.add(path.normalize(sf.fileName));
+    //       if (this.#modifiedFileSet.has(path.normalize(dep))) {
+    //         affectedFileSet.add(path.normalize(sf.fileName));
+    //       }
+    //     }
+    //   }
+    // }
+
+    // if (affectedFileSet.size === 0) {
+    //   this.#debug(`get affected (init)...`);
+    //
+    //   for (const sf of this.#program.getSourceFiles()) {
+    //     const orgSf = getOrgSourceFile(sf);
+    //     if (!orgSf) continue;
+    //
+    //     affectedFileSet.add(path.normalize(orgSf.fileName));
+    //   }
+    // }
 
-    const allDepMap = new Map<string, Set<string>>();
-    const getAllDeps = (fileName: string, prevSet?: Set<string>) => {
-      if (allDepMap.has(fileName)) {
-        return allDepMap.get(fileName)!;
-      }
-
-      const result = new Set<string>();
+    this.#debug(`get diagnostics...`);
 
-      const deps = depMap.get(fileName) ?? [];
-      result.adds(...deps.map((item) => item.fileName));
+    const diagnostics: ts.Diagnostic[] = [];
 
-      for (const dep of deps) {
-        const targetDeps = depMap.get(dep.fileName) ?? [];
+    diagnostics.push(
+      ...this.#builder.getConfigFileParsingDiagnostics(),
+      ...this.#builder.getOptionsDiagnostics(),
+      ...this.#builder.getGlobalDiagnostics(),
+    );
 
-        if (dep.importName === "*") {
-          for (const targetRefItem of targetDeps.filter((item) => item.exportName != null)) {
-            if (prevSet?.has(targetRefItem.fileName)) continue;
+    /*diagnostics.push(
+      ...this.#program.getConfigFileParsingDiagnostics(),
+      ...this.#program.getOptionsDiagnostics(),
+      ...this.#program.getGlobalDiagnostics(),
+    );*/
 
-            result.add(targetRefItem.fileName);
-            result.adds(...getAllDeps(targetRefItem.fileName, new Set<string>(prevSet).adds(...result)));
-          }
-        } else {
-          for (const targetRefItem of targetDeps.filter((item) => item.exportName === dep.importName)) {
-            if (prevSet?.has(targetRefItem.fileName)) continue;
+    if (this.#ngProgram) {
+      diagnostics.push(...this.#ngProgram.compiler.getOptionDiagnostics());
+    }
 
-            result.add(targetRefItem.fileName);
-            result.adds(...getAllDeps(targetRefItem.fileName, new Set<string>(prevSet).adds(...result)));
+    this.#debug(`get diagnostics of files...`);
+
+    while (true) {
+      const affectedFileResult = this.#builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sf) => {
+        if (
+          this.#ngProgram &&
+          this.#ngProgram.compiler.ignoreForDiagnostics.has(sf) &&
+          sf.fileName.endsWith(".ngtypecheck.ts")
+        ) {
+          const orgSourceFile = getOrgSourceFile(sf);
+          if (orgSourceFile) {
+            affectedSourceFileSet.add(orgSourceFile);
           }
+          return true;
         }
-      }
+        return false;
+      });
+      if (!affectedFileResult) break;
 
-      return result;
-    };
+      const affectedSourceFile = affectedFileResult.affected as ts.SourceFile;
+
+      affectedSourceFileSet.add(affectedSourceFile);
+    }
 
-    for (const sf of sourceFileSet) {
-      const deps = getAllDeps(path.normalize(sf.fileName));
-      allDepMap.set(path.normalize(sf.fileName), deps);
+    for (const affectedSourceFile of affectedSourceFileSet) {
+      this.#debug(`get diagnostics of file [${affectedSourceFile.fileName}]`);
 
-      for (const dep of getAllDeps(path.normalize(sf.fileName))) {
-        const depCache = this.#revDependencyCacheMap.getOrCreate(path.normalize(dep), new Set<string>());
-        depCache.add(path.normalize(sf.fileName));
-        if (this.#modifiedFileSet.has(path.normalize(dep))) {
-          affectedFileSet.add(path.normalize(sf.fileName));
-        }
-      }
+      diagnostics.push(
+        ...this.#program.getSyntacticDiagnostics(affectedSourceFile),
+        ...this.#program.getSemanticDiagnostics(affectedSourceFile),
+      );
 
       if (this.#ngProgram) {
-        if (this.#ngProgram.compiler.ignoreForEmit.has(sf)) {
+        if (affectedSourceFile.isDeclarationFile) {
           continue;
         }
 
-        for (const dep of this.#ngProgram.compiler.getResourceDependencies(sf)) {
-          const ref = this.#resourceDependencyCacheMap.getOrCreate(path.normalize(dep), new Set<string>());
-          ref.add(path.normalize(sf.fileName));
-          if (this.#modifiedFileSet.has(path.normalize(dep))) {
-            affectedFileSet.add(path.normalize(sf.fileName));
-          }
-        }
+        diagnostics.push(
+          ...this.#ngProgram.compiler.getDiagnosticsForFile(affectedSourceFile, OptimizeFor.WholeProgram),
+        );
       }
     }
 
-    if (affectedFileSet.size === 0) {
-      this.#debug(`get affected (init)...`);
-
-      for (const sf of this.#program.getSourceFiles()) {
-        const orgSf = getOrgSourceFile(sf);
-        if (!orgSf) continue;
-
-        affectedFileSet.add(path.normalize(orgSf.fileName));
+    /*
+    for (const affectedFile of affectedFileSet) {
+      if (!PathUtil.isChildPath(affectedFile, this.#pkgPath)) {
+        continue;
       }
-    }
-
-    this.#debug(`get diagnostics...`);
-
-    const diagnostics: ts.Diagnostic[] = [];
-
-    diagnostics.push(
-      ...this.#program.getConfigFileParsingDiagnostics(),
-      ...this.#program.getOptionsDiagnostics(),
-      ...this.#program.getGlobalDiagnostics(),
-    );
 
-    if (this.#ngProgram) {
-      diagnostics.push(...this.#ngProgram.compiler.getOptionDiagnostics());
-    }
+      this.#debug(`get diagnostics of file [${affectedFile}]`);
 
-    for (const affectedFile of affectedFileSet) {
       const affectedSourceFile = this.#program.getSourceFile(affectedFile);
       if (
         !affectedSourceFile ||
@@ -390,10 +456,6 @@ export class SdTsCompiler {
         continue;
       }
 
-      if (!PathUtil.isChildPath(affectedFile, this.#pkgPath)) {
-        continue;
-      }
-
       diagnostics.push(
         ...this.#program.getSyntacticDiagnostics(affectedSourceFile),
         ...this.#program.getSemanticDiagnostics(affectedSourceFile),
@@ -408,7 +470,7 @@ export class SdTsCompiler {
           ...this.#ngProgram.compiler.getDiagnosticsForFile(affectedSourceFile, OptimizeFor.WholeProgram),
         );
       }
-    }
+    }*/
 
     this.#debug(`prepare emit...`);
 
@@ -423,6 +485,58 @@ export class SdTsCompiler {
     }
     (transformers.before ??= []).push(transformKeys(this.#program));
 
+    this.#debug(`prepare emit files...`);
+
+    while (
+      this.#builder.emitNextAffectedFile(
+        (fileName, text, writeByteOrderMark, onError, sourceFiles, data) => {
+          if (!sourceFiles || sourceFiles.length === 0) {
+            this.#compilerHost.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+            return;
+          }
+
+          const sourceFile = ts.getOriginalNode(sourceFiles[0], ts.isSourceFile);
+          if (this.#ngProgram) {
+            if (this.#ngProgram.compiler.ignoreForEmit.has(sourceFile)) {
+              return;
+            }
+            this.#ngProgram.compiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
+          }
+
+          const emitFileInfoCaches = this.#emittedFilesCacheMap.getOrCreate(path.normalize(sourceFile.fileName), []);
+          if (PathUtil.isChildPath(sourceFile.fileName, this.#pkgPath)) {
+            let realFilePath = fileName;
+            let realText = text;
+            if (PathUtil.isChildPath(realFilePath, path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"))) {
+              realFilePath = path.resolve(
+                this.#distPath,
+                path.relative(path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"), realFilePath),
+              );
+
+              if (fileName.endsWith(".js.map")) {
+                const sourceMapContents = JSON.parse(realText);
+                // remove "../../"
+                sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6);
+                realText = JSON.stringify(sourceMapContents);
+              }
+            }
+
+            emitFileInfoCaches.push({
+              outAbsPath: realFilePath,
+              text: realText,
+            });
+          } else {
+            emitFileInfoCaches.push({ text });
+          }
+
+          emitFileSet.add(path.normalize(sourceFile.fileName));
+        },
+        undefined,
+        undefined,
+        transformers,
+      )
+    ) {}
+
     // affected에 새로 추가된 파일은 포함되지 않는 현상이 있어 getSourceFiles로 바꿈
     // 비교해보니, 딱히 getSourceFiles라서 더 느려지는것 같지는 않음
     /*for (const affectedFile of affectedFileSet) {
@@ -435,7 +549,7 @@ export class SdTsCompiler {
         continue;
       }*/
 
-    for (const sf of sourceFileSet) {
+    /*for (const sf of sourceFileSet) {
       if (this.#emittedFilesCacheMap.has(path.normalize(sf.fileName))) {
         continue;
       }
@@ -504,7 +618,7 @@ export class SdTsCompiler {
         undefined,
         transformers,
       );
-    }
+    }*/
 
     //-- global style
     if (
@@ -531,6 +645,7 @@ export class SdTsCompiler {
 
     this.#modifiedFileSet.clear();
 
+    const affectedFileSet = new Set(Array.from(affectedSourceFileSet).map((item) => path.normalize(item.fileName)));
     this.#debug(`build completed`, affectedFileSet, diagnostics.length);
 
     //-- result
@@ -550,7 +665,7 @@ export class SdTsCompiler {
     this.#logger.debug(`[${path.basename(this.#pkgPath)}]`, ...msg);
   }
 
-  #findDeps(sf: ts.SourceFile) {
+  /*#findDeps(sf: ts.SourceFile) {
     const deps: {
       fileName: string;
       importName: string;
@@ -604,9 +719,9 @@ export class SdTsCompiler {
               importName: "*",
             });
           }
-          /*else {
+          /!*else {
             throw new NeverEntryError(`import moduleSymbol: ${sf.fileName} ${node.moduleSpecifier["text"]}`);
-          }*/
+          }*!/
         } else {
           const decls = moduleSymbol.getDeclarations();
           if (!decls) throw new NeverEntryError(`import decls: ${sf.fileName}`);
@@ -634,7 +749,7 @@ export class SdTsCompiler {
     });
 
     return deps;
-  }
+  }*/
 }
 
 export interface ISdTsCompilerResult {

package/src/builders/SdCliClientBuilder.ts

@@ -14,6 +14,7 @@ import { SdCliCordova } from "../build-tools/SdCliCordova";
 import { SdCliNgRoutesFileGenerator } from "../build-tools/SdCliNgRoutesFileGenerator";
 import { SdLinter } from "../build-tools/SdLinter";
 import { SdCliElectron } from "../entry/SdCliElectron";
+import { SdReactBundler } from "../build-tools/SdReactBundler";
 
 // import ts from "typescript";
 
@@ -21,7 +22,7 @@ export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
   private readonly _pkgConf: ISdCliClientPackageConfig;
   private readonly _npmConf: INpmConfig;
-  private _builders?: SdNgBundler[];
+  private _builders?: (SdNgBundler | SdReactBundler)[];
   private _cordova?: SdCliCordova;
 
   // #program?: ts.Program;
@@ -129,27 +130,55 @@ export class SdCliClientBuilder extends EventEmitter {
     if (!this._builders) {
       this._debug(`BUILD 준비...`);
 
-      this._builders = builderTypes.map(
-        (builderType) =>
-          new SdNgBundler({
-            dev: opt.dev,
-            builderType: builderType,
-            pkgPath: this._pkgPath,
-            outputPath:
-              builderType === "web"
-                ? path.resolve(this._pkgPath, "dist")
-                : builderType === "electron" && !opt.dev
-                  ? path.resolve(this._pkgPath, ".electron/src")
-                  : builderType === "cordova" && !opt.dev
-                    ? path.resolve(this._pkgPath, ".cordova/www")
-                    : path.resolve(this._pkgPath, "dist", builderType),
-            env: {
-              ...this._pkgConf.env,
-              ...this._pkgConf.builder?.[builderType]?.env,
-            },
-            cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-          }),
-      );
+      if (
+        this._npmConf.dependencies &&
+        (Object.keys(this._npmConf.dependencies).includes("preact") ||
+          Object.keys(this._npmConf.dependencies).includes("react"))
+      ) {
+        this._builders = builderTypes.map(
+          (builderType) =>
+            new SdReactBundler({
+              dev: opt.dev,
+              builderType: builderType,
+              pkgPath: this._pkgPath,
+              outputPath:
+                builderType === "web"
+                  ? path.resolve(this._pkgPath, "dist")
+                  : builderType === "electron" && !opt.dev
+                    ? path.resolve(this._pkgPath, ".electron/src")
+                    : builderType === "cordova" && !opt.dev
+                      ? path.resolve(this._pkgPath, ".cordova/www")
+                      : path.resolve(this._pkgPath, "dist", builderType),
+              env: {
+                ...this._pkgConf.env,
+                ...this._pkgConf.builder?.[builderType]?.env,
+              },
+              cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
+            }),
+        );
+      } else {
+        this._builders = builderTypes.map(
+          (builderType) =>
+            new SdNgBundler({
+              dev: opt.dev,
+              builderType: builderType,
+              pkgPath: this._pkgPath,
+              outputPath:
+                builderType === "web"
+                  ? path.resolve(this._pkgPath, "dist")
+                  : builderType === "electron" && !opt.dev
+                    ? path.resolve(this._pkgPath, ".electron/src")
+                    : builderType === "cordova" && !opt.dev
+                      ? path.resolve(this._pkgPath, ".cordova/www")
+                      : path.resolve(this._pkgPath, "dist", builderType),
+              env: {
+                ...this._pkgConf.env,
+                ...this._pkgConf.builder?.[builderType]?.env,
+              },
+              cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
+            }),
+        );
+      }
     }
 
     this._debug(`BUILD & CHECK...`);
@@ -168,11 +197,7 @@ export class SdCliClientBuilder extends EventEmitter {
     //   oldProgram: this.#program
     // });
     // const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
-    const lintResults = await SdLinter.lintAsync(
-      this._pkgPath,
-      affectedFileSet,
-      firstProgram,
-    );
+    const lintResults = await SdLinter.lintAsync(this._pkgPath, affectedFileSet, firstProgram);
 
     if (!opt.dev && this._cordova) {
       this._debug("CORDOVA BUILD...");