@simplysm/sd-cli 7.0.38 → 7.0.43

package/src/builder/SdCliTsLibBuilder.ts

@@ -1,7 +1,7 @@
 import { INpmConfig, ISdCliPackageBuildResult } from "../commons";
 import { EventEmitter } from "events";
 import ts from "typescript";
-import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core/node";
 import * as path from "path";
 import { createHash } from "crypto";
 import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
@@ -33,7 +33,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
 
   private readonly _isAngular: boolean;
 
-  public constructor(private readonly _rootPath) {
+  public constructor(private readonly _rootPath: string) {
     super();
     this._linter = new SdCliPackageLinter(this._rootPath);
 
@@ -78,15 +78,20 @@ export class SdCliTsLibBuilder extends EventEmitter {
         this._fileCache.delete(PathUtil.posix(changeFilePath));
       }
 
+      const watchBuildResults: ISdCliPackageBuildResult[] = [];
+
       // 빌드
       const watchBuildPack = this._createSdBuildPack(this._parsedTsconfig);
+      watchBuildResults.push(...await this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
 
       // 린트
-      const watchBuildResults = await this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler);
-      watchBuildResults.push(...await this._linter.lintAsync([
+      const lintFilePaths = [
         ...watchBuildPack.affectedSourceFiles.map((item) => item.fileName),
-        ...changeFilePaths
-      ], watchBuildPack.program));
+        ...changeInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path)
+      ];
+      if (lintFilePaths.length > 0) {
+        watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
+      }
 
       const watchRelatedPaths = await this.getAllRelatedPathsAsync();
       watcher.add(watchRelatedPaths);
@@ -194,7 +199,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
     }
     catch (err) {
       if (err instanceof sass.Exception) {
-        const matches = err.sassStack.match(/^(.*\.sd\.scss) ([0-9]*):([0-9]*)/)!;
+        const matches = (/^(.*\.sd\.scss) ([0-9]*):([0-9]*)/).exec(err.sassStack)!;
         const filePath = path.resolve(matches[1].replace(/\.sd\.scss/, "").replace(/^\.:/, item => item.toUpperCase()));
         const scssLine = matches[2];
         const scssChar = matches[3];
@@ -206,7 +211,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
           char: undefined,
           code: undefined,
           severity: "error",
-          message: `스타일(${scssLine}:${scssChar}): ${message}`
+          message: `스타일(${scssLine}:${scssChar}): ${message}\n${err.message}`
         }];
       }
 
