@simplysm/sd-cli 12.5.20 → 12.5.22

package/dist/pkg-builders/lib/SdTsLibBuilder.js

@@ -0,0 +1,54 @@
+import path from "path";
+import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
+import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import { SdTsCompileWorker } from "../../ts-builder/SdTsCompileWorker";
+export class SdTsLibBuilder {
+    static async new(pkgPath, dev, watchScopePaths) {
+        const tsCompiler = await SdTsCompileWorker.new({
+            pkgPath,
+            additionalOptions: { declaration: true },
+            isDevMode: dev,
+            globalStyleFilePath: PathUtil.norm(pkgPath, "src/styles.scss"),
+            isForBundle: false,
+            watchScopePaths: watchScopePaths,
+        });
+        return new SdTsLibBuilder(tsCompiler, pkgPath);
+    }
+    constructor(_compiler, _pkgPath) {
+        this._compiler = _compiler;
+        this._pkgPath = _pkgPath;
+    }
+    async buildAsync(modifiedFileSet) {
+        const tsCompileResult = await this._compiler.compileAsync(modifiedFileSet);
+        const emitFileSet = new Set();
+        for (const emitFile of tsCompileResult.emitFileSet) {
+            const emitFileInfos = tsCompileResult.emittedFilesCacheMap.get(emitFile);
+            if (emitFileInfos) {
+                for (const emitFileInfo of emitFileInfos) {
+                    if (emitFileInfo.outAbsPath != null) {
+                        FsUtil.writeFile(emitFileInfo.outAbsPath, emitFileInfo.text);
+                        emitFileSet.add(emitFileInfo.outAbsPath);
+                    }
+                }
+            }
+            const globalStylesheetBundlingResult = tsCompileResult.stylesheetBundlingResultMap.get(emitFile);
+            if (globalStylesheetBundlingResult) {
+                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);
+                        emitFileSet.add(distPath);
+                    }
+                }
+            }
+        }
+        const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany((item) => SdCliConvertMessageUtil.convertToBuildMessagesFromEsbuild(item, this._pkgPath));
+        return {
+            watchFileSet: tsCompileResult.watchFileSet,
+            affectedFileSet: tsCompileResult.affectedFileSet,
+            results: [...tsCompileResult.messages, ...styleResults],
+            emitFileSet,
+        };
+    }
+}
+//# sourceMappingURL=SdTsLibBuilder.js.map

package/dist/pkg-builders/lib/SdTsLibBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdTsLibBuilder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdTsLibBuilder.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/server/SdServerBuildRunner.d.ts

@@ -0,0 +1,17 @@
+import { EventEmitter } from "events";
+import { TNormPath } from "@simplysm/sd-core-node";
+import { ISdProjectConfig } from "../../types/sd-configs.type";
+import { ISdBuildRunnerResult } from "../../types/build.type";
+export declare class SdServerBuildRunner extends EventEmitter {
+    #private;
+    private readonly _projConf;
+    private readonly _pkgPath;
+    constructor(_projConf: ISdProjectConfig, _pkgPath: TNormPath);
+    on(event: "change", listener: () => void): this;
+    on(event: "complete", listener: (result: ISdBuildRunnerResult) => void): this;
+    watchAsync(): Promise<void>;
+    buildAsync(): Promise<ISdBuildRunnerResult>;
+    private _runAsync;
+    private _getExternalModulesAsync;
+    private _debug;
+}

package/dist/{builders/SdCliServerBuilder.js → pkg-builders/server/SdServerBuildRunner.js}

@@ -1,13 +1,12 @@
 import { EventEmitter } from "events";
 import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
