@simplysm/sd-cli 12.5.14 → 12.5.16

package/lib/postinstall.js

@@ -1,5 +1,5 @@
 import {fileURLToPath} from "url";
-import * as fs from "node:fs";
+import fs from "node:fs";
 
 const filePath = fileURLToPath(import.meta.resolve("@angular/build/package.json"));
 const contents = JSON.parse(fs.readFileSync(filePath).toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.5.14",
+  "version": "12.5.16",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -24,18 +24,18 @@
     "@angular/compiler": "^18.2.5",
     "@angular/compiler-cli": "^18.2.5",
     "@electron/rebuild": "^3.6.0",
-    "@simplysm/sd-core-common": "12.5.14",
-    "@simplysm/sd-core-node": "12.5.14",
-    "@simplysm/sd-service-server": "12.5.14",
-    "@simplysm/sd-storage": "12.5.14",
-    "@simplysm/ts-transformer-keys": "12.5.14",
+    "@simplysm/sd-core-common": "12.5.16",
+    "@simplysm/sd-core-node": "12.5.16",
+    "@simplysm/sd-service-server": "12.5.16",
+    "@simplysm/sd-storage": "12.5.16",
+    "@simplysm/ts-transformer-keys": "12.5.16",
     "browserslist": "^4.23.3",
     "cordova": "^12.0.0",
     "css-has-pseudo": "^7.0.0",
     "electron": "^32.1.2",
-    "electron-builder": "^25.1.4",
+    "electron-builder": "^25.1.5",
     "esbuild": "^0.24.0",
-    "eslint": "^9.11.0",
+    "eslint": "^9.11.1",
     "glob": "^11.0.0",
     "jszip": "^3.10.1",
     "node-stdlib-browser": "^1.2.1",

package/src/build-tools/SdCliIndexFileGenerator.ts

@@ -29,7 +29,7 @@ export class SdCliIndexFileGenerator {
     const filePaths = await this._getFilePathsAsync(pkgPath);
     for (const filePath of filePaths.orderBy()) {
       const requirePath = PathUtil.posix(path.relative(path.dirname(indexFilePath), filePath))
-        .replace(/\.tsx?$/, "")
+        .replace(/\.ts$/, "")
         .replace(/\/index$/, "");
 
       const sourceTsFileContent = await FsUtil.readFileAsync(filePath);
@@ -53,7 +53,7 @@ export class SdCliIndexFileGenerator {
     const tsconfig = await FsUtil.readJsonAsync(path.resolve(pkgPath, "tsconfig.json"));
     const entryFilePaths: string[] = tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
 
-    return (await FsUtil.globAsync(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), { nodir: true })).filter(
+    return (await FsUtil.globAsync(path.resolve(pkgPath, "src/**/*.ts"), { nodir: true })).filter(
       (item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"),
     );
   }

package/src/build-tools/SdLinter.ts

@@ -1,45 +1,46 @@
 import { ISdCliPackageBuildResult } from "../commons";
 import { ESLint } from "eslint";
 import ts from "typescript";
-import { FsUtil } from "@simplysm/sd-core-node";
+import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import path from "path";
 
 export abstract class SdLinter {
   static async lintAsync(
-    fileSet: Iterable<string>,
-    tsProgram: ts.Program | undefined
+    cwd: string,
+    fileSet: Set<string>,
+    tsProgram: ts.Program | undefined,
   ): Promise<ISdCliPackageBuildResult[]> {
+    const isTsPackage = FsUtil.exists(path.resolve(cwd, "tsconfig.json"));
+
     const lintFilePaths = Array.from(fileSet)
-      .filter(
-        (item) =>
-          (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
-          item.endsWith(".tsx") ||
-          item.endsWith(".js")
-      )
+      .filter((item) => PathUtil.isChildPath(item, cwd))
+      .filter((item) => (isTsPackage && !item.endsWith(".d.ts") && item.endsWith(".ts")) || item.endsWith(".js"))
       .filter((item) => FsUtil.exists(item));
 
     if (lintFilePaths.length === 0) {
       return [];
     }
 
-    const linter = new ESLint(
-      tsProgram != null
+    const linter = new ESLint({
+      cwd,
+      cache: false,
+      ...(isTsPackage && tsProgram
         ? {
-          cache: false,
-          overrideConfig: [
-            {
-              files: ["**/*.ts", "**/*.tsx"],
-              languageOptions: {
-                parserOptions: {
-                  programs: [tsProgram],
-                  project: null,
-                  tsconfigRootDir: null
-                }
-              }
-            }
-          ]
-        }
-        : undefined
-    );
+            overrideConfig: [
+              {
+                files: ["**/*.ts"],
+                languageOptions: {
+                  parserOptions: {
+                    programs: [tsProgram],
+                    project: null,
+                    tsconfigRootDir: null,
+                  },
+                },
+              },
+            ],
+          }
+        : {}),
+    });
 
     const lintResults = await linter.lintFiles(lintFilePaths);
 
@@ -51,8 +52,8 @@ export abstract class SdLinter {
         code: msg.messageId,
         severity: msg.severity === 1 ? ("warning" as const) : ("error" as const),
         message: msg.message + (msg.ruleId != null ? ` (${msg.ruleId})` : ``),
-        type: "lint" as const
-      }))
+        type: "lint" as const,
+      })),
     );
   }
 }