@@ -234,7 +239,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
     const affectedSourceFileSet: Set<ts.SourceFile> = new Set<ts.SourceFile>();
     while (true) {
       const result = this._builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
-        if (ngCompiler && ngCompiler.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
+        if (ngCompiler?.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
           const orgFileName = sourceFile.fileName.slice(0, -15) + ".ts";
           const orgSourceFile = this._builder!.getSourceFile(orgFileName);
           if (orgSourceFile) {

package/src/commons.ts

@@ -58,4 +58,5 @@ export interface ISdCliServerPackageConfig {
 export interface ISdCliClientPackageConfig {
   type: "client";
   server: string;
+  env?: Record<string, string>;
 }

package/src/entry-points/SdCliLocalUpdate.ts

@@ -1,5 +1,5 @@
 import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
-import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core/node";
 import * as path from "path";
 
 export class SdCliLocalUpdate {

package/src/entry-points/SdCliNpm.ts

@@ -1,4 +1,4 @@
-import { Logger, SdProcess } from "@simplysm/sd-core-node";
+import { Logger, SdProcess } from "@simplysm/sd-core/node";
 import { SdCliPrepare } from "./SdCliPrepare";
 
 export class SdCliNpm {

package/src/entry-points/SdCliPrepare.ts

@@ -1,4 +1,4 @@
-import { FsUtil, Logger } from "@simplysm/sd-core-node";
+import { FsUtil, Logger } from "@simplysm/sd-core/node";
 import { fileURLToPath } from "url";
 
 export class SdCliPrepare {

package/src/entry-points/SdCliWorkspace.ts

@@ -1,8 +1,8 @@
-import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core/node";
 import path from "path";
 import { INpmConfig, ISdCliConfig, ISdCliPackageBuildResult } from "../commons";
 import { SdCliPackage } from "../packages/SdCliPackage";
-import { Uuid, Wait } from "@simplysm/sd-core-common";
+import { Uuid, Wait } from "@simplysm/sd-core/common";
 import os from "os";
 import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
 import semver from "semver/preload";
@@ -238,7 +238,7 @@ export class SdCliWorkspace {
       if (i !== sec) {
         process.stdout.cursorTo(0);
       }
-      process.stdout.write(msg + " " + i);
+      process.stdout.write(`${msg} ${i}`);
       await Wait.time(1000);
     }
 
@@ -252,6 +252,7 @@ export class SdCliWorkspace {
       throw new Error("최상위 'package.json'에서 'workspaces'를 찾을 수 없습니다.");
     }
 
+
     return pkgRootPaths.map((pkgRootPath) => {
       const pkgConfig = conf.packages[path.basename(pkgRootPath)];
       return pkgConfig ? new SdCliPackage(this._rootPath, pkgRootPath, pkgConfig) : undefined;
@@ -264,7 +265,7 @@ export class SdCliWorkspace {
         pkgName: item[0],
         ...item1
       })))
-      .orderBy((item) => item.pkgName + "_" + item.filePath);
+      .orderBy((item) => `${item.pkgName}_${item.filePath}`);
 
     const warnings = totalResults
       .filter((item) => item.severity === "warning")

package/src/packages/SdCliPackage.ts

@@ -1,8 +1,8 @@
 import { INpmConfig, ISdCliPackageBuildResult, ITsconfig, TSdCliPackageConfig } from "../commons";
 import path from "path";
-import { FsUtil, SdProcess } from "@simplysm/sd-core-node";
+import { FsUtil, SdProcess } from "@simplysm/sd-core/node";
 import { EventEmitter } from "events";
-import { ObjectUtil } from "@simplysm/sd-core-common";
+import { ObjectUtil } from "@simplysm/sd-core/common";
 import { SdCliTsLibBuilder } from "../builder/SdCliTsLibBuilder";
 import { SdCliJsLibBuilder } from "../builder/SdCliJsLibBuilder";
 import { SdCliServerBuilder } from "../builder/SdCliServerBuilder";

package/src/utils/SdCliBuildResultUtil.ts

@@ -11,7 +11,7 @@ export class SdCliBuildResultUtil {
         : undefined;
     if (!severity) return undefined;
 
-    const code = "TS" + diag.code;
+    const code = `TS${diag.code}`;
     const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
 
 

package/src/utils/SdCliConfigUtil.ts

@@ -1,6 +1,6 @@
 import { ISdCliConfig, TSdCliPackageConfig } from "../commons";
-import { FsUtil } from "@simplysm/sd-core-node";
-import { ObjectUtil } from "@simplysm/sd-core-common";
+import { FsUtil } from "@simplysm/sd-core/node";
+import { ObjectUtil } from "@simplysm/sd-core/common";
 import path from "path";
 
 export class SdCliConfigUtil {

package/tsconfig.json

@@ -7,14 +7,11 @@
     "outDir": "./dist",
     "baseUrl": ".",
     "paths": {
-      "@simplysm/sd-core-node": [
-        "../sd-core-node/src/index.ts"
+      "@simplysm/sd-core/*": [
+        "../sd-core/src/*/index.ts"
       ],
-      "@simplysm/sd-core-common": [
-        "../sd-core-common/src/index.ts"
-      ],
-      "@simplysm/sd-service/server": [
-        "../sd-service/src/server.ts"
+      "@simplysm/sd-service/*": [
+        "../sd-service/src/*/index.ts"
       ]
     }
   }