@simplysm/sd-cli 7.0.65 → 7.0.66

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

@@ -1,25 +1,32 @@
 import {
   Declaration,
   Expression,
+  File,
   isArrayExpression,
+  isAssignmentExpression,
+  isCallExpression,
   isClassDeclaration,
   isExportDeclaration,
   isExportDefaultDeclaration,
   isExportNamedDeclaration,
   isExportSpecifier,
+  isExpressionStatement,
   isFunctionDeclaration,
   isIdentifier,
   isImportDeclaration,
+  isImportDefaultSpecifier,
   isImportSpecifier,
+  isMemberExpression,
   isObjectExpression,
   isSpreadElement,
   isStringLiteral,
   isVariableDeclaration,
   PatternLike,
   SpreadElement,
-  Statement
+  Statement,
+  traverseFast
 } from "@babel/types";
-import babelParser from "@babel/parser";
+import babelParser, { ParseResult } from "@babel/parser";
 import { FsUtil } from "@simplysm/sd-core-node";
 import path from "path";
 import { TSdCliBbMetadata } from "./SdCliBbRootMetadata";
@@ -31,14 +38,16 @@ import {
   SdCliBbVariableMetadata
 } from "./TSdCliBbTypeMetadata";
 import { SdCliBbUtil } from "./SdCliBbUtil";
