@simplysm/sd-cli 12.5.60 → 12.6.3

package/src/pkg-builders/client/SdNgBundler.ts

@@ -600,9 +600,9 @@ export class SdNgBundler {
         //     resolveDir: this._opt.pkgPath
         //   }),
         // }) as esbuild.Plugin,
-        pluginFactory.create(SassStylesheetLanguage) as esbuild.Plugin,
-        pluginFactory.create(CssStylesheetLanguage) as esbuild.Plugin,
-        createCssResourcePlugin(this.#styleLoadResultCache) as esbuild.Plugin,
+        pluginFactory.create(SassStylesheetLanguage),
+        pluginFactory.create(CssStylesheetLanguage),
+        createCssResourcePlugin(this.#styleLoadResultCache),
       ],
     });
   }

package/src/pkg-builders/client/SdNgBundlerContext.ts

@@ -1,9 +1,19 @@
 import esbuild from "esbuild";
 import path from "path";
 import { Logger } from "@simplysm/sd-core-node";
-import { InitialFileRecord } from "@angular/build/src/tools/esbuild/bundler-context";
 import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
 
+// import { InitialFileRecord } from "@angular/build/src/tools/esbuild/bundler-context";
+
+interface InitialFileRecord {
+  entrypoint: boolean;
+  name?: string;
+  type: 'script' | 'style';
+  external?: boolean;
+  serverFile: boolean;
+  depth: number;
+}
+
 export class SdNgBundlerContext {
   readonly #logger = Logger.get(["simplysm", "sd-cli", "SdNgBundlerContext"]);
 
@@ -12,7 +22,8 @@ export class SdNgBundlerContext {
   public constructor(
     private readonly _pkgPath: string,
     private readonly _esbuildOptions: esbuild.BuildOptions,
-  ) {}
+  ) {
+  }
 
   public async bundleAsync() {
     if (this._context == null) {
@@ -25,10 +36,12 @@ export class SdNgBundlerContext {
       this.#debug(`rebuild...`);
       esbuildResult = await this._context.rebuild();
       this.#debug(`rebuild completed`);
-    } catch (err) {
+    }
+    catch (err) {
       if ("warnings" in err || "errors" in err) {
         esbuildResult = err;
-      } else {
+      }
+      else {
         throw err;
       }
     }
@@ -104,7 +117,8 @@ export class SdNgBundlerContext {
 
   #debug(...msg: any[]): void {
     this.#logger.debug(
-      `[${path.basename(this._pkgPath)}] (${Object.keys(this._esbuildOptions.entryPoints as Record<string, any>).join(", ")})`,
+      `[${path.basename(this._pkgPath)}] (${Object.keys(this._esbuildOptions.entryPoints as Record<string, any>)
+        .join(", ")})`,
       ...msg,
     );
   }

package/src/pkg-builders/client/createSdNgPlugin.ts

@@ -243,7 +243,7 @@ export function createSdNgPlugin(conf: {
 
         for (const { outputFiles, metafile } of tsCompileResult.stylesheetBundlingResultMap.values()) {
           result.outputFiles ??= [];
-          result.outputFiles.push(...outputFiles);
+          result.outputFiles.push(...outputFiles ?? []);
 
           if (result.metafile && metafile) {
             result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };

package/src/pkg-builders/lib/SdCliIndexFileGenerator.ts

@@ -53,7 +53,7 @@ export class SdCliIndexFileGenerator {
     const tsconfig = FsUtil.readJson(path.resolve(pkgPath, "tsconfig.json"));
     const entryFilePaths: string[] = tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
 
-    return FsUtil.glob(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), { nodir: true }).filter(
+    return FsUtil.glob(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), { nodir: true, ignore: tsconfig.excludes }).filter(
       (item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"),
     );
   }

package/src/pkg-builders/lib/SdJsLibBuildRunner.ts

@@ -1,15 +1,17 @@
-import { FsUtil, Logger, PathUtil, SdFsWatcher, SdWorker } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 import { EventEmitter } from "events";
 import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
-import { TSdLintWorkerType } from "../../types/workers.type";
+// import { TSdLintWorkerType } from "../../types/workers.type";
 import { ISdProjectConfig } from "../../types/sd-configs.type";
 import { ISdBuildRunnerResult } from "../../types/build.type";
+import { ESLint } from "eslint";
 
 export class SdJsLibBuildRunner extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdJsLibBuildRunner"]);
   private readonly _pkgName: string;
-  private readonly _lintWorker: SdWorker<TSdLintWorkerType>;
+
+  // private readonly _lintWorker: SdWorker<TSdLintWorkerType>;
 
   public constructor(
     private readonly _projConf: ISdProjectConfig,
@@ -18,7 +20,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
     super();
     this._pkgName = path.basename(_pkgPath);
 
-    this._lintWorker = new SdWorker(import.meta.resolve("../../workers/lint-worker"));
+    // this._lintWorker = new SdWorker(import.meta.resolve("../../workers/lint-worker"));
   }
 
   public override on(event: "change", listener: () => void): this;
@@ -33,12 +35,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
     const srcFilePaths = FsUtil.glob(srcGlobPath);
 
-    const lintResults = await this._lintWorker.run("lint", [
-      {
-        cwd: this._pkgPath,
-        fileSet: new Set(srcFilePaths),
-      },
-    ]);
+    const lintResults = await this.#lintAsync(new Set(srcFilePaths));
     const messages = SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(lintResults);
 
     this._debug(`LINT 완료`);
@@ -55,12 +52,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
     const srcFilePaths = FsUtil.glob(srcGlobPath);
 
-    const lintResults = await this._lintWorker.run("lint", [
-      {
-        cwd: this._pkgPath,
-        fileSet: new Set(srcFilePaths),
-      },
-    ]);
+    const lintResults = await this.#lintAsync(new Set(srcFilePaths));
     const messages = SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(lintResults);
 
     this._debug(`LINT 완료`);
@@ -79,12 +71,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
 
       this._debug("LINT...");
 
-      const watchLintResults = await this._lintWorker.run("lint", [
-        {
-          cwd: this._pkgPath,
-          fileSet: new Set(watchFilePaths),
-        },
-      ]);
+      const watchLintResults = await this.#lintAsync(new Set(watchFilePaths));
       const watchMessages = SdCliConvertMessageUtil.convertToBuildMessagesFromEslint(watchLintResults);
 
       this._debug(`LINT 완료`);
@@ -99,6 +86,20 @@ export class SdJsLibBuildRunner extends EventEmitter {
     });
   }
 
+  async #lintAsync(fileSet: Set<string>) {
+    const lintFilePaths = Array.from(fileSet)
+      .filter((item) => PathUtil.isChildPath(item, this._pkgPath))
+      .filter((item) => item.endsWith(".js"))
+      .filter((item) => FsUtil.exists(item));
+
+    if (lintFilePaths.length === 0) {
+      return [];
+    }
+
+    const linter = new ESLint({ cwd: this._pkgPath, cache: false });
+    return await linter.lintFiles(lintFilePaths);
+  }
+
   private _debug(msg: string): void {
     this._logger.debug(`[${this._pkgName}] ${msg}`);
   }

package/src/pkg-builders/lib/SdTsLibBuilder.ts

@@ -44,7 +44,7 @@ export class SdTsLibBuilder {
 
       const globalStylesheetBundlingResult = tsCompileResult.stylesheetBundlingResultMap.get(emitFile);
       if (globalStylesheetBundlingResult) {
-        for (const outputFile of globalStylesheetBundlingResult.outputFiles) {
+        for (const outputFile of globalStylesheetBundlingResult.outputFiles ?? []) {
           const distPath = PathUtil.norm(this._pkgPath, "dist", path.relative(this._pkgPath, outputFile.path));
           if (PathUtil.isChildPath(distPath, path.resolve(this._pkgPath, "dist"))) {
             FsUtil.writeFile(distPath, outputFile.text);