@simplysm/sd-cli 12.7.4 → 12.7.6

package/src/{ts-builder/SdTsCompiler.ts → ts-compiler/sd-ts-compiler.ts}

@@ -1,22 +1,32 @@
 import ts from "typescript";
 import path from "path";
-import { FsUtil, Logger, PathUtil, TNormPath } from "@simplysm/sd-core-node";
-import { StringUtil } from "@simplysm/sd-core-common";
+import { FsUtils, SdLogger, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { StringUtils } from "@simplysm/sd-core-common";
 import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
-import { ComponentStylesheetBundler } from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
-import { AngularCompilerHost } from "@angular/build/src/tools/angular/angular-host";
+import {
+  ComponentStylesheetBundler,
+} from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
+import { type AngularCompilerHost } from "@angular/build/src/tools/angular/angular-host";
 import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
 import browserslist from "browserslist";
-import { replaceBootstrap } from "@angular/build/src/tools/angular/transformers/jit-bootstrap-transformer";
-import { SdCliPerformanceTimer } from "../utils/SdCliPerformanceTime";
-import { SdCliConvertMessageUtil } from "../utils/SdCliConvertMessageUtil";
-import { ISdTsCompilerResult, IStylesheetBundlingResult, SdTsCompilerOptions } from "../types/ts-compiler.type";
-import { ISdBuildMessage } from "../types/build.type";
-import { createWorkerTransformer } from "@angular/build/src/tools/angular/transformers/web-worker-transformer";
+import {
+  replaceBootstrap,
+} from "@angular/build/src/tools/angular/transformers/jit-bootstrap-transformer";
+import { SdCliPerformanceTimer } from "../utils/sd-cli-performance-time";
+import { SdCliConvertMessageUtils } from "../utils/sd-cli-convert-message.utils";
+import {
+  type ISdTsCompilerResult,
+  type IStylesheetBundlingResult,
+  type SdTsCompilerOptions,
+} from "../types/ts-compiler.types";
+import { type ISdBuildMessage } from "../types/build.types";
+import {
+  createWorkerTransformer,
+} from "@angular/build/src/tools/angular/transformers/web-worker-transformer";
 import { ESLint } from "eslint";
 
 export class SdTsCompiler {
-  readonly #logger = Logger.get(["simplysm", "sd-cli", "SdTsCompiler"]);
+  readonly #logger = SdLogger.get(["simplysm", "sd-cli", "SdTsCompiler"]);
 
   readonly #parsedTsconfig: ts.ParsedCommandLine;
   readonly #isForAngular: boolean;
@@ -70,14 +80,17 @@ export class SdTsCompiler {
     //-- isForAngular / parsedTsConfig
 
     const tsconfigPath = path.resolve(opt.pkgPath, "tsconfig.json");
-    const tsconfig = FsUtil.readJson(tsconfigPath);
+    const tsconfig = FsUtils.readJson(tsconfigPath);
     this.#isForAngular = Boolean(tsconfig.angularCompilerOptions);
     this.#parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, opt.pkgPath, {
       ...tsconfig.angularCompilerOptions,
       ...opt.additionalOptions,
     });
 
-    this.#distPath = PathUtil.norm(this.#parsedTsconfig.options.outDir ?? path.resolve(opt.pkgPath, "dist"));
+    this.#distPath = PathUtils.norm(this.#parsedTsconfig.options.outDir ?? path.resolve(
+      opt.pkgPath,
+      "dist",
+    ));
 
     //-- compilerHost
 
