@simplysm/sd-cli 12.9.17 → 12.9.18

package/src/ts-compiler/sd-ts-compiler.ts

@@ -1,6 +1,6 @@
 import ts from "typescript";
 import path from "path";
-import { FsUtils, PathUtils, SdLogger, SdWorker, TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import { StringUtils } from "@simplysm/sd-core-common";
 import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
 import { AngularCompilerHost } from "@angular/build/src/tools/angular/angular-host";
@@ -17,17 +17,21 @@ import {
 import {
   createWorkerTransformer,
 } from "@angular/build/src/tools/angular/transformers/web-worker-transformer";
-import { ESLint } from "eslint";
 import { ISdAffectedFileTreeNode, SdDependencyCache } from "./sd-dependency-cache";
 import { SdDependencyAnalyzer } from "./sd-dependency-analyzer";
-import { TStyleBundlerWorkerType } from "../types/worker.types";
+import { FlatESLint } from "eslint/use-at-your-own-risk";
+import {
+  ComponentStylesheetBundler,
+} from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
+import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
+import browserslist from "browserslist";
 
 export class SdTsCompiler {
   private _logger = SdLogger.get(["simplysm", "sd-cli", "SdTsCompiler"]);
 
   private _isForAngular: boolean;
 
-  private _stylesheetBundlingWorker?: SdWorker<TStyleBundlerWorkerType>;
+  private _stylesheetBundler: ComponentStylesheetBundler;
 
   private _ngProgram: NgtscProgram | undefined;
   private _program: ts.Program | undefined;
@@ -54,6 +58,33 @@ export class SdTsCompiler {
     const tsconfigPath = path.resolve(this._opt.pkgPath, "tsconfig.json");
     const tsconfig = FsUtils.readJson(tsconfigPath);
     this._isForAngular = Boolean(tsconfig.angularCompilerOptions);
+
+    this._stylesheetBundler = new ComponentStylesheetBundler(
+      {
+        workspaceRoot: this._opt.pkgPath,
+        optimization: !this._opt.isDevMode,
+        inlineFonts: true,
+        preserveSymlinks: false,
+        sourcemap: this._opt.isDevMode ? "inline" : false,
+        outputNames: { bundles: "[name]", media: "media/[name]" },
+        includePaths: [],
+        // sass:
+        externalDependencies: [],
+        target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
+        tailwindConfiguration: undefined,
+        postcssConfiguration: {
+          plugins: [["css-has-pseudo"]],
+        },
+        // publicPath:
+        cacheOptions: {
+          enabled: true,
+          path: ".cache/angular",
+          basePath: ".cache",
+        },
+      },
+      "scss",
+      this._opt.isDevMode,
+    );
   }
 
   private _parseTsConfig() {
@@ -151,22 +182,22 @@ export class SdTsCompiler {
     return compilerHost;
   }
 
-  private async _getOrCreateStyleBundleWorkerAsync() {
-    if (this._stylesheetBundlingWorker) {
-      return this._stylesheetBundlingWorker;
-    }
-
-    this._stylesheetBundlingWorker = new SdWorker<TStyleBundlerWorkerType>(
-      import.meta.resolve("../workers/style-bundler.worker"),
-    );
-
-    await this._stylesheetBundlingWorker.run(
-      "prepare",
-      [this._opt.pkgPath, this._opt.isDevMode],
-    );
-
-    return this._stylesheetBundlingWorker;
-  }
+  // private async _getOrCreateStyleBundleWorkerAsync() {
+  //   if (this._stylesheetBundlingWorker) {
+  //     return this._stylesheetBundlingWorker;
+  //   }
+  //
+  //   this._stylesheetBundlingWorker = new SdWorker<TStyleBundlerWorkerType>(
+  //     import.meta.resolve("../workers/style-bundler.worker"),
+  //   );
+  //
+  //   await this._stylesheetBundlingWorker.run(
+  //     "prepare",
+  //     [this._opt.pkgPath, this._opt.isDevMode],
+  //   );
+  //
+  //   return this._stylesheetBundlingWorker;
+  // }
 
   private async _bundleStylesheetAsync(
     data: string,
@@ -186,16 +217,32 @@ export class SdTsCompiler {
       }
 
       try {
-        const worker = this._stylesheetBundlingWorker!;
-        const result = await worker.run("bundle", [data, containingFile, resourceFile]);
+        // const result = await new SdSassEmbeddedBundler(this._opt.isDevMode)
+        //   .bundleAsync(data, resourceFile ?? containingFile);
+        // const worker = this._stylesheetBundlingWorker!;
+        // const result = await worker.run("bundle", [data, containingFile, resourceFile]);
+
+        const result = resourceFile != null
+          ? await this._stylesheetBundler.bundleFile(resourceFile)
+          : await this._stylesheetBundler.bundleInline(data, containingFile, "scss");
 
         for (const referencedFile of result.referencedFiles ?? []) {
+          // for (const referencedFile of result.referencedFiles) {
           // 참조하는 파일과 참조된 파일 사이의 의존성 관계 추가
           this._depCache.addImport(fileNPath, PathUtils.norm(referencedFile), 0);
         }
 
-        this._stylesheetBundlingResultMap.set(fileNPath, result);
-
+        // this._stylesheetBundlingResultMap.set(fileNPath, {
+        //   errors: undefined,
+        //   warnings: [],
+        //   ...result,
+        // });
+        //
+        // return {
+        //   errors: undefined,
+        //   warnings: [],
+        //   ...result,
+        // };
         return result;
       }
       catch (err) {
@@ -243,14 +290,15 @@ export class SdTsCompiler {
   }
 
   private async _prepareAsync(modifiedFileSet: Set<TNormPath>): Promise<IPrepareResult> {
-    const worker = await this._getOrCreateStyleBundleWorkerAsync();
+    // const worker = await this._getOrCreateStyleBundleWorkerAsync();
 
     const tsconfig = this._parseTsConfig();
 
     if (modifiedFileSet.size !== 0) {
       this._debug(`캐시 무효화 및 초기화 중...`);
 
-      await this._perf.run("캐시 무효화 및 초기화", async () => {
+      // this._perf.run("캐시 무효화 및 초기화", () => {
+      this._perf.run("캐시 무효화 및 초기화", () => {
         // 기존 의존성에 의해 영향받는 파일들 계산
         const affectedFileSet = this._depCache.getAffectedFileSet(modifiedFileSet);
 
@@ -269,7 +317,8 @@ export class SdTsCompiler {
 ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
 
         // 스타일 번들러에서 영향받은 파일 관련 항목 무효화
-        await worker.run("invalidate", [affectedFileSet]);
+        this._stylesheetBundler.invalidate(affectedFileSet);
+        // await worker.run("invalidate", [affectedFileSet]);
 
         // 의존성 캐시에서 영향받은 파일 관련 항목 무효화
         this._depCache.invalidates(affectedFileSet);
@@ -322,7 +371,7 @@ ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
       SdDependencyAnalyzer.analyze(
         this._program!,
         compilerHost,
-        this._opt.watchScopePaths,
+        this._opt.watchScopePathSet,
         this._depCache,
       );
 
@@ -330,7 +379,7 @@ ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
       if (this._ngProgram) {
         SdDependencyAnalyzer.analyzeAngularResources(
           this._ngProgram,
-          this._opt.watchScopePaths,
+          this._opt.watchScopePathSet,
           this._depCache,
         );
       }
@@ -362,7 +411,7 @@ ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
       return [];
     }
 
-    const linter = new ESLint({
+    const linter = new FlatESLint({
       cwd: this._opt.pkgPath,
       cache: false,
       overrideConfig: {

package/src/types/config.types.ts

@@ -5,9 +5,13 @@ export interface ISdProjectConfig {
   postPublish?: TSdPostPublishConfig[];
 }
 
-export type TSdProjectConfigFn = (isDev: boolean, opts?: string[]) => ISdProjectConfig;
+// export type TSdProjectConfigFn = (isDev: boolean, opts?: string[]) => ISdProjectConfig;
 
-export type TSdPackageConfig = ISdLibPackageConfig | ISdServerPackageConfig | ISdClientPackageConfig;
+export type TSdPackageConfig<T extends "server" | "library" | "client" | unknown = unknown> =
+  T extends "library" ? ISdLibPackageConfig
+    : T extends "server" ? ISdServerPackageConfig
+      : T extends "client" ? ISdClientPackageConfig
+        : (ISdLibPackageConfig | ISdServerPackageConfig | ISdClientPackageConfig);
 
 export interface ISdLibPackageConfig {
   type: "library";
@@ -15,6 +19,7 @@ export interface ISdLibPackageConfig {
   polyfills?: string[];
   noGenIndex?: boolean;
   dbContext?: string;
+  forceProductionMode?: boolean;
 }
 
 export interface ISdServerPackageConfig {
@@ -23,6 +28,8 @@ export interface ISdServerPackageConfig {
   publish?: ISdLocalDirectoryPublishConfig | ISdFtpPublishConfig;
   configs?: Record<string, any>;
   env?: Record<string, string>;
+  forceProductionMode?: boolean;
+
   pm2?: {
     name?: string;
     ignoreWatchPaths?: string[];

package/src/types/ts-compiler.types.ts

@@ -2,13 +2,14 @@ import { CompilerOptions } from "typescript";
 import esbuild from "esbuild";
 import { ISdBuildMessage } from "./build.types";
 import { TNormPath } from "@simplysm/sd-core-node";
+import { ScopePathSet } from "../pkg-builders/commons/scope-path";
 
 export interface SdTsCompilerOptions {
   pkgPath: TNormPath;
   additionalOptions: CompilerOptions;
   isForBundle: boolean;
   isDevMode: boolean;
-  watchScopePaths: TNormPath[];
+  watchScopePathSet: ScopePathSet;
   globalStyleFilePath?: TNormPath;
   /*processWebWorker?: (
     workerFile: string,

package/tests/deps/sd-dependency-analyzer.spec.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import * as ts from "typescript";
-import { PathUtils, TNormPath } from "@simplysm/sd-core-node/src";
+import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { SdDependencyCache } from "../../src/ts-compiler/sd-dependency-cache";
 import { SdDependencyAnalyzer } from "../../src/ts-compiler/sd-dependency-analyzer";
 

package/dist/workers/style-bundler.worker.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/workers/style-bundler.worker.js

@@ -1,56 +0,0 @@
-import { createSdWorker, SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
-import { EventEmitter } from "events";
-import { ComponentStylesheetBundler, } from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
-import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
-import browserslist from "browserslist";
-Error.stackTraceLimit = Infinity;
-EventEmitter.defaultMaxListeners = 0;
-if (process.env["SD_DEBUG"] != null) {
-    SdLogger.setConfig({
-        console: {
-            level: SdLoggerSeverity.debug,
-        },
-    });
-}
-else {
-    SdLogger.setConfig({
-        dot: true,
-    });
-}
-let stylesheetBundler;
-createSdWorker({
-    prepare(rootPath, dev) {
-        //-- stylesheetBundler
-        stylesheetBundler = new ComponentStylesheetBundler({
-            workspaceRoot: rootPath,
-            optimization: !dev,
-            inlineFonts: true,
-            preserveSymlinks: false,
-            sourcemap: dev ? "inline" : false,
-            outputNames: { bundles: "[name]", media: "media/[name]" },
-            includePaths: [],
-            // sass:
-            externalDependencies: [],
-            target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
-            tailwindConfiguration: undefined,
-            postcssConfiguration: {
-                plugins: [["css-has-pseudo"]],
-            },
-            // publicPath:
-            cacheOptions: {
-                enabled: true,
-                path: ".cache/angular",
-                basePath: ".cache",
-            },
-        }, "scss", dev);
-    },
-    async bundle(data, containingFile, resourceFile = null) {
-        return resourceFile != null
-            ? await stylesheetBundler.bundleFile(resourceFile)
-            : await stylesheetBundler.bundleInline(data, containingFile, "scss");
-    },
-    invalidate(fileNPathSet) {
-        stylesheetBundler.invalidate(fileNPathSet);
-    },
-});
-//# sourceMappingURL=style-bundler.worker.js.map

package/dist/workers/style-bundler.worker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"style-bundler.worker.js","sourceRoot":"","sources":["../../src/workers/style-bundler.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAa,MAAM,wBAAwB,CAAC;AAE/F,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,0BAA0B,GAC3B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC;QACjB,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B;KACF,CAAC,CAAC;AACL,CAAC;KACI,CAAC;IACJ,QAAQ,CAAC,SAAS,CAAC;QACjB,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,IAAI,iBAA6C,CAAC;AAElD,cAAc,CAA0B;IACtC,OAAO,CAAC,QAAgB,EAAE,GAAY;QACpC,sBAAsB;QACtB,iBAAiB,GAAG,IAAI,0BAA0B,CAChD;YACE,aAAa,EAAE,QAAQ;YACvB,YAAY,EAAE,CAAC,GAAG;YAClB,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,KAAK;YACvB,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;YACjC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE;YACzD,YAAY,EAAE,EAAE;YAChB,QAAQ;YACR,oBAAoB,EAAE,EAAE;YACxB,MAAM,EAAE,mCAAmC,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1E,qBAAqB,EAAE,SAAS;YAChC,oBAAoB,EAAE;gBACpB,OAAO,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;aAC9B;YACD,cAAc;YACd,YAAY,EAAE;gBACZ,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,gBAAgB;gBACtB,QAAQ,EAAE,QAAQ;aACnB;SACF,EACD,MAAM,EACN,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,cAAyB,EACzB,eAAiC,IAAI;QAErC,OAAO,YAAY,IAAI,IAAI;YACzB,CAAC,CAAC,MAAM,iBAAkB,CAAC,UAAU,CAAC,YAAY,CAAC;YACnD,CAAC,CAAC,MAAM,iBAAkB,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IACD,UAAU,CAAC,YAA4B;QACrC,iBAAiB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;CACF,CAAC,CAAC"}

package/src/workers/style-bundler.worker.ts

@@ -1,70 +0,0 @@
-import { createSdWorker, SdLogger, SdLoggerSeverity, TNormPath } from "@simplysm/sd-core-node";
-import { TStyleBundlerWorkerType } from "../types/worker.types";
-import { EventEmitter } from "events";
-import {
-  ComponentStylesheetBundler,
-} from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
-import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
-import browserslist from "browserslist";
-
-Error.stackTraceLimit = Infinity;
-EventEmitter.defaultMaxListeners = 0;
-
-if (process.env["SD_DEBUG"] != null) {
-  SdLogger.setConfig({
-    console: {
-      level: SdLoggerSeverity.debug,
-    },
-  });
-}
-else {
-  SdLogger.setConfig({
-    dot: true,
-  });
-}
-
-let stylesheetBundler: ComponentStylesheetBundler;
-
-createSdWorker<TStyleBundlerWorkerType>({
-  prepare(rootPath: string, dev: boolean) {
-    //-- stylesheetBundler
-    stylesheetBundler = new ComponentStylesheetBundler(
-      {
-        workspaceRoot: rootPath,
-        optimization: !dev,
-        inlineFonts: true,
-        preserveSymlinks: false,
-        sourcemap: dev ? "inline" : false,
-        outputNames: { bundles: "[name]", media: "media/[name]" },
-        includePaths: [],
-        // sass:
-        externalDependencies: [],
-        target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
-        tailwindConfiguration: undefined,
-        postcssConfiguration: {
-          plugins: [["css-has-pseudo"]],
-        },
-        // publicPath:
-        cacheOptions: {
-          enabled: true,
-          path: ".cache/angular",
-          basePath: ".cache",
-        },
-      },
-      "scss",
-      dev,
-    );
-  },
-  async bundle(
-    data: string,
-    containingFile: TNormPath,
-    resourceFile: TNormPath | null = null,
-  ) {
-    return resourceFile != null
-      ? await stylesheetBundler!.bundleFile(resourceFile)
-      : await stylesheetBundler!.bundleInline(data, containingFile, "scss");
-  },
-  invalidate(fileNPathSet: Set<TNormPath>) {
-    stylesheetBundler.invalidate(fileNPathSet);
-  },
-});