package/src/build-tools/SdNgBundler.ts

@@ -330,6 +330,7 @@ export class SdNgBundler {
         { input: "src", glob: "manifest.webmanifest", output: "" },
         { input: "src", glob: "manifest.json", output: "" },
         { input: "src/assets", glob: "**/*", output: "assets" },
+        ...(this.#opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
         ...(this.#opt.dev && this.#opt.builderType === "cordova"
           ? Object.keys(this.#opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
               {

package/src/build-tools/SdTsCompiler.ts

@@ -44,23 +44,32 @@ export class SdTsCompiler {
   readonly #distPath: string;
   readonly #globalStyleFilePath?: string;
 
-  constructor(pkgPath: string, additionalOptions: CompilerOptions, isDevMode: boolean, globalStyleFilePath?: string) {
-    this.#pkgPath = pkgPath;
-    this.#globalStyleFilePath = globalStyleFilePath != null ? path.normalize(globalStyleFilePath) : undefined;
+  readonly #isForBundle: boolean;
+
+  constructor(opt: {
+    pkgPath: string;
+    additionalOptions: CompilerOptions;
+    isForBundle: boolean;
+    isDevMode: boolean;
+    globalStyleFilePath?: string;
+  }) {
+    this.#pkgPath = opt.pkgPath;
+    this.#globalStyleFilePath = opt.globalStyleFilePath != null ? path.normalize(opt.globalStyleFilePath) : undefined;
+    this.#isForBundle = opt.isForBundle;
 
     this.#debug("초기화...");
 
     //-- isForAngular / parsedTsConfig
 
-    const tsconfigPath = path.resolve(pkgPath, "tsconfig.json");
+    const tsconfigPath = path.resolve(opt.pkgPath, "tsconfig.json");
     const tsconfig = FsUtil.readJson(tsconfigPath);
     this.#isForAngular = Boolean(tsconfig.angularCompilerOptions);
-    this.#parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, pkgPath, {
+    this.#parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, opt.pkgPath, {
       ...tsconfig.angularCompilerOptions,
-      ...additionalOptions,
+      ...opt.additionalOptions,
     });
 
-    this.#distPath = this.#parsedTsconfig.options.outDir ?? path.resolve(pkgPath, "dist");
+    this.#distPath = this.#parsedTsconfig.options.outDir ?? path.resolve(opt.pkgPath, "dist");
 
     //-- compilerHost
 
@@ -99,8 +108,8 @@ export class SdTsCompiler {
       //-- stylesheetBundler
       this.#stylesheetBundler = new ComponentStylesheetBundler(
         {
-          workspaceRoot: pkgPath,
-          optimization: !isDevMode,
+          workspaceRoot: opt.pkgPath,
+          optimization: !opt.isDevMode,
           inlineFonts: true,
           preserveSymlinks: false,
           sourcemap: "inline", //conf.dev ? 'inline' : false,
@@ -118,7 +127,7 @@ export class SdTsCompiler {
             basePath: ".cache",
           },
         },
-        isDevMode,
+        opt.isDevMode,
       );
 
       //-- compilerHost
@@ -381,6 +390,10 @@ export class SdTsCompiler {
         continue;
       }
 
+      if (!PathUtil.isChildPath(affectedFile, this.#pkgPath)) {
+        continue;
+      }
+
       diagnostics.push(
         ...this.#program.getSyntacticDiagnostics(affectedSourceFile),
         ...this.#program.getSemanticDiagnostics(affectedSourceFile),
@@ -411,8 +424,8 @@ export class SdTsCompiler {
     (transformers.before ??= []).push(transformKeys(this.#program));
 
     // affected에 새로 추가된 파일은 포함되지 않는 현상이 있어 getSourceFiles로 바꿈
-    // -> 너무 느려져서 다시 돌림. 포함안되는 현상은 getAllDep 문제인가?
-    for (const affectedFile of affectedFileSet) {
+    // 비교해보니, 딱히 getSourceFiles라서 더 느려지는것 같지는 않음
+    /*for (const affectedFile of affectedFileSet) {
       if (this.#emittedFilesCacheMap.has(affectedFile)) {
         continue;
       }
@@ -420,10 +433,9 @@ export class SdTsCompiler {
       const sf = this.#program.getSourceFile(affectedFile);
       if (!sf) {
         continue;
-      }
-
-      // for (const sf of sourceFileSet) {
+      }*/
 
+    for (const sf of sourceFileSet) {
       if (this.#emittedFilesCacheMap.has(path.normalize(sf.fileName))) {
         continue;
       }
@@ -436,6 +448,13 @@ export class SdTsCompiler {
         continue;
       }
 
+      // esbuild를 통해 bundle로 묶어야 하는놈들은 모든 output이 있어야 함.
+      if (!this.#isForBundle) {
+        if (!PathUtil.isChildPath(sf.fileName, this.#pkgPath)) {
+          continue;
+        }
+      }
+
       this.#debug(`emit for`, sf.fileName);
       this.#program.emit(
         sf,

package/src/build-tools/SdTsLibBundler.ts

@@ -12,7 +12,13 @@ export class SdTsLibBundler {
 
   public constructor(pkgPath: string, dev: boolean) {
     this.#pkgPath = pkgPath;
-    this.#compiler = new SdTsCompiler(pkgPath, { declaration: true }, dev, path.resolve(pkgPath, "src/styles.scss"));
+    this.#compiler = new SdTsCompiler({
+      pkgPath,
+      additionalOptions: { declaration: true },
+      isDevMode: dev,
+      globalStyleFilePath: path.resolve(pkgPath, "src/styles.scss"),
+      isForBundle: false,
+    });
   }
 
   public markChanges(modifiedFileSet: Set<string>): void {

package/src/builders/SdCliClientBuilder.ts

@@ -169,7 +169,8 @@ export class SdCliClientBuilder extends EventEmitter {
     // });
     // const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
     const lintResults = await SdLinter.lintAsync(
-      Array.from(affectedFileSet).filter((item) => PathUtil.isChildPath(item, this._pkgPath)),
+      this._pkgPath,
+      affectedFileSet,
       firstProgram,
     );
 

package/src/builders/SdCliJsLibLinter.ts

@@ -24,7 +24,7 @@ export class SdCliJsLibLinter extends EventEmitter {
     this._debug("LINT...");
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
     const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(srcFilePaths, undefined);
+    const lintResults = await SdLinter.lintAsync(this._pkgPath, new Set(srcFilePaths), undefined);
 
     this._debug(`LINT 완료`);
     return {
@@ -38,7 +38,7 @@ export class SdCliJsLibLinter extends EventEmitter {
     this._debug("LINT...");
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
     const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(srcFilePaths, undefined);
+    const lintResults = await SdLinter.lintAsync(this._pkgPath, new Set(srcFilePaths), undefined);
 
     this._debug(`LINT 완료`);
     this.emit("complete", {
@@ -56,7 +56,7 @@ export class SdCliJsLibLinter extends EventEmitter {
 
         this.emit("change");
         this._debug("LINT...");
-        const watchLintResults = await SdLinter.lintAsync(watchFilePaths, undefined);
+        const watchLintResults = await SdLinter.lintAsync(this._pkgPath, new Set(watchFilePaths), undefined);
 
         this._debug(`LINT 완료`);
         this.emit("complete", {