@@ -91,8 +104,8 @@ export class SdTsCompiler {
       shouldCreateNewSourceFile?: boolean,
       ...args
     ): ts.SourceFile | undefined => {
-      if (!shouldCreateNewSourceFile && this.#sourceFileCacheMap.has(PathUtil.norm(fileName))) {
-        return this.#sourceFileCacheMap.get(PathUtil.norm(fileName));
+      if (!shouldCreateNewSourceFile && this.#sourceFileCacheMap.has(PathUtils.norm(fileName))) {
+        return this.#sourceFileCacheMap.get(PathUtils.norm(fileName));
       }
 
       const sf: ts.SourceFile | undefined = baseGetSourceFile.call(
@@ -105,10 +118,10 @@ export class SdTsCompiler {
       );
 
       if (sf) {
-        this.#sourceFileCacheMap.set(PathUtil.norm(fileName), sf);
+        this.#sourceFileCacheMap.set(PathUtils.norm(fileName), sf);
       }
       else {
-        this.#sourceFileCacheMap.delete(PathUtil.norm(fileName));
+        this.#sourceFileCacheMap.delete(PathUtils.norm(fileName));
       }
 
       return sf;
@@ -116,7 +129,7 @@ export class SdTsCompiler {
 
     const baseReadFile = this.#compilerHost.readFile;
     this.#compilerHost.readFile = (fileName) => {
-      this.#watchFileSet.add(PathUtil.norm(fileName));
+      this.#watchFileSet.add(PathUtils.norm(fileName));
       return baseReadFile.call(this.#compilerHost, fileName);
     };
 
@@ -167,20 +180,24 @@ export class SdTsCompiler {
 
         const contents = await this.#bundleStylesheetAsync(
           data,
-          PathUtil.norm(context.containingFile),
-          context.resourceFile != null ? PathUtil.norm(context.resourceFile) : undefined,
+          PathUtils.norm(context.containingFile),
+          context.resourceFile != null ? PathUtils.norm(context.resourceFile) : undefined,
         );
 
-        return StringUtil.isNullOrEmpty(contents) ? null : { content: contents };
+        return StringUtils.isNullOrEmpty(contents) ? null : { content: contents };
       };
 
       (this.#compilerHost as AngularCompilerHost).getModifiedResourceFiles = () => {
-        return new Set(Array.from(this.#modifiedFileSet).map((item) => PathUtil.posix(item)));
+        return new Set(Array.from(this.#modifiedFileSet).map((item) => PathUtils.posix(item)));
       };
     }
   }
 
-  async #bundleStylesheetAsync(data: string, containingFile: TNormPath, resourceFile: TNormPath | null = null) {
+  async #bundleStylesheetAsync(
+    data: string,
+    containingFile: TNormPath,
+    resourceFile: TNormPath | null = null,
+  ) {
     // containingFile: 포함된 파일 (.ts)
     // resourceFile: 외부 리소스 파일 (styleUrls로 입력하지 않고 styles에 직접 입력한 경우 null)
     // referencedFiles: import한 외부 scss 파일 혹은 woff파일등 외부 파일
@@ -196,18 +213,19 @@ export class SdTsCompiler {
       if (stylesheetResult.referencedFiles) {
         for (const referencedFile of stylesheetResult.referencedFiles) {
           const depCacheSet = this.#resourceDependencyCacheMap.getOrCreate(
-            PathUtil.norm(referencedFile),
+            PathUtils.norm(referencedFile),
             new Set<TNormPath>(),
           );
           depCacheSet.add(resourceFile ?? containingFile);
         }
 
         this.#watchFileSet.adds(
-          ...Array.from(stylesheetResult.referencedFiles.values()).map((item) => PathUtil.norm(item)),
+          ...Array.from(stylesheetResult.referencedFiles.values())
+            .map((item) => PathUtils.norm(item)),
         );
       }
 
-      this.#stylesheetBundlingResultMap.set(PathUtil.norm(resourceFile ?? containingFile), {
+      this.#stylesheetBundlingResultMap.set(PathUtils.norm(resourceFile ?? containingFile), {
         outputFiles: stylesheetResult.errors == null ? stylesheetResult.outputFiles : undefined,
         metafile: stylesheetResult.errors == null ? stylesheetResult.metafile : undefined,
         errors: stylesheetResult.errors,
@@ -242,8 +260,8 @@ export class SdTsCompiler {
     return {
       messages: [
         ...prepareResult.messages,
-        ...SdCliConvertMessageUtil.convertToBuildMessagesFromTsDiag(buildResult.diagnostics),
-        ...SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(lintResults),
+        ...SdCliConvertMessageUtils.convertToBuildMessagesFromTsDiag(buildResult.diagnostics),
+        ...SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(lintResults),
       ],
       watchFileSet: this.#watchFileSet,
       affectedFileSet: this.#affectedFileSet,
@@ -262,17 +280,16 @@ export class SdTsCompiler {
           this.#affectedFileSet.add(modifiedFile);
           this.#affectedFileSet.adds(...(this.#revDependencyCacheMap.get(modifiedFile) ?? []));
           this.#affectedFileSet.adds(...(this.#resourceDependencyCacheMap.get(modifiedFile) ?? []));
-
-          this.#emittedFilesCacheMap.delete(modifiedFile);
         }
       });
 
       this.#debug(`invalidate & clear cache...`);
 
       this.#perf.run("invalidate & clear cache", () => {
-        this.#stylesheetBundler?.invalidate(this.#modifiedFileSet);
+        this.#stylesheetBundler?.invalidate(this.#affectedFileSet);
 
         for (const affectedFile of this.#affectedFileSet) {
+          this.#emittedFilesCacheMap.delete(affectedFile);
           this.#sourceFileCacheMap.delete(affectedFile);
           this.#stylesheetBundlingResultMap.delete(affectedFile);
           this.#watchFileSet.delete(affectedFile);
@@ -340,18 +357,24 @@ export class SdTsCompiler {
         }[]
       >();
       for (const sf of sourceFileSet) {
-        if (!this.#watchScopePaths.some((scopePath) => PathUtil.isChildPath(sf.fileName, scopePath))) {
+        if (!this.#watchScopePaths.some((scopePath) => PathUtils.isChildPath(
+          sf.fileName,
+          scopePath,
+        ))) {
           continue;
         }
 
         const refs = this.#findDeps(sf);
         messages.push(...refs.filter((item) => "severity" in item));
         depMap.set(
-          PathUtil.norm(sf.fileName),
+          PathUtils.norm(sf.fileName),
           refs
             .filter((item) => "fileName" in item)
             .filter((item) =>
-              this.#watchScopePaths.some((scopePath) => PathUtil.isChildPath(item.fileName, scopePath)),
+              this.#watchScopePaths.some((scopePath) => PathUtils.isChildPath(
+                item.fileName,
+                scopePath,
+              )),
             ),
         );
       }
@@ -375,15 +398,22 @@ export class SdTsCompiler {
               if (prevSet?.has(targetRefItem.fileName)) continue;
 
               result.add(targetRefItem.fileName);
-              result.adds(...getAllDeps(targetRefItem.fileName, new Set<TNormPath>(prevSet).adds(...result)));
+              result.adds(...getAllDeps(
+                targetRefItem.fileName,
+                new Set<TNormPath>(prevSet).adds(...result),
+              ));
             }
           }
           else {
-            for (const targetRefItem of targetDeps.filter((item) => item.exportName === dep.importName)) {
+            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<TNormPath>(prevSet).adds(...result)));
+              result.adds(...getAllDeps(
+                targetRefItem.fileName,
+                new Set<TNormPath>(prevSet).adds(...result),
+              ));
             }
           }
         }
