@simplysm/sd-cli 7.0.81 → 7.0.146

package/src/entry-points/SdCliWorkspace.ts

@@ -80,9 +80,33 @@ 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()!,
+              platforms: pkg.config.builder ? Object.keys(pkg.config.builder) : ["web"],
+              cordovaTargets: pkg.config.builder?.cordova?.target ? Object.keys(pkg.config.builder.cordova.target) : ["browser"]
+            });
+          }
+          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()!,
+                platforms: pkg.config.builder ? Object.keys(pkg.config.builder) : ["web"],
+                cordovaTargets: pkg.config.builder?.cordova?.target ? Object.keys(pkg.config.builder.cordova.target) : ["browser"]
+              });
+            }
+          }
         }
         else {
           await pkg.watchAsync();
@@ -345,11 +369,28 @@ export class SdCliWorkspace {
       const portStr = serverInfo.server.options.port.toString();
 
       for (const clientInfo of serverInfo.clientInfos) {
-        clientHrefs.push(`${protocolStr}://localhost:${portStr}/${clientInfo.pkgKey}/`);
+        for (const platform of clientInfo.platforms) {
+          if (platform === "web") {
+            clientHrefs.push(`${protocolStr}://localhost:${portStr}/${clientInfo.pkgKey}/`);
+          }
+          else if (platform === "electron") {
+            clientHrefs.push(`sd-cli run-electron ${clientInfo.pkgKey} http://localhost:${portStr}`);
+          }
+          else if (platform === "cordova") {
+            for (const target of clientInfo.cordovaTargets) {
+              if (target === "browser") {
+                clientHrefs.push(`${protocolStr}://localhost:${portStr}/${clientInfo.pkgKey}/${platform}/`);
+              }
+              else {
+                clientHrefs.push(`sd-cli run-cordova ${clientInfo.pkgKey} http://[IP]:${portStr}`);
+              }
+            }
+          }
+        }
       }
     }
     if (clientHrefs.length > 0) {
-      this._logger.log(`오픈된 클라이언트: ${clientHrefs.join(", ")}`);
+      this._logger.log(`오픈된 클라이언트:\n${clientHrefs.join("\n")}`);
     }
   }
 }
@@ -357,5 +398,5 @@ export class SdCliWorkspace {
 interface IServerInfo {
   server?: SdServiceServer;
   middlewares: NextHandleFunction[];
-  clientInfos: { pkgKey: string }[];
+  clientInfos: { pkgKey: string; platforms: string[]; cordovaTargets: string[] }[];
 }

package/src/index.ts

@@ -1,5 +1,7 @@
 export * from "./build-tool/SdCliCacheCompilerHost";
 export * from "./build-tool/SdCliCordova";
+export * from "./build-tool/SdCliElectron";
+export * from "./build-tool/SdCliGithubApi";
 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/src/packages/SdCliPackage.ts

@@ -11,6 +11,7 @@ import { SdCliClientBuilder } from "../builder/SdCliClientBuilder";
 import { NextHandleFunction } from "connect";
 import { SdStorage } from "@simplysm/sd-storage";
 import ts from "typescript";
+import { SdCliGithubApi } from "../build-tool/SdCliGithubApi";
 
 export class SdCliPackage extends EventEmitter {
   private readonly _npmConfig: INpmConfig;
@@ -96,7 +97,23 @@ export class SdCliPackage extends EventEmitter {
         }
       }
       else {
-        if (this.config.publish.type === "ftp" || this.config.publish.type === "ftps" || this.config.publish.type === "sftp") {
+        if (this.config.publish.type === "github") {
+          const repoUrl = typeof this._npmConfig.repository === "string" ? this._npmConfig.repository : this._npmConfig.repository.url;
+          const repoOwner = repoUrl.split("/").slice(-2)[0];
+          const repoName = repoUrl.split("/").slice(-2)[1].replace(/\..*/g, "");
+
+          const github = new SdCliGithubApi(
+            this.config.publish.apiKey,
+            repoOwner,
+            repoName
+          );
+
+          await github.uploadAsync(this._npmConfig.version, this.config.publish.files.map((item) => ({
+            buffer: FsUtil.readFileBuffer(path.resolve(this.rootPath, "dist", item.from)),
+            name: item.to
+          })));
+        }
+        else if (this.config.publish.type === "ftp" || this.config.publish.type === "ftps" || this.config.publish.type === "sftp") {
           const tsconfigPath = path.resolve(this.rootPath, "tsconfig-build.json");
           const tsconfig = FsUtil.readJson(tsconfigPath);
           const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this.rootPath, tsconfig.angularCompilerOptions);

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"
       ]