@simplysm/sd-cli 7.0.305 → 7.1.11

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

@@ -158,7 +158,7 @@ export class SdCliBbRootMetadata {
     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"];
+      const entryFilePath = npmConfig["es2020"] ?? npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
       if (entryFilePath === undefined) {
         entryMap.set(npmConfig.name, {
           rootPath: ngDepPath,
@@ -167,6 +167,10 @@ export class SdCliBbRootMetadata {
       }
       else if (typeof entryFilePath === "string") {
         const realPath = this._getRealFilePath(path.resolve(ngDepPath, entryFilePath));
+        if (realPath?.endsWith(".json")) {
+          continue;
+        }
+
         entryMap.set(npmConfig.name, {
           rootPath: ngDepPath,
           entryFilePath: realPath
@@ -178,6 +182,10 @@ export class SdCliBbRootMetadata {
           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
@@ -190,23 +198,31 @@ 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) {
+              if (exportResultItem.target.endsWith(".json")) {
+                continue;
+              }
+
               const exportRealPath = this._getRealFilePath(exportResultItem.target);
               entryMap.set(exportResultItem.name, {
                 rootPath: ngDepPath,

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/packages/SdCliPackage.ts

@@ -123,7 +123,7 @@ export class SdCliPackage extends EventEmitter {
       if (this.config.type === "library") {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (this.config.publish === "npm") {
-          await SdProcess.spawnAsync("npm publish --access public", { cwd: this.rootPath });
+          await SdProcess.spawnAsync("yarn npm publish --access public", { cwd: this.rootPath });
         }
         else {
           throw new NeverEntryError();

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

package/.eslintrc.cjs

@@ -1,21 +0,0 @@
-module.exports = {
-  overrides: [
-    {
-      files: ["*.ts"],
-      parserOptions: {
-        tsconfigRootDir: __dirname,
-        project: "tsconfig.json"
-      },
-      settings: {
-        "import/resolver": {
-          "typescript": {
-            project: "tsconfig.json"
-          }
-        }
-      },
-      rules: {
-        "@simplysm/ts-no-throw-not-implement-error": "off"
-      }
-    }
-  ]
-};

package/dist/entry-points/SdCliNpm.d.ts

@@ -1,6 +0,0 @@
-export declare class SdCliNpm {
-    private readonly _rootPath;
-    private readonly _logger;
-    constructor(_rootPath: string);
-    updateAsync(): Promise<void>;
-}

package/dist/entry-points/SdCliNpm.mjs

@@ -1,24 +0,0 @@
-import { Logger, SdProcess } from "@simplysm/sd-core-node";
-import { SdCliPrepare } from "./SdCliPrepare";
-export class SdCliNpm {
-    constructor(_rootPath) {
-        this._rootPath = _rootPath;
-        this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
-    }
-    async updateAsync() {
-        try {
-            this._logger.debug("업데이트할 패키지 확인...");
-            await SdProcess.spawnAsync("npm outdated", { cwd: this._rootPath });
-        }
-        catch (err) {
-            this._logger.debug("업데이트 시작...");
-            await SdProcess.spawnAsync("npm update", { cwd: this._rootPath });
-            this._logger.debug("sd-cli 준비...");
-            await new SdCliPrepare().prepareAsync();
-            this._logger.info("노드 패키지 업데이트 완료");
-            return;
-        }
-        this._logger.warn("업데이트할 패키지가 없습니다.");
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlOcG0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW50cnktcG9pbnRzL1NkQ2xpTnBtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRTlDLE1BQU0sT0FBTyxRQUFRO0lBR25CLFlBQW9DLFNBQWlCO1FBQWpCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFGcEMsWUFBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUdyRixDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVc7UUFDdEIsSUFBSTtZQUNGLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7WUFDdEMsTUFBTSxTQUFTLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztTQUNyRTtRQUNELE9BQU8sR0FBRyxFQUFFO1lBQ1YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDakMsTUFBTSxTQUFTLENBQUMsVUFBVSxDQUFDLFlBQVksRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztZQUVsRSxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUNuQyxNQUFNLElBQUksWUFBWSxFQUFFLENBQUMsWUFBWSxFQUFFLENBQUM7WUFFeEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUNwQyxPQUFPO1NBQ1I7UUFFRCxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDRiJ9

package/src/entry-points/SdCliNpm.ts

@@ -1,28 +0,0 @@
-import { Logger, SdProcess } from "@simplysm/sd-core-node";
-import { SdCliPrepare } from "./SdCliPrepare";
-
-export class SdCliNpm {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
-
-  public constructor(private readonly _rootPath: string) {
-  }
-
-  public async updateAsync(): Promise<void> {
-    try {
-      this._logger.debug("업데이트할 패키지 확인...");
-      await SdProcess.spawnAsync("npm outdated", { cwd: this._rootPath });
-    }
-    catch (err) {
-      this._logger.debug("업데이트 시작...");
-      await SdProcess.spawnAsync("npm update", { cwd: this._rootPath });
-
-      this._logger.debug("sd-cli 준비...");
-      await new SdCliPrepare().prepareAsync();
-
-      this._logger.info("노드 패키지 업데이트 완료");
-      return;
-    }
-
-    this._logger.warn("업데이트할 패키지가 없습니다.");
-  }
-}

package/tsconfig-build.json

@@ -1,16 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2020"
-    ],
-    "outDir": "./dist",
-    "declaration": true
-  },
-  "files": [
-    "src/bin/sd-cli.ts",
-    "src/index.ts",
-    "src/worker/build-worker.ts",
-    "src/worker/server-worker.ts"
-  ]
-}

package/tsconfig.json

@@ -1,39 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2020"
-    ],
-    "outDir": "./dist",
-    "baseUrl": ".",
-    "paths": {
-      "@simplysm/sd-core-common": [
-        "../sd-core-common/src/index.ts"
-      ],
-      "@simplysm/sd-core-node": [
-        "../sd-core-node/src/index.ts"
-      ],
-      "@simplysm/sd-service-common": [
-        "../sd-service-common/src/index.ts"
-      ],
-      "@simplysm/sd-service-server": [
-        "../sd-service-server/src/index.ts"
-      ],
-      "@simplysm/sd-orm-common": [
-        "../sd-orm-common/src/index.ts"
-      ],
-      "@simplysm/sd-orm-node": [
-        "../sd-orm-node/src/index.ts"
-      ],
-      "@simplysm/sd-storage": [
-        "../sd-storage/src/index.ts"
-      ]
-    }
-  },
-  "files": [
-    "src/bin/sd-cli.ts",
-    "src/index.ts",
-    "src/worker/build-worker.ts",
-    "src/worker/server-worker.ts"
-  ]
-}