@simplysm/sd-cli 12.5.20 → 12.5.22

package/src/build-tools/SdTsLibBundler.ts

@@ -1,72 +0,0 @@
-import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
-import { ISdCliPackageBuildResult } from "../commons";
-import { SdTsCompiler } from "./SdTsCompiler";
-import ts from "typescript";
-import path from "path";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
-
-export class SdTsLibBundler {
-  readonly #compiler: SdTsCompiler;
-
-  readonly #pkgPath: string;
-
-  public constructor(pkgPath: string, dev: boolean, watchScopePaths: string[]) {
-    this.#pkgPath = pkgPath;
-    this.#compiler = new SdTsCompiler({
-      pkgPath,
-      additionalOptions: { declaration: true },
-      isDevMode: dev,
-      globalStyleFilePath: path.resolve(pkgPath, "src/styles.scss"),
-      isForBundle: false,
-      watchScopePaths: watchScopePaths,
-    });
-  }
-
-  public markChanges(modifiedFileSet: Set<string>): void {
-    this.#compiler.invalidate(modifiedFileSet);
-  }
-
-  public async buildAsync(): Promise<{
-    program: ts.Program;
-    watchFileSet: Set<string>;
-    affectedFileSet: Set<string>;
-    results: ISdCliPackageBuildResult[];
-  }> {
-    const buildResult = await this.#compiler.buildAsync();
-
-    for (const emitFile of buildResult.emitFileSet) {
-      const emitFileInfos = buildResult.emittedFilesCacheMap.get(emitFile);
-      if (emitFileInfos) {
-        for (const emitFileInfo of emitFileInfos) {
-          if (emitFileInfo.outAbsPath != null) {
-            await FsUtil.writeFileAsync(emitFileInfo.outAbsPath, emitFileInfo.text);
-          }
-        }
-      }
-
-      const globalStylesheetBundlingResult = buildResult.stylesheetBundlingResultMap.get(emitFile);
-      if (globalStylesheetBundlingResult) {
-        for (const outputFile of globalStylesheetBundlingResult.outputFiles) {
-          const distPath = path.resolve(this.#pkgPath, "dist", path.relative(this.#pkgPath, outputFile.path));
-          if (PathUtil.isChildPath(distPath, path.resolve(this.#pkgPath, "dist"))) {
-            await FsUtil.writeFileAsync(distPath, outputFile.text);
-          }
-        }
-      }
-    }
-
-    return {
-      program: buildResult.program,
-      watchFileSet: buildResult.watchFileSet,
-      affectedFileSet: buildResult.affectedFileSet,
-      results: [
-        ...buildResult.typescriptDiagnostics.map((item) => SdCliBuildResultUtil.convertFromTsDiag(item, "build")),
-        ...Array.from(buildResult.stylesheetBundlingResultMap.values())
-          .mapMany((item) => item.errors ?? [])
-          .map((err) => SdCliBuildResultUtil.convertFromEsbuildResult(err, "build", "error")),
-        /*...Array.from(buildResult.stylesheetResultMap.values()).mapMany(item => item.warnings!)
-          .map(warn => SdCliBuildResultUtil.convertFromEsbuildResult(warn, "build", "warning"))*/
-      ],
-    };
-  }
-}

package/src/builders/SdCliClientBuilder.ts

@@ -1,211 +0,0 @@
-import { EventEmitter } from "events";
-import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
-import {
-  INpmConfig,
-  ISdCliBuilderResult,
-  ISdCliClientPackageConfig,
-  ISdCliConfig,
-  ISdCliPackageBuildResult,
-} from "../commons";
-import { FunctionQueue } from "@simplysm/sd-core-common";
-import path from "path";
-import { SdNgBundler } from "../build-tools/SdNgBundler";
-import { SdCliCordova } from "../build-tools/SdCliCordova";
-import { SdCliNgRoutesFileGenerator } from "../build-tools/SdCliNgRoutesFileGenerator";
-import { SdLinter } from "../build-tools/SdLinter";
-import { SdCliElectron } from "../entry/SdCliElectron";
-
-// import ts from "typescript";
-
-export class SdCliClientBuilder extends EventEmitter {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
-  private readonly _pkgConf: ISdCliClientPackageConfig;
-  private readonly _npmConf: INpmConfig;
-  private _builders?: SdNgBundler[];
-  private _cordova?: SdCliCordova;
-
-  // #program?: ts.Program;
-
-  public constructor(
-    private readonly _projConf: ISdCliConfig,
-    private readonly _pkgPath: string,
-  ) {
-    super();
-    this._pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdCliClientPackageConfig;
-    this._npmConf = FsUtil.readJson(path.resolve(_pkgPath, "package.json")) as INpmConfig;
-  }
-
-  public override on(event: "change", listener: () => void): this;
-  public override on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
-  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
-    super.on(event, listener);
-    return this;
-  }
-
-  public async buildAsync(): Promise<ISdCliBuilderResult> {
-    this._debug("dist 초기화...");
-    await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
-
-    if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies).includes("@angular/router")) {
-      this._debug(`GEN routes.ts...`);
-      await SdCliNgRoutesFileGenerator.runAsync(this._pkgPath, undefined, this._pkgConf.noLazyRoute);
-    }
-
-    this._debug("GEN .config...");
-    const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-    await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
-
-    const result = await this._runAsync({ dev: false });
-    return {
-      affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults,
-    };
-  }
-
-  public async watchAsync() {
-    this.emit("change");
-
-    this._debug("dist 초기화...");
-    await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
-
-    if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies).includes("@angular/router")) {
-      this._debug(`WATCH GEN routes.ts...`);
-      await SdCliNgRoutesFileGenerator.watchAsync(this._pkgPath, this._pkgConf.noLazyRoute);
-    }
-
-    this._debug("GEN .config...");
-    const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-    await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
-
-    const result = await this._runAsync({ dev: !this._pkgConf.forceProductionMode });
-    this.emit("complete", {
-      affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults,
-    });
-
-    this._debug("WATCH...");
-    let changeFiles: string[] = [];
-    const fnQ = new FunctionQueue();
-    const watcher = SdFsWatcher.watch(Array.from(result.watchFileSet)).onChange({ delay: 100 }, (changeInfos) => {
-      changeFiles.push(...changeInfos.map((item) => item.path));
-
-      fnQ.runLast(async () => {
-        const currChangeFiles = [...changeFiles];
-        changeFiles = [];
-
-        this.emit("change");
-
-        for (const builder of this._builders!) {
-          // builder.removeCache(currChangeFiles);
-          builder.markForChanges(currChangeFiles);
-        }
-
-        const watchResult = await this._runAsync({ dev: !this._pkgConf.forceProductionMode });
-        this.emit("complete", {
-          affectedFilePaths: Array.from(watchResult.affectedFileSet),
-          buildResults: watchResult.buildResults,
-        });
-
-        watcher.add(watchResult.watchFileSet);
-      });
-    });
-  }
-
-  private async _runAsync(opt: { dev: boolean }): Promise<{
-    watchFileSet: Set<string>;
-    affectedFileSet: Set<string>;
-    buildResults: ISdCliPackageBuildResult[];
-  }> {
-    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
-    );
-
-    const builderTypes = Object.keys(this._pkgConf.builder ?? { web: {} }) as ("web" | "electron" | "cordova")[];
-    if (this._pkgConf.builder?.cordova && !this._cordova) {
-      this._debug("CORDOVA 준비...");
-      this._cordova = new SdCliCordova({
-        pkgPath: this._pkgPath,
-        config: this._pkgConf.builder.cordova,
-      });
-      await this._cordova.initializeAsync();
-    }
-
-    if (!this._builders) {
-      this._debug(`BUILD 준비...`);
-
-      this._builders = builderTypes.map(
-        (builderType) =>
-          new SdNgBundler({
-            dev: opt.dev,
-            builderType: builderType,
-            pkgPath: this._pkgPath,
-            outputPath:
-              builderType === "web"
-                ? path.resolve(this._pkgPath, "dist")
-                : builderType === "electron" && !opt.dev
-                  ? path.resolve(this._pkgPath, ".electron/src")
-                  : builderType === "cordova" && !opt.dev
-                    ? path.resolve(this._pkgPath, ".cordova/www")
-                    : path.resolve(this._pkgPath, "dist", builderType),
-            env: {
-              ...this._pkgConf.env,
-              ...this._pkgConf.builder?.[builderType]?.env,
-            },
-            cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-            watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths],
-          }),
-      );
-    }
-
-    this._debug(`BUILD & CHECK...`);
-    const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
-    const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
-    const affectedFileSet = new Set(buildResults.mapMany((item) => Array.from(item.affectedFileSet)));
-    const results = buildResults.mapMany((item) => item.results).distinct();
-    const firstProgram = buildResults.first()?.program;
-
-    this._debug(`LINT...`);
-    // const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
-    // const parsedTsConfig = ts.parseJsonConfigFileContent(tsConfig, ts.sys, this._pkgPath);
-    // this.#program = ts.createProgram({
-    //   rootNames: parsedTsConfig.fileNames,
-    //   options: parsedTsConfig.options,
-    //   oldProgram: this.#program
-    // });
-    // const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
-    const lintResults = await SdLinter.lintAsync(this._pkgPath, affectedFileSet, firstProgram);
-
-    if (!opt.dev && this._cordova) {
-      this._debug("CORDOVA BUILD...");
-      await this._cordova.buildAsync(path.resolve(this._pkgPath, "dist"));
-    }
-
-    if (!opt.dev && this._pkgConf.builder?.electron) {
-      this._debug("ELECTRON BUILD...");
-      await SdCliElectron.buildAsync({
-        pkgPath: this._pkgPath,
-        config: this._pkgConf.builder.electron,
-      });
-    }
-
-    this._debug(`빌드 완료`);
-    const currWatchFileSet = new Set(
-      Array.from(watchFileSet).filter(
-        (item) =>
-          PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
-          localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)),
-      ),
-    );
-    return {
-      watchFileSet: currWatchFileSet,
-      affectedFileSet,
-      buildResults: [...results, ...lintResults].filter(
-        (item) => item.filePath !== path.resolve(this._pkgPath, "src/routes.ts"),
-      ),
-    };
-  }
-
-  private _debug(msg: string): void {
-    this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
-  }
-}

