@simplysm/sd-cli 6.0.26 → 6.0.30

package/dist-types/builders/SdCliTypescriptBuilder.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as ts from "typescript";
-import { INpmConfig, ISdAutoIndexConfig, ISdPackageBuildResult } from "../commons";
+import { INpmConfig, ISdAutoIndexConfig, ISdPackageBuildResult, ITsconfig } from "../commons";
 import { Logger } from "@simplysm/sd-core-node";
 import { EventEmitter } from "events";
 export declare class SdCliTypescriptBuilder extends EventEmitter {
@@ -8,17 +8,17 @@ export declare class SdCliTypescriptBuilder extends EventEmitter {
     tsconfigFilePath: string;
     autoIndexConfig: ISdAutoIndexConfig | undefined;
     protected readonly _logger: Logger;
-    protected _parsedTsconfig: ts.ParsedCommandLine;
+    protected _tsconfig: ITsconfig;
     readonly npmConfig: INpmConfig;
     protected _moduleResolutionCache?: ts.ModuleResolutionCache;
     protected _cacheCompilerHost?: ts.CompilerHost;
     protected _program?: ts.Program;
-    protected _builder?: ts.BuilderProgram | ts.EmitAndSemanticDiagnosticsBuilderProgram;
+    protected _builder?: ts.BuilderProgram | ts.SemanticDiagnosticsBuilderProgram;
     protected readonly _fileCache: Map<string, ITsBuildFileCache>;
     private readonly _indexFileGenerator?;
     private _watcher?;
-    ignoreProcesses: string[];
-    constructor(rootPath: string, tsconfigFilePath: string, ignoreProcesses: ("emit" | "check" | "lint" | "genIndex")[], autoIndexConfig: ISdAutoIndexConfig | undefined);
+    skipProcesses: string[];
+    constructor(rootPath: string, tsconfigFilePath: string, skipProcesses: ("emit" | "check" | "lint" | "genIndex")[], autoIndexConfig: ISdAutoIndexConfig | undefined);
     on(event: "change", listener: () => void): this;
     on(event: "complete", listener: (results: ISdPackageBuildResult[]) => void): this;
     buildAsync(watch: boolean): Promise<void>;

package/dist-types/commons.d.ts

@@ -23,7 +23,9 @@ export interface ISdServerPackageConfig {
     externalDependencies?: string[];
     configs?: Record<string, any>;
     pm2?: Record<string, any> | boolean;
-    iis?: boolean;
+    iis?: boolean | {
+        serverExeFilePath?: string;
+    };
     publish?: TSdPublishConfig;
 }
 export interface ISdNonePackageConfig {

package/dist-types/entry-points/SdCliLocalUpdater.d.ts

@@ -7,5 +7,5 @@ export declare class SdCliLocalUpdater {
     }): Promise<void>;
     private _runAsync;
     protected _getWatchPathsAsync(updateSourcePath: string): Promise<string[]>;
-    private _getUpdatePathsAsync;
+    private _getUpdatePathInfosAsync;
 }

package/dist-types/entry-points/SdCliProject.d.ts

@@ -12,6 +12,8 @@ export declare class SdCliProject {
         packages?: string[];
         options?: string[];
         config?: string;
+        skipProcesses?: string[];
+        localUpdate?: boolean;
     }): Promise<void>;
     publishAsync(opt: {
         build: boolean;

package/dist-types/packages/SdCliClientPackage.d.ts

@@ -4,10 +4,11 @@ import { SdCliPackageBase } from "./SdCliPackageBase";
 export declare class SdCliClientPackage extends SdCliPackageBase {
     readonly rootPath: string;
     readonly config: ISdClientPackageConfig;
+    readonly useCache: boolean;
     readonly _serverPath?: string | undefined;
     on(event: "change", listener: (target: "node" | "browser" | undefined) => void): this;
     on(event: "complete", listener: (target: "node" | "browser" | undefined, results: ISdPackageBuildResult[]) => void): this;
-    constructor(rootPath: string, config: ISdClientPackageConfig, _serverPath?: string | undefined);
+    constructor(rootPath: string, config: ISdClientPackageConfig, useCache: boolean, _serverPath?: string | undefined);
     buildAsync(): Promise<void>;
     watchAsync(): Promise<NextHandleFunction[]>;
     publishAsync(): Promise<void>;

package/dist-types/packages/SdCliLibraryPackage.d.ts

@@ -4,11 +4,12 @@ import { SdCliPackageBase } from "./SdCliPackageBase";
 export declare class SdCliLibraryPackage extends SdCliPackageBase {
     readonly rootPath: string;
     readonly config: ISdLibraryPackageConfig;
+    private readonly _skipProcesses;
     private readonly _processWorkManager;
     private readonly _logger;
     on(event: "change", listener: (target: "node" | "browser" | undefined) => void): this;
     on(event: "complete", listener: (target: "node" | "browser" | undefined, results: ISdPackageBuildResult[]) => void): this;
-    constructor(rootPath: string, config: ISdLibraryPackageConfig, _processWorkManager: SdProcessWorkManager);
+    constructor(rootPath: string, config: ISdLibraryPackageConfig, _skipProcesses: ("emit" | "check" | "lint" | "genIndex")[], _processWorkManager: SdProcessWorkManager);
     buildAsync(): Promise<void>;
     watchAsync(): Promise<void>;
     publishAsync(): Promise<void>;

package/dist-types/packages/SdCliServerPackage.d.ts

@@ -4,9 +4,10 @@ import { SdCliPackageBase } from "./SdCliPackageBase";
 export declare class SdCliServerPackage extends SdCliPackageBase {
     readonly rootPath: string;
     readonly config: ISdServerPackageConfig;
+    readonly useCache: boolean;
     on(event: "change", listener: (target: "node" | "browser" | undefined) => void): this;
     on(event: "complete", listener: (target: "node" | "browser" | undefined, results: ISdPackageBuildResult[], server?: SdServiceServer) => void): this;
-    constructor(rootPath: string, config: ISdServerPackageConfig);
+    constructor(rootPath: string, config: ISdServerPackageConfig, useCache: boolean);
     buildAsync(): Promise<void>;
     publishAsync(): Promise<void>;
     watchAsync(): Promise<void>;

package/dist-types/utils/SdWebpackUtil.d.ts

@@ -2,5 +2,5 @@ import { ISdPackageBuildResult } from "../commons";
 import * as webpack from "webpack";
 export declare class SdWebpackUtil {
     static getWebpackResults(stats: Error | webpack.Stats): ISdPackageBuildResult[];
-    private static _statErrorToMessage;
+    private static _errorToMessage;
 }

package/dist-types/workers/client-ng-gen-worker.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "6.0.26",
+  "version": "6.0.30",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": "github:kslhunter/simplysm",
@@ -13,20 +13,20 @@
   "sideEffects": false,
   "dependencies": {
     "yargs": "^17.1.1",
-    "@simplysm/sd-core-common": "6.0.26",
-    "@simplysm/sd-core-node": "6.0.26",
-    "@simplysm/sd-service-node": "6.0.26",
+    "@simplysm/sd-core-common": "6.0.30",
+    "@simplysm/sd-core-node": "6.0.30",
+    "@simplysm/sd-service-node": "6.0.30",
     "eslint": "^7.32.0",
     "@typescript-eslint/parser": "4.28.2",
     "@typescript-eslint/typescript-estree": "4.28.2",
-    "typescript": "4.3.5",
+    "typescript": "~4.3.2",
     "ng-packagr": "^12.2.1",
     "@angular/compiler-cli": "^12.2.2",
     "@angular/compiler": "^12.2.2",
     "@angular-devkit/build-angular": "^12.2.2",
     "@angular-devkit/core": "^12.2.2",
     "tslib": "^2.3.1",
-    "webpack": "^5.51.1",
+    "webpack": "^5.54.0",
     "node-sass": "^6.0.1",
     "css-minimizer-webpack-plugin": "^3.0.2",
     "esbuild": "^0.12.24",
@@ -46,7 +46,7 @@
     "source-map-loader": "^3.0.0",
     "buffer": "^6.0.3",
     "browserslist": "^4.16.8",
-    "@simplysm/sd-storage": "6.0.26",
+    "@simplysm/sd-storage": "6.0.30",
     "webpack-hot-middleware": "^2.25.0",
     "jsdom": "^17.0.0"
   },

package/schema/schema.json

@@ -3,6 +3,154 @@
   "type": "object",
   "additionalProperties": false,
   "definitions": {
+    "schemaPublish": {
+      "type": "object",
+      "anyOf": [
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "ftp",
+                "sftp"
+              ]
+            },
+            "host": {
+              "type": "string"
+            },
+            "port": {
+              "type": "number"
+            },
+            "path": {
+              "type": "string"
+            },
+            "username": {
+              "type": "string"
+            },
+            "password": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "type",
+            "host",
+            "path",
+            "username",
+            "password"
+          ]
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "local-directory"
+              ]
+            },
+            "path": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "type",
+            "path"
+          ]
+        }
+      ]
+    },
+    "schemaConfigs": {
+      "type": "object",
+      "properties": {
+        "orm": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "dialect": {
+                "enum": [
+                  "mssql",
+                  "mssql-azure"
+                ]
+              },
+              "host": {
+                "type": "string"
+              },
+              "port": {
+                "type": "number"
+              },
+              "username": {
+                "type": "string"
+              },
+              "password": {
+                "type": "string"
+              },
+              "database": {
+                "type": "string"
+              },
+              "defaultIsolationLevel": {
+                "enum": [
+                  "READ_UNCOMMITTED",
+                  "READ_COMMITTED",
+                  "REPEATABLE_READ",
+                  "SERIALIZABLE"
+                ]
+              }
+            }
+          }
+        },
+        "smtp": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "email": {
+                "type": "string"
+              },
+              "user": {
+                "type": "string"
+              },
+              "pass": {
+                "type": "string"
+              },
+              "host": {
+                "type": "string"
+              },
+              "port": {
+                "type": "number"
+              },
+              "secure": {
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "name",
+              "email",
+              "user",
+              "pass",
+              "host"
+            ]
+          }
+        },
+        "crypto": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "key": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "key"
+          ]
+        }
+      },
+      "additionalProperties": {
+        "type": "object"
+      }
+    },
     "schemaPackage": {
       "type": "object",
       "additionalProperties": false,
@@ -21,7 +169,7 @@
           "$ref": "#/definitions/schemaPackage"
         }
       },