@@ -392,12 +422,12 @@ export class SdTsCompiler {
       };
 
       for (const sf of sourceFileSet) {
-        const deps = getAllDeps(PathUtil.norm(sf.fileName));
-        allDepMap.set(PathUtil.norm(sf.fileName), deps);
+        const deps = getAllDeps(PathUtils.norm(sf.fileName));
+        allDepMap.set(PathUtils.norm(sf.fileName), deps);
 
-        for (const dep of getAllDeps(PathUtil.norm(sf.fileName))) {
+        for (const dep of getAllDeps(PathUtils.norm(sf.fileName))) {
           const depCache = this.#revDependencyCacheMap.getOrCreate(dep, new Set<TNormPath>());
-          depCache.add(PathUtil.norm(sf.fileName));
+          depCache.add(PathUtils.norm(sf.fileName));
         }
 
         if (this.#ngProgram) {
@@ -406,8 +436,11 @@ export class SdTsCompiler {
           }
 
           for (const dep of this.#ngProgram.compiler.getResourceDependencies(sf)) {
-            const ref = this.#resourceDependencyCacheMap.getOrCreate(PathUtil.norm(dep), new Set<TNormPath>());
-            ref.add(PathUtil.norm(sf.fileName));
+            const ref = this.#resourceDependencyCacheMap.getOrCreate(
+              PathUtils.norm(dep),
+              new Set<TNormPath>(),
+            );
+            ref.add(PathUtils.norm(sf.fileName));
           }
         }
       }
