@simplysm/sd-cli 6.0.27 → 6.0.36

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") {

package/src/build-tools/SdCliNgModuleFilesGenerator.ts

@@ -1,5 +1,5 @@
 import { ISdPackageBuildResult } from "../commons";
-import { NeverEntryError, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
+import { NeverEntryError, ObjectUtil, SdError, StringUtil } from "@simplysm/sd-core-common";
 import * as ts from "typescript";
 import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
 import * as path from "path";
@@ -25,7 +25,9 @@ import {
 } from "./metadata/SdAotMetadataReader";
 import { IIvyNgModuleMetadata, SdIvyMetadataReader, TIvyNgMetadata } from "./metadata/SdIvyMetadataReader";
 import { NgtscProgram } from "@angular/compiler-cli";
+import { SdMetadataError } from "./metadata/SdMetadataError";
 
+// TODO: LazyPage??
 export class SdCliNgModuleFilesGenerator {
   private readonly _fileCache = new Map<string, TFileCache>();
 
@@ -57,61 +59,81 @@ export class SdCliNgModuleFilesGenerator {
 
     let changed = false;
     for (const dirtyFilePath of dirtyFilePaths) {
-      if (PathUtil.isChildPath(dirtyFilePath, this._moduleDistDirPath)) continue;
+      try {
+        if (PathUtil.isChildPath(dirtyFilePath, this._moduleDistDirPath)) continue;
 
-      this._fileCache.delete(dirtyFilePath);
+        this._fileCache.delete(dirtyFilePath);
 
-      // 내 소스코드
-      if (dirtyFilePath.endsWith(".ts") && !dirtyFilePath.endsWith(".d.ts")) {
-        const sourceFile = this._program.getSourceFile(dirtyFilePath);
-        if (!sourceFile) throw new NeverEntryError();
-
-        this._fileCache.set(dirtyFilePath, {
-          type: "my",
-          sourceFile,
-          metadata: new SdMyMetadataReader(sourceFile, this._program).getMetadatas()
-        });
-        changed = true;
-      }
-
-      // AOT 라이브러리
-      else if (dirtyFilePath.endsWith(".d.ts")) {
-        const sourceFile = this._program.getSourceFile(dirtyFilePath);
-        if (!sourceFile) throw new NeverEntryError();
-
-        // from METADATA
-        const metadataFilePath = dirtyFilePath.replace(/\.d\.ts$/, ".metadata.json");
-        const sdMetadataFilePath = dirtyFilePath.replace(/\.d\.ts$/, ".sd-metadata.json");
-
-        if (FsUtil.exists(metadataFilePath)) {
-          const metadataRoot = await FsUtil.readJsonAsync(metadataFilePath);
+        // 내 소스코드
+        if (dirtyFilePath.endsWith(".ts") && !dirtyFilePath.endsWith(".d.ts")) {
+          const sourceFile = this._program.getSourceFile(dirtyFilePath);
+          if (!sourceFile) { // 삭제된 파일
+            changed = true;
+            continue;
+          }
 
           this._fileCache.set(dirtyFilePath, {
-            type: "aot",
+            type: "my",
             sourceFile,
-            ...new SdAotMetadataReader(metadataRoot).getMetadatas()
+            metadata: new SdMyMetadataReader(sourceFile, this._program).getMetadatas()
           });
           changed = true;
         }
-        else if (FsUtil.exists(sdMetadataFilePath)) {
-          const metadataRoot = await FsUtil.readJsonAsync(sdMetadataFilePath);
 
-          this._fileCache.set(dirtyFilePath, {
-            type: "aot",
-            sourceFile,
-            ...new SdAotMetadataReader(metadataRoot).getMetadatas()
+        // AOT 라이브러리
+        else if (dirtyFilePath.endsWith(".d.ts")) {
+          const sourceFile = this._program.getSourceFile(dirtyFilePath);
+          if (!sourceFile) { // 삭제된 파일
+            changed = true;
+            continue;
+          }
+
+          // from METADATA
+          const metadataFilePath = dirtyFilePath.replace(/\.d\.ts$/, ".metadata.json");
+          const sdMetadataFilePath = dirtyFilePath.replace(/\.d\.ts$/, ".sd-metadata.json");
+
+          if (FsUtil.exists(metadataFilePath)) {
+            const metadataRoot = await FsUtil.readJsonAsync(metadataFilePath);
+
+            this._fileCache.set(dirtyFilePath, {
+              type: "aot",
+              sourceFile,
+              ...new SdAotMetadataReader(metadataRoot).getMetadatas()
+            });
+            changed = true;
+          }
+          else if (FsUtil.exists(sdMetadataFilePath)) {
+            const metadataRoot = await FsUtil.readJsonAsync(sdMetadataFilePath);
+
+            this._fileCache.set(dirtyFilePath, {
+              type: "aot",
+              sourceFile,
+              ...new SdAotMetadataReader(metadataRoot).getMetadatas()
+            });
+            changed = true;
+          }
+
+          // from IVY
+          else {
+            this._fileCache.set(dirtyFilePath, {
+              type: "ivy",
+              sourceFile,
+              ...new SdIvyMetadataReader(sourceFile, ngProgram).getMetadatas()
+            });
+            changed = true;
+          }
+        }
+      }
+      catch (err) {
+        if (err instanceof SdMetadataError) {
+          result.push({
+            filePath: err.fileName,
+            severity: "error",
+            message: err.message
           });
-          changed = true;
         }
-
-        // from IVY
         else {
-          this._fileCache.set(dirtyFilePath, {
-            type: "ivy",
-            sourceFile,
-            ...new SdIvyMetadataReader(sourceFile, ngProgram).getMetadatas()
-          });
-          changed = true;
+          throw new SdError(err, "'" + dirtyFilePath + "' 메타데이터 로딩중 에러");
         }
       }
     }
@@ -120,29 +142,46 @@ export class SdCliNgModuleFilesGenerator {
   }
 
   public async generateAsync(): Promise<{ result: ISdPackageBuildResult[]; changedFilePaths: string[] }> {
-    let moduleInfoMap = this._getModuleInfoMap();
-    moduleInfoMap = this._mergeCircularModuleInfoMap(moduleInfoMap);
-
-    const routingModuleMap = await this._getRoutingModuleInfoMapAsync();
-
-    const changedFilePaths = [
-      ...await this._writeNgModuleFileAsync(moduleInfoMap),
-      ...await this._writeRoutingModuleFileAsync(moduleInfoMap, routingModuleMap)
-    ];
-
-    const genFilePaths = [...moduleInfoMap.keys(), ...routingModuleMap.keys()].distinct();
-    const delFilePaths = (await FsUtil.globAsync(path.resolve(this._moduleDistDirPath, "**", "*")))
-      .filter((item) => (
-        !genFilePaths.includes(PathUtil.posix(item))
-        && !genFilePaths.some((item1) => PathUtil.isChildPath(item1, item))
-      ))
-      .map((item) => PathUtil.posix(item));
-    for (const delFilePath of delFilePaths) {
-      changedFilePaths.push(delFilePath);
-      await FsUtil.removeAsync(delFilePath);
-    }
+    try {
+      let moduleInfoMap = this._getModuleInfoMap();
+      moduleInfoMap = this._mergeCircularModuleInfoMap(moduleInfoMap);
+
+      const routingModuleMap = await this._getRoutingModuleInfoMapAsync();
+
+      const changedFilePaths = [
+        ...await this._writeNgModuleFileAsync(moduleInfoMap),
+        ...await this._writeRoutingModuleFileAsync(moduleInfoMap, routingModuleMap)
+      ];
+
+      const genFilePaths = [...moduleInfoMap.keys(), ...routingModuleMap.keys()].distinct();
+      const delFilePaths = (await FsUtil.globAsync(path.resolve(this._moduleDistDirPath, "**", "*")))
+        .filter((item) => (
+          !genFilePaths.includes(PathUtil.posix(item))
+          && !genFilePaths.some((item1) => PathUtil.isChildPath(item1, item))
+        ))
+        .map((item) => PathUtil.posix(item));
+      for (const delFilePath of delFilePaths) {
+        changedFilePaths.push(delFilePath);
+        await FsUtil.removeAsync(delFilePath);
+      }
 
-    return { result: [], changedFilePaths: changedFilePaths.distinct() };
+      return { result: [], changedFilePaths: changedFilePaths.distinct() };
+    }
+    catch (err) {
+      if (err instanceof SdMetadataError) {
+        return {
+          result: [{
+            filePath: err.fileName,
+            severity: "error",
+            message: err.message
+          }],
+          changedFilePaths: []
+        };
+      }
+      else {
+        throw new SdError(err, "메타데이터 생성중 에러");
+      }
+    }
   }
 
   // region NgModule
@@ -512,7 +551,10 @@ export class ${moduleInfo.className} {
     const expFilePath = this._getResolvedFilePath(filePath, moduleName);
     if (StringUtil.isNullOrEmpty(expFilePath)) throw new NeverEntryError();
     const expFileCache = this._fileCache.get(expFilePath);
-    if (!expFileCache || expFileCache.type !== "aot") throw new NeverEntryError();
+    if (!expFileCache) {
+      throw new SdMetadataError(filePath, `'${filePath}'에서 '${moduleName}'에 대한 파일 '${expFilePath}'을 찾을 수 없습니다.`);
+    }
+    if (expFileCache.type !== "aot") throw new NeverEntryError();
     const newExp = expFileCache.exports.single((item) => (item.as ?? item.name) === targetName);
     if (!newExp) throw new NeverEntryError();
 
@@ -612,7 +654,7 @@ export class ${moduleInfo.className} {
       if (fileCache.type !== "my") continue;
 
       for (const metadata of fileCache.metadata) {
-        if (metadata.type !== "Component" || !metadata.className.endsWith("Page")) continue;
+        if (!metadata.className.endsWith("Page")) continue;
 
         const newRoutingModuleInfo: IGenRoutingModuleInfo = {
           path: "",
@@ -681,7 +723,6 @@ export class ${moduleInfo.className} {
       const moduleImportTexts: string[] = [];
 
       const pageFilePath = this._getModuleModuleImportName(path.dirname(distFilePath), routingModuleInfo.page.moduleFilePath);
-      moduleImportTexts.push(`import { ${routingModuleInfo.page.name} } from "${pageFilePath}";`);
 
       let content: string;
       if (path.basename(distFilePath) === "_routes.ts") {
@@ -697,6 +738,7 @@ export const routes: Routes = [
       else {
         moduleImportTexts.push(`import { NgModule } from "@angular/core";`);
         moduleImportTexts.push(`import { RouterModule } from "@angular/router";`);
+        moduleImportTexts.push(`import { ${routingModuleInfo.page.name} } from "${pageFilePath}";`);
 
         const thisPageModuleInfoEntry = Array.from(moduleInfoMap.entries())
           .single((item) => item[1].exports.some((exp) => exp.moduleFilePath === routingModuleInfo.page.moduleFilePath && exp.name === routingModuleInfo.page.name));
@@ -745,7 +787,9 @@ export class ${routingModuleInfo.page.name}RoutingModule {
   private _getRoutingModuleText(routingModuleInfo: IGenRoutingModuleInfo, distFilePath: string): string {
     let content = "{\r\n";
     content += `  path: "${routingModuleInfo.path}",\r\n`;
-    content += `  component: ${routingModuleInfo.page.name},\r\n`;
+    if (path.basename(distFilePath) !== "_routes.ts") {
+      content += `  component: ${routingModuleInfo.page.name},\r\n`;
+    }
     if (routingModuleInfo.children.length > 0) {
       content += `  children: [\r\n`;
       for (const child of routingModuleInfo.children) {