-      "oneOf": [
+      "anyOf": [
         {
           "properties": {
             "type": {
@@ -75,13 +223,19 @@
               ]
             },
             "server": {
-              "type": "string",
+              "type": "string"
             },
             "resolveFallback": {
               "type": "object",
               "additionalProperties": {
                 "type": "string"
               }
+            },
+            "configs": {
+              "$ref": "#/definitions/schemaConfigs"
+            },
+            "publish": {
+              "$ref": "#/definitions/schemaPublish"
             }
           }
         },
@@ -96,125 +250,25 @@
               "type": "object"
             },
             "iis": {
-              "type": "boolean"
-            },
-            "configs": {
-              "type": "object",
-              "properties": {
-                "orm": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                      "host": {
-                        "type": "string"
-                      },
-                      "port": {
-                        "type": "number"
-                      },
-                      "username": {
-                        "type": "string"
-                      },
-                      "password": {
-                        "type": "string"
-                      },
-                      "defaultIsolationLevel": {
-                        "enum": [
-                          "READ_UNCOMMITTED",
-                          "READ_COMMITTED",
-                          "REPEATABLE_READ",
-                          "SERIALIZABLE"
-                        ]
-                      }
-                    },
-                    "oneOf": [
-                      {
-                        "properties": {
-                          "dialect": {
-                            "enum": [
-                              "mssql"
-                            ]
-                          },
-                          "database": {
-                            "type": "string"
-                          }
-                        }
-                      },
-                      {
-                        "properties": {
-                          "dialect": {
-                            "enum": [
-                              "mssql-azure"
-                            ]
-                          },
-                          "database": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "database"
-                        ]
-                      }
-                    ],
-                    "required": [
-                      "username",
-                      "password"
-                    ]
-                  }
-                },
-                "smtp": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                      "name": {
-                        "type": "string"
-                      },
-                      "email": {
-                        "type": "string"
-                      },
-                      "user": {
-                        "type": "string"
-                      },
-                      "pass": {
-                        "type": "string"
-                      },
-                      "host": {
-                        "type": "string"
-                      },
-                      "port": {
-                        "type": "number"
-                      },
-                      "secure": {
-                        "type": "boolean"
-                      }
-                    },
-                    "required": [
-                      "name",
-                      "email",
-                      "user",
-                      "pass",
-                      "host"
-                    ]
-                  }
+              "oneOf": [
+                {
+                  "type": "boolean"
                 },
-                "crypto": {
+                {
                   "type": "object",
-                  "additionalProperties": false,
                   "properties": {
-                    "key": {
+                    "serverExeFilePath": {
                       "type": "string"
                     }
-                  },
-                  "required": [
-                    "key"
-                  ]
+                  }
                 }
-              },
-              "additionalProperties": {
-              }
+              ]
+            },
+            "configs": {
+              "$ref": "#/definitions/schemaConfigs"
+            },
+            "publish": {
+              "$ref": "#/definitions/schemaPublish"
             }
           }
         }