@@ -418,11 +451,14 @@ export class SdTsCompiler {
 
       this.#perf.run("get affected (init)", () => {
         for (const sf of sourceFileSet) {
-          if (!this.#watchScopePaths.some((scopePath) => PathUtil.isChildPath(sf.fileName, scopePath))) {
+          if (!this.#watchScopePaths.some((scopePath) => PathUtils.isChildPath(
+            sf.fileName,
+            scopePath,
+          ))) {
             continue;
           }
 
-          this.#affectedFileSet.add(PathUtil.norm(sf.fileName));
+          this.#affectedFileSet.add(PathUtils.norm(sf.fileName));
         }
       });
     }
@@ -434,7 +470,7 @@ export class SdTsCompiler {
             [
               item,
               // .d.ts면 .js파일도 affected에 추가
-              item.endsWith(".d.ts") ? PathUtil.norm(item.replace(/\.d\.ts$/, ".js")) : undefined,
+              item.endsWith(".d.ts") ? PathUtils.norm(item.replace(/\.d\.ts$/, ".js")) : undefined,
             ].filterExists(),
           ),
         );
@@ -468,12 +504,12 @@ export class SdTsCompiler {
 
   async #lintAsync() {
     const lintFilePaths = Array.from(this.#affectedFileSet)
-      .filter((item) => PathUtil.isChildPath(item, this.#pkgPath))
+      .filter((item) => PathUtils.isChildPath(item, this.#pkgPath))
       .filter((item) => (
         (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
         item.endsWith(".js")
       ))
-      .filter((item) => FsUtil.exists(item));
+      .filter((item) => FsUtils.exists(item));
 
     if (lintFilePaths.length === 0) {
       return [];
@@ -523,7 +559,7 @@ export class SdTsCompiler {
     this.#debug(`get diagnostics of files...`);
 
     for (const affectedFile of this.#affectedFileSet) {
-      if (!PathUtil.isChildPath(affectedFile, this.#pkgPath)) {
+      if (!PathUtils.isChildPath(affectedFile, this.#pkgPath)) {
         continue;
       }
 
@@ -552,7 +588,10 @@ export class SdTsCompiler {
           }
 
           diagnostics.push(
-            ...this.#ngProgram!.compiler.getDiagnosticsForFile(affectedSourceFile, OptimizeFor.WholeProgram),
+            ...this.#ngProgram!.compiler.getDiagnosticsForFile(
+              affectedSourceFile,
+              OptimizeFor.WholeProgram,
+            ),
           );
         });
       }
@@ -608,7 +647,7 @@ export class SdTsCompiler {
 
         // esbuild를 통해 bundle로 묶어야 하는놈들은 모든 output이 있어야 함.
         if (!this.#isForBundle) {
-          if (!PathUtil.isChildPath(sf.fileName, this.#pkgPath)) {
+          if (!PathUtils.isChildPath(sf.fileName, this.#pkgPath)) {
             continue;
           }
         }
@@ -617,7 +656,14 @@ export class SdTsCompiler {
           sf,
           (fileName, text, writeByteOrderMark, onError, sourceFiles, data) => {
             if (!sourceFiles || sourceFiles.length === 0) {
-              this.#compilerHost.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+              this.#compilerHost.writeFile(
+                fileName,
+                text,
+                writeByteOrderMark,
+                onError,
+                sourceFiles,
+                data,
+              );
               return;
             }
 
@@ -629,17 +675,24 @@ export class SdTsCompiler {
               this.#ngProgram.compiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
             }
 
-            const emitFileInfoCaches = this.#emittedFilesCacheMap.getOrCreate(PathUtil.norm(sourceFile.fileName), []);
+            const emitFileInfoCaches = this.#emittedFilesCacheMap.getOrCreate(PathUtils.norm(
+              sourceFile.fileName), []);
 
-            if (PathUtil.isChildPath(sourceFile.fileName, this.#pkgPath)) {
-              let realFilePath = PathUtil.norm(fileName);
+            if (PathUtils.isChildPath(sourceFile.fileName, this.#pkgPath)) {
+              let realFilePath = PathUtils.norm(fileName);
               let realText = text;
               if (
-                PathUtil.isChildPath(realFilePath, path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"))
+                PathUtils.isChildPath(
+                  realFilePath,
+                  path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"),
+                )
               ) {
-                realFilePath = PathUtil.norm(
+                realFilePath = PathUtils.norm(
                   this.#distPath,
-                  path.relative(path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"), realFilePath),
+                  path.relative(
+                    path.resolve(this.#distPath, path.basename(this.#pkgPath), "src"),
+                    realFilePath,
+                  ),
                 );
 
                 if (fileName.endsWith(".js.map")) {
@@ -659,7 +712,7 @@ export class SdTsCompiler {
               emitFileInfoCaches.push({ text });
             }
 
-            emitFileSet.add(PathUtil.norm(sourceFile.fileName));
+            emitFileSet.add(PathUtils.norm(sourceFile.fileName));
           },
           undefined,
           undefined,
@@ -671,19 +724,27 @@ export class SdTsCompiler {
     //-- global style
     if (
       this.#globalStyleFilePath != null &&
-      FsUtil.exists(this.#globalStyleFilePath) &&
+      FsUtils.exists(this.#globalStyleFilePath) &&
       !this.#emittedFilesCacheMap.has(this.#globalStyleFilePath)
     ) {
       this.#debug(`bundle global style...`);
 
       await this.#perf.run("bundle global style", async () => {
-        const data = FsUtil.readFile(this.#globalStyleFilePath!);
-        const contents = await this.#bundleStylesheetAsync(data, this.#globalStyleFilePath!, this.#globalStyleFilePath);
-        const emitFileInfos = this.#emittedFilesCacheMap.getOrCreate(this.#globalStyleFilePath!, []);
+        const data = FsUtils.readFile(this.#globalStyleFilePath!);
+        const contents = await this.#bundleStylesheetAsync(
+          data,
+          this.#globalStyleFilePath!,
+          this.#globalStyleFilePath,
+        );
+        const emitFileInfos = this.#emittedFilesCacheMap.getOrCreate(
+          this.#globalStyleFilePath!,
+          [],
+        );
         emitFileInfos.push({
-          outAbsPath: PathUtil.norm(
+          outAbsPath: PathUtils.norm(
             this.#pkgPath,
-            path.relative(path.resolve(this.#pkgPath, "src"), this.#globalStyleFilePath!).replace(/\.scss$/, ".css"),
+            path.relative(path.resolve(this.#pkgPath, "src"), this.#globalStyleFilePath!)
+              .replace(/\.scss$/, ".css"),
           ),
           text: contents,
         });
@@ -717,7 +778,7 @@ export class SdTsCompiler {
           if (!moduleSymbol) {
             const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
             deps.push({
-              filePath: PathUtil.norm(sf.fileName),
+              filePath: PathUtils.norm(sf.fileName),
               line: pos.line,
               char: pos.character,
               code: undefined,
@@ -732,7 +793,7 @@ export class SdTsCompiler {
           if (!decls) {
             const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
             deps.push({
-              filePath: PathUtil.norm(sf.fileName),
+              filePath: PathUtils.norm(sf.fileName),
               line: pos.line,
               char: pos.character,
               code: undefined,
@@ -748,7 +809,7 @@ export class SdTsCompiler {
             for (const el of namedBindings.elements) {
               for (const decl of decls) {
                 deps.push({
-                  fileName: PathUtil.norm(decl.getSourceFile().fileName),
+                  fileName: PathUtils.norm(decl.getSourceFile().fileName),
                   importName: el.name.text,
                   exportName: el.propertyName?.text ?? el.name.text,
                 });
@@ -759,7 +820,7 @@ export class SdTsCompiler {
             if (!moduleSymbol.exports) {
               const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
               deps.push({
-                filePath: PathUtil.norm(sf.fileName),
+                filePath: PathUtils.norm(sf.fileName),
                 line: pos.line,
                 char: pos.character,
                 code: undefined,
@@ -773,7 +834,7 @@ export class SdTsCompiler {
             for (const decl of decls) {
               for (const key of moduleSymbol.exports.keys()) {
                 deps.push({
-                  fileName: PathUtil.norm(decl.getSourceFile().fileName),
+                  fileName: PathUtils.norm(decl.getSourceFile().fileName),
                   importName: key.toString(),
                   exportName: key.toString(),
                 });
@@ -785,9 +846,13 @@ export class SdTsCompiler {
       else if (ts.isImportDeclaration(node)) {
         const moduleSymbol = tc.getSymbolAtLocation(node.moduleSpecifier);
         if (!moduleSymbol) {
-          if (ts.isStringLiteral(node.moduleSpecifier) && node.moduleSpecifier.text.startsWith("./")) {
+          if (ts.isStringLiteral(node.moduleSpecifier)
+            && node.moduleSpecifier.text.startsWith("./")) {
             deps.push({
-              fileName: PathUtil.norm(path.resolve(path.dirname(sf.fileName), node.moduleSpecifier.text + ".ts")),
+              fileName: PathUtils.norm(path.resolve(
+                path.dirname(sf.fileName),
+                node.moduleSpecifier.text + ".ts",
+              )),
               importName: "*",
             });
 
@@ -813,7 +878,7 @@ export class SdTsCompiler {
           if (!decls) {
             const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
             deps.push({
-              filePath: PathUtil.norm(sf.fileName),
+              filePath: PathUtils.norm(sf.fileName),
               line: pos.line,
               char: pos.character,
               code: undefined,
@@ -829,7 +894,7 @@ export class SdTsCompiler {
             for (const el of namedBindings.elements) {
               for (const decl of decls) {
                 deps.push({
-                  fileName: PathUtil.norm(decl.getSourceFile().fileName),
+                  fileName: PathUtils.norm(decl.getSourceFile().fileName),
                   importName: el.name.text,
                 });
               }
@@ -838,7 +903,7 @@ export class SdTsCompiler {
           else {
             for (const decl of decls) {
               deps.push({
-                fileName: PathUtil.norm(decl.getSourceFile().fileName),
+                fileName: PathUtils.norm(decl.getSourceFile().fileName),
                 importName: "*",
               });
             }
@@ -852,7 +917,10 @@ export class SdTsCompiler {
           const moduleSymbol = tc.getSymbolAtLocation(node.arguments[0]);
           if (!moduleSymbol) {
             deps.push({
-              fileName: PathUtil.norm(path.resolve(path.dirname(sf.fileName), node.arguments[0].text + ".ts")),
+              fileName: PathUtils.norm(path.resolve(
+                path.dirname(sf.fileName),
+                node.arguments[0].text + ".ts",
+              )),
               importName: "*",
             });
 
@@ -873,7 +941,7 @@ export class SdTsCompiler {
             if (!decls) {
               const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
               deps.push({
-                filePath: PathUtil.norm(sf.fileName),
+                filePath: PathUtils.norm(sf.fileName),
                 line: pos.line,
                 char: pos.character,
                 code: undefined,
@@ -886,7 +954,7 @@ export class SdTsCompiler {
 
             for (const decl of decls) {
               deps.push({
-                fileName: PathUtil.norm(decl.getSourceFile().fileName),
+                fileName: PathUtils.norm(decl.getSourceFile().fileName),
                 importName: "*",
               });
             }

package/src/types/{build-plugin.type.ts → build-plugin.types.ts}

@@ -1,5 +1,5 @@
 import esbuild from "esbuild";
-import { TNormPath } from "@simplysm/sd-core-node";
+import { type TNormPath } from "@simplysm/sd-core-node";
 
 export interface ISdCliServerPluginResultCache {
   watchFileSet?: Set<TNormPath>;

package/src/types/{build-runner.type.ts → build-runner.types.ts}

@@ -1,5 +1,5 @@
-import { TNormPath } from "@simplysm/sd-core-node";
-import { ISdProjectConfig } from "./sd-configs.type";
+import { type TNormPath } from "@simplysm/sd-core-node";
+import { type ISdProjectConfig } from "./config.types";
 
 export interface ISdBuildRunnerWorkerRequest {
   cmd: "watch" | "build";

package/src/types/{build.type.ts → build.types.ts}

@@ -1,4 +1,4 @@
-import { TNormPath } from "@simplysm/sd-core-node";
+import { type TNormPath } from "@simplysm/sd-core-node";
 
 export interface ISdBuildRunnerResult {
   affectedFilePathSet: Set<TNormPath>;

package/src/types/{ts-compiler.type.ts → ts-compiler.types.ts}

@@ -1,7 +1,7 @@
-import { CompilerOptions } from "typescript";
+import { type CompilerOptions } from "typescript";
 import esbuild from "esbuild";
-import { ISdBuildMessage } from "./build.type";
-import { TNormPath } from "@simplysm/sd-core-node";
+import { type ISdBuildMessage } from "./build.types";
+import { type TNormPath } from "@simplysm/sd-core-node";
 
 export interface SdTsCompilerOptions {
   pkgPath: TNormPath;

package/src/types/{workers.type.ts → worker.types.ts}

@@ -1,5 +1,5 @@
-import { ISdBuildRunnerWorkerRequest } from "./build-runner.type";
-import { ISdBuildMessage, ISdBuildRunnerResult } from "./build.type";
+import { type ISdBuildRunnerWorkerRequest } from "./build-runner.types";
+import { type ISdBuildMessage, type ISdBuildRunnerResult } from "./build.types";
 
 export interface TServerWorkerType {
   methods: {

package/src/utils/{SdCliConvertMessageUtil.ts → sd-cli-convert-message.utils.ts}

@@ -1,12 +1,12 @@
 import ts from "typescript";
 import os from "os";
 import path from "path";
-import { PartialMessage } from "esbuild";
+import { type PartialMessage } from "esbuild";
 import { ESLint } from "eslint";
-import { ISdBuildMessage } from "../types/build.type";
-import { PathUtil } from "@simplysm/sd-core-node";
+import { type ISdBuildMessage } from "../types/build.types";
+import { PathUtils } from "@simplysm/sd-core-node";
 
-export class SdCliConvertMessageUtil {
+export class SdCliConvertMessageUtils {
   static convertToBuildMessagesFromTsDiag(diags: ts.Diagnostic[]): ISdBuildMessage[] {
     return diags.map((diag) => {
       const severity =
@@ -21,7 +21,7 @@ export class SdCliConvertMessageUtil {
       const code = `TS${diag.code}`;
       const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
 
-      const filePath = diag.file ? PathUtil.norm(path.resolve(diag.file.fileName)) : undefined;
+      const filePath = diag.file ? PathUtils.norm(path.resolve(diag.file.fileName)) : undefined;
       const position =
         diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
       const line = position ? position.line + 1 : undefined;
@@ -47,7 +47,7 @@ export class SdCliConvertMessageUtil {
     orgPath: string,
   ): ISdBuildMessage[] {
     const convertFn = (msg: PartialMessage, severity: "error" | "warning") => {
-      const filePath = msg.location?.file != null ? PathUtil.norm(orgPath, msg.location.file) : undefined;
+      const filePath = msg.location?.file != null ? PathUtils.norm(orgPath, msg.location.file) : undefined;
       const line = msg.location?.line;
       const char = msg.location?.column;
       const code = msg.text!.slice(0, msg.text!.indexOf(":"));
@@ -73,7 +73,7 @@ export class SdCliConvertMessageUtil {
   static convertToBuildMessagesFromEslint(results: ESLint.LintResult[]): ISdBuildMessage[] {
     return results.mapMany((result) =>
       result.messages.map((msg) => ({
-        filePath: PathUtil.norm(result.filePath),
+        filePath: PathUtils.norm(result.filePath),
         line: msg.line,
         char: msg.column,
         code: msg.messageId,