-import { SdLinter } from "../build-tools/SdLinter";
-import { FunctionQueue, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
-import { SdServerBundler } from "../build-tools/SdServerBundler";
-export class SdCliServerBuilder extends EventEmitter {
-    #logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuilder"]);
+import { ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
+import { SdServerBundler } from "./SdServerBundler";
+export class SdServerBuildRunner extends EventEmitter {
+    #logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuildRunner"]);
     #pkgConf;
-    #builder;
+    #serverBundler;
     #extModules;
     constructor(_projConf, _pkgPath) {
         super();
@@ -22,42 +21,38 @@ export class SdCliServerBuilder extends EventEmitter {
     async watchAsync() {
         this.emit("change");
         this._debug("dist 초기화...");
-        await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
+        FsUtil.remove(path.resolve(this._pkgPath, "dist"));
         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: true });
-        this.emit("complete", {
-            affectedFilePaths: Array.from(result.affectedFileSet),
-            buildResults: result.buildResults,
-        });
+        FsUtil.writeFile(confDistPath, JSON.stringify(this.#pkgConf.configs ?? {}, undefined, 2));
+        const result = await this._runAsync(true);
+        const res = {
+            affectedFilePathSet: result.affectedFileSet,
+            buildMessages: result.buildMessages,
+            emitFileSet: result.emitFileSet,
+        };
+        this.emit("complete", res);
         this._debug("WATCH...");
-        let changeFiles = [];
-        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");
-                this.#builder.markForChanges(currChangeFiles);
-                const watchResult = await this._runAsync({ dev: true });
-                this.emit("complete", {
-                    affectedFilePaths: Array.from(watchResult.affectedFileSet),
-                    buildResults: watchResult.buildResults,
-                });
-                watcher.add(watchResult.watchFileSet);
-            });
+        const watcher = SdFsWatcher.watch(Array.from(result.watchFileSet)).onChange({ delay: 300 }, async (changeInfos) => {
+            this.emit("change");
+            const watchResult = await this._runAsync(true, new Set(changeInfos.map((item) => PathUtil.norm(item.path))));
+            const watchRes = {
+                affectedFilePathSet: watchResult.affectedFileSet,
+                buildMessages: watchResult.buildMessages,
+                emitFileSet: watchResult.emitFileSet,
+            };
+            this.emit("complete", watchRes);
+            watcher.replaceWatchPaths(watchResult.watchFileSet);
         });
     }
     async buildAsync() {
-        const npmConfig = (await FsUtil.readJsonAsync(path.resolve(this._pkgPath, "package.json")));
+        const npmConfig = FsUtil.readJson(path.resolve(this._pkgPath, "package.json"));
         const extModules = await this._getExternalModulesAsync();
         this._debug("dist 초기화...");
-        await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
+        FsUtil.remove(path.resolve(this._pkgPath, "dist"));
         this._debug("GEN .config.json...");
         const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-        await FsUtil.writeJsonAsync(confDistPath, this.#pkgConf.configs ?? {}, { space: 2 });
+        FsUtil.writeJson(confDistPath, this.#pkgConf.configs ?? {}, { space: 2 });
         this._debug("GEN package.json...");
         {
             const deps = extModules.filter((item) => item.exists).map((item) => item.name);
@@ -72,11 +67,11 @@ export class SdCliServerBuilder extends EventEmitter {
             if (this.#pkgConf.pm2 && !this.#pkgConf.pm2.noStartScript) {
                 distNpmConfig.scripts = { start: "pm2 start pm2.json" };
             }
-            await FsUtil.writeJsonAsync(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
+            FsUtil.writeJson(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
         }
         this._debug("GEN openssl.cnf...");
         {
-            await FsUtil.writeFileAsync(path.resolve(this._pkgPath, "dist/openssl.cnf"), `
+            FsUtil.writeFile(path.resolve(this._pkgPath, "dist/openssl.cnf"), `
 nodejs_conf = openssl_init
 
 [openssl_init]
@@ -101,7 +96,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
         }
         if (this.#pkgConf.pm2) {
             this._debug("GEN pm2.json...");
-            await FsUtil.writeJsonAsync(path.resolve(this._pkgPath, "dist/pm2.json"), {
+            FsUtil.writeJson(path.resolve(this._pkgPath, "dist/pm2.json"), {
                 name: this.#pkgConf.pm2.name ?? npmConfig.name.replace(/@/g, "").replace(/\//g, "-"),
                 script: "main.js",
                 watch: true,
@@ -129,7 +124,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
             this._debug("GEN web.config...");
             const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
             const serverExeFilePath = this.#pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
-            await FsUtil.writeFileAsync(iisDistPath, `
+            FsUtil.writeFile(iisDistPath, `
 <configuration>
   <appSettings>
     <add key="NODE_ENV" value="production" />
@@ -160,40 +155,40 @@ Options = UnsafeLegacyRenegotiation`.trim());
 
 `.trim());
         }
-        const result = await this._runAsync({ dev: false });
+        const result = await this._runAsync(false);
         return {
-            affectedFilePaths: Array.from(result.affectedFileSet),
-            buildResults: result.buildResults,
+            affectedFilePathSet: result.affectedFileSet,
+            buildMessages: result.buildMessages,
+            emitFileSet: result.emitFileSet,
         };
     }
-    async _runAsync(opt) {
+    async _runAsync(dev, modifiedFileSet) {
         const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
         this._debug(`BUILD 준비...`);
         const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json"));
         this.#extModules = this.#extModules ?? (await this._getExternalModulesAsync());
-        this.#builder =
-            this.#builder ??
+        this.#serverBundler =
+            this.#serverBundler ??
                 new SdServerBundler({
-                    dev: opt.dev,
+                    dev,
                     pkgPath: this._pkgPath,
                     entryPoints: tsConfig.files
                         ? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
                         : [path.resolve(this._pkgPath, "src/main.ts")],
                     external: this.#extModules.map((item) => item.name),
-                    watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths],
+                    watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtil.norm(item)),
                 });
-        this._debug(`BUILD & CHECK...`);
-        const buildResult = await this.#builder.bundleAsync();
+        this._debug(`BUILD...`);
+        const bundleResult = await this.#serverBundler.bundleAsync(modifiedFileSet);
         //-- filePaths
-        const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) => PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
+        const watchFileSet = new Set(Array.from(bundleResult.watchFileSet).filter((item) => PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
             localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))));
-        this._debug(`LINT...`);
-        const lintResults = await SdLinter.lintAsync(this._pkgPath, buildResult.affectedFileSet, buildResult.program);
         this._debug(`빌드 완료`);
         return {
             watchFileSet,
-            affectedFileSet: buildResult.affectedFileSet,
-            buildResults: [...buildResult.results, ...lintResults],
+            affectedFileSet: bundleResult.affectedFileSet,
+            buildMessages: bundleResult.results,
+            emitFileSet: bundleResult.emitFileSet,
         };
     }
     async _getExternalModulesAsync() {
@@ -201,7 +196,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
         const results = [];
         const npmConfigMap = new Map();
         const fn = async (currPath) => {
-            const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
+            const npmConfig = npmConfigMap.getOrCreate(currPath, FsUtil.readJson(path.resolve(currPath, "package.json")));
             const deps = {
                 defaults: [
                     ...Object.keys(npmConfig.dependencies ?? {}),
@@ -276,4 +271,4 @@ Options = UnsafeLegacyRenegotiation`.trim());
         this.#logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
     }
 }
-//# sourceMappingURL=SdCliServerBuilder.js.map
+//# sourceMappingURL=SdServerBuildRunner.js.map

package/dist/pkg-builders/server/SdServerBuildRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdServerBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBuildRunner.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/server/SdServerBundler.d.ts

@@ -0,0 +1,19 @@
+import { TNormPath } from "@simplysm/sd-core-node";
+import { ISdBuildMessage } from "../../types/build.type";
+export declare class SdServerBundler {
+    #private;
+    private readonly _opt;
+    constructor(_opt: {
+        dev: boolean;
+        pkgPath: TNormPath;
+        entryPoints: string[];
+        external?: string[];
+        watchScopePaths: TNormPath[];
+    });
+    bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<{
+        watchFileSet: Set<TNormPath>;
+        affectedFileSet: Set<TNormPath>;
+        results: ISdBuildMessage[];
+        emitFileSet: Set<TNormPath>;
+    }>;
+}

package/dist/{build-tools → pkg-builders/server}/SdServerBundler.js

@@ -1,21 +1,24 @@
 import esbuild from "esbuild";
 import path from "path";
-import { sdServerPlugin } from "../bundle-plugins/sdServerPlugin";
-import { Logger } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
+import { createSdServerPlugin } from "./createSdServerPlugin";
+import { BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
+import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
 export class SdServerBundler {
     #logger = Logger.get(["simplysm", "sd-cli", "SdServerBundler"]);
     #context;
     #modifiedFileSet = new Set();
     #resultCache = {};
+    #outputCache = new Map();
     constructor(_opt) {
         this._opt = _opt;
     }
-    markForChanges(filePaths) {
-        for (const filePath of filePaths) {
-            this.#modifiedFileSet.add(path.normalize(filePath));
+    async bundleAsync(modifiedFileSet) {
+        this.#modifiedFileSet.clear();
+        if (modifiedFileSet) {
+            this.#modifiedFileSet.adds(...modifiedFileSet);
         }
-    }
-    async bundleAsync() {
         if (!this.#context) {
             this.#context = await esbuild.context({
                 entryPoints: this._opt.entryPoints,
@@ -26,7 +29,7 @@ export class SdServerBundler {
                 mainFields: ["es2020", "es2015", "module", "main"],
                 conditions: ["es2020", "es2015", "module"],
                 tsconfig: path.resolve(this._opt.pkgPath, "tsconfig.json"),
-                write: true,
+                write: false,
                 metafile: true,
                 outdir: path.resolve(this._opt.pkgPath, "dist"),
                 format: "esm",
@@ -73,7 +76,7 @@ const __filename = __fileURLToPath__(import.meta.url);
 const __dirname = __path__.dirname(__filename);`.trim(),
                 },
                 plugins: [
-                    sdServerPlugin({
+                    createSdServerPlugin({
                         modifiedFileSet: this.#modifiedFileSet,
                         dev: this._opt.dev,
                         pkgPath: this._opt.pkgPath,
@@ -83,9 +86,20 @@ const __dirname = __path__.dirname(__filename);`.trim(),
                 ],
             });
         }
+        const emitFileSet = new Set();
         let result;
         try {
             result = await this.#context.rebuild();
+            const outputFiles = result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [];
+            for (const outputFile of outputFiles) {
+                const distFilePath = PathUtil.norm(this._opt.pkgPath, outputFile.path);
+                const prev = this.#outputCache.get(distFilePath);
+                if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
+                    FsUtil.writeFile(distFilePath, outputFile.contents);
+                    this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
+                    emitFileSet.add(distFilePath);
+                }
+            }
         }
         catch (err) {
             result = err;
@@ -96,29 +110,10 @@ const __dirname = __path__.dirname(__filename);`.trim(),
             }
         }
         return {
-            program: this.#resultCache.program,
             watchFileSet: this.#resultCache.watchFileSet,
             affectedFileSet: this.#resultCache.affectedFileSet,
-            results: [
-                ...result.warnings.map((warn) => ({
-                    type: "build",
-                    filePath: warn.location?.file !== undefined ? path.resolve(warn.location.file) : undefined,
-                    line: warn.location?.line,
-                    char: warn.location?.column,
-                    code: warn.text.slice(0, warn.text.indexOf(":")),
-                    severity: "warning",
-                    message: `(${warn.pluginName}) ${warn.text.slice(warn.text.indexOf(":") + 1)}`,
-                })),
-                ...result.errors.map((err) => ({
-                    type: "build",
-                    filePath: err.location?.file !== undefined ? path.resolve(err.location.file) : undefined,
-                    line: err.location?.line,
-                    char: err.location?.column !== undefined ? err.location.column + 1 : undefined,
-                    code: err.text.slice(0, err.text.indexOf(":")),
-                    severity: "error",
-                    message: `(${err.pluginName}) ${err.text.slice(err.text.indexOf(":") + 1)}`,
-                })),
-            ],
+            results: SdCliConvertMessageUtil.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
+            emitFileSet: emitFileSet,
         };
     }
 }

package/dist/pkg-builders/server/SdServerBundler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdServerBundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBundler.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/server/createSdServerPlugin.d.ts

@@ -0,0 +1,10 @@
+import esbuild from "esbuild";
+import { ISdCliServerPluginResultCache } from "../../types/build-plugin.type";
+import { TNormPath } from "@simplysm/sd-core-node";
+export declare function createSdServerPlugin(conf: {
+    pkgPath: TNormPath;
+    dev: boolean;
+    modifiedFileSet: Set<TNormPath>;
+    result: ISdCliServerPluginResultCache;
+    watchScopePaths: TNormPath[];
+}): esbuild.Plugin;

package/dist/pkg-builders/server/createSdServerPlugin.js

@@ -0,0 +1,53 @@
+import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
+import { PathUtil } from "@simplysm/sd-core-node";
+import { SdTsCompileWorker } from "../../ts-builder/SdTsCompileWorker";
+export function createSdServerPlugin(conf) {
+    return {
+        name: "sd-server-compile",
+        setup: async (build) => {
+            const tsCompiler = await SdTsCompileWorker.new({
+                pkgPath: conf.pkgPath,
+                additionalOptions: { declaration: false },
+                isDevMode: conf.dev,
+                isForBundle: true,
+                watchScopePaths: conf.watchScopePaths,
+            });
+            let tsCompileResult;
+            build.onStart(async () => {
+                tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
+                conf.result.watchFileSet = tsCompileResult.watchFileSet;
+                conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
+                //-- return err/warn
+                return SdCliConvertMessageUtil.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
+            });
+            build.onLoad({ filter: /\.ts$/ }, (args) => {
+                const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtil.norm(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(PathUtil.norm(args.path));
+                return null;
+            });
+            build.onLoad({
+                filter: new RegExp("(" +
+                    Object.keys(build.initialOptions.loader)
+                        .map((item) => "\\" + item)
+                        .join("|") +
+                    ")$"),
+            }, (args) => {
+                conf.result.watchFileSet.add(PathUtil.norm(args.path));
+                return null;
+            });
+            build.onEnd((result) => {
+                conf.result.outputFiles = result.outputFiles;
+                conf.result.metafile = result.metafile;
+                conf.modifiedFileSet.clear();
+            });
+        },
+    };
+}
+//# sourceMappingURL=createSdServerPlugin.js.map

package/dist/pkg-builders/server/createSdServerPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSdServerPlugin.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/createSdServerPlugin.ts"],"names":[],"mappings":"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"}