@@ -223,24 +277,33 @@
   },
   "properties": {
     "$schema": {
-      "type": "string"
+      "type": "string",
+      "format": "uri"
     },
     "extends": {
-      "type": "string"
+      "type": "array",
+      "uniqueItems": true,
+      "items": {
+        "type": "string",
+        "format": "uri"
+      }
     },
     "packages": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/schemaPackage",
-        "required": [
-          "type"
-        ]
+        "$ref": "#/definitions/schemaPackage"
       }
     },
     "overrides": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/schemaPackage"
+        "type": "object"
+      }
+    },
+    "localUpdates": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
       }
     }
   }

package/sd-tsconfig.node.json

@@ -11,6 +11,7 @@
   },
   "files": [
     "src/bin/sd-cli.ts",
-    "src/workers/lib-build-worker.ts"
+    "src/workers/lib-build-worker.ts",
+    "src/workers/client-ng-gen-worker.ts"
   ]
 }

package/src/bin/sd-cli.ts

@@ -59,6 +59,14 @@ const logger = Logger.get(["simplysm", "sd-cli"]);
             type: "string",
             describe: "simplysm.json 파일 경로"
           },
+          noLint: {
+            type: "boolean",
+            describe: `lint 작업을 수행하지 않음`
+          },
+          localUpdate: {
+            type: "boolean",
+            describe: "LocalUpdate를 사용함"
+          },
           options: {
             type: "string",
             describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)",
