@simplysm/sd-cli 12.16.42 → 12.16.51

package/dist/ts-compiler/SdTsCompiler.d.ts

@@ -23,7 +23,6 @@ export declare class SdTsCompiler {
     private _lintAsync;
     private _buildGlobalStyleAsync;
     private _build;
-    private _convertOutputToReal;
     private _removeOutputDevModeLine;
     private _debug;
 }

package/dist/ts-compiler/SdTsCompiler.js

@@ -12,6 +12,7 @@ import { SdDepAnalyzer } from "./SdDepAnalyzer";
 import { FlatESLint } from "eslint/use-at-your-own-risk";
 import { SdStyleBundler } from "./SdStyleBundler";
 import { ScopePathSet } from "./ScopePathSet";
+import { convertOutputToReal } from "./convertOutputToReal";
 export class SdTsCompiler {
     constructor(_opt, _forBundle) {
         this._opt = _opt;
@@ -376,7 +377,7 @@ export class SdTsCompiler {
                         }
                         const emitFileInfoCaches = this._emittedFilesCacheMap.getOrCreate(PathUtils.norm(sourceFile.fileName), []);
                         if (PathUtils.isChildPath(sourceFile.fileName, this._opt.pkgPath)) {
-                            const real = this._convertOutputToReal(fileName, prepareResult.tsconfig.distPath, text);
+                            const real = convertOutputToReal(fileName, prepareResult.tsconfig.distPath, this._opt.pkgPath, text);
                             emitFileInfoCaches.push({
                                 outAbsPath: real.filePath,
                                 text: this._removeOutputDevModeLine(real.text),
@@ -396,21 +397,6 @@ export class SdTsCompiler {
             diagnostics,
         };
     }
-    _convertOutputToReal(filePath, distPath, text) {
-        let realFilePath = PathUtils.norm(filePath);
-        let realText = text;
-        const srcRelBasePath = path.resolve(distPath, path.basename(this._opt.pkgPath), "src");
-        if (PathUtils.isChildPath(realFilePath, srcRelBasePath)) {
-            realFilePath = PathUtils.norm(distPath, path.relative(srcRelBasePath, realFilePath));
-            // source map 위치 정확히 찾아가기
-            if (filePath.endsWith(".js.map")) {
-                const sourceMapContents = JSON.parse(realText);
-                sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6); // remove "../../"
-                realText = JSON.stringify(sourceMapContents);
-            }
-        }
-        return { filePath: realFilePath, text: realText };
-    }
     _removeOutputDevModeLine(str) {
         return str.replace(/\(\(\) => \{ \(typeof ngDevMode === "undefined" \|\| ngDevMode\) && i0.ɵsetClassDebugInfo\(.*, \{ className: ".*", filePath: ".*", lineNumber: [0-9]* }\); }\)\(\);/, "");
     }

package/dist/ts-compiler/convertOutputToReal.d.ts

@@ -0,0 +1,5 @@
+import { TNormPath } from "@simplysm/sd-core-node";
+export declare function convertOutputToReal(filePath: string, distPath: TNormPath, pkgPath: TNormPath, text: string): {
+    filePath: TNormPath;
+    text: string;
+};

package/dist/ts-compiler/convertOutputToReal.js

@@ -0,0 +1,32 @@
+import path from "path";
+import { PathUtils } from "@simplysm/sd-core-node";
+export function convertOutputToReal(filePath, distPath, pkgPath, text) {
+    let realFilePath = PathUtils.norm(filePath);
+    let realText = text;
+    // 패턴 1: dist/<패키지명>/src/ (commonSourceDirectory가 packages/)
+    const pkgNameSrcPath = PathUtils.norm(path.resolve(distPath, path.basename(pkgPath), "src"));
+    // 패턴 2: dist/src/ (commonSourceDirectory가 패키지 루트)
+    const directSrcPath = PathUtils.norm(path.resolve(distPath, "src"));
+    let matchedBasePath;
+    if (PathUtils.isChildPath(realFilePath, pkgNameSrcPath)) {
+        matchedBasePath = pkgNameSrcPath;
+    }
+    else if (PathUtils.isChildPath(realFilePath, directSrcPath)) {
+        matchedBasePath = directSrcPath;
+    }
+    if (matchedBasePath != null) {
+        const newFilePath = PathUtils.norm(distPath, path.relative(matchedBasePath, realFilePath));
+        // source map 보정: matchedBasePath와 distPath 간 depth 차이만큼 "../" 제거
+        if (filePath.endsWith(".js.map")) {
+            const depthDiff = path.relative(distPath, matchedBasePath).split(path.sep).length;
+            if (depthDiff > 0) {
+                const sourceMapContents = JSON.parse(realText);
+                const prefixToRemove = "../".repeat(depthDiff);
+                sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(prefixToRemove.length);
+                realText = JSON.stringify(sourceMapContents);
+            }
+        }
+        realFilePath = newFilePath;
+    }
+    return { filePath: realFilePath, text: realText };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.16.42",
+  "version": "12.16.51",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,10 +17,10 @@
     "@angular/compiler-cli": "^20.3.18",
     "@anthropic-ai/sdk": "^0.78.0",
     "@electron/rebuild": "^4.0.3",
-    "@simplysm/sd-core-common": "12.16.42",
-    "@simplysm/sd-core-node": "12.16.42",
-    "@simplysm/sd-service-server": "12.16.42",
-    "@simplysm/sd-storage": "12.16.42",
+    "@simplysm/sd-core-common": "12.16.51",
+    "@simplysm/sd-core-node": "12.16.51",
+    "@simplysm/sd-service-server": "12.16.51",
+    "@simplysm/sd-storage": "12.16.51",
     "abortcontroller-polyfill": "^1.7.8",
     "browserslist": "^4.28.1",
     "cordova": "^13.0.0",

package/src/ts-compiler/SdTsCompiler.ts

@@ -15,6 +15,7 @@ import { SdStyleBundler } from "./SdStyleBundler";
 import { ISdTsCompilerOptions } from "../types/build/ISdTsCompilerOptions";
 import { ISdTsCompilerResult } from "../types/build/ISdTsCompilerResult";
 import { ScopePathSet } from "./ScopePathSet";
+import { convertOutputToReal } from "./convertOutputToReal";
 
 export class SdTsCompiler {
   private readonly _logger = SdLogger.get(["simplysm", "sd-cli", "SdTsCompiler"]);
@@ -562,9 +563,10 @@ export class SdTsCompiler {
               );
 
               if (PathUtils.isChildPath(sourceFile.fileName, this._opt.pkgPath)) {
-                const real = this._convertOutputToReal(
+                const real = convertOutputToReal(
                   fileName,
                   prepareResult.tsconfig.distPath,
+                  this._opt.pkgPath,
                   text,
                 );
 
@@ -594,26 +596,6 @@ export class SdTsCompiler {
     };
   }
 
-  private _convertOutputToReal(filePath: string, distPath: string, text: string) {
-    let realFilePath = PathUtils.norm(filePath);
-    let realText = text;
-
-    const srcRelBasePath = path.resolve(distPath, path.basename(this._opt.pkgPath), "src");
-
-    if (PathUtils.isChildPath(realFilePath, srcRelBasePath)) {
-      realFilePath = PathUtils.norm(distPath, path.relative(srcRelBasePath, realFilePath));
-
-      // source map 위치 정확히 찾아가기
-      if (filePath.endsWith(".js.map")) {
-        const sourceMapContents = JSON.parse(realText);
-        sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6); // remove "../../"
-        realText = JSON.stringify(sourceMapContents);
-      }
-    }
-
-    return { filePath: realFilePath, text: realText };
-  }
-
   private _removeOutputDevModeLine(str: string) {
     return str.replace(
       /\(\(\) => \{ \(typeof ngDevMode === "undefined" \|\| ngDevMode\) && i0.ɵsetClassDebugInfo\(.*, \{ className: ".*", filePath: ".*", lineNumber: [0-9]* }\); }\)\(\);/,
@@ -629,7 +611,7 @@ export class SdTsCompiler {
 interface ITsConfigInfo {
   fileNames: string[];
   options: ts.CompilerOptions;
-  distPath: string;
+  distPath: TNormPath;
 }
 
 interface IPrepareResult {

package/src/ts-compiler/convertOutputToReal.ts

@@ -0,0 +1,45 @@
+import path from "path";
+import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
+
+export function convertOutputToReal(
+  filePath: string,
+  distPath: TNormPath,
+  pkgPath: TNormPath,
+  text: string,
+): { filePath: TNormPath; text: string } {
+  let realFilePath = PathUtils.norm(filePath);
+  let realText = text;
+
+  // 패턴 1: dist/<패키지명>/src/ (commonSourceDirectory가 packages/)
+  const pkgNameSrcPath = PathUtils.norm(path.resolve(distPath, path.basename(pkgPath), "src"));
+  // 패턴 2: dist/src/ (commonSourceDirectory가 패키지 루트)
+  const directSrcPath = PathUtils.norm(path.resolve(distPath, "src"));
+
+  let matchedBasePath: TNormPath | undefined;
+
+  if (PathUtils.isChildPath(realFilePath, pkgNameSrcPath)) {
+    matchedBasePath = pkgNameSrcPath;
+  } else if (PathUtils.isChildPath(realFilePath, directSrcPath)) {
+    matchedBasePath = directSrcPath;
+  }
+
+  if (matchedBasePath != null) {
+    const newFilePath = PathUtils.norm(distPath, path.relative(matchedBasePath, realFilePath));
+
+    // source map 보정: matchedBasePath와 distPath 간 depth 차이만큼 "../" 제거
+    if (filePath.endsWith(".js.map")) {
+      const depthDiff = path.relative(distPath, matchedBasePath).split(path.sep).length;
+
+      if (depthDiff > 0) {
+        const sourceMapContents = JSON.parse(realText);
+        const prefixToRemove = "../".repeat(depthDiff);
+        sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(prefixToRemove.length);
+        realText = JSON.stringify(sourceMapContents);
+      }
+    }
+
+    realFilePath = newFilePath;
+  }
+
+  return { filePath: realFilePath, text: realText };
+}

package/tests/ts-compiler/convert-output-to-real.spec.ts

@@ -0,0 +1,67 @@
+import "@simplysm/sd-core-common";
+import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
+import { describe, expect, it } from "vitest";
+import { convertOutputToReal } from "../../src/ts-compiler/convertOutputToReal";
+
+describe("convertOutputToReal", () => {
+  // Case: commonSourceDirectory가 packages/ → 출력이 dist/<패키지명>/src/
+  it("dist/<패키지명>/src/ 패턴을 dist/로 보정한다", () => {
+    const pkgPath = PathUtils.norm("/repo/packages/sd-excel") as TNormPath;
+    const distPath = PathUtils.norm("/repo/packages/sd-excel/dist") as TNormPath;
+    const filePath = PathUtils.norm("/repo/packages/sd-excel/dist/sd-excel/src/index.js") as TNormPath;
+
+    const result = convertOutputToReal(filePath, distPath, pkgPath, "export default {};");
+
+    expect(result.filePath).toBe(PathUtils.norm("/repo/packages/sd-excel/dist/index.js"));
+  });
+
+  // Case: commonSourceDirectory가 패키지 루트 → 출력이 dist/src/
+  it("dist/src/ 패턴을 dist/로 보정한다", () => {
+    const pkgPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent") as TNormPath;
+    const distPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist") as TNormPath;
+    const filePath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist/src/index.js") as TNormPath;
+
+    const result = convertOutputToReal(filePath, distPath, pkgPath, "export default {};");
+
+    expect(result.filePath).toBe(PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist/index.js"));
+  });
+
+  it("dist/src/ 중첩 경로도 보정한다", () => {
+    const pkgPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent") as TNormPath;
+    const distPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist") as TNormPath;
+    const filePath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist/src/web/IntentWeb.js") as TNormPath;
+
+    const result = convertOutputToReal(filePath, distPath, pkgPath, "export default {};");
+
+    expect(result.filePath).toBe(PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist/web/IntentWeb.js"));
+  });
+
+  // source map 보정
+  // dist/sd-excel/src/ → dist/ (2단계 위로 이동)
+  // sources: "../../../src/index.ts" → depth가 2 줄어 "../" 2개 제거 → "../src/index.ts"
+  it("dist/<패키지명>/src/ 패턴의 source map을 보정한다", () => {
+    const pkgPath = PathUtils.norm("/repo/packages/sd-excel") as TNormPath;
+    const distPath = PathUtils.norm("/repo/packages/sd-excel/dist") as TNormPath;
+    const filePath = PathUtils.norm("/repo/packages/sd-excel/dist/sd-excel/src/index.js.map") as TNormPath;
+    const sourceMap = JSON.stringify({ sources: ["../../../src/index.ts"] });
+
+    const result = convertOutputToReal(filePath, distPath, pkgPath, sourceMap);
+
+    const parsed = JSON.parse(result.text);
+    expect(parsed.sources[0]).toBe("../src/index.ts");
+  });
+
+  // dist/src/ → dist/ (1단계 위로 이동)
+  // sources: "../../src/index.ts" → depth가 1 줄어 "../" 1개 제거 → "../src/index.ts"
+  it("dist/src/ 패턴의 source map을 보정한다", () => {
+    const pkgPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent") as TNormPath;
+    const distPath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist") as TNormPath;
+    const filePath = PathUtils.norm("/repo/packages/capacitor-plugin-intent/dist/src/index.js.map") as TNormPath;
+    const sourceMap = JSON.stringify({ sources: ["../../src/index.ts"] });
+
+    const result = convertOutputToReal(filePath, distPath, pkgPath, sourceMap);
+
+    const parsed = JSON.parse(result.text);
+    expect(parsed.sources[0]).toBe("../src/index.ts");
+  });
+});

package/tsconfig.test.json

@@ -1,8 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["ES2021"],
-    "outDir": "./dist"
-  },
-  "exclude": ["dist", "node_modules"]
-}

package/vitest.config.js

@@ -1,12 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  resolve: {
-    tsconfigPaths: true,
-  },
-  test: {
-    globals: true,
-    environment: "node",
-    include: ["tests/**/*.spec.ts"],
-  },
-});