@simplysm/sd-cli 7.0.263 → 7.0.266

package/src/ng-tools/typescript/SdCliTsRootMetadata.ts

@@ -1,32 +1,32 @@
-import path from "path";
-import ts from "typescript";
-import { FsUtil } from "@simplysm/sd-core-node";
-import { SdCliTsFileMetadata } from "./SdCliTsFileMetadata";
-
-export class SdCliTsRootMetadata {
-  private readonly _fileMetaCache = new Map<string, SdCliTsFileMetadata>();
-
-  public constructor(private readonly _packagePath: string) {
-  }
-
-  public removeCaches(filePaths: string[]): void {
-    for (const filePath of filePaths) {
-      this._fileMetaCache.delete(filePath);
-    }
-  }
-
-  public getFileMetas(): SdCliTsFileMetadata[] {
-    const tsconfigPath = path.resolve(this._packagePath, "tsconfig-build.json");
-    const tsconfig = FsUtil.readJson(tsconfigPath);
-    const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this._packagePath, tsconfig.angularCompilerOptions);
-
-    const result: SdCliTsFileMetadata[] = [];
-    for (const fileName of parsedTsconfig.fileNames) {
-      const filePath = path.resolve(fileName);
-      const fileMeta = this._fileMetaCache.getOrCreate(filePath, () => new SdCliTsFileMetadata(filePath));
-      result.push(fileMeta);
-    }
-
-    return result;
-  }
-}
+import path from "path";
+import ts from "typescript";
+import { FsUtil } from "@simplysm/sd-core-node";
+import { SdCliTsFileMetadata } from "./SdCliTsFileMetadata";
+
+export class SdCliTsRootMetadata {
+  private readonly _fileMetaCache = new Map<string, SdCliTsFileMetadata>();
+
+  public constructor(private readonly _packagePath: string) {
+  }
+
+  public removeCaches(filePaths: string[]): void {
+    for (const filePath of filePaths) {
+      this._fileMetaCache.delete(filePath);
+    }
+  }
+
+  public getFileMetas(): SdCliTsFileMetadata[] {
+    const tsconfigPath = path.resolve(this._packagePath, "tsconfig-build.json");
+    const tsconfig = FsUtil.readJson(tsconfigPath);
+    const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this._packagePath, tsconfig.angularCompilerOptions);
+
+    const result: SdCliTsFileMetadata[] = [];
+    for (const fileName of parsedTsconfig.fileNames) {
+      const filePath = path.resolve(fileName);
+      const fileMeta = this._fileMetaCache.getOrCreate(filePath, () => new SdCliTsFileMetadata(filePath));
+      result.push(fileMeta);
+    }
+
+    return result;
+  }
+}

package/src/ng-tools/typescript/SdCliTsUtil.ts

@@ -1,29 +1,29 @@
-import ts from "typescript";
-import { SdCliBuildResultError } from "../../SdCliBuildResultError";
-import path from "path";
-
-export class SdCliTsUtil {
-  public static error(message: string, sourceFile: ts.SourceFile, meta?: ts.Node): SdCliBuildResultError {
-    if (meta) {
-      const pos = sourceFile.getLineAndCharacterOfPosition(meta.getStart());
-      return new SdCliBuildResultError({
-        filePath: path.resolve(sourceFile.fileName),
-        line: pos.line,
-        char: pos.character,
-        code: undefined,
-        severity: "error",
-        message: message
-      });
-    }
-    else {
-      return new SdCliBuildResultError({
-        filePath: path.resolve(sourceFile.fileName),
-        line: undefined,
-        char: undefined,
-        code: undefined,
-        severity: "error",
-        message: message
-      });
-    }
-  }
-}
+import ts from "typescript";
+import { SdCliBuildResultError } from "../../SdCliBuildResultError";
+import path from "path";
+
+export class SdCliTsUtil {
+  public static error(message: string, sourceFile: ts.SourceFile, meta?: ts.Node): SdCliBuildResultError {
+    if (meta) {
+      const pos = sourceFile.getLineAndCharacterOfPosition(meta.getStart());
+      return new SdCliBuildResultError({
+        filePath: path.resolve(sourceFile.fileName),
+        line: pos.line,
+        char: pos.character,
+        code: undefined,
+        severity: "error",
+        message: message
+      });
+    }
+    else {
+      return new SdCliBuildResultError({
+        filePath: path.resolve(sourceFile.fileName),
+        line: undefined,
+        char: undefined,
+        code: undefined,
+        severity: "error",
+        message: message
+      });
+    }
+  }
+}

package/src/packages/SdCliPackage.ts

@@ -178,7 +178,7 @@ export class SdCliPackage extends EventEmitter {
             return process.env[envName] ?? item;
           });
 