+import { NeverEntryError } from "@simplysm/sd-core-common";
 
 export class SdCliBbFileMetadata {
-  public readonly rawMetas: Statement[] = [];
+  public readonly ast: ParseResult<File>;
+  public readonly rawMetas: Statement[];
 
   public constructor(public readonly filePath: string) {
     let realFilePath: string | undefined;
     for (const ext of ["", ".mjs", ".cjs", ".js"]) {
-      if (FsUtil.exists(filePath + ext) && !FsUtil.isDirectory(filePath + ext)) {
+      if (FsUtil.exists(filePath + ext) && !FsUtil.stat(filePath + ext).isDirectory()) {
         realFilePath = filePath + ext;
         break;
       }
@@ -48,7 +57,8 @@ export class SdCliBbFileMetadata {
     }
 
     const fileContent = FsUtil.readFile(realFilePath);
-    this.rawMetas = babelParser.parse(fileContent, { sourceType: "module" }).program.body;
+    this.ast = babelParser.parse(fileContent, { sourceType: "module" });
+    this.rawMetas = this.ast.program.body;
   }
 
   private _exportsCache?: { exportedName: string; target: TSdCliBbMetadata }[];
@@ -61,44 +71,81 @@ export class SdCliBbFileMetadata {
       if (!isExportDeclaration(rawMeta)) continue;
 
       if (isExportNamedDeclaration(rawMeta)) {
-        for (const specifier of rawMeta.specifiers) {
-          if (isExportSpecifier(specifier)) {
-            const exportedName = isIdentifier(specifier.exported) ? specifier.exported.name : undefined;
-            if (exportedName === undefined) {
-              throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
-            }
-
-            if (rawMeta.source) {
-              if (rawMeta.source.value.includes(".")) {
-                const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
+        if (rawMeta.declaration) {
+          if (isVariableDeclaration(rawMeta.declaration)) {
+            for (const decl of rawMeta.declaration.declarations) {
+              if (isIdentifier(decl.id)) {
                 result.push({
-                  exportedName,
-                  target: {
-                    filePath: moduleFilePath,
-                    name: specifier.local.name,
-                    __TDeclRef__: "__TDeclRef__"
-                  }
+                  exportedName: decl.id.name,
+                  target: new SdCliBbVariableMetadata(this, decl)
                 });
               }
               else {
-                const moduleName = rawMeta.source.value;
-                result.push({
-                  exportedName,
-                  target: { moduleName, name: specifier.local.name, __TDeclRef__: "__TDeclRef__" }
-                });
+                throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
               }
             }
-            else {
+          }
+          else if (isClassDeclaration(rawMeta.declaration)) {
+            result.push({
+              exportedName: rawMeta.declaration.id.name,
+              target: new SdCliBbClassMetadata(this, rawMeta.declaration)
+            });
+          }
+          else if (isFunctionDeclaration(rawMeta.declaration)) {
+            if (rawMeta.declaration.id) {
               result.push({
-                exportedName,
-                target: this._findMetaFromInside(specifier.local.name)
+                exportedName: rawMeta.declaration.id.name,
+                target: new SdCliBbFunctionMetadata(this, rawMeta.declaration)
               });
             }
+            else {
+              throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
+            }
           }
           else {
             throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
           }
         }
+        else {
+          for (const specifier of rawMeta.specifiers) {
+            if (isExportSpecifier(specifier)) {
+              const exportedName = isIdentifier(specifier.exported) ? specifier.exported.name : undefined;
+              if (exportedName === undefined) {
+                throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
+              }
+
+              if (rawMeta.source) {
+                if (rawMeta.source.value.includes(".")) {
+                  const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
+                  result.push({
+                    exportedName,
+                    target: {
+                      filePath: moduleFilePath,
+                      name: specifier.local.name,
+                      __TSdCliMetaRef__: "__TSdCliMetaRef__"
+                    }
+                  });
+                }
+                else {
+                  const moduleName = rawMeta.source.value;
+                  result.push({
+                    exportedName,
+                    target: { moduleName, name: specifier.local.name, __TSdCliMetaRef__: "__TSdCliMetaRef__" }
+                  });
+                }
+              }
+              else {
+                result.push({
+                  exportedName,
+                  target: this._findMetaFromInside(specifier.local.name)
+                });
+              }
+            }
+            else {
+              throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
+            }
+          }
+        }
       }
       else if (isExportDefaultDeclaration(rawMeta)) {
         result.push({
@@ -114,7 +161,7 @@ export class SdCliBbFileMetadata {
             target: {
               filePath: moduleFilePath,
               name: "*",
-              __TDeclRef__: "__TDeclRef__"
+              __TSdCliMetaRef__: "__TSdCliMetaRef__"
             }
           });
         }
@@ -130,7 +177,7 @@ export class SdCliBbFileMetadata {
 
   private readonly _findMetaFromOutsideCache = new Map<string, TSdCliBbMetadata>();
 
-  public findMetaFromOutside(name: string): TSdCliBbMetadata {
+  public findMetaFromOutside(name: string): TSdCliBbMetadata | undefined {
     const cache = this._findMetaFromOutsideCache.get(name);
     if (cache !== undefined) return cache;
 
@@ -188,7 +235,7 @@ export class SdCliBbFileMetadata {
                     const result = {
                       filePath: moduleFilePath,
                       name: specifier.local.name,
-                      __TDeclRef__: "__TDeclRef__" as const
+                      __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                     };
                     this._findMetaFromOutsideCache.set(name, result);
                     return result;
@@ -198,7 +245,7 @@ export class SdCliBbFileMetadata {
                     const result = {
                       moduleName,
                       name: specifier.local.name,
-                      __TDeclRef__: "__TDeclRef__" as const
+                      __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                     };
                     this._findMetaFromOutsideCache.set(name, result);
                     return result;
@@ -224,7 +271,7 @@ export class SdCliBbFileMetadata {
       }
     }
 
-    throw SdCliBbUtil.error(`'${name}'에 대한 'export'를 찾을 수 없습니다.`, this.filePath);
+    return undefined;
   }
 
   private readonly _findMetaFromInsideCache = new Map<string, TSdCliBbMetadata>();
@@ -251,7 +298,7 @@ export class SdCliBbFileMetadata {
                   const result = {
                     filePath: moduleFilePath,
                     name: specifier.local.name,
-                    __TDeclRef__: "__TDeclRef__" as const
+                    __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                   };
                   this._findMetaFromInsideCache.set(localName, result);
                   return result;
@@ -261,7 +308,7 @@ export class SdCliBbFileMetadata {
                   const result = {
                     moduleName,
                     name: specifier.local.name,
-                    __TDeclRef__: "__TDeclRef__" as const
+                    __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                   };
                   this._findMetaFromInsideCache.set(localName, result);
                   return result;
@@ -293,7 +340,7 @@ export class SdCliBbFileMetadata {
                   const result = {
                     filePath: moduleFilePath,
                     name: specifier.imported.name,
-                    __TDeclRef__: "__TDeclRef__" as const
+                    __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                   };
                   this._findMetaFromInsideCache.set(localName, result);
                   return result;
@@ -303,7 +350,7 @@ export class SdCliBbFileMetadata {
                   const result = {
                     moduleName,
                     name: specifier.imported.name,
-                    __TDeclRef__: "__TDeclRef__" as const
+                    __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
                   };
                   this._findMetaFromInsideCache.set(localName, result);
                   return result;
@@ -314,6 +361,30 @@ export class SdCliBbFileMetadata {
               }
             }
           }
+          else if (isImportDefaultSpecifier(specifier)) {
+            if (specifier.local.name === localName) {
+              if (rawMeta.source.value.includes(".")) {
+                const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
+                const result = {
+                  filePath: moduleFilePath,
+                  name: "default",
+                  __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
+                };
+                this._findMetaFromInsideCache.set(localName, result);
+                return result;
+              }
+              else {
+                const moduleName = rawMeta.source.value;
+                const result = {
+                  moduleName,
+                  name: "default",
+                  __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
+                };
+                this._findMetaFromInsideCache.set(localName, result);
+                return result;
+              }
+            }
+          }
         }
       }
       else if (isVariableDeclaration(rawMeta)) {
@@ -369,4 +440,129 @@ export class SdCliBbFileMetadata {
 
     throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
   }
+
+  private readonly _getNgDecoArgCache = new Map<string, SdCliBbObjectMetadata>();
+
+  public getNgDecoArg(className: string): SdCliBbObjectMetadata {
+    if (this._getNgDecoArgCache.has(className)) {
+      return this._getNgDecoArgCache.get(className)!;
+    }
+
+    for (const meta of this.rawMetas) {
+      // 'compilationMode: partial' 일때
+      if (
+        isExpressionStatement(meta) &&
+        isCallExpression(meta.expression) &&
+        (
+          (
+            isMemberExpression(meta.expression.callee) &&
+            isIdentifier(meta.expression.callee.property) &&
+            meta.expression.callee.property.name === "ɵɵngDeclareClassMetadata"
+          ) ||
+          (
+            isIdentifier(meta.expression.callee) &&
+            meta.expression.callee.name === "ngDeclareClassMetadata"
+          )
+        ) &&
+        isObjectExpression(meta.expression.arguments[0])
+      ) {
+        const objMeta = new SdCliBbObjectMetadata(this, meta.expression.arguments[0]);
+        const typePropVal = objMeta.getPropValue("type");
+        if (
+          typePropVal instanceof SdCliBbClassMetadata &&
+          typePropVal.name === className
+        ) {
+          const decos = objMeta.getPropValue("decorators");
+          if (
+            decos instanceof SdCliBbArrayMetadata &&
+            decos.value[0] instanceof SdCliBbObjectMetadata
+          ) {
+            const args = decos.value[0].getPropValue("args");
+            if (
+              args instanceof SdCliBbArrayMetadata &&
+              args.value[0] instanceof SdCliBbObjectMetadata
+            ) {
+              this._getNgDecoArgCache.set(className, args.value[0]);
+              return args.value[0];
+            }
+          }
+          else {
+            throw new NeverEntryError();
+          }
+        }
+      }
+    }
+
+    // 'compilationMode: full' 일때
+    let result: SdCliBbObjectMetadata | undefined;
+    traverseFast(this.ast, (node) => {
+      if (
+        isCallExpression(node) &&
+        (
+          (
+            isMemberExpression(node.callee) &&
+            isIdentifier(node.callee.property) &&
+            node.callee.property.name === "ɵsetClassMetadata"
+          ) ||
+          (
+            isIdentifier(node.callee) &&
+            node.callee.name === "setClassMetadata"
+          )
+        ) &&
+        isIdentifier(node.arguments[0]) &&
+        node.arguments[0].name === className &&
+        isArrayExpression(node.arguments[1])
+      ) {
+        const decos = new SdCliBbArrayMetadata(this, node.arguments[1]);
+        if (decos.value[0] instanceof SdCliBbObjectMetadata) {
+          const args = decos.value[0].getPropValue("args");
+          if (
+            args instanceof SdCliBbArrayMetadata &&
+            args.value[0] instanceof SdCliBbObjectMetadata
+          ) {
+            result = args.value[0];
+          }
+        }
+        else {
+          throw new NeverEntryError();
+        }
+      }
+    });
+
+    if (result === undefined) {
+      throw new NeverEntryError(this.filePath + "," + className);
+    }
+
+    this._getNgDecoArgCache.set(className, result);
+    return result;
+  }
+
+  public getNgDecoPropValue(className: string, decoName: string, propName: string): TSdCliBbMetadata | undefined {
+    for (const meta of this.rawMetas) {
+      if (
+        isExpressionStatement(meta) &&
+        isAssignmentExpression(meta.expression) &&
+        isMemberExpression(meta.expression.left) &&
+        isIdentifier(meta.expression.left.object) &&
+        meta.expression.left.object.name === className &&
+        isIdentifier(meta.expression.left.property)
+      ) {
+        if (meta.expression.left.property.name === decoName) {
+          if (
+            isCallExpression(meta.expression.right) &&
+            meta.expression.right.arguments.length > 0 &&
+            isObjectExpression(meta.expression.right.arguments[0])
+          ) {
+            const dirObjMeta = new SdCliBbObjectMetadata(this, meta.expression.right.arguments[0]);
+            return dirObjMeta.getPropValue(propName);
+          }
+          else {
+            throw new NeverEntryError();
+          }
+        }
+      }
+    }
+
+    throw new NeverEntryError();
+  }
 }

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

@@ -43,7 +43,7 @@ export class SdCliBbRootMetadata {
       const result: TSdCliBbMetadata[] = [];
       for (const exp of fileMeta.exports) {
         const meta = exp.target;
-        if (typeof meta !== "string" && "__TDeclRef__" in meta) {
+        if (typeof meta !== "string" && "__TSdCliMetaRef__" in meta) {
           const resultMeta = this.findMeta(meta);
           if (resultMeta instanceof Array) {
             result.push(...resultMeta);
@@ -60,7 +60,11 @@ export class SdCliBbRootMetadata {
     }
     else {
       const meta = fileMeta.findMetaFromOutside(ref.name);
-      if (typeof meta !== "string" && "__TDeclRef__" in meta) {
+      if (meta === undefined) {
+        throw new NeverEntryError();
+      }
+
+      if (typeof meta !== "string" && "__TSdCliMetaRef__" in meta) {
         return this.findMeta(meta);
       }
       return meta;
@@ -78,7 +82,7 @@ export class SdCliBbRootMetadata {
           exp.target.filePath === localRef.filePath
         ) {
           if (exp.target.name === "*") {
-            throw new NeverEntryError();
+            return { moduleName, name: localRef.name };
           }
           else if (exp.target.name === localRef.name) {
             return { moduleName, name: exp.exportedName };
@@ -139,7 +143,7 @@ export class SdCliBbRootMetadata {
       const npmConfig = FsUtil.readJson(path.resolve(ngDepPath, "package.json")) as INpmConfig;
 
       const entryFilePath = npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
-      if (entryFilePath !== undefined) {
+      if (typeof entryFilePath === "string") {
         entryMap.set(npmConfig.name, path.resolve(ngDepPath, entryFilePath));
       }
 
@@ -148,7 +152,7 @@ export class SdCliBbRootMetadata {
         for (const exportKey of exportKeys) {
           if (
             exportKey.includes("/locales") ||
-            exportKey.endsWith("/package.json") ||
+            exportKey.endsWith(".json") ||
             exportKey.endsWith("/testing") ||
             exportKey.endsWith("/upgrade")
           ) {
@@ -160,7 +164,7 @@ export class SdCliBbRootMetadata {
             npmConfig.exports[exportKey]["module"] ??
             npmConfig.exports[exportKey]["main"] ??
             npmConfig.exports[exportKey]["default"];
-          if (expEntryFilePath !== undefined) {
+          if (typeof expEntryFilePath === "string") {
             const exportPath = path.resolve(ngDepPath, expEntryFilePath);
             const exportResult = this._getGlobExportResult(PathUtil.posix(npmConfig.name, exportKey), exportPath);
             for (const exportResultItem of exportResult) {

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

@@ -9,7 +9,7 @@ export class SdCliBbUtil {
       char: meta?.loc?.start.column,
       code: undefined,
       severity: "error",
-      message: "예상치 못한 방식의 코드가 발견되었습니다."
+      message: message
     });
   }
 }

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

@@ -1,14 +1,6 @@
-import {
-  isAssignmentExpression,
-  isCallExpression,
-  isExpressionStatement,
-  isIdentifier,
-  isMemberExpression,
-  isObjectExpression
-} from "@babel/types";
 import { NeverEntryError } from "@simplysm/sd-core-common";
 import { SdCliBbFileMetadata } from "./SdCliBbFileMetadata";
-import { SdCliBbArrayMetadata, SdCliBbObjectMetadata, SdCliBbVariableMetadata } from "./TSdCliBbTypeMetadata";
+import { SdCliBbArrayMetadata, SdCliBbVariableMetadata } from "./TSdCliBbTypeMetadata";
 import { TSdCliBbMetadata } from "./SdCliBbRootMetadata";
 
 export type TSdCliBbNgMetadata =
@@ -33,7 +25,21 @@ export class SdCliBbNgModuleMetadata {
       providers: []
     };
 
-    for (const meta of this._fileMeta.rawMetas) {
+    const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
+
+    const expVal = argObjMeta.getPropValue("exports") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵmod", "exports");
+    if (expVal !== undefined) {
+      const expMetas = this._getExportAndProviderMetas(expVal);
+      result.exports.push(...expMetas);
+    }
+
+    const provVal = argObjMeta.getPropValue("providers") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵmod", "providers");
+    if (provVal !== undefined) {
+      const provMetas = this._getExportAndProviderMetas(provVal);
+      result.providers.push(...provMetas);
+    }
+
+    /*for (const meta of this._fileMeta.rawMetas) {
       if (
         isExpressionStatement(meta) &&
         isAssignmentExpression(meta.expression) &&
@@ -86,24 +92,23 @@ export class SdCliBbNgModuleMetadata {
           }
         }
       }
-    }
+    }*/
 
     this._defCache = result;
     return result;
   }
 
-
-  private _getProviderMetas(meta: TSdCliBbMetadata): TSdCliBbMetadata[] {
+  private _getExportAndProviderMetas(meta: TSdCliBbMetadata): TSdCliBbMetadata[] {
     const result: TSdCliBbMetadata[] = [];
 
     if (meta instanceof SdCliBbArrayMetadata) {
       for (const metaItem of meta.value.filterExists()) {
-        result.push(...this._getProviderMetas(metaItem));
+        result.push(...this._getExportAndProviderMetas(metaItem));
       }
     }
     else if (meta instanceof SdCliBbVariableMetadata) {
       if (meta.value !== undefined) {
-        result.push(...this._getProviderMetas(meta.value));
+        result.push(...this._getExportAndProviderMetas(meta.value));
       }
     }
     else {
@@ -115,8 +120,12 @@ export class SdCliBbNgModuleMetadata {
 }
 
 export class SdCliBbNgInjectableMetadata {
-  public constructor(private readonly _fileMeta: SdCliBbFileMetadata,
-                     private readonly _className: string) {
+
+  public constructor(
+    // @ts-expect-error
+    private readonly _fileMeta: SdCliBbFileMetadata,
+    // @ts-expect-error
+    private readonly _className: string) {
   }
 }
 
@@ -130,10 +139,11 @@ export class SdCliBbNgDirectiveMetadata {
   public get selector(): string {
     if (this._selectorCache !== undefined) return this._selectorCache;
 
-    const val = SdCliNgMetadataUtil.getDecoPropValue(this._fileMeta, this._className, "ɵdir", "selector");
+    const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
+    const val = argObjMeta.getPropValue("selector") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵdir", "selector");
     if (typeof val === "string") {
       this._selectorCache = val;
-      return val;
+      return this._selectorCache;
     }
     else {
       throw new NeverEntryError();
@@ -151,10 +161,11 @@ export class SdCliBbNgComponentMetadata {
   public get selector(): string {
     if (this._selectorCache !== undefined) return this._selectorCache;
 
-    const val = SdCliNgMetadataUtil.getDecoPropValue(this._fileMeta, this._className, "ɵcmp", "selector");
+    const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
+    const val = argObjMeta.getPropValue("selector") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵcmp", "selector");
     if (typeof val === "string") {
       this._selectorCache = val;
-      return val;
+      return this._selectorCache;
     }
     else {
       throw new NeverEntryError();
@@ -172,7 +183,8 @@ export class SdCliBbNgPipeMetadata {
   public get pipeName(): string {
     if (this._pipeNameCache !== undefined) return this._pipeNameCache;
 
-    const val = SdCliNgMetadataUtil.getDecoPropValue(this._fileMeta, this._className, "ɵpipe", "name");
+    const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
+    const val = argObjMeta.getPropValue("name") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵpipe", "name");
     if (typeof val === "string") {
       this._pipeNameCache = val;
       return val;
@@ -188,6 +200,7 @@ interface ISdCliBbNgModuleDef {
   providers: TSdCliBbMetadata[];
 }
 
+/*
 class SdCliNgMetadataUtil {
   public static getDecoPropValue(fileMeta: SdCliBbFileMetadata, className: string, decoName: string, propName: string): TSdCliBbMetadata | undefined {
     for (const meta of fileMeta.rawMetas) {
@@ -218,3 +231,4 @@ class SdCliNgMetadataUtil {
     throw new NeverEntryError();
   }
 }
+*/

package/src/ng-tools/commons.ts

@@ -1,3 +1,3 @@
 export type TSdCliMetaRef =
   ({ filePath: string; name: string } | { moduleName: string; name: string })
-  & { __TDeclRef__: "__TDeclRef__" };
+  & { __TSdCliMetaRef__: "__TSdCliMetaRef__" };