@simplysm/sd-cli 12.5.50 → 12.5.52

package/src/ts-builder/SdTsCompiler.ts

@@ -74,7 +74,7 @@ export class SdTsCompiler {
     this.#isForAngular = Boolean(tsconfig.angularCompilerOptions);
     this.#parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, opt.pkgPath, {
       ...tsconfig.angularCompilerOptions,
-      ...opt.additionalOptions,
+      ...opt.additionalOptions
     });
 
     this.#distPath = PathUtil.norm(this.#parsedTsconfig.options.outDir ?? path.resolve(opt.pkgPath, "dist"));
@@ -99,7 +99,8 @@ export class SdTsCompiler {
 
       if (sf) {
         this.#sourceFileCacheMap.set(PathUtil.norm(fileName), sf);
-      } else {
+      }
+      else {
         this.#sourceFileCacheMap.delete(PathUtil.norm(fileName));
       }
 
@@ -120,22 +121,22 @@ export class SdTsCompiler {
           optimization: !opt.isDevMode,
           inlineFonts: true,
           preserveSymlinks: false,
-          sourcemap: opt.isDevMode ? 'inline' : false,
+          sourcemap: opt.isDevMode ? "inline" : false,
           outputNames: { bundles: "[name]", media: "media/[name]" },
           includePaths: [],
           externalDependencies: [],
           target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
           postcssConfiguration: {
-            plugins: [["css-has-pseudo"]],
+            plugins: [["css-has-pseudo"]]
           },
           tailwindConfiguration: undefined,
           cacheOptions: {
             enabled: true,
             path: ".cache/angular",
-            basePath: ".cache",
-          },
+            basePath: ".cache"
+          }
         },
-        opt.isDevMode,
+        opt.isDevMode
       );
 
       //-- compilerHost
@@ -150,7 +151,7 @@ export class SdTsCompiler {
           type: string;
           containingFile: string;
           resourceFile: string | null;
-        },
+        }
       ) => {
         if (context.type !== "style") {
           return null;
@@ -159,7 +160,7 @@ export class SdTsCompiler {
         const contents = await this.#bundleStylesheetAsync(
           data,
           PathUtil.norm(context.containingFile),
-          context.resourceFile != null ? PathUtil.norm(context.resourceFile) : undefined,
+          context.resourceFile != null ? PathUtil.norm(context.resourceFile) : undefined
         );
 
         return StringUtil.isNullOrEmpty(contents) ? null : { content: contents };
@@ -188,13 +189,13 @@ export class SdTsCompiler {
         for (const referencedFile of stylesheetResult.referencedFiles) {
           const depCacheSet = this.#resourceDependencyCacheMap.getOrCreate(
             PathUtil.norm(referencedFile),
-            new Set<TNormPath>(),
+            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) => PathUtil.norm(item))
         );
       }
 
@@ -202,7 +203,7 @@ export class SdTsCompiler {
         outputFiles: stylesheetResult.outputFiles,
         metafile: stylesheetResult.metafile,
         errors: stylesheetResult.errors,
-        warnings: stylesheetResult.warnings,
+        warnings: stylesheetResult.warnings
       });
 
       return stylesheetResult.contents;
@@ -234,13 +235,13 @@ export class SdTsCompiler {
       messages: [
         ...prepareResult.messages,
         ...SdCliConvertMessageUtil.convertToBuildMessagesFromTsDiag(buildResult.diagnostics),
-        ...SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(lintResults),
+        ...SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(lintResults)
       ],
       watchFileSet: this.#watchFileSet,
       affectedFileSet: this.#affectedFileSet,
       stylesheetBundlingResultMap: this.#stylesheetBundlingResultMap,
       emittedFilesCacheMap: this.#emittedFilesCacheMap,
-      emitFileSet: buildResult.emitFileSet,
+      emitFileSet: buildResult.emitFileSet
     };
   }
 
@@ -282,15 +283,16 @@ export class SdTsCompiler {
           this.#parsedTsconfig.fileNames,
           this.#parsedTsconfig.options,
           this.#compilerHost,
-          this.#ngProgram,
+          this.#ngProgram
         );
         this.#program = this.#ngProgram.getTsProgram();
-      } else {
+      }
+      else {
         this.#program = ts.createProgram(
           this.#parsedTsconfig.fileNames,
           this.#parsedTsconfig.options,
           this.#compilerHost,
-          this.#program,
+          this.#program
         );
       }
     });
@@ -313,7 +315,7 @@ export class SdTsCompiler {
     const sourceFileSet = new Set(
       this.#program!.getSourceFiles()
         .map((sf) => getOrgSourceFile(sf))
-        .filterExists(),
+        .filterExists()
     );
 
     this.#debug(`get new deps...`);
@@ -341,8 +343,8 @@ export class SdTsCompiler {
           refs
             .filter((item) => "fileName" in item)
             .filter((item) =>
-              this.#watchScopePaths.some((scopePath) => PathUtil.isChildPath(item.fileName, scopePath)),
-            ),
+              this.#watchScopePaths.some((scopePath) => PathUtil.isChildPath(item.fileName, scopePath))
+            )
         );
       }
 
