@simplysm/sd-cli 12.5.12 → 12.5.14

package/src/build-tools/SdTsCompiler.ts

@@ -10,6 +10,7 @@ import { AngularCompilerHost } from "@angular/build/src/tools/angular/angular-ho
 import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
 import browserslist from "browserslist";
 import transformKeys from "@simplysm/ts-transformer-keys/transformer";
+import { replaceBootstrap } from "@angular/build/src/tools/angular/transformers/jit-bootstrap-transformer";
 
 export class SdTsCompiler {
   readonly #logger = Logger.get(["simplysm", "sd-cli", "SdTsCompiler"]);
@@ -398,21 +399,31 @@ export class SdTsCompiler {
 
     this.#debug(`prepare emit...`);
 
-    const ngTransformers = this.#ngProgram?.compiler.prepareEmit().transformers;
+    let transformers: ts.CustomTransformers = {};
+
+    if (this.#ngProgram) {
+      transformers = {
+        ...transformers,
+        ...this.#ngProgram.compiler.prepareEmit().transformers,
+      };
+      (transformers.before ??= []).push(replaceBootstrap(() => this.#program!.getTypeChecker()));
+    }
+    (transformers.before ??= []).push(transformKeys(this.#program));
 
     // affected에 새로 추가된 파일은 포함되지 않는 현상이 있어 getSourceFiles로 바꿈
     // -> 너무 느려져서 다시 돌림. 포함안되는 현상은 getAllDep 문제인가?
+    for (const affectedFile of affectedFileSet) {
+      if (this.#emittedFilesCacheMap.has(affectedFile)) {
+        continue;
+      }
+
+      const sf = this.#program.getSourceFile(affectedFile);
+      if (!sf) {
+        continue;
+      }
+
+      // for (const sf of sourceFileSet) {
 
-    // for (const affectedFile of affectedFileSet) {
-    //   if (this.#emittedFilesCacheMap.has(affectedFile)) {
-    //     continue;
-    //   }
-    //
-    //   const sf = this.#program.getSourceFile(affectedFile);
-    //   if (!sf) {
-    //     continue;
-    //   }
-    for (const sf of sourceFileSet) {
       if (this.#emittedFilesCacheMap.has(path.normalize(sf.fileName))) {
         continue;
       }
@@ -472,10 +483,7 @@ export class SdTsCompiler {
         },
         undefined,
         undefined,
-        {
-          ...(ngTransformers ?? {}),
-          before: [...(ngTransformers?.before ?? []), transformKeys(this.#program)],
-        },
+        transformers,
       );
     }
 

package/src/commons.ts

@@ -8,9 +8,12 @@ export interface INpmConfig {
   optionalDependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
   peerDependencies?: Record<string, string>;
-  peerDependenciesMeta?: Record<string, {
-    optional?: boolean
-  }>;
+  peerDependenciesMeta?: Record<
+    string,
+    {
+      optional?: boolean;
+    }
+  >;
 
   resolutions?: Record<string, string>;
 
@@ -18,7 +21,7 @@ export interface INpmConfig {
 }
 
 export interface ITsConfig {
-  files?: string[],
+  files?: string[];
   compilerOptions: { lib: string[] };
   angularCompilerOptions?: {};
 }
@@ -83,7 +86,7 @@ export interface ISdCliServerPackageConfig {
   };
   iis?: {
     nodeExeFilePath?: string;
-  }
+  };
 }
 
 export interface ISdCliClientPackageConfig {
@@ -99,7 +102,7 @@ export interface ISdCliClientPackageConfig {
     web?: ISdCliClientBuilderWebConfig;
     electron?: ISdCliClientBuilderElectronConfig;
     cordova?: ISdCliClientBuilderCordovaConfig;
-  }
+  };
 }
 
 export interface ISdCliLocalDirectoryPublishConfig {
@@ -154,7 +157,7 @@ export interface ISdCliClientBuilderCordovaConfig {
         name: string;
         maxSdkVersion?: number;
       }[];
-    }
+    };
   };
   env?: Record<string, string>;
   browserslist?: string[];
@@ -165,4 +168,4 @@ export type TSdCliPostPublishConfig = ISdCliPostPublishScriptConfig;
 export interface ISdCliPostPublishScriptConfig {
   type: "script";
   script: string;
-}
+}

package/src/entry/SdCliProject.ts

@@ -530,7 +530,7 @@ export class SdCliProject {
     logger.info("모든 빌드가 완료되었습니다.");
   }
 
-  // TODO: npm:piscina??
+  // piscina 사용시 ts파일을 못찾으므로 그냥 이렇게..
   private static async _prepareClusterAsync(): Promise<cp.ChildProcess> {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "_runBuildClusterAsync"]);
     return await new Promise<cp.ChildProcess>((resolve, reject) => {