@simplysm/sd-cli 10.0.66 → 11.0.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "10.0.66",
+  "version": "11.0.3",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
     "type": "git",
-    "url": "https://github.com/kslhunter/simplysm10.git",
+    "url": "https://github.com/kslhunter/simplysm11.git",
     "directory": "packages/sd-cli"
   },
   "license": "MIT",
@@ -17,33 +17,29 @@
     "node": "^16"
   },
   "dependencies": {
+    "@angular-devkit/build-angular": "^16.2.5",
+    "@angular/common": "^16.2.8",
+    "@angular/compiler": "^16.2.8",
+    "@angular/compiler-cli": "^16.2.8",
+    "@angular/core": "^16.2.8",
     "@electron/rebuild": "^3.3.0",
-    "@rollup/plugin-inject": "^5.0.3",
-    "@simplysm/sd-core-common": "10.0.66",
-    "@simplysm/sd-core-node": "10.0.66",
-    "@simplysm/sd-service-server": "10.0.66",
-    "@simplysm/sd-storage": "10.0.66",
-    "@swc/core": "^1.3.91",
-    "@vite-pwa/assets-generator": "^0.0.10",
-    "@vitejs/plugin-react-swc": "^3.4.0",
+    "@simplysm/sd-core-common": "11.0.3",
+    "@simplysm/sd-core-node": "11.0.3",
+    "@simplysm/sd-service-server": "11.0.3",
+    "@simplysm/sd-storage": "11.0.3",
     "electron": "^26.2.4",
     "electron-builder": "^24.7.0",
     "esbuild": "^0.19.4",
     "esbuild-plugin-tsc": "^0.4.0",
     "eslint": "^8.50.0",
-    "less": "^4.2.0",
-    "lib-esm": "^0.4.1",
     "node-stdlib-browser": "^1.2.0",
+    "rxjs": "^7.8.1",
     "semver": "^7.5.4",
-    "ts-transformer-keys": "^0.4.4",
-    "vite": "^4.4.9",
-    "vite-plugin-pwa": "^0.16.5",
-    "vite-tsconfig-paths": "^4.2.1",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "zone.js": "~0.13.0"
   },
   "devDependencies": {
     "@types/eslint": "^8.44.3",
-    "@types/less": "^3.0.4",
     "@types/yargs": "^17.0.26"
   },
   "peerDependencies": {

package/src/build-cluster.ts

@@ -48,10 +48,11 @@ if (cluster.isPrimary) {
 }
 else {
   const message = JSON.parse(process.env["SD_CLUSTER_MESSAGE"]!) as ISdCliBuildClusterReqMessage;
+  const pkgConf = message.projConf.packages[path.basename(message.pkgPath)]!;
 
   if (message.cmd === "watch") {
     // [library] javascript
-    if (message.pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+    if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
       if (message.withLint) {
         await new SdCliJsLibLinter(message.pkgPath)
           .on("change", () => {
@@ -75,8 +76,8 @@ else {
       });
     }
     // [library] typescript
-    else if (message.pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      await new SdCliTsLibBuilder(message.pkgPath, message.pkgConf, message.withLint)
+    else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+      await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint)
         .on("change", () => {
           sendMessage({
             type: "change",
@@ -97,8 +98,8 @@ else {
       });
     }
     // [server]
-    else if (message.pkgConf.type === "server") {
-      await new SdCliServerBuilder(message.pkgPath, message.pkgConf, message.withLint)
+    else if (pkgConf.type === "server") {
+      await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint)
         .on("change", () => {
           sendMessage({
             type: "change",
@@ -119,8 +120,8 @@ else {
       });
     }
     // [client]
-    else if (message.pkgConf.type === "client") {
-      await new SdCliClientBuilder(message.pkgPath, message.pkgConf, message.builderKey ?? "web", message.withLint)
+    else if (pkgConf.type === "client") {
+      await new SdCliClientBuilder(message.projConf, message.pkgPath)
         .on("change", () => {
           sendMessage({
             type: "change",
@@ -146,7 +147,7 @@ else {
   }
   else { // build
     // [library] javascript
-    if (message.pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+    if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
       if (message.withLint) {
         const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
         sendMessage({
@@ -164,8 +165,8 @@ else {
       }
     }
     // [library] typescript
-    else if (message.pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      const result = await new SdCliTsLibBuilder(message.pkgPath, message.pkgConf, message.withLint).buildAsync();
+    else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+      const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
       sendMessage({
         type: "complete",
         result,
@@ -173,8 +174,8 @@ else {
       });
     }
     // [server]
-    else if (message.pkgConf.type === "server") {
-      const result = await new SdCliServerBuilder(message.pkgPath, message.pkgConf, message.withLint).buildAsync();
+    else if (pkgConf.type === "server") {
+      const result = await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
       sendMessage({
         type: "complete",
         result,
@@ -182,8 +183,8 @@ else {
       });
     }
     // [client]
-    else if (message.pkgConf.type === "client") {
-      const result = await new SdCliClientBuilder(message.pkgPath, message.pkgConf, message.builderKey ?? "web", message.withLint).buildAsync();
+    else if (pkgConf.type === "client") {
+      const result = await new SdCliClientBuilder(message.projConf, message.pkgPath).buildAsync();
       sendMessage({
         type: "complete",
         result,

package/src/build-tools/SdTsIncrementalBuilder.ts

@@ -3,6 +3,8 @@ import ts from "typescript";
 import {SdCliBuildResultUtil} from "../utils/SdCliBuildResultUtil";
 import {FsUtil, Logger, PathUtil} from "@simplysm/sd-core-node";
 import {ISdCliPackageBuildResult} from "../commons";
+import {NgtscProgram} from "@angular/compiler-cli";
+import {createHash} from "crypto";
 
 
 interface IOptTransform<T> {
@@ -12,6 +14,9 @@ interface IOptTransform<T> {
 
 export class SdTsIncrementalBuilder {
   public builderProgram?: ts.SemanticDiagnosticsBuilderProgram;
+
+  private _program?: ts.Program;
+  private _ngProgram?: NgtscProgram;
   private readonly _writeFileCache = new Map<string, string>();
 
   public constructor(private readonly _pkgPath: string,
@@ -30,7 +35,13 @@ export class SdTsIncrementalBuilder {
     transforms?: IOptTransform<any>[]
   }): Promise<SdTsIncrementalBuilder> {
     const tsConfigFilePath = path.resolve(pkgPath, "tsconfig.json");
-    const parsedTsConfig = ts.parseJsonConfigFileContent(await FsUtil.readJsonAsync(tsConfigFilePath), ts.sys, pkgPath);
+    const tsConfig = await FsUtil.readJsonAsync(tsConfigFilePath);
+    const parsedTsConfig = ts.parseJsonConfigFileContent(
+      await FsUtil.readJsonAsync(tsConfigFilePath),
+      ts.sys,
+      pkgPath,
+      tsConfig["angularCompilerOptions"]
+    );
     const opt = optFn(parsedTsConfig.options);
     const compilerOptions = {
       ...parsedTsConfig.options,
@@ -54,9 +65,40 @@ export class SdTsIncrementalBuilder {
     const distPath = this._compilerOptions.outDir ?? path.resolve(this._pkgPath, "dist");
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.{ts,tsx}");
     const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
+
+    if (this._compilerOptions["strictTemplates"] === true) {
+      this._ngProgram = new NgtscProgram(
+        srcFilePaths,
+        this._compilerOptions,
+        this._host,
+        this._ngProgram
+      );
+      this._program = this._ngProgram.getTsProgram();
+    }
+    else {
+      this._program = ts.createProgram(
+        srcFilePaths,
+        this._compilerOptions,
+        this._host,
+        this._program
+      );
+    }
+
+    const baseGetSourceFiles = this._program.getSourceFiles;
+    this._program.getSourceFiles = function (...parameters) {
+      const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);
+
+      for (const file of files) {
+        if (file.version === undefined) {
+          file.version = createHash("sha256").update(file.text).digest("hex");
+        }
+      }
+
+      return files;
+    };
+
     this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(
-      srcFilePaths,
-      this._compilerOptions,
+      this._program,
       this._host,
       this.builderProgram
     );
@@ -64,25 +106,52 @@ export class SdTsIncrementalBuilder {
     const diagnostics: ts.Diagnostic[] = [];
     const affectedFilePaths: string[] = [];
 
+    if (this._ngProgram) {
+      diagnostics.push(...this._ngProgram.compiler.getOptionDiagnostics());
+    }
+
     diagnostics.push(
       ...this.builderProgram.getOptionsDiagnostics(),
       ...this.builderProgram.getGlobalDiagnostics(),
     );
 
+    if (this._ngProgram) {
+      await this._ngProgram.compiler.analyzeAsync();
+    }
+
     const program = this.builderProgram.getProgram();
 
     logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리중...`);
     const srcFilePathSet = new Set<string>(srcFilePaths);
     while (true) {
+      let affectedSourceFile: ts.SourceFile | undefined;
+
       const semanticResult = this.builderProgram.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
-        return !srcFilePathSet.has(path.resolve(sourceFile.fileName));
+        //-- ngtypecheck의 org파일 포함 (ngtypecheck 파일는 무시)
+        if (this._ngProgram?.compiler.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
+          const orgFileName = sourceFile.fileName.slice(0, -15) + ".ts";
+          const orgSourceFile = this.builderProgram!.getSourceFile(orgFileName);
+          if (orgSourceFile) {
+            affectedSourceFile = orgSourceFile;
+          }
+          return true;
+        }
+        //-- 소스폴더 파일 포함
+        else if (srcFilePathSet.has(path.resolve(sourceFile.fileName))) {
+          affectedSourceFile = sourceFile;
+          return false;
+        }
+        //-- 나머지 무시
+        else {
+          return true;
+        }
       });
-      if (!semanticResult) break;
+      if (!semanticResult || !affectedSourceFile) break;
       diagnostics.push(...semanticResult.result);
 
-      if ("fileName" in semanticResult.affected) {
+      if ("fileName" in affectedSourceFile) {
         const emitResult = this.builderProgram.emit
-        (semanticResult.affected,
+        (affectedSourceFile,
           (filePath, data, writeByteOrderMark) => {
             let realFilePath = filePath;
             let realData = data;
@@ -91,6 +160,7 @@ export class SdTsIncrementalBuilder {
 
               if (filePath.endsWith(".js.map")) {
                 const sourceMapContents = JSON.parse(realData);
+                // remove "../../"
                 sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6);
                 realData = JSON.stringify(sourceMapContents);
               }
@@ -102,15 +172,27 @@ export class SdTsIncrementalBuilder {
             this._writeFileCache.set(realFilePath, realData);
           },
           undefined,
-          Array.isArray(this._opt.emitJs) ? !this._opt.emitJs.includes(path.resolve(semanticResult.affected.fileName)) : !this._opt.emitJs,
+          Array.isArray(this._opt.emitJs) ? !this._opt.emitJs.includes(path.resolve(affectedSourceFile.fileName)) : !this._opt.emitJs,
           this._opt.transforms ? {
             before: this._opt.transforms.map((item) => typeof item.fn === "function" ? item.fn(program, item.args) : (item.fn["default"] as any)(program, item.args))
           } : undefined
         );
         diagnostics.push(...emitResult.diagnostics);
 
-        diagnostics.push(...this.builderProgram.getSyntacticDiagnostics(semanticResult.affected));
-        affectedFilePaths.push(path.resolve(semanticResult.affected.fileName));
+        diagnostics.push(...this.builderProgram.getSyntacticDiagnostics(affectedSourceFile));
+
+        if (
+          this._ngProgram &&
+          !affectedSourceFile.isDeclarationFile &&
+          !this._ngProgram.compiler.ignoreForEmit.has(affectedSourceFile) &&
+          !this._ngProgram.compiler.incrementalCompilation.safeToSkipEmit(affectedSourceFile)
+        ) {
+          diagnostics.push(
+            ...this._ngProgram.compiler.getDiagnosticsForFile(affectedSourceFile, 1)
+          );
+        }
+
+        affectedFilePaths.push(path.resolve(affectedSourceFile.fileName));
       }
     }
     logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리 완료`, affectedFilePaths);