@simplysm/sd-cli 7.0.79 → 7.0.100

package/src/builder/SdCliClientBuilder.ts

@@ -31,10 +31,11 @@ import { TransferSizePlugin } from "@angular-devkit/build-angular/src/webpack/pl
 import { CssOptimizerPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/css-optimizer-plugin";
 import browserslist from "browserslist";
 import { augmentAppWithServiceWorker } from "@angular-devkit/build-angular/src/utils/service-worker";
-import { StringUtil } from "@simplysm/sd-core-common";
 import { SdCliNgModuleGenerator } from "../ng-tools/SdCliNgModuleGenerator";
 import { SdCliCordova } from "../build-tool/SdCliCordova";
 import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
+import electronBuilder from "electron-builder";
+import { NeverEntryError } from "@simplysm/sd-core-common";
 import LintResult = ESLint.LintResult;
 
 export class SdCliClientBuilder extends EventEmitter {
@@ -84,8 +85,8 @@ export class SdCliClientBuilder extends EventEmitter {
     } : undefined);
 
     // CORDOVA
-    if (this._config.cordova) {
-      this._cordova = new SdCliCordova(this._rootPath, this._config.cordova);
+    if (this._config.builders?.cordova) {
+      this._cordova = new SdCliCordova(this._rootPath, this._config.builders.cordova);
     }
   }
 
@@ -97,6 +98,7 @@ export class SdCliClientBuilder extends EventEmitter {
 
   public async watchAsync(): Promise<NextHandleFunction[]> {
     // DIST 비우기
+    await FsUtil.removeAsync(path.resolve(this._rootPath, ".electron"));
     await FsUtil.removeAsync(this._parsedTsconfig.options.outDir!);
 
     // NgModule 생성
@@ -109,10 +111,11 @@ export class SdCliClientBuilder extends EventEmitter {
     }
 
     // 빌드 준비
-    const webpackConfig = this._getWebpackConfig(true);
-    const compiler = webpack(webpackConfig);
+    const webpackConfigs = (Object.keys(this._config.builders ?? { web: {} }) as ("web" | "cordova" | "electron")[])
+      .map((builderType) => this._getWebpackConfig(true, builderType));
+    const multiCompiler = webpack(webpackConfigs);
     return await new Promise<NextHandleFunction[]>((resolve, reject) => {
-      compiler.hooks.invalid.tap(this.constructor.name, (fileName) => {
+      multiCompiler.hooks.invalid.tap(this.constructor.name, (fileName) => {
         if (fileName != null) {
           this._logger.debug("파일변경 감지", fileName);
           // NgModule 캐시 삭제
@@ -120,7 +123,7 @@ export class SdCliClientBuilder extends EventEmitter {
         }
       });
 
-      compiler.hooks.watchRun.tapAsync(this.constructor.name, async (args, callback) => {
+      multiCompiler.hooks.watchRun.tapAsync(this.constructor.name, async (args, callback) => {
         this.emit("change");
 
         // NgModule 생성
@@ -131,54 +134,58 @@ export class SdCliClientBuilder extends EventEmitter {
         this._logger.debug("Webpack 빌드 수행...");
       });
 
-      compiler.hooks.failed.tap(this.constructor.name, (err) => {
-        this.emit("complete", [{
-          filePath: undefined,
-          line: undefined,
-          char: undefined,
-          code: undefined,
-          severity: "error",
-          message: err.stack
-        }]);
-        reject(err);
-        return;
-      });
+      for (const compiler of multiCompiler.compilers) {
+        compiler.hooks.failed.tap(this.constructor.name, (err) => {
+          this.emit("complete", [{
+            filePath: undefined,
+            line: undefined,
+            char: undefined,
+            code: undefined,
+            severity: "error",
+            message: err.stack
+          }]);
+          reject(err);
+          return;
+        });
+      }
 
-      compiler.hooks.done.tap(this.constructor.name, async (stats) => {
+      multiCompiler.hooks.done.tap(this.constructor.name, async (multiStats) => {
         // 결과 반환
-        const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
+        const results = multiStats.stats.mapMany((stats) => SdCliBuildResultUtil.convertFromWebpackStats(stats));
 
         // .config.json 파일 쓰기
         const npmConfig = this._getNpmConfig(this._rootPath)!;
         const packageKey = npmConfig.name.split("/").last()!;
 
-        const configDistPath = !StringUtil.isNullOrEmpty(this._config.server)
+        const configDistPath = typeof this._config.server === "string"
           ? path.resolve(this._workspaceRootPath, "packages", this._config.server, "dist/www", packageKey, ".config.json")
           : path.resolve(this._parsedTsconfig.options.outDir!, ".config.json");
         await FsUtil.writeFileAsync(configDistPath, JSON.stringify(this._config.configs ?? {}, undefined, 2));
 
         // 마무리
         this._logger.debug("Webpack 빌드 완료");
-        resolve([devMiddleware, hotMiddleware]);
+        resolve(middlewares);
 
         this.emit("complete", results);
       });
 
-      const devMiddleware = wdm(compiler, {
-        publicPath: webpackConfig.output!.publicPath as string,
-        index: "index.html",
-        stats: false
-      });
-
-      const hotMiddleware = whm(compiler, {
-        path: `${webpackConfig.output!.publicPath as string}__webpack_hmr`,
-        log: false
-      });
+      const middlewares = multiCompiler.compilers.mapMany((compiler) => [
+        wdm(compiler, {
+          publicPath: compiler.options.output.publicPath,
+          index: "index.html",
+          stats: false
+        }),
+        whm(compiler, {
+          path: `${compiler.options.output.publicPath}__webpack_hmr`,
+          log: false
+        })
+      ]);
     });
   }
 
   public async buildAsync(): Promise<ISdCliPackageBuildResult[]> {
     // DIST 비우기
+    await FsUtil.removeAsync(path.resolve(this._rootPath, ".electron"));
     await FsUtil.removeAsync(this._parsedTsconfig.options.outDir!);
 
     // NgModule 생성
@@ -186,17 +193,18 @@ export class SdCliClientBuilder extends EventEmitter {
 
     // 빌드
     this._logger.debug("Webpack 빌드 수행...");
-    const webpackConfig = this._getWebpackConfig(false);
-    const compiler = webpack(webpackConfig);
+    const builderTypes = (Object.keys(this._config.builders ?? { web: {} }) as ("web" | "cordova" | "electron")[]);
+    const webpackConfigs = builderTypes.map((builderType) => this._getWebpackConfig(false, builderType));
+    const multipleCompiler = webpack(webpackConfigs);
     const buildResults = await new Promise<ISdCliPackageBuildResult[]>((resolve, reject) => {
-      compiler.run((err, stats) => {
-        if (err != null || stats == null) {
+      multipleCompiler.run((err, multiStats) => {
+        if (err != null || multiStats == null) {
           reject(err);
           return;
         }
 
         // 결과 반환
-        const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
+        const results = multiStats.stats.mapMany((stats) => SdCliBuildResultUtil.convertFromWebpackStats(stats));
         resolve(results);
       });
     });
@@ -206,12 +214,12 @@ export class SdCliClientBuilder extends EventEmitter {
     await FsUtil.writeFileAsync(targetPath, JSON.stringify(this._config.configs ?? {}, undefined, 2));
 
     // service-worker 처리
-    if (FsUtil.exists(path.resolve(this._rootPath, "ngsw-config.json"))) {
+    if (builderTypes.includes("web") && FsUtil.exists(path.resolve(this._rootPath, "ngsw-config.json"))) {
       const packageKey = this._getNpmConfig(this._rootPath)!.name.split("/").last()!;
       await augmentAppWithServiceWorker(
         PathUtil.posix(path.relative(this._workspaceRootPath, this._rootPath)) as any,
-        PathUtil.posix(path.relative(this._workspaceRootPath, this._parsedTsconfig.options.outDir!)) as any,
-        `/${packageKey}/`,
+        PathUtil.posix(path.relative(this._workspaceRootPath, path.resolve(this._parsedTsconfig.options.outDir!, "web"))) as any,
+        `/${packageKey}/web/`,
         PathUtil.posix(path.relative(this._workspaceRootPath, path.resolve(this._rootPath, "ngsw-config.json")))
       );
     }
@@ -222,7 +230,55 @@ export class SdCliClientBuilder extends EventEmitter {
       await this._cordova.initializeAsync();
 
       this._logger.debug("CORDOVA 빌드...");
-      await this._cordova.buildAsync(this._parsedTsconfig.options.outDir!);
+      await this._cordova.buildAsync(path.resolve(this._parsedTsconfig.options.outDir!, "cordova"));
+    }
+
+    // ELECTRON
+    if (this._config.builders?.electron) {
+      const npmConfig = this._getNpmConfig(this._rootPath)!;
+
+      if (npmConfig.dependencies?.["electron"] == null) {
+        throw new NeverEntryError();
+      }
+
+      await FsUtil.writeJsonAsync(path.resolve(this._rootPath, `.electron/src/package.json`), {
+        name: npmConfig.name,
+        version: npmConfig.version,
+        description: npmConfig.description,
+        main: "electron.js",
+        author: npmConfig.author,
+        license: npmConfig.license,
+        devDependencies: {
+          "electron": npmConfig.dependencies["electron"].replace("^", "")
+        }
+      });
+
+      await FsUtil.writeFileAsync(path.resolve(this._rootPath, `.electron/src/.env`), `NODE_ENV=production`);
+
+      await FsUtil.copyAsync(path.resolve(this._rootPath, `src/electron.prod.js`), path.resolve(this._rootPath, ".electron/src/electron.js"));
+
+      await electronBuilder.build({
+        targets: electronBuilder.Platform.WINDOWS.createTarget(),
+        config: {
+          appId: this._config.builders.electron.appId,
+          productName: npmConfig.description,
+          asar: true,
+          nsis: {},
+          directories: {
+            app: path.resolve(this._rootPath, ".electron/src"),
+            output: path.resolve(this._rootPath, ".electron/dist")
+          }
+        }
+      });
+
+      await FsUtil.copyAsync(
+        path.resolve(this._rootPath, `.electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
+        path.resolve(this._parsedTsconfig.options.outDir!, `electron/${npmConfig.description}-v${npmConfig.version}.exe`)
+      );
+      await FsUtil.copyAsync(
+        path.resolve(this._rootPath, `.electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
+        path.resolve(this._parsedTsconfig.options.outDir!, `electron/${npmConfig.description}-latest.exe`)
+      );
     }
 
     // 마무리
@@ -237,7 +293,7 @@ export class SdCliClientBuilder extends EventEmitter {
     ].map((p) => path.dirname(p));
   }
 
-  private _getWebpackConfig(watch: boolean): webpack.Configuration {
+  private _getWebpackConfig(watch: boolean, builderType: "web" | "cordova" | "electron"): webpack.Configuration {
     const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath)!;
     const workspaceName = workspaceNpmConfig.name;
 
@@ -248,12 +304,16 @@ export class SdCliClientBuilder extends EventEmitter {
     const ngVersion = this._getNpmConfig(FsUtil.findAllParentChildDirPaths("node_modules/@angular/core", this._rootPath, this._workspaceRootPath)[0])!.version;
 
     const pkgKey = npmConfig.name.split("/").last()!;
-    const publicPath = (this._cordova && !watch) ? `/` : `/${pkgKey}/`;
+    const publicPath = (builderType === "web" || watch) ? `/${pkgKey}/${builderType}/` : ``;
 
     const cacheBasePath = path.resolve(this._rootPath, ".cache");
     const cachePath = path.resolve(cacheBasePath, pkgVersion);
 
-    const distPath = (this._cordova && !watch) ? path.resolve(this._cordova.cordovaPath, "www") : this._parsedTsconfig.options.outDir;
+    const distPath = (builderType === "cordova" && !watch)
+      ? path.resolve(this._cordova!.cordovaPath, "www")
+      : (builderType === "electron" && !watch)
+        ? path.resolve(this._rootPath, ".electron/src")
+        : `${this._parsedTsconfig.options.outDir}/${builderType}`;
 
     const sassImplementation = new SassWorkerImplementation();
 
@@ -265,7 +325,7 @@ export class SdCliClientBuilder extends EventEmitter {
     return {
       mode: watch ? "development" : "production",
       devtool: false,
-      target: ["web", "es2015"],
+      target: builderType === "electron" ? ["electron-renderer", "es2015"] : ["web", "es2015"],
       profile: false,
       resolve: {
         roots: [this._rootPath],
@@ -273,7 +333,7 @@ export class SdCliClientBuilder extends EventEmitter {
         symlinks: true,
         modules: [this._workspaceRootPath, "node_modules"],
         mainFields: ["es2015", "browser", "module", "main"],
-        conditionNames: ["es2015", "..."]
+        conditionNames: ["es2015", "..."],
       },
       resolveLoader: {
         symlinks: true
@@ -518,7 +578,9 @@ export class SdCliClientBuilder extends EventEmitter {
             }
           }
         }),
-        new CommonJsUsageWarnPlugin(),
+        new CommonJsUsageWarnPlugin({
+          allowedDependencies: ["@fortawesome"]
+        }),
         ...watch ? [] : [
           new LicenseWebpackPlugin({
             stats: { warnings: false, errors: false },
@@ -529,7 +591,7 @@ export class SdCliClientBuilder extends EventEmitter {
         ],
         new CopyWebpackPlugin({
           patterns: [
-            ...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
+            ...["favicon.ico", "assets/", "manifest.json"].map((item) => ({
               context: this._rootPath,
               to: item,
               from: `src/${item}`,
@@ -546,11 +608,31 @@ export class SdCliClientBuilder extends EventEmitter {
               },
               priority: 0
             })),
-            ...this._cordova ? this._cordova.platforms.map((platform) => ({
-              context: this._cordova!.cordovaPath,
-              to: `cordova-${platform}`,
-              from: `platforms/${platform}/platform_www`
-            })) : []
+            ...builderType === "cordova" && watch ? this._cordova!.platforms.mapMany((platform) => [
+              {
+                context: this._cordova!.cordovaPath,
+                to: `cordova-${platform}/plugins`,
+                from: `platforms/${platform}/www/plugins`,
+                noErrorOnMissing: true
+              },
+              {
+                context: this._cordova!.cordovaPath,
+                to: `cordova-${platform}/cordova.js`,
+                from: `platforms/${platform}/www/cordova.js`
+              },
+              {
+                context: this._cordova!.cordovaPath,
+                to: `cordova-${platform}/cordova_plugins.js`,
+                from: `platforms/${platform}/www/cordova_plugins.js`,
+                noErrorOnMissing: true
+              },
+              {
+                context: this._cordova!.cordovaPath,
+                to: `cordova-${platform}/config.xml`,
+                from: `platforms/${platform}/www/config.xml`,
+                noErrorOnMissing: true
+              }
+            ]) : []
           ]
         }),
         ...watch ? [

package/src/builder/SdCliJsLibBuilder.ts

@@ -25,15 +25,15 @@ export class SdCliJsLibBuilder extends EventEmitter {
 
     const relatedPaths = await this.getRelatedPathsAsync();
     const watcher = SdFsWatcher.watch(relatedPaths);
-    watcher.onChange({}, async (changeInfos) => {
-      const changeFilePaths = changeInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+    watcher.onChange({}, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
       if (changeFilePaths.length === 0) return;
 
       this._logger.debug("파일 변경 감지");
       this.emit("change");
       const watchBuildResults: ISdCliPackageBuildResult[] = [];
 
-      const lintFilePaths = changeInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
+      const lintFilePaths = changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
       if (lintFilePaths.length > 0) {
         watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths));
       }

package/src/builder/SdCliTsLibBuilder.ts

@@ -115,8 +115,8 @@ export class SdCliTsLibBuilder extends EventEmitter {
     this._logger.debug("변경감지 구성...");
     const relatedPaths = await this.getAllRelatedPathsAsync();
     const watcher = SdFsWatcher.watch(relatedPaths);
-    watcher.onChange({}, async (changeInfos) => {
-      const changeFilePaths = changeInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+    watcher.onChange({}, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
       if (changeFilePaths.length === 0) return;
 
       this._logger.debug("파일 변경 감지", changeFilePaths);
@@ -153,7 +153,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
       this._logger.debug("린트...");
       const lintFilePaths = [
         ...watchBuildPack.affectedSourceFiles.map((item) => item.fileName),
-        ...changeInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path)
+        ...changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path)
       ];
       if (lintFilePaths.length > 0) {
         watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths, watchBuildPack.program));

package/src/commons.ts

@@ -1,6 +1,9 @@
 export interface INpmConfig {
   name: string;
   version: string;
+  description?: string;
+  author?: string;
+  license?: string;
   type?: "module";
   workspaces?: string[];
   main?: string;
@@ -63,8 +66,12 @@ export interface ISdCliServerPackageConfig {
 
 export interface ISdCliClientPackageConfig {
   type: "client";
-  cordova?: ISdCliClientPackageCordovaConfig;
-  server: string;
+  builders?: {
+    web?: ISdCliClientBuilderWebConfig;
+    cordova?: ISdCliClientBuilderCordovaConfig;
+    electron?: ISdCliClientBuilderElectronConfig;
+  };
+  server: string | { port: number };
   env?: Record<string, string>;
   configs?: Record<string, any>;
   publish?: TSdCliPublishConfig;
@@ -86,17 +93,21 @@ export interface ISdCliLocalDirectoryPublishConfig {
   path: string;
 }
 
-export interface ISdCliClientPackageCordovaConfig {
-  platforms: TSdCliCordovaPlatform[];
+export interface ISdCliClientBuilderWebConfig {
+}
+
+export interface ISdCliClientBuilderCordovaConfig {
+  type: "cordova";
   appId: string;
   appName: string;
   plugins?: string[];
   icon?: string;
-  buildOption?: {
-    debug?: boolean;
-    bundle?: boolean;
-    sign?: {
-      android?: {
+  debug?: boolean;
+  targets?: {
+    browser?: {};
+    android?: {
+      bundle?: boolean;
+      sign?: {
         keystore: string;
         storePassword: string;
         alias: string;
@@ -107,4 +118,11 @@ export interface ISdCliClientPackageCordovaConfig {
   };
 }
 
-export type TSdCliCordovaPlatform = "browser" | "ios" | "android" | "electron";
+export interface ISdCliClientBuilderElectronConfig {
+  appId: string;
+}
+
+export type TSdCliClientBuilderConfig =
+  ISdCliClientBuilderWebConfig
+  | ISdCliClientBuilderCordovaConfig
+  | ISdCliClientBuilderElectronConfig;

package/src/entry-points/SdCliLocalUpdate.ts

@@ -42,8 +42,8 @@ export class SdCliLocalUpdate {
     const watchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
 
     const watcher = SdFsWatcher.watch(watchPaths);
-    watcher.onChange({ delay: 1000 }, async (changeInfos) => {
-      const changeFilePaths = changeInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+    watcher.onChange({ delay: 1000 }, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
       if (changeFilePaths.length === 0) return;
 
       this._logger.log("로컬 라이브러리 변경감지...");

package/src/entry-points/SdCliWorkspace.ts

@@ -80,9 +80,25 @@ export class SdCliWorkspace {
         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()! });
+          if (typeof pkg.config.server === "string") {
+            const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
+            serverInfo.middlewares.push(...middlewares);
+            serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
+          }
+          else { // DEV SERVER
+            const serverInfo = this._serverInfoMap.getOrCreate("_", { middlewares: [], clientInfos: [] });
+            if (serverInfo.server === undefined) {
+              const server = new SdServiceServer({
+                rootPath: process.cwd(),
+                services: [],
+                port: pkg.config.server.port
+              });
+              await server.listenAsync();
+              serverInfo.server = server;
+              serverInfo.server.devMiddlewares = middlewares;
+              serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
+            }
+          }
         }
         else {
           await pkg.watchAsync();

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./build-tool/SdCliCacheCompilerHost";
 export * from "./build-tool/SdCliCordova";
+export * from "./build-tool/SdCliElectron";
 export * from "./build-tool/SdCliIndexFileGenerator";
 export * from "./build-tool/SdCliNgCacheCompilerHost";
 export * from "./build-tool/SdCliPackageLinter";

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

@@ -46,7 +46,7 @@ export class SdCliBbFileMetadata {
 
   public constructor(public readonly filePath: string) {
     let realFilePath: string | undefined;
-    for (const ext of ["", ".mjs", ".cjs", ".js"]) {
+    for (const ext of ["", ".mjs", ".cjs", ".js"/*, "/index.mjs", "/index.cjs", "/index.js"*/]) {
       if (FsUtil.exists(filePath + ext) && !FsUtil.stat(filePath + ext).isDirectory()) {
         realFilePath = filePath + ext;
         break;

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

@@ -144,7 +144,10 @@ export class SdCliBbRootMetadata {
 
       const entryFilePath = npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
       if (typeof entryFilePath === "string") {
-        entryMap.set(npmConfig.name, path.resolve(ngDepPath, entryFilePath));
+        const realPath = this._getRealFilePath(path.resolve(ngDepPath, entryFilePath));
+        if (realPath != null) {
+          entryMap.set(npmConfig.name, realPath);
+        }
       }
 
       if (npmConfig.exports) {
@@ -168,7 +171,10 @@ export class SdCliBbRootMetadata {
             const exportPath = path.resolve(ngDepPath, expEntryFilePath);
             const exportResult = this._getGlobExportResult(PathUtil.posix(npmConfig.name, exportKey), exportPath);
             for (const exportResultItem of exportResult) {
-              entryMap.set(exportResultItem.name, exportResultItem.target);
+              const realPath = this._getRealFilePath(exportResultItem.target);
+              if (realPath != null) {
+                entryMap.set(exportResultItem.name, realPath);
+              }
             }
           }
         }
@@ -178,6 +184,28 @@ export class SdCliBbRootMetadata {
     return entryMap;
   }
 
+  private _getRealFilePath(itemPath: string): string | undefined {
+    if (!FsUtil.exists(itemPath)) {
+      for (const ext of [".mjs", ".cjs", ".js"]) {
+        if (FsUtil.exists(itemPath + ext)) {
+          return itemPath + ext;
+        }
+      }
+    }
+    else if (FsUtil.stat(itemPath).isFile()) {
+      return itemPath;
+    }
+    else {
+      for (const fileName of ["index.mjs", "index.cjs", "index.js"]) {
+        if (FsUtil.exists(path.resolve(itemPath, fileName))) {
+          return path.resolve(itemPath, fileName);
+        }
+      }
+    }
+
+    return undefined;
+  }
+
   private _getGlobExportResult(globName: string, globTarget: string): { name: string; target: string }[] {
     if (globName.includes("*") && globTarget.includes("*")) {
       const result: { name: string; target: string }[] = [];

package/tsconfig.json

@@ -19,6 +19,9 @@
       "@simplysm/sd-service-server": [
         "../sd-service-server/src/index.ts"
       ],
+      "@simplysm/sd-orm-common": [
+        "../sd-orm-common/src/index.ts"
+      ],
       "@simplysm/sd-storage": [
         "../sd-storage/src/index.ts"
       ]