@@ -367,7 +369,8 @@ export class SdTsCompiler {
               result.add(targetRefItem.fileName);
               result.adds(...getAllDeps(targetRefItem.fileName, new Set<TNormPath>(prevSet).adds(...result)));
             }
-          } else {
+          }
+          else {
             for (const targetRefItem of targetDeps.filter((item) => item.exportName === dep.importName)) {
               if (prevSet?.has(targetRefItem.fileName)) continue;
 
@@ -423,9 +426,9 @@ export class SdTsCompiler {
             [
               item,
               // .d.ts면 .js파일도 affected에 추가
-              item.endsWith(".d.ts") ? PathUtil.norm(item.replace(/\.d\.ts$/, ".js")) : undefined,
-            ].filterExists(),
-          ),
+              item.endsWith(".d.ts") ? PathUtil.norm(item.replace(/\.d\.ts$/, ".js")) : undefined
+            ].filterExists()
+          )
         );
       }
 
@@ -451,7 +454,7 @@ export class SdTsCompiler {
     }
 
     return {
-      messages,
+      messages
     };
   }
 
@@ -459,8 +462,8 @@ export class SdTsCompiler {
     return await this.#lintWorker.run("lint", [
       {
         cwd: this.#pkgPath,
-        fileSet: this.#affectedFileSet,
-      },
+        fileSet: this.#affectedFileSet
+      }
     ]);
   }
 
@@ -474,7 +477,7 @@ export class SdTsCompiler {
       diagnostics.push(
         ...this.#program!.getConfigFileParsingDiagnostics(),
         ...this.#program!.getOptionsDiagnostics(),
-        ...this.#program!.getGlobalDiagnostics(),
+        ...this.#program!.getGlobalDiagnostics()
       );
 
       if (this.#ngProgram) {
@@ -503,7 +506,7 @@ export class SdTsCompiler {
       this.#perf.run("get file diagnostics", () => {
         diagnostics.push(
           ...this.#program!.getSyntacticDiagnostics(affectedSourceFile),
-          ...this.#program!.getSemanticDiagnostics(affectedSourceFile),
+          ...this.#program!.getSemanticDiagnostics(affectedSourceFile)
         );
       });
 
@@ -514,7 +517,7 @@ export class SdTsCompiler {
           }
 
           diagnostics.push(
-            ...this.#ngProgram!.compiler.getDiagnosticsForFile(affectedSourceFile, OptimizeFor.WholeProgram),
+            ...this.#ngProgram!.compiler.getDiagnosticsForFile(affectedSourceFile, OptimizeFor.WholeProgram)
           );
         });
       }
@@ -528,7 +531,7 @@ export class SdTsCompiler {
       if (this.#ngProgram) {
         transformers = {
           ...transformers,
-          ...this.#ngProgram.compiler.prepareEmit().transformers,
+          ...this.#ngProgram.compiler.prepareEmit().transformers
         };
         (transformers.before ??= []).push(replaceBootstrap(() => this.#program!.getTypeChecker()));
         (transformers.before ??= []).push(
@@ -536,7 +539,7 @@ export class SdTsCompiler {
             const fullPath = path.resolve(path.dirname(importer), file);
             const relPath = path.relative(path.resolve(this.#pkgPath, "src"), fullPath);
             return relPath.replace(/\.ts$/, "").replaceAll("\\", "/") + ".js";
-          }),
+          })
         );
       }
       // (transformers.before ??= []).push(transformKeys(this.#program));
@@ -601,7 +604,7 @@ export class SdTsCompiler {
               ) {
                 realFilePath = PathUtil.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")) {
@@ -614,9 +617,10 @@ export class SdTsCompiler {
 
               emitFileInfoCaches.push({
                 outAbsPath: realFilePath,
-                text: realText,
+                text: realText
               });
-            } else {
+            }
+            else {
               emitFileInfoCaches.push({ text });
             }
 
@@ -624,7 +628,7 @@ export class SdTsCompiler {
           },
           undefined,
           undefined,
-          transformers,
+          transformers
         );
       }
     });
@@ -644,9 +648,9 @@ export class SdTsCompiler {
         emitFileInfos.push({
           outAbsPath: PathUtil.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,
+          text: contents
         });
         emitFileSet.add(this.#globalStyleFilePath!);
       });
@@ -654,7 +658,7 @@ export class SdTsCompiler {
 
     return {
       emitFileSet,
-      diagnostics,
+      diagnostics
     };
   }
 