package/src/builders/SdCliJsLibLinter.ts

@@ -1,72 +0,0 @@
-import {FsUtil, Logger, SdFsWatcher} from "@simplysm/sd-core-node";
-import path from "path";
-import {ISdCliBuilderResult} from "../commons";
-import {EventEmitter} from "events";
-import {SdLinter} from "../build-tools/SdLinter";
-
-export class SdCliJsLibLinter extends EventEmitter {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliJsLibLinter"]);
-  private readonly _pkgName: string;
-
-  public constructor(private readonly _pkgPath: string) {
-    super();
-    this._pkgName = path.basename(_pkgPath);
-  }
-
-  public override on(event: "change", listener: () => void): this;
-  public override on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
-  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
-    super.on(event, listener);
-    return this;
-  }
-
-  public async buildAsync(): Promise<ISdCliBuilderResult> {
-    this._debug("LINT...");
-    const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
-    const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(this._pkgPath, new Set(srcFilePaths), undefined);
-
-    this._debug(`LINT 완료`);
-    return {
-      affectedFilePaths: srcFilePaths,
-      buildResults: lintResults
-    };
-  }
-
-  public async watchAsync(): Promise<void> {
-    this.emit("change");
-    this._debug("LINT...");
-    const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
-    const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(this._pkgPath, new Set(srcFilePaths), undefined);
-
-    this._debug(`LINT 완료`);
-    this.emit("complete", {
-      affectedFilePaths: srcFilePaths,
-      buildResults: lintResults
-    });
-
-    SdFsWatcher
-      .watch([srcGlobPath])
-      .onChange({
-        delay: 100
-      }, async (changeInfos) => {
-        const watchFilePaths = changeInfos.filter((item) => FsUtil.exists(item.path)).map((item) => item.path);
-        if (watchFilePaths.length < 1) return;
-
-        this.emit("change");
-        this._debug("LINT...");
-        const watchLintResults = await SdLinter.lintAsync(this._pkgPath, new Set(watchFilePaths), undefined);
-
-        this._debug(`LINT 완료`);
-        this.emit("complete", {
-          affectedFilePaths: changeInfos.map((item) => item.path),
-          buildResults: watchLintResults
-        });
-      });
-  }
-
-  private _debug(msg: string): void {
-    this._logger.debug(`[${this._pkgName}] ${msg}`);
-  }
-}

