@simplysm/sd-cli 12.7.4 → 12.7.6

package/src/pkg-builders/server/{SdServerBundler.ts → sd-server.bundler.ts}

@@ -1,16 +1,16 @@
 import esbuild from "esbuild";
 import path from "path";
-import { FsUtil, Logger, PathUtil, TNormPath } from "@simplysm/sd-core-node";
-import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
-import { ISdCliServerPluginResultCache } from "../../types/build-plugin.type";
-import { ISdBuildMessage } from "../../types/build.type";
-import { createSdServerPlugin } from "./createSdServerPlugin";
-import { BuildOutputFile, BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
+import { FsUtils, SdLogger, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
+import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
+import { type ISdBuildMessage } from "../../types/build.types";
+import { createSdServerPlugin } from "./sd-server.plugin-creator";
+import { type BuildOutputFile, BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
 import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 
 export class SdServerBundler {
-  readonly #logger = Logger.get(["simplysm", "sd-cli", "SdServerBundler"]);
+  readonly #logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBundler"]);
 
   #context?: esbuild.BuildContext;
 
@@ -122,10 +122,10 @@ const __dirname = __path__.dirname(__filename);`.trim(),
         result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [];
 
       for (const outputFile of outputFiles) {
-        const distFilePath = PathUtil.norm(this._opt.pkgPath, outputFile.path);
+        const distFilePath = PathUtils.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);
+          FsUtils.writeFile(distFilePath, outputFile.contents);
           this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
           emitFileSet.add(distFilePath);
         }
@@ -141,12 +141,12 @@ const __dirname = __path__.dirname(__filename);`.trim(),
       );
 
       for (const assetFile of assetFiles) {
-        const prev = this.#outputCache.get(PathUtil.norm(assetFile.source));
-        const curr = FsUtil.lstat(assetFile.source).mtime.getTime();
+        const prev = this.#outputCache.get(PathUtils.norm(assetFile.source));
+        const curr = FsUtils.lstat(assetFile.source).mtime.getTime();
         if (prev !== curr) {
-          FsUtil.copy(assetFile.source, path.resolve(this._opt.pkgPath, "dist", assetFile.destination));
-          this.#outputCache.set(PathUtil.norm(assetFile.source), curr);
-          emitFileSet.add(PathUtil.norm(assetFile.destination));
+          FsUtils.copy(assetFile.source, path.resolve(this._opt.pkgPath, "dist", assetFile.destination));
+          this.#outputCache.set(PathUtils.norm(assetFile.source), curr);
+          emitFileSet.add(PathUtils.norm(assetFile.destination));
         }
       }
     }
@@ -162,7 +162,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
     return {
       watchFileSet: this.#resultCache.watchFileSet!,
       affectedFileSet: this.#resultCache.affectedFileSet!,
-      results: SdCliConvertMessageUtil.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
+      results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
       emitFileSet: emitFileSet,
     };
   }

package/src/pkg-builders/server/{createSdServerPlugin.ts → sd-server.plugin-creator.ts}

@@ -1,9 +1,9 @@
 import esbuild from "esbuild";
-import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
-import { ISdCliServerPluginResultCache } from "../../types/build-plugin.type";
-import { PathUtil, TNormPath } from "@simplysm/sd-core-node";
-import { ISdTsCompilerResult } from "../../types/ts-compiler.type";
-import { SdTsCompiler } from "../../ts-builder/SdTsCompiler";
+import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
+import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
+import { PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { type ISdTsCompilerResult } from "../../types/ts-compiler.types";
+import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
 
 export function createSdServerPlugin(conf: {
   pkgPath: TNormPath;
@@ -32,11 +32,11 @@ export function createSdServerPlugin(conf: {
         conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
 
         //-- return err/warn
-        return SdCliConvertMessageUtil.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
+        return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
       });
 
       build.onLoad({ filter: /\.ts$/ }, (args) => {
-        const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtil.norm(args.path))?.last();
+        const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))?.last();
         if (!emittedJsFile) {
           return {
             errors: [
@@ -52,7 +52,7 @@ export function createSdServerPlugin(conf: {
       });
 
       build.onLoad({ filter: /\.[cm]?js$/ }, (args) => {
-        conf.result.watchFileSet!.add(PathUtil.norm(args.path));
+        conf.result.watchFileSet!.add(PathUtils.norm(args.path));
         return null;
       });
 
@@ -67,7 +67,7 @@ export function createSdServerPlugin(conf: {
           ),
         },
         (args) => {
-          conf.result.watchFileSet!.add(PathUtil.norm(args.path));
+          conf.result.watchFileSet!.add(PathUtils.norm(args.path));
           return null;
         },
       );

package/src/sd-cli.ts

@@ -2,13 +2,13 @@
 
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { SdCliProject } from "./entry/SdCliProject";
-import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
+import { SdCliProject } from "./entry/sd-cli-project";
+import { SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
 import { EventEmitter } from "events";
-import { SdCliElectron } from "./entry/SdCliElectron";
-import { SdCliLocalUpdate } from "./entry/SdCliLocalUpdate";
-import { SdCliCordova } from "./entry/SdCliCordova";
-import { SdAiCommand } from "./entry/SdAiCommand";
+import { SdCliElectron } from "./entry/sd-cli-electron";
+import { SdCliLocalUpdate } from "./entry/sd-cli-local-update";
+import { SdCliCordova } from "./entry/sd-cli-cordova";
+import { SdCliAiCommand } from "./entry/sd-cli-ai-command";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;
@@ -183,14 +183,14 @@ const argv = (await yargs(hideBin(process.argv))
 
 if (Boolean(argv.debug)) {
   process.env["SD_DEBUG"] = "true";
-  Logger.setConfig({
+  SdLogger.setConfig({
     console: {
-      level: LoggerSeverity.debug,
+      level: SdLoggerSeverity.debug,
     },
   });
 }
 else {
-  Logger.setConfig({
+  SdLogger.setConfig({
     dot: true,
   });
 }
@@ -246,7 +246,7 @@ else if (argv._[0] === "run-cordova") {
   });
 }
 else if (argv._[0] === "commit") {
-  await SdAiCommand.commitMessageAsync();
+  await SdCliAiCommand.commitAsync();
 }
 else {
   throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);