@simplysm/sd-cli 7.0.66 → 7.0.74

package/src/builder/SdCliServerBuilder.ts

@@ -13,8 +13,8 @@ import { ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
 import ESLintWebpackPlugin from "eslint-webpack-plugin";
 import CopyWebpackPlugin from "copy-webpack-plugin";
 import { LicenseWebpackPlugin } from "license-webpack-plugin";
-import { createHash } from "crypto";
 import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
+import { createHash } from "crypto";
 import LintResult = ESLint.LintResult;
 
 export class SdCliServerBuilder extends EventEmitter {
@@ -47,7 +47,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
     // 빌드 준비
     const extModules = this._getExternalModules();
-    const webpackConfig = this._getWebpackConfig(true, extModules.map((item) => item.name));
+    const webpackConfig = this._getWebpackConfig(true, extModules);
     const compiler = webpack(webpackConfig);
     await new Promise<void>((resolve, reject) => {
       compiler.hooks.watchRun.tapAsync(this.constructor.name, (args, callback) => {
@@ -81,7 +81,7 @@ export class SdCliServerBuilder extends EventEmitter {
     // 빌드
     this._logger.debug("Webpack 빌드 수행...");
     const extModules = this._getExternalModules();
-    const webpackConfig = this._getWebpackConfig(false, extModules.map((item) => item.name));
+    const webpackConfig = this._getWebpackConfig(false, extModules);
     const compiler = webpack(webpackConfig);
     const buildResults = await new Promise<ISdCliPackageBuildResult[]>((resolve, reject) => {
       compiler.run((err, stats) => {
@@ -130,6 +130,7 @@ export class SdCliServerBuilder extends EventEmitter {
           {
             "name": npmConfig.name.replace(/@/g, "").replace(/\//g, "-"),
             "script": path.basename(path.resolve(this._parsedTsconfig.options.outDir!, "main.mjs")),
+            "node_args": "--experimental-specifier-resolution=node --experimental-import-meta-resolve",
             "watch": true,
             "watch_delay": 2000,
             "ignore_watch": [
@@ -211,7 +212,7 @@ export class SdCliServerBuilder extends EventEmitter {
     ].map((p) => path.dirname(p));
   }
 
-  private _getWebpackConfig(watch: boolean, extModuleNames: string[]): webpack.Configuration {
+  private _getWebpackConfig(watch: boolean, extModules: { name: string; exists: boolean }[]): webpack.Configuration {
     const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath)!;
     const workspaceName = workspaceNpmConfig.name;
 
@@ -227,15 +228,15 @@ export class SdCliServerBuilder extends EventEmitter {
     return {
       mode: watch ? "development" : "production",
       devtool: false,
-      target: ["node", "es2015"],
+      target: ["node", "es2020"],
       profile: false,
       resolve: {
         roots: [this._rootPath],
         extensions: [".ts", ".js", ".mjs", ".cjs"],
         symlinks: true,
         modules: [this._workspaceRootPath, "node_modules"],
-        mainFields: ["es2015", "default", "module", "main"],
-        conditionNames: ["es2015", "..."]
+        mainFields: ["es2020", "default", "module", "main"],
+        conditionNames: ["es2020", "..."]
       },
       resolveLoader: {
         symlinks: true
@@ -251,17 +252,23 @@ export class SdCliServerBuilder extends EventEmitter {
         hashFunction: "xxhash64",
         clean: true,
         path: this._parsedTsconfig.options.outDir,
-        filename: "[name].cjs",
-        chunkFilename: "[name].cjs",
+        filename: "[name].mjs",
+        chunkFilename: "[name].mjs",
         assetModuleFilename: "res/[name][ext][query]",
-        libraryTarget: "commonjs2"
+        library: {
+          type: "module"
+        },
+        module: true
+      },
+      experiments: {
+        outputModule: true
       },
       watch: false,
       watchOptions: { poll: undefined, ignored: undefined },
       performance: { hints: false },
       infrastructureLogging: { level: "error" },
       stats: "errors-warnings",
-      externals: extModuleNames.toObject((item) => item, (item) => "commonjs2 " + item),
+      externals: extModules.toObject((item) => item.name, (item) => "node-commonjs " + item.name),
       cache: {
         type: "filesystem",
         profile: watch ? undefined : false,
@@ -276,6 +283,7 @@ export class SdCliServerBuilder extends EventEmitter {
           .update(watch.toString())
           .digest("hex")
       },
+      // cache: { type: "memory", maxGenerations: 1 },
       ...watch ? {
         snapshot: {
           immutablePaths: internalModuleCachePaths,
@@ -289,7 +297,7 @@ export class SdCliServerBuilder extends EventEmitter {
             extractComments: false,
             terserOptions: {
               compress: true,
-              ecma: 2015,
+              ecma: 2020,
               sourceMap: false,
               keep_classnames: true,
               keep_fnames: true,
@@ -318,9 +326,6 @@ export class SdCliServerBuilder extends EventEmitter {
             test: /\.[cm]?[tj]sx?$/,
             resolve: {
               fullySpecified: false
-            },
-            use: {
-              loader: "babel-loader"
             }
           },
           ...watch ? [
@@ -455,6 +460,10 @@ export class SdCliServerBuilder extends EventEmitter {
           results.push({ name: moduleName, exists: true });
         }
 
+        if (this._config.externalNodeModules?.includes(moduleName)) {
+          results.push({ name: moduleName, exists: true });
+        }
+
         fn(modulePath);
       }
 
@@ -472,6 +481,10 @@ export class SdCliServerBuilder extends EventEmitter {
           results.push({ name: optModuleName, exists: true });
         }
 
+        if (this._config.externalNodeModules?.includes(optModuleName)) {
+          results.push({ name: optModuleName, exists: true });
+        }
+
         fn(optModulePath);
       }
     };

package/src/builder/SdCliTsLibBuilder.ts

@@ -296,7 +296,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
         char: undefined,
         code: undefined,
         severity: "error",
-        message: err.message
+        message: err.stack
       }];
     }
   }

package/src/commons.ts

@@ -57,6 +57,8 @@ export interface ISdCliServerPackageConfig {
   configs?: Record<string, any>;
   pm2?: Record<string, any> | boolean;
   iis?: { serverExeFilePath?: string } | boolean;
+  externalNodeModules?: string[];
+  publish?: TSdCliPublishConfig;
 }
 
 export interface ISdCliClientPackageConfig {
@@ -65,6 +67,23 @@ export interface ISdCliClientPackageConfig {
   server: string;
   env?: Record<string, string>;
   configs?: Record<string, any>;
+  publish?: TSdCliPublishConfig;
+}
+
+export type TSdCliPublishConfig = ISdCliFtpPublishConfig | ISdCliLocalDirectoryPublishConfig;
+
+export interface ISdCliFtpPublishConfig {
+  type: "ftp" | "ftps" | "sftp";
+  host: string;
+  port?: number;
+  path: string;
+  user: string;
+  pass: string;
+}
+
+export interface ISdCliLocalDirectoryPublishConfig {
+  type: "local-directory";
+  path: string;
 }
 
 export interface ISdCliClientPackageCordovaConfig {

package/src/entry-points/SdCliPrepare.ts

@@ -50,6 +50,6 @@ export class SdCliPrepare {
             }
         }`);
     await FsUtil.writeFileAsync(filePath, modifiedFileContent);
-    return fileContent !== modifiedFileContent;
+    return modifiedFileContent.includes("const prevUsage = process.cpuUsage();");
   }
 }

package/src/entry-points/SdCliWorkspace.ts

@@ -1,4 +1,4 @@
-import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdProcess } from "@simplysm/sd-core-node";
 import path from "path";
 import { INpmConfig, ISdCliConfig, ISdCliPackageBuildResult } from "../commons";
 import { SdCliPackage } from "../packages/SdCliPackage";
@@ -23,7 +23,7 @@ export class SdCliWorkspace {
     this._npmConfig = FsUtil.readJson(npmConfigFilePath);
   }
 
-  public async watchAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async watchAsync(opt: { confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), true, opt.optNames);
 
@@ -33,7 +33,7 @@ export class SdCliWorkspace {
     }
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("패키지 이벤트 설정...");
     let changeCount = 0;
@@ -72,22 +72,29 @@ export class SdCliWorkspace {
     }
     changeCount++;
 
-    const pkgNames = pkgs.map((item) => item.name);
-    const buildCompletedPackageNames: string[] = [];
-    await pkgs.parallelAsync(async (pkg) => {
-      await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
-      if (pkg.config.type === "client") {
-        const middlewares = (await pkg.watchAsync()) as NextHandleFunction[];
-
-        const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
-        serverInfo.middlewares.push(...middlewares);
-        serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
-      }
-      else {
-        await pkg.watchAsync();
-      }
-      buildCompletedPackageNames.push(pkg.name);
-    });
+    try {
+      const pkgNames = pkgs.map((item) => item.name);
+      const buildCompletedPackageNames: string[] = [];
+      await pkgs.parallelAsync(async (pkg) => {
+        await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
+        if (pkg.config.type === "client") {
+          const middlewares = (await pkg.watchAsync()) as NextHandleFunction[];
+
+          const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
+          serverInfo.middlewares.push(...middlewares);
+          serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
+        }
+        else {
+          await pkg.watchAsync();
+        }
+        buildCompletedPackageNames.push(pkg.name);
+      });
+    }
+    catch (err) {
+      this._loggingResults(totalResultMap);
+      this._loggingOpenClientHrefs();
+      throw err;
+    }
 
     changeCount--;
     if (changeCount === 0) {
@@ -111,18 +118,22 @@ export class SdCliWorkspace {
     }
     const entryFilePath = path.resolve(pkg.rootPath, entryFileRelPath);
 
-    this._logger.log(`서버(${pkg.name}) 재시작...`);
     try {
       const serverInfo = this._serverInfoMap.getOrCreate(path.basename(pkg.rootPath), {
         middlewares: [],
         clientInfos: []
       });
       if (serverInfo.server) {
+        this._logger.log(`[${pkg.name}] 기존 서버 중지...`);
         await serverInfo.server.closeAsync();
         delete serverInfo.server;
       }
 
-      serverInfo.server = (await import("file:///" + entryFilePath + "?update=" + Uuid.new().toString())).default.default as SdServiceServer | undefined;
+      this._logger.log(`[${pkg.name}] 서버 시작중...`);
+
+      const serverMainPath = "file:///" + PathUtil.posix(entryFilePath) + "?update=" + Uuid.new().toString().replace(/-/g, "");
+      const serverModule = await import(serverMainPath);
+      serverInfo.server = serverModule.default as SdServiceServer | undefined;
       if (!serverInfo.server) {
         this._logger.error(`${entryFilePath}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
         this._isServerRestarting = false;
@@ -131,7 +142,7 @@ export class SdCliWorkspace {
       serverInfo.server.devMiddlewares = serverInfo.middlewares;
       await Wait.until(() => serverInfo.server!.isOpen);
 
-      this._logger.log(`서버(${pkg.name}) 재시작 완료`);
+      this._logger.log(`[${pkg.name}] 서버가 시작되었습니다.`);
     }
     catch (err) {
       this._logger.error(`서버(${pkg.name}) 재시작중 오류 발생`, err);
@@ -140,12 +151,12 @@ export class SdCliWorkspace {
     this._isServerRestarting = false;
   }
 
-  public async buildAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async buildAsync(opt: { confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false, opt.optNames);
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("프로젝트 및 패키지 버전 설정...");
     await this._upgradeVersionAsync(pkgs);
@@ -159,26 +170,32 @@ export class SdCliWorkspace {
     const pkgNames = pkgs.map((item) => item.name);
     const buildCompletedPackageNames: string[] = [];
     const totalResultMap = new Map<string, ISdCliPackageBuildResult[]>();
-    await pkgs.parallelAsync(async (pkg) => {
-      await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
+    try {
+      await pkgs.parallelAsync(async (pkg) => {
+        await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
 
-      this._logger.debug(`[${pkg.name}] 빌드를 시작합니다...`);
-      totalResultMap.set(pkg.name, await pkg.buildAsync());
-      this._logger.debug(`[${pkg.name}] 빌드가 완료되었습니다.`);
+        this._logger.debug(`[${pkg.name}] 빌드를 시작합니다...`);
+        totalResultMap.set(pkg.name, await pkg.buildAsync());
+        this._logger.debug(`[${pkg.name}] 빌드가 완료되었습니다.`);
 
-      buildCompletedPackageNames.push(pkg.name);
-    });
+        buildCompletedPackageNames.push(pkg.name);
+      });
 
-    this._loggingResults(totalResultMap);
-    if (Array.from(totalResultMap.values()).mapMany().some((item) => item.severity === "error")) {
-      throw new Error("빌드중 오류가 발생하였습니다.");
+      this._loggingResults(totalResultMap);
+      if (Array.from(totalResultMap.values()).mapMany().some((item) => item.severity === "error")) {
+        throw new Error("빌드중 오류가 발생하였습니다.");
+      }
+      else {
+        this._logger.info("모든 빌드가 완료되었습니다.");
+      }
     }
-    else {
-      this._logger.info("모든 빌드가 완료되었습니다.");
+    catch (err) {
+      this._loggingResults(totalResultMap);
+      throw new err;
     }
   }
 
-  public async publishAsync(opt: { noBuild: boolean; confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async publishAsync(opt: { noBuild: boolean; confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false, opt.optNames);
 
@@ -197,7 +214,7 @@ export class SdCliWorkspace {
     }
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("프로젝트 및 패키지 버전 설정...");
     await this._upgradeVersionAsync(pkgs);
@@ -270,16 +287,17 @@ export class SdCliWorkspace {
     process.stdout.clearLine(0);
   }
 
-  private async _getPackagesAsync(conf: ISdCliConfig): Promise<SdCliPackage[]> {
+  private async _getPackagesAsync(conf: ISdCliConfig, pkgs: string[]): Promise<SdCliPackage[]> {
     const pkgRootPaths = await this._npmConfig.workspaces?.mapManyAsync(async (item) => await FsUtil.globAsync(item));
     if (!pkgRootPaths) {
       throw new Error("최상위 'package.json'에서 'workspaces'를 찾을 수 없습니다.");
     }
 
-
     return pkgRootPaths.map((pkgRootPath) => {
+      if (pkgs.length > 0 && !pkgs.includes(path.basename(pkgRootPath))) return undefined;
       const pkgConfig = conf.packages[path.basename(pkgRootPath)];
-      return pkgConfig ? new SdCliPackage(this._rootPath, pkgRootPath, pkgConfig) : undefined;
+      if (!pkgConfig) return undefined;
+      return new SdCliPackage(this._rootPath, pkgRootPath, pkgConfig);
     }).filterExists();
   }
 

package/src/ng-tools/SdCliNgModuleGenerator.ts

@@ -7,17 +7,21 @@ import {
   SdCliBbNgModuleMetadata,
   SdCliBbNgPipeMetadata
 } from "./babel/TSdCliBbNgMetadata";
-import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
+import { NeverEntryError, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
 import { TSdCliMetaRef } from "./commons";
 import { SdCliTsNgInjectableMetadata } from "./typescript/SdCliTsFileMetadata";
 import path from "path";
 import { JSDOM } from "jsdom";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
 import os from "os";
+import { INpmConfig } from "../commons";
 
 // TODO: 에러 메시지 처리
 // TODO: forRoot에 있는 Provider 처리??
+// TODO: CircularDependency
 export class SdCliNgModuleGenerator {
+  private readonly _logger: Logger;
+
   private readonly _bbMeta: SdCliBbRootMetadata;
   private readonly _tsMeta: SdCliTsRootMetadata;
 
@@ -44,6 +48,9 @@ export class SdCliNgModuleGenerator {
       const content = FsUtil.readFile(currFilePath);
       this._fileWriterCache.set(currFilePath, content);
     }
+
+    const npmConfig: INpmConfig = FsUtil.readJson(path.resolve(packagePath, "package.json"));
+    this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, npmConfig.name]);
   }
 
   public removeCaches(changedFilePaths: string[]): void {
@@ -57,20 +64,118 @@ export class SdCliNgModuleGenerator {
   }
 
   public async runAsync(): Promise<void> {
+    this._logger.debug("Babel NgModule 정의 가져오기...");
     const bbNgModules = this._getBbNgModuleDefs();
+    
+    this._logger.debug("NgModule Preset 구성...");
     const tsPreset = this._getTsGenNgModulePreset();
 
+    this._logger.debug("RoutingModule 정의 구성...");
     const genNgRoutingModules = await this._getGenNgRoutingModuleDefsAsync();
+
+    this._logger.debug("NgModule 정의 구성...");
     const genNgModules = this._getGenNgModuleDefs(bbNgModules, tsPreset.modules, tsPreset.sources);
 
+    this._logger.debug("NgModule 순환참조 병합...");
+    const mergedGenNgModules = this._mergeNgModuleCircularDependency(genNgModules);
+
+    this._logger.debug("생성할 파일 내용 구성...");
     const files = [
       ...this._getGenNgRoutingModuleFiles(genNgRoutingModules),
-      ...this._getGenNgModuleFiles(genNgModules)
+      ...this._getGenNgModuleFiles(mergedGenNgModules)
     ];
 
+    this._logger.debug("파일 쓰기...");
     await this._writeFilesAsync(files);
   }
 
+  private _mergeNgModuleCircularDependency(mods: ITsGenNgModuleDef[]): ITsGenNgModuleDef[] {
+    // 중복 'check'목록 구성
+    const check = (mod: ITsGenNgModuleDef, ref: { filePath: string; name: string }, chain: ITsGenNgModuleDef[]): ITsGenNgModuleDef[][] => {
+      const result: ITsGenNgModuleDef[][] = [];
+      for (const imp of mod.imports) {
+        if ("filePath" in imp) {
+          if (imp.filePath === ref.filePath || imp.name === ref.name) {
+            result.push(chain.concat([mod]));
+          }
+          else {
+            const childMod = mods.single((item) => item.filePath === imp.filePath && item.name === imp.name);
+            if (childMod) {
+              if (chain.some((item) => item.filePath === childMod.filePath && item.name === childMod.name)) {
+                continue;
+              }
+
+              result.push(
+                ...check(childMod, ref, chain.concat([mod]))
+              );
+            }
+          }
+        }
+      }
+
+      return result;
+    };
+
+    const checkedList: ITsGenNgModuleDef[][] = [];
+    for (const mod of mods) {
+      const circularDepModules = check(mod, { filePath: mod.filePath, name: mod.name }, []);
+      if (circularDepModules.length > 0) {
+        checkedList.push(...circularDepModules);
+      }
+    }
+    const mergeModPacks = checkedList.map((item) => item.orderBy((item1) => item1.filePath)).distinct();
+
+    // 'merge'목록 구성
+    const currMergedList: ITsGenNgModuleDef[] = [];
+    for (const mergeModPack of mergeModPacks) {
+      let currMerged = mergeModPack[0];
+      for (const mergeMod of mergeModPack.slice(1)) {
+        currMerged = {
+          filePath: currMerged.filePath,
+          name: currMerged.name,
+          imports: currMerged.imports.concat(mergeMod.imports).distinct(),
+          exports: currMerged.exports.concat(mergeMod.exports).distinct(),
+          providers: currMerged.providers.concat(mergeMod.providers).distinct()
+        };
+      }
+      currMerged.imports.remove((imp) => (
+        "filePath" in imp &&
+        mergeModPack.some((mergeMod) => (
+          imp.filePath === mergeMod.filePath &&
+          imp.name === mergeMod.name
+        ))
+      ));
+
+      currMergedList.push(currMerged);
+    }
+
+    // 기존 'check'된 것들 모두 삭제
+    const result: ITsGenNgModuleDef[] = ObjectUtil.clone(mods);
+    for (const delMod of mergeModPacks.mapMany()) {
+      result.remove((item) => item.filePath === delMod.filePath && item.name === delMod.name);
+    }
+
+    // 'merge'된 것들 등록
+    result.push(...currMergedList);
+
+    // 모든 결과물에서 'import'에 'merge'된것들이 있으면 'merge'결과물 파일로 변경후, distinct
+    for (const resultItem of result) {
+      for (const imp of resultItem.imports) {
+        if (!("filePath" in imp)) continue;
+
+        for (const mergeModPack of mergeModPacks) {
+          if (mergeModPack.some((mergeModPackItem) => mergeModPackItem.filePath === imp.filePath && mergeModPackItem.name === imp.name)) {
+            imp.filePath = mergeModPack[0].filePath;
+            imp.name = mergeModPack[0].name;
+          }
+        }
+      }
+      resultItem.imports = resultItem.imports.distinct();
+    }
+
+    return result;
+  }
+
   private _findBbMetasFromMeta(srcMeta: TSdCliBbMetadata): TSdCliBbMetadata[] {
     const metaTmp = typeof srcMeta !== "string" && "__TSdCliMetaRef__" in srcMeta ? this._bbMeta.findMeta(srcMeta) : srcMeta;
     return metaTmp instanceof Array ? metaTmp : [metaTmp];
@@ -187,7 +292,7 @@ export class SdCliNgModuleGenerator {
           const moduleFilePath = path.resolve(this._modulesPath, path.relative(this._srcPath, path.dirname(fileMeta.filePath)), moduleClassName);
 
           result.sources.push({
-            filePath: fileMeta.filePath,
+            filePath: fileMeta.filePath.replace(/\.[^.]*$/, ""),
             name: cls.exportedName,
             module: {
               filePath: moduleFilePath,
@@ -202,7 +307,7 @@ export class SdCliNgModuleGenerator {
             filePath: moduleFilePath,
             name: moduleClassName,
             source: {
-              filePath: fileMeta.filePath,
+              filePath: fileMeta.filePath.replace(/\.[^.]*$/, ""),
               name: cls.exportedName
             },
             selector: "selector" in cls.target.ngDecl ? cls.target.ngDecl.selector : undefined,
@@ -218,9 +323,9 @@ export class SdCliNgModuleGenerator {
   private _getGenNgModuleDefs(bbModules: IBbNgModuleDef[], presetModules: ITsNgPresetModuleDef[], presetSources: ITsNgPresetSourceDef[]): ITsGenNgModuleDef[] {
     const result: ITsGenNgModuleDef[] = [];
 
-    for (const el of presetSources) {
+    for (const presetSource of presetSources) {
       const imports: TSdCliMetaRef[] = [];
-      for (const imp of el.imports) {
+      for (const imp of presetSource.imports) {
         if ("moduleName" in imp) {
           for (const mod of bbModules) {
             if (mod.exports.some((item) => item.moduleName === imp.moduleName && item.name === imp.name)) {
@@ -240,8 +345,8 @@ export class SdCliNgModuleGenerator {
         }
       }
 
-      if (el.template !== undefined) {
-        const templateDOM = new JSDOM(el.template);
+      if (presetSource.template !== undefined) {
+        const templateDOM = new JSDOM(presetSource.template);
 
         for (const mod of bbModules) {
           for (const selector of mod.selectors) {
@@ -257,7 +362,7 @@ export class SdCliNgModuleGenerator {
           }
 
           for (const pipeName of mod.pipeNames) {
-            if (new RegExp("| *" + pipeName + "[^\\w]").test(el.template)) {
+            if (new RegExp("| *" + pipeName + "[^\\w]").test(presetSource.template)) {
               imports.push({ moduleName: mod.moduleName, name: mod.name, __TSdCliMetaRef__: "__TSdCliMetaRef__" });
             }
           }
@@ -277,7 +382,7 @@ export class SdCliNgModuleGenerator {
           }
 
           if (mod.pipeName !== undefined) {
-            if (new RegExp("| *" + mod.pipeName + "[^\\w]").test(el.template)) {
+            if (new RegExp("| *" + mod.pipeName + "[^\\w]").test(presetSource.template)) {
               imports.push({ filePath: mod.filePath, name: mod.name, __TSdCliMetaRef__: "__TSdCliMetaRef__" });
             }
           }
@@ -285,11 +390,11 @@ export class SdCliNgModuleGenerator {
       }
 
       result.push({
-        filePath: el.module.filePath,
-        name: el.module.name,
+        filePath: presetSource.module.filePath,
+        name: presetSource.module.name,
         imports: imports.distinct(),
-        exports: el.isProvider ? [] : [{ filePath: el.filePath, name: el.name }],
-        providers: el.isProvider ? [{ filePath: el.filePath, name: el.name }] : []
+        exports: presetSource.isProvider ? [] : [{ filePath: presetSource.filePath, name: presetSource.name }],
+        providers: presetSource.isProvider ? [{ filePath: presetSource.filePath, name: presetSource.name }] : []
       });
     }