package/src/builders/SdCliTsLibBuilder.ts

@@ -1,126 +0,0 @@
-import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
-import path from "path";
-import { ISdCliBuilderResult, ISdCliConfig, ISdCliLibPackageConfig, ISdCliPackageBuildResult } from "../commons";
-import { EventEmitter } from "events";
-import { SdTsLibBundler } from "../build-tools/SdTsLibBundler";
-import { SdLinter } from "../build-tools/SdLinter";
-import { FunctionQueue } from "@simplysm/sd-core-common";
-import { SdCliIndexFileGenerator } from "../build-tools/SdCliIndexFileGenerator";
-
-export class SdCliTsLibBuilder extends EventEmitter {
-  readonly #logger = Logger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
-
-  readonly #projConf: ISdCliConfig;
-  readonly #pkgPath: string;
-  readonly #pkgConf: ISdCliLibPackageConfig;
-
-  #bundler?: SdTsLibBundler;
-
-  public constructor(projConf: ISdCliConfig, pkgPath: string) {
-    super();
-    this.#projConf = projConf;
-    this.#pkgPath = pkgPath;
-
-    this.#pkgConf = projConf.packages[path.basename(pkgPath)] as ISdCliLibPackageConfig;
-  }
-
-  public override on(event: "change", listener: () => void): this;
-  public override on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
-  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
-    super.on(event, listener);
-    return this;
-  }
-
-  public async buildAsync(): Promise<ISdCliBuilderResult> {
-    this._debug("dist 초기화...");
-    await FsUtil.removeAsync(path.resolve(this.#pkgPath, "dist"));
-
-    if (!this.#pkgConf.noGenIndex) {
-      this._debug("GEN index.ts...");
-      await SdCliIndexFileGenerator.runAsync(this.#pkgPath, this.#pkgConf.polyfills);
-    }
-
-    const result = await this._runAsync(false);
-    return {
-      affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults,
-    };
-  }
-
-  public async watchAsync(): Promise<void> {
-    this.emit("change");
-
-    this._debug("dist 초기화...");
-    await FsUtil.removeAsync(path.resolve(this.#pkgPath, "dist"));
-
-    if (!this.#pkgConf.noGenIndex) {
-      this._debug("WATCH GEN index.ts...");
-      await SdCliIndexFileGenerator.watchAsync(this.#pkgPath, this.#pkgConf.polyfills);
-    }
-
-    const result = await this._runAsync(true);
-    this.emit("complete", {
-      affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults,
-    });
-
-    this._debug("WATCH...");
-    const fnQ = new FunctionQueue();
-    const watcher = SdFsWatcher.watch(Array.from(result.watchFileSet)).onChange({ delay: 100 }, (changeInfos) => {
-      this.#bundler!.markChanges(new Set(changeInfos.map((item) => item.path)));
-
-      fnQ.runLast(async () => {
-        this.emit("change");
-
-        const watchResult = await this._runAsync(true);
-        this.emit("complete", {
-          affectedFilePaths: Array.from(watchResult.affectedFileSet),
-          buildResults: watchResult.buildResults,
-        });
-
-        watcher.add(watchResult.watchFileSet);
-      });
-    });
-  }
-
-  private async _runAsync(dev: boolean): Promise<{
-    watchFileSet: Set<string>;
-    affectedFileSet: Set<string>;
-    buildResults: ISdCliPackageBuildResult[];
-  }> {
-    const localUpdatePaths = Object.keys(this.#projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this.#pkgPath, "../../node_modules", key)),
-    );
-
-    this._debug(`BUILD...`);
-    this.#bundler =
-      this.#bundler ??
-      new SdTsLibBundler(this.#pkgPath, dev, [path.resolve(this.#pkgPath, "../"), ...localUpdatePaths]);
-    const buildResult = await this.#bundler.buildAsync();
-
-    this._debug("LINT...");
-    /*const lintFilePaths = Array.from(buildResult.affectedFileSet).filter((item) =>
-      PathUtil.isChildPath(item, this.#pkgPath),
-    );*/
-    const lintResults = await SdLinter.lintAsync(this.#pkgPath, buildResult.affectedFileSet, buildResult.program);
-
-    this._debug(`빌드 완료`);
-    const watchFileSet = new Set(
-      Array.from(buildResult.watchFileSet).filter(
-        (item) =>
-          PathUtil.isChildPath(item, path.resolve(this.#pkgPath, "../")) ||
-          localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)),
-      ),
-    );
-
-    return {
-      watchFileSet,
-      affectedFileSet: buildResult.affectedFileSet,
-      buildResults: [...buildResult.results, ...lintResults],
-    };
-  }
-
-  private _debug(msg: string): void {
-    this.#logger.debug(`[${path.basename(this.#pkgPath)}] ${msg}`);
-  }
-}

package/src/bundle-plugins/sdServerPlugin.ts

@@ -1,94 +0,0 @@
-import esbuild from "esbuild";
-import ts from "typescript";
-import path from "path";
-import { ISdTsCompilerResult, SdTsCompiler } from "../build-tools/SdTsCompiler";
-import { convertTypeScriptDiagnostic } from "@angular/build/src/tools/esbuild/angular/diagnostics";
-
-export function sdServerPlugin(conf: {
-  pkgPath: string;
-  dev: boolean;
-  modifiedFileSet: Set<string>;
-  result: IServerPluginResultCache;
-  watchScopePaths: string[];
-}): esbuild.Plugin {
-  return {
-    name: "sd-server-compiler",
-    setup: (build: esbuild.PluginBuild) => {
-      const compiler = new SdTsCompiler({
-        pkgPath: conf.pkgPath,
-        additionalOptions: { declaration: false },
-        isDevMode: conf.dev,
-        isForBundle: true,
-        watchScopePaths: conf.watchScopePaths
-      });
-
-      let buildResult: ISdTsCompilerResult;
-
-      build.onStart(async () => {
-        compiler.invalidate(conf.modifiedFileSet);
-        buildResult = await compiler.buildAsync();
-
-        conf.result.watchFileSet = buildResult.watchFileSet;
-        conf.result.affectedFileSet = buildResult.affectedFileSet;
-        conf.result.program = buildResult.program;
-
-        //-- return err/warn
-
-        return {
-          errors: buildResult.typescriptDiagnostics
-            .filter((item) => item.category === ts.DiagnosticCategory.Error)
-            .map((item) => convertTypeScriptDiagnostic(ts, item)),
-          warnings: buildResult.typescriptDiagnostics
-            .filter((item) => item.category !== ts.DiagnosticCategory.Error)
-            .map((item) => convertTypeScriptDiagnostic(ts, item)),
-        };
-      });
-
-      build.onLoad({ filter: /\.ts$/ }, (args) => {
-        const emittedJsFile = buildResult.emittedFilesCacheMap.get(path.normalize(args.path))?.last();
-        if (!emittedJsFile) {
-          throw new Error(`ts 빌더 결과 emit 파일이 존재하지 않습니다. ${args.path}`);
-        }
-
-        const contents = emittedJsFile.text;
-        return { contents, loader: "js" };
-      });
-
-      build.onLoad({ filter: /\.[cm]?js$/ }, (args) => {
-        conf.result.watchFileSet!.add(path.normalize(args.path));
-        return null;
-      });
-
-      build.onLoad(
-        {
-          filter: new RegExp(
-            "(" +
-              Object.keys(build.initialOptions.loader!)
-                .map((item) => "\\" + item)
-                .join("|") +
-              ")$",
-          ),
-        },
-        (args) => {
-          conf.result.watchFileSet!.add(path.normalize(args.path));
-          return null;
-        },
-      );
-
-      build.onEnd((result) => {
-        conf.result.outputFiles = result.outputFiles;
-        conf.result.metafile = result.metafile;
-
-        conf.modifiedFileSet.clear();
-      });
-    },
-  };
-}
-
-export interface IServerPluginResultCache {
-  watchFileSet?: Set<string>;
-  affectedFileSet?: Set<string>;
-  outputFiles?: esbuild.OutputFile[];
-  metafile?: esbuild.Metafile;
-  program?: ts.Program;
-}