-          const filePaths = await FsUtil.globAsync(path.resolve(this.rootPath, "**", "*"), {
+          const filePaths = await FsUtil.globAsync(path.resolve(parsedTsconfig.options.outDir!, "**", "*"), {
             dot: true,
             nodir: true
           });

package/src/utils/SdCliConfigUtil.ts

@@ -1,94 +1,94 @@
-import { ISdCliConfig, TSdCliPackageConfig } from "../commons";
-import { FsUtil } from "@simplysm/sd-core-node";
-import { ObjectUtil } from "@simplysm/sd-core-common";
-import path from "path";
-
-export class SdCliConfigUtil {
-  public static async loadConfigAsync(confFilePath: string, isDev: boolean, opts?: string[]): Promise<ISdCliConfig> {
-    const confFileCont = await FsUtil.readJsonAsync(confFilePath);
-    let conf = this._getConfigFromFileContent(confFileCont, isDev, opts);
-
-    // extends
-    if (conf.extends) {
-      for (const extConfFilePath of conf.extends) {
-        const extConf = await this.loadConfigAsync(path.resolve(path.dirname(confFilePath), extConfFilePath), isDev, opts);
-        conf = this._mergeObj(extConf, conf);
-      }
-    }
-    delete conf["extends"];
-
-    return conf as ISdCliConfig;
-  }
-
-  private static _getConfigFromFileContent(confFileCont: ISdCliConfigFileContent, isDev: boolean, opts?: string[]): ISdCliConfigFileContent {
-    const conf = ObjectUtil.clone(confFileCont);
-
-    if (conf.packages) {
-      for (const pkgName of Object.keys(conf.packages)) {
-        conf.packages[pkgName] = this._getPkgConfigFromFileContent(conf, conf.packages[pkgName], isDev, opts);
-      }
-    }
-    return conf;
-  }
-
-  private static _getPkgConfigFromFileContent(confFileCont: ISdCliConfigFileContent, pkgConfFileCont: TSdCliPackageConfigFileContent, isDev: boolean, opts?: string[]): TSdCliPackageConfig {
-    let pkgConf = ObjectUtil.clone(pkgConfFileCont);
-
-    // override
-    const pkgOvrNames = pkgConf.overrides;
-    if (pkgOvrNames) {
-      for (const pkgOvrName of pkgOvrNames) {
-        const rootOvr = confFileCont.overrides?.[pkgOvrName];
-        if (rootOvr) {
-          const ovrConf = this._getPkgConfigFromFileContent(confFileCont, rootOvr, isDev, opts);
-          pkgConf = this._mergeObj(pkgConf, ovrConf);
-        }
-      }
-      delete pkgConf.overrides;
-    }
-
-
-    // mode 처리
-    const mode = isDev ? "dev" : "prod";
-    if (pkgConf[mode] !== undefined) {
-      const modeConf = this._getPkgConfigFromFileContent(confFileCont, pkgConf[mode], isDev, opts);
-      pkgConf = this._mergeObj(pkgConf, modeConf);
-    }
-    delete pkgConf["dev"];
-    delete pkgConf["prod"];
-
-    // options
-    if (opts && opts.length > 0) {
-      const pkgOpts = Object.keys(pkgConf).filter((key) => key.startsWith("@") && opts.some((opt) => opt === key.slice(1)));
-
-      for (const pkgOpt of pkgOpts) {
-        const optConf = this._getPkgConfigFromFileContent(confFileCont, pkgConf[pkgOpt], isDev, opts);
-        pkgConf = this._mergeObj(pkgConf, optConf);
-      }
-
-      for (const optKey of Object.keys(pkgConf).filter((item) => item.startsWith("@"))) {
-        delete pkgConf[optKey];
-      }
-    }
-
-    return pkgConf;
-  }
-
-  private static _mergeObj<A, B>(orig: A, target: B): A & B {
-    return ObjectUtil.merge(orig, target, {
-      arrayProcess: "replace",
-      useDelTargetNull: true
-    });
-  }
-}
-
-interface ISdCliConfigFileContent {
-  packages?: Record<string, TSdCliPackageConfigFileContent>;
-  overrides?: Record<string, TSdCliPackageConfigFileContent>;
-  extends?: string[];
-}
-
-type TSdCliPackageConfigFileContent =
-  TSdCliPackageConfig
-  & { overrides?: string[] }
-  & Record<string, any>;
+import { ISdCliConfig, TSdCliPackageConfig } from "../commons";
+import { FsUtil } from "@simplysm/sd-core-node";
+import { ObjectUtil } from "@simplysm/sd-core-common";
+import path from "path";
+
+export class SdCliConfigUtil {
+  public static async loadConfigAsync(confFilePath: string, isDev: boolean, opts?: string[]): Promise<ISdCliConfig> {
+    const confFileCont = await FsUtil.readJsonAsync(confFilePath);
+    let conf = this._getConfigFromFileContent(confFileCont, isDev, opts);
+
+    // extends
+    if (conf.extends) {
+      for (const extConfFilePath of conf.extends) {
+        const extConf = await this.loadConfigAsync(path.resolve(path.dirname(confFilePath), extConfFilePath), isDev, opts);
+        conf = this._mergeObj(extConf, conf);
+      }
+    }
+    delete conf["extends"];
+
+    return conf as ISdCliConfig;
+  }
+
+  private static _getConfigFromFileContent(confFileCont: ISdCliConfigFileContent, isDev: boolean, opts?: string[]): ISdCliConfigFileContent {
+    const conf = ObjectUtil.clone(confFileCont);
+
+    if (conf.packages) {
+      for (const pkgName of Object.keys(conf.packages)) {
+        conf.packages[pkgName] = this._getPkgConfigFromFileContent(conf, conf.packages[pkgName], isDev, opts);
+      }
+    }
+    return conf;
+  }
+
+  private static _getPkgConfigFromFileContent(confFileCont: ISdCliConfigFileContent, pkgConfFileCont: TSdCliPackageConfigFileContent, isDev: boolean, opts?: string[]): TSdCliPackageConfig {
+    let pkgConf = ObjectUtil.clone(pkgConfFileCont);
+
+    // override
+    const pkgOvrNames = pkgConf.overrides;
+    if (pkgOvrNames) {
+      for (const pkgOvrName of pkgOvrNames) {
+        const rootOvr = confFileCont.overrides?.[pkgOvrName];
+        if (rootOvr) {
+          const ovrConf = this._getPkgConfigFromFileContent(confFileCont, rootOvr, isDev, opts);
+          pkgConf = this._mergeObj(pkgConf, ovrConf);
+        }
+      }
+      delete pkgConf.overrides;
+    }
+
+
+    // mode 처리
+    const mode = isDev ? "dev" : "prod";
+    if (pkgConf[mode] !== undefined) {
+      const modeConf = this._getPkgConfigFromFileContent(confFileCont, pkgConf[mode], isDev, opts);
+      pkgConf = this._mergeObj(pkgConf, modeConf);
+    }
+    delete pkgConf["dev"];
+    delete pkgConf["prod"];
+
+    // options
+    if (opts && opts.length > 0) {
+      const pkgOpts = Object.keys(pkgConf).filter((key) => key.startsWith("@") && opts.some((opt) => opt === key.slice(1)));
+
+      for (const pkgOpt of pkgOpts) {
+        const optConf = this._getPkgConfigFromFileContent(confFileCont, pkgConf[pkgOpt], isDev, opts);
+        pkgConf = this._mergeObj(pkgConf, optConf);
+      }
+
+      for (const optKey of Object.keys(pkgConf).filter((item) => item.startsWith("@"))) {
+        delete pkgConf[optKey];
+      }
+    }
+
+    return pkgConf;
+  }
+
+  private static _mergeObj<A, B>(orig: A, target: B): A & B {
+    return ObjectUtil.merge(orig, target, {
+      arrayProcess: "replace",
+      useDelTargetNull: true
+    });
+  }
+}
+
+interface ISdCliConfigFileContent {
+  packages?: Record<string, TSdCliPackageConfigFileContent>;
+  overrides?: Record<string, TSdCliPackageConfigFileContent>;
+  extends?: string[];
+}
+
+type TSdCliPackageConfigFileContent =
+  TSdCliPackageConfig
+  & { overrides?: string[] }
+  & Record<string, any>;

package/src/utils/SdCliNpmConfigUtil.ts

@@ -1,16 +1,16 @@
-import { INpmConfig } from "../commons";
-
-export class SdCliNpmConfigUtil {
-  public static getDependencies(npmConfig: INpmConfig): { defaults: string[]; optionals: string[] } {
-    return {
-      defaults: [
-        ...Object.keys(npmConfig.dependencies ?? {}),
-        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
-      ].distinct(),
-      optionals: [
-        ...Object.keys(npmConfig.optionalDependencies ?? {}),
-        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
-      ].distinct()
-    };
-  }
-}
+import { INpmConfig } from "../commons";
+
+export class SdCliNpmConfigUtil {
+  public static getDependencies(npmConfig: INpmConfig): { defaults: string[]; optionals: string[] } {
+    return {
+      defaults: [
+        ...Object.keys(npmConfig.dependencies ?? {}),
+        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
+      ].distinct(),
+      optionals: [
+        ...Object.keys(npmConfig.optionalDependencies ?? {}),
+        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
+      ].distinct()
+    };
+  }
+}

package/dist/entry-points/file/client/fc_package_appicons.d.ts

@@ -1 +0,0 @@
-export declare const fc_package_appicons: () => string;

package/dist/entry-points/file/client/fc_package_appicons.mjs

@@ -1,6 +0,0 @@
-export const fc_package_appicons = () => /* language=ts */ `
-
-export const appIcons = {};
-
-`.trim();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmNfcGFja2FnZV9hcHBpY29ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9lbnRyeS1wb2ludHMvZmlsZS9jbGllbnQvZmNfcGFja2FnZV9hcHBpY29ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxHQUFXLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQzs7OztDQUlsRSxDQUFDLElBQUksRUFBRSxDQUFDIn0=

package/src/entry-points/file/client/fc_package_appicons.ts

@@ -1,5 +0,0 @@
-export const fc_package_appicons = (): string => /* language=ts */ `
-
-export const appIcons = {};
-
-`.trim();