@@ -76,6 +84,10 @@ const logger = Logger.get(["simplysm", "sd-cli"]);
             describe: "새로 빌드한 후에 배포합니다",
             default: false
           },
+          noLint: {
+            type: "boolean",
+            describe: `빌드시, lint 작업을 수행하지 않음`
+          },
           packages: {
             type: "string",
             describe: "수행할 패키지 설정",
@@ -128,14 +140,14 @@ const logger = Logger.get(["simplysm", "sd-cli"]);
 
     process.env.SD_CLI_LOGGER_SEVERITY = "DEBUG";
 
-    Logger.setConfig({
+    Logger.setConfig(["simplysm", "sd-cli"], {
       console: {
         level: LoggerSeverity.debug
       }
     });
   }
   else {
-    Logger.setConfig({
+    Logger.setConfig(["simplysm", "sd-cli"], {
       dot: true
     });
   }
@@ -147,7 +159,8 @@ const logger = Logger.get(["simplysm", "sd-cli"]);
       .buildAsync({
         packages: argv.packages,
         config: argv.config,
-        options: argv.options
+        options: argv.options,
+        skipProcesses: argv.noLint ? ["lint"] : undefined
       });
     process.exit(0);
   }
@@ -157,7 +170,9 @@ const logger = Logger.get(["simplysm", "sd-cli"]);
         watch: true,
         packages: argv.packages,
         config: argv.config,
-        options: argv.options
+        options: argv.options,
+        skipProcesses: argv.noLint ? ["lint"] : undefined,
+        localUpdate: argv.localUpdate
       });
   }
   else if (args[0] === "local-update") {