@simplysm/sd-cli 7.0.303 → 7.1.1

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;
   }
 
@@ -116,7 +123,7 @@ export class SdCliBbFileMetadata {
               }
 
               if (rawMeta.source) {
-                if (rawMeta.source.value.includes(".")) {
+                if (rawMeta.source.value.startsWith(".")) {
                   const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                   result.push({
                     exportedName,
@@ -155,7 +162,7 @@ export class SdCliBbFileMetadata {
         });
       }
       else {
-        if (rawMeta.source.value.includes(".")) {
+        if (rawMeta.source.value.startsWith(".")) {
           const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
           result.push({
             exportedName: "*",
@@ -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__" }
+          });
         }
       }
     }
@@ -231,7 +242,7 @@ export class SdCliBbFileMetadata {
               }
               else if (exportedName === name) {
                 if (rawMeta.source) {
-                  if (rawMeta.source.value.includes(".")) {
+                  if (rawMeta.source.value.startsWith(".")) {
                     const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                     const result = {
                       filePath: moduleFilePath,
@@ -295,7 +306,7 @@ export class SdCliBbFileMetadata {
             }
             else if (exportedName === localName) {
               if (rawMeta.source) {
-                if (rawMeta.source.value.includes(".")) {
+                if (rawMeta.source.value.startsWith(".")) {
                   const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                   const result = {
                     filePath: moduleFilePath,
@@ -354,7 +365,7 @@ export class SdCliBbFileMetadata {
             }
             else if (impLocalName === localName) {
               if (isIdentifier(specifier.imported)) {
-                if (rawMeta.source.value.includes(".")) {
+                if (rawMeta.source.value.startsWith(".")) {
                   const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                   const result = {
                     filePath: moduleFilePath,
@@ -382,7 +393,7 @@ export class SdCliBbFileMetadata {
           }
           else if (isImportDefaultSpecifier(specifier)) {
             if (specifier.local.name === localName) {
-              if (rawMeta.source.value.includes(".")) {
+              if (rawMeta.source.value.startsWith(".")) {
                 const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                 const result = {
                   filePath: moduleFilePath,
@@ -406,7 +417,7 @@ export class SdCliBbFileMetadata {
           }
           else if (isImportNamespaceSpecifier(specifier)) {
             if (specifier.local.name === localName) {
-              if (rawMeta.source.value.includes(".")) {
+              if (rawMeta.source.value.startsWith(".")) {
                 const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
                 const result = {
                   filePath: moduleFilePath,
@@ -417,7 +428,15 @@ export class SdCliBbFileMetadata {
                 return result;
               }
               else {
-                throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
+                const moduleName = rawMeta.source.value;
+                const result = {
+                  moduleName,
+                  name: "*",
+                  __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
+                };
+                this._findMetaFromInsideCache.set(localName, result);
+                return result;
+                // throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
               }
             }
           }
@@ -476,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

@@ -8,12 +8,12 @@ import { TSdCliBbTypeMetadata } from "./TSdCliBbTypeMetadata";
 import { TSdCliMetaRef } from "../commons";
 
 export class SdCliBbRootMetadata {
-  private readonly _entryMap: Map<string, string>;
+  private readonly _depMap: Map<string, { rootPath: string; entryFilePath?: string }>;
   private readonly _fileMetaCache = new Map<string, SdCliBbFileMetadata>();
 
   public constructor(packagePath: string) {
     const allDepPaths = this._getAllDepPaths(packagePath);
-    this._entryMap = this._getEntryMap(allDepPaths);
+    this._depMap = this._getDepMap(allDepPaths);
     // const ngDepPaths = this._getNgDepPaths(allDepPaths);
     // this._entryMap = this._getEntryMap(ngDepPaths);
   }
@@ -26,19 +26,35 @@ export class SdCliBbRootMetadata {
 
   public getEntryFileMetaRecord(): Record<string, SdCliBbFileMetadata> {
     const result: Record<string, SdCliBbFileMetadata> = {};
-    for (const moduleName of this._entryMap.keys()) {
-      const entryFilePath = this._entryMap.get(moduleName)!;
-      result[moduleName] = this._fileMetaCache.getOrCreate(entryFilePath, () => new SdCliBbFileMetadata(entryFilePath))!;
+    for (const moduleName of this._depMap.keys()) {
+      const entryFilePath = this._depMap.get(moduleName)?.entryFilePath;
+      if (entryFilePath !== undefined) {
+        result[moduleName] = this._fileMetaCache.getOrCreate(entryFilePath, () => new SdCliBbFileMetadata(entryFilePath))!;
+      }
     }
     return result;
   }
 
   public findMeta(ref: TSdCliMetaRef): TSdCliBbMetadata | TSdCliBbMetadata[] {
-    const filePath = "moduleName" in ref ? this._entryMap.get(ref.moduleName) : ref.filePath;
+    let filePath: string | undefined;
+    if ("moduleName" in ref) {
+      filePath = this._depMap.get(ref.moduleName)?.entryFilePath;
+      if (filePath === undefined) {
+        const fileRootPath = this._depMap.get(ref.moduleName.split("/")[0])?.rootPath;
+        if (fileRootPath !== undefined) {
+          filePath = path.resolve(fileRootPath, ref.moduleName.split("/").slice(1).join("/"));
+        }
+      }
+    }
+    else {
+      filePath = ref.filePath;
+    }
+
     if (filePath === undefined) {
       throw new NeverEntryError();
     }
-    const fileMeta = this._fileMetaCache.getOrCreate(filePath, () => new SdCliBbFileMetadata(filePath));
+
+    const fileMeta = this._fileMetaCache.getOrCreate(filePath, () => new SdCliBbFileMetadata(filePath!));
     if (ref.name === "*") {
       const result: TSdCliBbMetadata[] = [];
       for (const exp of fileMeta.exports) {
@@ -137,16 +153,44 @@ export class SdCliBbRootMetadata {
   //   return results;
   // }
 
-  private _getEntryMap(ngDepPaths: string[]): Map<string, string> {
-    const entryMap = new Map<string, string>();
+  private _getDepMap(ngDepPaths: string[]): Map<string, { rootPath: string; entryFilePath?: string }> {
+    const entryMap = new Map<string, { rootPath: string; entryFilePath?: string }>();
     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"];
-      if (typeof entryFilePath === "string") {
+      const entryFilePath = npmConfig["es2020"] ?? npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
+      if (entryFilePath === undefined) {
+        entryMap.set(npmConfig.name, {
+          rootPath: ngDepPath,
+          entryFilePath: undefined
+        });
+      }
+      else if (typeof entryFilePath === "string") {
         const realPath = this._getRealFilePath(path.resolve(ngDepPath, entryFilePath));
-        if (realPath != null) {
-          entryMap.set(npmConfig.name, realPath);
+        if (realPath?.endsWith(".json")) {
+          continue;
+        }
+
+        entryMap.set(npmConfig.name, {
+          rootPath: ngDepPath,
+          entryFilePath: realPath
+        });
+      }
+      else {
+        for (const key of Object.keys(entryMap)) {
+          const exportPath = path.resolve(ngDepPath, key);
+          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
+            });
+          }
         }
       }
 
@@ -154,27 +198,36 @@ 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) {
-              const realPath = this._getRealFilePath(exportResultItem.target);
-              if (realPath != null) {
-                entryMap.set(exportResultItem.name, realPath);
+              if (exportResultItem.target.endsWith(".json")) {
+                continue;
               }
+
+              const exportRealPath = this._getRealFilePath(exportResultItem.target);
+              entryMap.set(exportResultItem.name, {
+                rootPath: ngDepPath,
+                entryFilePath: exportRealPath
+              });
             }
           }
         }

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/ng-tools/typescript/SdCliTsFileMetadata.ts

@@ -38,7 +38,7 @@ export class SdCliTsFileMetadata {
       if (ts.isImportDeclaration(node)) {
         if (ts.isStringLiteral(node.moduleSpecifier)) {
           if (node.importClause) {
-            if (node.moduleSpecifier.text.includes(".")) {
+            if (node.moduleSpecifier.text.startsWith(".")) {
               const moduleFilePath = path.resolve(path.dirname(this.filePath), node.moduleSpecifier.text);
 
               if (node.importClause.namedBindings) {
@@ -116,7 +116,7 @@ export class SdCliTsFileMetadata {
           node.moduleSpecifier &&
           ts.isStringLiteral(node.moduleSpecifier)
         ) {
-          if (node.moduleSpecifier.text.includes(".")) {
+          if (node.moduleSpecifier.text.startsWith(".")) {
             const moduleFilePath = path.resolve(path.dirname(this.filePath), node.moduleSpecifier.text);
             for (const el of node.exportClause.elements) {
               if (el.propertyName && el.name.text !== el.propertyName.text) {

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;
   }
 }