@@ -664,18 +668,16 @@ export class SdTsCompiler {
 
   #findDeps(sf: ts.SourceFile) {
     const deps: (
-      | {
-          fileName: TNormPath;
-          importName: string;
-          exportName?: string;
-        }
-      // | ts.Diagnostic
-      | ISdBuildMessage
-    )[] = [];
+      {
+        fileName: TNormPath;
+        importName: string;
+        exportName?: string;
+      } | ISdBuildMessage
+      )[] = [];
 
     const tc = this.#program!.getTypeChecker();
 
-    sf.forEachChild((node) => {
+    const visit = (node: ts.Node) => {
       if (ts.isExportDeclaration(node)) {
         if (node.moduleSpecifier) {
           const moduleSymbol = tc.getSymbolAtLocation(node.moduleSpecifier);
@@ -688,7 +690,7 @@ export class SdTsCompiler {
               code: undefined,
               severity: "error",
               message: "export moduleSymbol not found",
-              type: "deps",
+              type: "deps"
             });
             return;
           }
@@ -703,7 +705,7 @@ export class SdTsCompiler {
               code: undefined,
               severity: "error",
               message: "export decls not found",
-              type: "deps",
+              type: "deps"
             });
             return;
           }
@@ -715,11 +717,12 @@ export class SdTsCompiler {
                 deps.push({
                   fileName: PathUtil.norm(decl.getSourceFile().fileName),
                   importName: el.name.text,
-                  exportName: el.propertyName?.text ?? el.name.text,
+                  exportName: el.propertyName?.text ?? el.name.text
                 });
               }
             }
-          } else {
+          }
+          else {
             if (!moduleSymbol.exports) {
               const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
               deps.push({
@@ -729,7 +732,7 @@ export class SdTsCompiler {
                 code: undefined,
                 severity: "error",
                 message: "moduleSymbol exports not found",
-                type: "deps",
+                type: "deps"
               });
               return;
             }
@@ -739,25 +742,27 @@ export class SdTsCompiler {
                 deps.push({
                   fileName: PathUtil.norm(decl.getSourceFile().fileName),
                   importName: key.toString(),
-                  exportName: key.toString(),
+                  exportName: key.toString()
                 });
               }
             }
           }
         }
-      } else if (ts.isImportDeclaration(node)) {
+      }
+      else if (ts.isImportDeclaration(node)) {
         const moduleSymbol = tc.getSymbolAtLocation(node.moduleSpecifier);
         if (!moduleSymbol) {
           if (ts.isStringLiteral(node.moduleSpecifier) && node.moduleSpecifier.text.startsWith("./")) {
             deps.push({
               fileName: PathUtil.norm(path.resolve(path.dirname(sf.fileName), node.moduleSpecifier.text)),
-              importName: "*",
+              importName: "*"
             });
           }
           /*else {
             throw new NeverEntryError(`import moduleSymbol: ${sf.fileName} ${node.moduleSpecifier["text"]}`);
           }*/
-        } else {
+        }
+        else {
           const decls = moduleSymbol.getDeclarations();
           if (!decls) {
             const pos = ts.getLineAndCharacterOfPosition(sf, node.getStart());
@@ -768,7 +773,7 @@ export class SdTsCompiler {
               code: undefined,
               severity: "error",
               message: "import decls not found",
-              type: "deps",
+              type: "deps"
             });
             return;
           }
@@ -779,21 +784,35 @@ export class SdTsCompiler {
               for (const decl of decls) {
                 deps.push({
                   fileName: PathUtil.norm(decl.getSourceFile().fileName),
-                  importName: el.name.text,
+                  importName: el.name.text
                 });
               }
             }
-          } else {
+          }
+          else {
             for (const decl of decls) {
               deps.push({
                 fileName: PathUtil.norm(decl.getSourceFile().fileName),
-                importName: "*",
+                importName: "*"
               });
             }
           }
         }
       }
-    });
+
+      if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+        if (ts.isStringLiteral(node.arguments[0]) && node.arguments[0].text.startsWith("./")) {
+          deps.push({
+            fileName: PathUtil.norm(path.resolve(path.dirname(sf.fileName), node.arguments[0].text)),
+            importName: "*"
+          });
+        }
+      }
+
+      node.forEachChild(visit);
+    };
+
+    sf.forEachChild(visit);
 
     return deps;
   }

package/tsconfig.json

@@ -2,14 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "lib": ["ES2021"],
-    "outDir": "./dist",
-    "types": ["node", "eslint", "yargs"]
-  },
-  "files": [
-    "./src/index.ts",
-    "./src/sd-cli.ts",
-    "./src/workers/build-runner-worker.ts",
-    "./src/workers/lint-worker.ts",
-    "./src/workers/server-worker.ts"
-  ]
+    "outDir": "./dist"
+  }
 }