@simplysm/sd-cli 7.0.305 → 7.1.1

package/src/entry-points/file/project/fc_project_npmconfig.ts

@@ -10,11 +10,13 @@ export const fc_project_npmconfig = (opt: { name: string; description: string; a
   type: "module",
   license: "UNLICENSED",
   private: true,
+  packageManager: "yarn@3.2.2",
   engines: {
     node: "^16"
   },
   workspaces: [
-    "packages/*"
+    "packages/*",
+    "test"
   ],
   scripts: {
     "watch": "sd-cli watch",
@@ -24,11 +26,11 @@ export const fc_project_npmconfig = (opt: { name: string; description: string; a
     "postinstall": "sd-cli prepare"
   },
   devDependencies: {
-    "@simplysm/eslint-plugin": "~7.0.0",
-    "@simplysm/sd-cli": opt.cliVersion ?? "~7.0.0",
-    "@types/node": "^17.0.12",
+    "@simplysm/eslint-plugin": "~7.1.0",
+    "@simplysm/sd-cli": opt.cliVersion ?? "~7.1.0",
+    "@types/node": "^16.11.47",
     "cross-env": "^7.0.3",
-    "eslint": "^8.7.0",
-    "typescript": "~4.5.5"
+    "eslint": "^8.21.0",
+    "typescript": "~4.7.4"
   }
 }, undefined, 2);

package/src/entry-points/file/project/fc_project_yarnrc.ts

@@ -0,0 +1,18 @@
+export const fc_project_yarnrc = (): string => /* language=yml */ `
+nodeLinker: node-modules
+
+packageExtensions:
+  "@angular-architects/module-federation-runtime@*":
+    dependencies:
+      "@angular/common": ^14.0.0
+      "@angular/core": ^14.0.0
+      rxjs: ^7.4.0
+      zone.js: ~0.11.4
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.2.cjs
+
+`.trim();

package/src/index.ts

@@ -31,6 +31,7 @@ export * from "./entry-points/file/project/fc_project_npmconfig";
 export * from "./entry-points/file/project/fc_project_readme";
 export * from "./entry-points/file/project/fc_project_simplysm";
 export * from "./entry-points/file/project/fc_project_tsconfig";
+export * from "./entry-points/file/project/fc_project_yarnrc";
 export * from "./entry-points/file/server/fc_package_server_main";
 export * from "./entry-points/SdCliFileCrypto";
 export * from "./entry-points/SdCliLocalUpdate";

package/src/ng-tools/SdCliNgModuleGenerator.ts

@@ -1,6 +1,11 @@
 import { SdCliTsRootMetadata } from "./typescript/SdCliTsRootMetadata";
 import { SdCliBbRootMetadata, TSdCliBbMetadata } from "./babel/SdCliBbRootMetadata";
-import { SdCliBbClassMetadata, SdCliBbObjectMetadata } from "./babel/TSdCliBbTypeMetadata";
+import {
+  SdCliBbArrayMetadata,
+  SdCliBbClassMetadata,
+  SdCliBbConditionMetadata,
+  SdCliBbObjectMetadata
+} from "./babel/TSdCliBbTypeMetadata";
 import {
   SdCliBbNgComponentMetadata,
   SdCliBbNgDirectiveMetadata,
@@ -177,6 +182,48 @@ export class SdCliNgModuleGenerator {
     return metaTmp instanceof Array ? metaTmp : [metaTmp];
   }
 
+  private _getBbNgModuleProvClass(modProvMeta: TSdCliBbMetadata): { moduleName: string; name: string }[] {
+    const result: { moduleName: string; name: string }[] = [];
+
+    if (modProvMeta instanceof SdCliBbObjectMetadata) {
+      // 무시
+    }
+    else if (modProvMeta instanceof SdCliBbClassMetadata) {
+      const ref = this._bbMeta.findExportRef({
+        filePath: modProvMeta.filePath,
+        name: modProvMeta.name
+      });
+      if (ref) {
+        result.push(ref);
+      }
+    }
+    else if (modProvMeta instanceof SdCliBbConditionMetadata) {
+      if (modProvMeta.consequent !== undefined) {
+        result.push(
+          ...this._getBbNgModuleProvClass(modProvMeta.consequent)
+        );
+      }
+
+      if (modProvMeta.alternate !== undefined) {
+        result.push(
+          ...this._getBbNgModuleProvClass(modProvMeta.alternate)
+        );
+      }
+    }
+    else if (modProvMeta instanceof SdCliBbArrayMetadata) {
+      for (const modProvMetaValue of modProvMeta.value) {
+        if (modProvMetaValue !== undefined) {
+          result.push(...this._getBbNgModuleProvClass(modProvMetaValue));
+        }
+      }
+    }
+    else {
+      throw new NeverEntryError();
+    }
+
+    return result;
+  }
+
   private _getBbNgModuleDefs(): IBbNgModuleDef[] {
     const entryRecord = this._bbMeta.getEntryFileMetaRecord();
     const result: IBbNgModuleDef[] = [];
@@ -206,21 +253,7 @@ export class SdCliNgModuleGenerator {
                 }
 
                 for (const modProvMeta of modProvMetas) {
-                  if (modProvMeta instanceof SdCliBbClassMetadata) {
-                    const ref = this._bbMeta.findExportRef({
-                      filePath: modProvMeta.filePath,
-                      name: modProvMeta.name
-                    });
-                    if (ref) {
-                      resultItem.providers.push(ref);
-                    }
-                  }
-                  else if (modProvMeta instanceof SdCliBbObjectMetadata) {
-                    // 무시
-                  }
-                  else {
-                    throw new NeverEntryError();
-                  }
+                  resultItem.providers.push(...this._getBbNgModuleProvClass(modProvMeta));
                 }
               }
 
@@ -469,7 +502,7 @@ export class SdCliNgModuleGenerator {
           fnResult += "  {\n";
           fnResult += `    path: "${child.path}",\n`;
           if ("target" in child) {
-            fnResult += `    loadChildren: async () => await import("${this._getImportModuleName(def.filePath, child.target.filePath)}").then((m) => m.${child.target.name})\n`;
+            fnResult += `    loadChildren: async () => await import("${this._getFileImportModuleName(def.filePath, child.target.filePath)}").then((m) => m.${child.target.name})\n`;
           }
           else {
             fnResult += `    children: ${fn(child.children).replace(/\n/g, "\n  ")}\n`;
@@ -486,7 +519,7 @@ export class SdCliNgModuleGenerator {
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { SdCanDeactivateGuard } from "@simplysm/sd-angular";
-import { ${def.component.name} } from "${this._getImportModuleName(def.filePath, def.component.filePath)}";
+import { ${def.component.name} } from "${this._getFileImportModuleName(def.filePath, def.component.filePath)}";
 
 @NgModule({
   imports: [
@@ -520,7 +553,7 @@ export const routes: Routes = ${fn(def.children)};
     for (const mod of mods) {
       const importMap = [...mod.imports, ...mod.exports, ...mod.providers]
         .map((item) => ({
-          moduleName: "moduleName" in item ? item.moduleName : this._getImportModuleName(mod.filePath, item.filePath),
+          moduleName: "moduleName" in item ? item.moduleName : this._getFileImportModuleName(mod.filePath, item.filePath),
           name: item.name
         }))
         .groupBy((item) => item.moduleName)
@@ -580,7 +613,7 @@ export class ${mod.name} {
     }
   }
 
-  private _getImportModuleName(mainFilePath: string, importFilePath: string): string {
+  private _getFileImportModuleName(mainFilePath: string, importFilePath: string): string {
     const filePath = PathUtil.posix(path.relative(path.dirname(mainFilePath), importFilePath).replace(/\.ts$/, ""));
     return filePath.startsWith(".") ? filePath : "./" + filePath;
   }

package/src/ng-tools/babel/SdCliBbFileMetadata.ts

@@ -6,6 +6,7 @@ import {
   isAssignmentExpression,
   isCallExpression,
   isClassDeclaration,
+  isConditionalExpression,
   isExportDeclaration,
   isExportDefaultDeclaration,
   isExportNamedDeclaration,
@@ -34,6 +35,7 @@ import { TSdCliBbMetadata } from "./SdCliBbRootMetadata";
 import {
   SdCliBbArrayMetadata,
   SdCliBbClassMetadata,
+  SdCliBbConditionMetadata,
   SdCliBbFunctionMetadata,
   SdCliBbObjectMetadata,
   SdCliBbVariableMetadata
@@ -58,7 +60,12 @@ export class SdCliBbFileMetadata {
     }
 
     const fileContent = FsUtil.readFile(realFilePath);
-    this.ast = babelParser.parse(fileContent, { sourceType: "module" });
+    try {
+      this.ast = babelParser.parse(fileContent, { sourceType: "module" });
+    }
+    catch (err) {
+      throw SdCliBbUtil.error(err.message, this.filePath, err.loc);
+    }
     this.rawMetas = this.ast.program.body;
   }
 
@@ -167,7 +174,11 @@ export class SdCliBbFileMetadata {
           });
         }
         else {
-          throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
+          const moduleName = rawMeta.source.value;
+          result.push({
+            exportedName: "*",
+            target: { moduleName, name: "*", __TSdCliMetaRef__: "__TSdCliMetaRef__" }
+          });
         }
       }
     }
@@ -484,6 +495,9 @@ export class SdCliBbFileMetadata {
     else if (isSpreadElement(rawMeta)) {
       return this.getMetaFromRaw(rawMeta.argument);
     }
+    else if (isConditionalExpression(rawMeta)) {
+      return new SdCliBbConditionMetadata(this, rawMeta);
+    }
 
     throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
   }

package/src/ng-tools/babel/SdCliBbRootMetadata.ts

@@ -158,7 +158,7 @@ export class SdCliBbRootMetadata {
     for (const ngDepPath of ngDepPaths) {
       const npmConfig = FsUtil.readJson(path.resolve(ngDepPath, "package.json")) as INpmConfig;
 
-      const entryFilePath = npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
+      const entryFilePath = npmConfig["es2020"] ?? npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
       if (entryFilePath === undefined) {
         entryMap.set(npmConfig.name, {
           rootPath: ngDepPath,
@@ -167,6 +167,10 @@ export class SdCliBbRootMetadata {
       }
       else if (typeof entryFilePath === "string") {
         const realPath = this._getRealFilePath(path.resolve(ngDepPath, entryFilePath));
+        if (realPath?.endsWith(".json")) {
+          continue;
+        }
+
         entryMap.set(npmConfig.name, {
           rootPath: ngDepPath,
           entryFilePath: realPath
@@ -178,6 +182,10 @@ export class SdCliBbRootMetadata {
           const exportResult = this._getGlobExportResult(PathUtil.posix(npmConfig.name, key), exportPath);
           for (const exportResultItem of exportResult) {
             const exportRealPath = this._getRealFilePath(exportResultItem.target);
+            if (exportResultItem.target.endsWith(".json")) {
+              continue;
+            }
+
             entryMap.set(exportResultItem.name, {
               rootPath: ngDepPath,
               entryFilePath: exportRealPath
@@ -190,23 +198,31 @@ export class SdCliBbRootMetadata {
         const exportKeys = Object.keys(npmConfig.exports);
         for (const exportKey of exportKeys) {
           if (
-            exportKey.includes("/locales") ||
-            exportKey.endsWith(".json") ||
-            exportKey.endsWith("/testing") ||
-            exportKey.endsWith("/upgrade")
+            exportKey.startsWith("./locales") ||
+            exportKey.startsWith("./testing") ||
+            exportKey.startsWith("./upgrade")
           ) {
             continue;
           }
 
-          const expEntryFilePath = npmConfig.exports[exportKey]["es2015"] ??
+          const expEntryFilePath = npmConfig.exports[exportKey]["es2020"] ??
+            npmConfig.exports[exportKey]["es2015"] ??
             npmConfig.exports[exportKey]["browser"] ??
             npmConfig.exports[exportKey]["module"] ??
             npmConfig.exports[exportKey]["main"] ??
             npmConfig.exports[exportKey]["default"];
           if (typeof expEntryFilePath === "string") {
+            if (expEntryFilePath.endsWith(".json")) {
+              continue;
+            }
+
             const exportPath = path.resolve(ngDepPath, expEntryFilePath);
             const exportResult = this._getGlobExportResult(PathUtil.posix(npmConfig.name, exportKey), exportPath);
             for (const exportResultItem of exportResult) {
+              if (exportResultItem.target.endsWith(".json")) {
+                continue;
+              }
+
               const exportRealPath = this._getRealFilePath(exportResultItem.target);
               entryMap.set(exportResultItem.name, {
                 rootPath: ngDepPath,

package/src/ng-tools/babel/SdCliBbUtil.ts

@@ -1,12 +1,12 @@
-import { Node } from "@babel/types";
+import { Node, SourceLocation } from "@babel/types";
 import { SdCliBuildResultError } from "../../SdCliBuildResultError";
 
 export class SdCliBbUtil {
-  public static error(message: string, filePath?: string, meta?: Node): SdCliBuildResultError {
+  public static error(message: string, filePath?: string, meta?: Node | SourceLocation["start"]): SdCliBuildResultError {
     return new SdCliBuildResultError({
       filePath,
-      line: meta?.loc?.start.line,
-      char: meta?.loc?.start.column,
+      line: meta && "loc" in meta ? meta.loc?.start.line : meta && "line" in meta ? meta.line : undefined,
+      char: meta && "loc" in meta ? meta.loc?.start.column : meta && "column" in meta ? meta.column : undefined,
       code: undefined,
       severity: "error",
       message: message

package/src/ng-tools/babel/TSdCliBbTypeMetadata.ts

@@ -1,6 +1,7 @@
 import {
   ArrayExpression,
   ClassDeclaration,
+  ConditionalExpression,
   FunctionDeclaration,
   isAssignmentExpression,
   isExpressionStatement,
@@ -26,7 +27,8 @@ export type TSdCliBbTypeMetadata = SdCliBbClassMetadata |
   SdCliBbVariableMetadata |
   SdCliBbFunctionMetadata |
   SdCliBbObjectMetadata |
-  SdCliBbArrayMetadata;
+  SdCliBbArrayMetadata |
+  SdCliBbConditionMetadata;
 
 export class SdCliBbClassMetadata {
   public constructor(private readonly _fileMeta: SdCliBbFileMetadata,
@@ -175,3 +177,36 @@ export class SdCliBbArrayMetadata {
     return this._valueCache;
   }
 }
+
+export class SdCliBbConditionMetadata {
+  public constructor(private readonly _fileMeta: SdCliBbFileMetadata,
+                     private readonly _metadata: ConditionalExpression) {
+  }
+
+  private _testCache?: TSdCliBbMetadata | undefined;
+
+  public get test(): TSdCliBbMetadata | undefined {
+    if (this._testCache === undefined) {
+      this._testCache = this._fileMeta.getMetaFromRaw(this._metadata.test);
+    }
+    return this._testCache;
+  }
+
+  private _consequentCache?: TSdCliBbMetadata | undefined;
+
+  public get consequent(): TSdCliBbMetadata | undefined {
+    if (this._consequentCache === undefined) {
+      this._consequentCache = this._fileMeta.getMetaFromRaw(this._metadata.consequent);
+    }
+    return this._consequentCache;
+  }
+
+  private _alternateCache?: TSdCliBbMetadata | undefined;
+
+  public get alternate(): TSdCliBbMetadata | undefined {
+    if (this._alternateCache === undefined) {
+      this._alternateCache = this._fileMeta.getMetaFromRaw(this._metadata.alternate);
+    }
+    return this._alternateCache;
+  }
+}

package/src/utils/SdCliBuildResultUtil.ts

@@ -49,8 +49,8 @@ export class SdCliBuildResultUtil {
   private static _convertFromWebpackError(severity: "warning" | "error", err: webpack.WebpackError): ISdCliPackageBuildResult {
     return {
       filePath: (err.file as string | undefined) ?? (err.module as webpack.Module | undefined)?.["request"],
-      line: err.file ? err.loc["start"]?.line : undefined,
-      char: err.file ? err.loc["start"]?.column : undefined,
+      line: err.file ? err.loc?.["start"]?.line : undefined, // eslint-disable-line
+      char: err.file ? err.loc?.["start"]?.column : undefined, // eslint-disable-line
       code: err.name,
       severity,
       message: err.message
@@ -71,6 +71,7 @@ export class SdCliBuildResultUtil {
       str += `${result.code}: `;
     }
     str += `${result.severity} ${result.message}`;
+
     return str;
   }
 }