@simplysm/angular 14.0.26 → 14.0.28

package/src/core/providers/sd-app-structure.provider.ts

@@ -1,9 +1,12 @@
-import { computed, inject, Injectable } from "@angular/core";
+import { computed, inject, Injectable, signal } from "@angular/core";
 import type { Signal } from "@angular/core";
-import type { TSdAppStructureItem, ISdFlatMenu } from "./sd-app-structure.types";
+import type { AppStructureService } from "@simplysm/service-common";
+import type { AppStructureItem, SdFlatMenu } from "./sd-app-structure.types";
 import { SdAppStructureUtils } from "./sd-app-structure.utils";
+import { SdServiceClientFactoryProvider } from "./sd-service-client-factory.provider";
+import { SdAngularConfigProvider } from "./sd-angular-config.provider";
 
-export function usePermsSignal<K extends string>(viewCodes: string[], keys: K[]): Signal<K[]> {
+export function injectPermsSignal<K extends string>(viewCodes: string[], keys: K[]): Signal<K[]> {
   const sdAppStructure = inject(SdAppStructureProvider);
   return computed(() => sdAppStructure.getPermsByFullCode(viewCodes, keys));
 }
@@ -11,33 +14,45 @@ export function usePermsSignal<K extends string>(viewCodes: string[], keys: K[])
 // 권한은 모듈만 체크하고
 // 메뉴는 모듈/권한 모두 체크함
 @Injectable({ providedIn: "root" })
-export abstract class SdAppStructureProvider<TModule = unknown> {
-  abstract items: TSdAppStructureItem<TModule>[];
-  abstract usableModules: Signal<TModule[] | undefined>;
-  abstract permRecord: Signal<Record<string, boolean> | undefined>;
+export class SdAppStructureProvider<TModule = unknown> {
+  private readonly _clientFactory = inject(SdServiceClientFactoryProvider);
+  private readonly _config = inject(SdAngularConfigProvider);
+
+  readonly usableModules = signal<TModule[] | undefined>(undefined);
+  readonly permRecord = signal<Record<string, boolean> | undefined>(undefined);
+  readonly items = signal<AppStructureItem<TModule>[]>([]);
+
+  async initialize(serviceKey: string): Promise<void> {
+    const client = this._clientFactory.get(serviceKey);
+    const svc = client.getService<AppStructureService>("AppStructure");
+    const itemsMap = await svc.getItems();
+    this.items.set(
+      (itemsMap[this._config.clientName] ?? []) as AppStructureItem<TModule>[],
+    );
+  }
 
   usableMenus = computed(() =>
-    SdAppStructureUtils.getMenus(this.items, [], this.usableModules(), this.permRecord()),
+    SdAppStructureUtils.getMenus(this.items(), [], this.usableModules(), this.permRecord()),
   );
-  usableFlatMenus = computed<ISdFlatMenu<TModule>[]>(() =>
-    SdAppStructureUtils.getFlatMenus(this.items, this.usableModules(), this.permRecord()),
+  usableFlatMenus = computed<SdFlatMenu<TModule>[]>(() =>
+    SdAppStructureUtils.getFlatMenus(this.items(), this.usableModules(), this.permRecord()),
   );
 
-  getPermissionsByStructure(items: TSdAppStructureItem<TModule>[], codeChain: string[] = []) {
+  getPermissionsByStructure(items: AppStructureItem<TModule>[], codeChain: string[] = []) {
     return SdAppStructureUtils.getPermissions(items, codeChain, this.usableModules());
   }
 
   getTitleByFullCode(fullCode: string) {
-    return SdAppStructureUtils.getTitleByFullCode(this.items, fullCode);
+    return SdAppStructureUtils.getTitleByFullCode(this.items(), fullCode);
   }
 
   getItemChainByFullCode(fullCode: string) {
-    return SdAppStructureUtils.getItemChainByFullCode(this.items, fullCode);
+    return SdAppStructureUtils.getItemChainByFullCode(this.items(), fullCode);
   }
 
   getPermsByFullCode<K extends string>(fullCodes: string[], permKeys: K[]): K[] {
     return SdAppStructureUtils.getPermsByFullCode(
-      this.items,
+      this.items(),
       fullCodes,
       permKeys,
       this.permRecord(),

package/src/core/providers/sd-app-structure.types.ts

@@ -1,60 +1,29 @@
-export type TSdAppStructureItem<TModule = unknown> =
-  | ISdAppStructureGroupItem<TModule>
-  | ISdAppStructureLeafItem<TModule>;
+export type {
+  AppStructureItem,
+  AppStructureGroupItem,
+  AppStructureLeafItem,
+  AppStructureSubPermission,
+  FlatPermission,
+} from "@simplysm/service-common";
 
-export interface ISdAppStructureGroupItem<TModule> {
-  code: string;
-  title: string;
-  modules?: TModule[];
-  requiredModules?: TModule[];
-  icon?: string;
-  children: TSdAppStructureItem<TModule>[];
-}
-
-export interface ISdAppStructureLeafItem<TModule> {
-  code: string;
-  title: string;
-  modules?: TModule[];
-  requiredModules?: TModule[];
-  perms?: ("use" | "edit")[];
-  subPerms?: ISdAppStructureSubPermission<TModule>[];
-  icon?: string;
-  url?: string;
-  isNotMenu?: boolean;
-}
-
-export interface ISdAppStructureSubPermission<TModule> {
-  code: string;
-  title: string;
-  modules?: TModule[];
-  requiredModules?: TModule[];
-  perms: ("use" | "edit")[];
-}
-
-export interface ISdMenu {
+export interface SdMenu {
   title: string;
   codeChain: string[];
   url?: string;
   icon?: string;
-  children?: ISdMenu[];
+  children?: SdMenu[];
 }
 
-export interface ISdFlatMenu<TModule = unknown> {
+export interface SdFlatMenu<TModule = unknown> {
   titleChain: string[];
   codeChain: string[];
   modulesChain: TModule[][];
 }
 
-export interface ISdPermission<TModule = unknown> {
+export interface SdPermission<TModule = unknown> {
   title: string;
   codeChain: string[];
   modules: TModule[] | undefined;
   perms: ("use" | "edit")[] | undefined;
-  children: ISdPermission<TModule>[] | undefined;
-}
-
-export interface ISdFlatPermission<TModule = unknown> {
-  titleChain: string[];
-  codeChain: string[];
-  modulesChain: TModule[][];
+  children: SdPermission<TModule>[] | undefined;
 }

package/src/core/providers/sd-app-structure.utils.ts

@@ -1,15 +1,19 @@
+import {
+  getFlatPermissions,
+  isUsableModules,
+  isUsableModulesChain,
+} from "@simplysm/service-common";
 import type {
-  TSdAppStructureItem,
-  ISdMenu,
-  ISdFlatMenu,
-  ISdPermission,
-  ISdFlatPermission,
+  AppStructureItem,
+  SdMenu,
+  SdFlatMenu,
+  SdPermission,
 } from "./sd-app-structure.types";
 
 export abstract class SdAppStructureUtils {
   //---------- Info
 
-  static getTitleByFullCode<TModule>(items: TSdAppStructureItem<TModule>[], fullCode: string) {
+  static getTitleByFullCode<TModule>(items: AppStructureItem<TModule>[], fullCode: string) {
     const itemChain = this.getItemChainByFullCode(items, fullCode);
     if (itemChain.length === 0) {
       throw new Error(`Item not found for fullCode: ${fullCode}`);
@@ -23,7 +27,7 @@ export abstract class SdAppStructureUtils {
   }
 
   static getPermsByFullCode<TModule, K extends string>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     fullCodes: string[],
     permKeys: K[],
     permRecord: Record<string, boolean> | undefined,
@@ -51,12 +55,12 @@ export abstract class SdAppStructureUtils {
   }
 
   static getItemChainByFullCode<TModule>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     fullCode: string,
-  ): TSdAppStructureItem<TModule>[] {
+  ): AppStructureItem<TModule>[] {
     const codeChain = fullCode.split(".");
 
-    const result: TSdAppStructureItem<TModule>[] = [];
+    const result: AppStructureItem<TModule>[] = [];
 
     let cursorChildren = items;
     for (const currCode of codeChain) {
@@ -72,12 +76,12 @@ export abstract class SdAppStructureUtils {
   //---------- Menus
 
   static getMenus<TModule>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     codeChain: string[],
     usableModules: TModule[] | undefined,
     permRecord: Record<string, boolean> | undefined,
-  ): ISdMenu[] {
-    const resultMenus: ISdMenu[] = [];
+  ): SdMenu[] {
+    const resultMenus: SdMenu[] = [];
 
     for (const item of items) {
       if ("isNotMenu" in item && item.isNotMenu) continue;
@@ -85,7 +89,7 @@ export abstract class SdAppStructureUtils {
       const currCodeChain = [...codeChain, item.code];
 
       // 모듈 활성화 여부 확인
-      if (!this._isUsableModules(item.modules, item.requiredModules, usableModules)) continue;
+      if (!isUsableModules(item.modules, item.requiredModules, usableModules)) continue;
 
       // 그룹 메뉴
       if ("children" in item) {
@@ -120,14 +124,14 @@ export abstract class SdAppStructureUtils {
   }
 
   static getFlatMenus<TModule>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     usableModules: TModule[] | undefined,
     permRecord: Record<string, boolean> | undefined,
-  ): ISdFlatMenu<TModule>[] {
-    const resultFlatMenus: ISdFlatMenu<TModule>[] = [];
+  ): SdFlatMenu<TModule>[] {
+    const resultFlatMenus: SdFlatMenu<TModule>[] = [];
 
     type QueueItem = {
-      item: TSdAppStructureItem<TModule>;
+      item: AppStructureItem<TModule>;
       titleChain: string[];
       codeChain: string[];
       modulesChain: TModule[][];
@@ -154,7 +158,7 @@ export abstract class SdAppStructureUtils {
         ? [...requiredModulesChain, item.requiredModules]
         : requiredModulesChain;
 
-      if (!this._isUsableModulesChain(currModulesChain, currRequiredModulesChain, usableModules))
+      if (!isUsableModulesChain(currModulesChain, currRequiredModulesChain, usableModules))
         continue;
 
       if ("children" in item) {
@@ -182,16 +186,16 @@ export abstract class SdAppStructureUtils {
   //---------- Perms
 
   static getPermissions<TModule>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     codeChain: string[],
     usableModules: TModule[] | undefined,
-  ): ISdPermission<TModule>[] {
-    const results: ISdPermission<TModule>[] = [];
+  ): SdPermission<TModule>[] {
+    const results: SdPermission<TModule>[] = [];
     for (const item of items) {
       const currCodeChain = [...codeChain, item.code];
 
       // 모듈 활성화 여부 확인
-      if (!this._isUsableModules(item.modules, item.requiredModules, usableModules)) continue;
+      if (!isUsableModules(item.modules, item.requiredModules, usableModules)) continue;
 
       // 그룹
       if ("children" in item) {
@@ -227,124 +231,9 @@ export abstract class SdAppStructureUtils {
   }
 
   static getFlatPermissions<TModule>(
-    items: TSdAppStructureItem<TModule>[],
+    items: AppStructureItem<TModule>[],
     usableModules: TModule[] | undefined,
   ) {
-    const results: ISdFlatPermission<TModule>[] = [];
-
-    type QueueItem = {
-      item: TSdAppStructureItem<TModule>;
-      titleChain: string[];
-      codeChain: string[];
-      modulesChain: TModule[][];
-      requiredModulesChain: TModule[][];
-    };
-
-    const queue: QueueItem[] = items.map((item) => ({
-      item,
-      titleChain: [],
-      codeChain: [],
-      modulesChain: [],
-      requiredModulesChain: [],
-    }));
-
-    while (queue.length > 0) {
-      const { item, titleChain, codeChain, modulesChain, requiredModulesChain } = queue.shift()!;
-
-      const currTitleChain = [...titleChain, item.title];
-      const currCodeChain = [...codeChain, item.code];
-      const currModulesChain = item.modules ? [...modulesChain, item.modules] : modulesChain;
-      const currRequiredModulesChain = item.requiredModules
-        ? [...requiredModulesChain, item.requiredModules]
-        : requiredModulesChain;
-
-      if (!this._isUsableModulesChain(currModulesChain, currRequiredModulesChain, usableModules))
-        continue;
-
-      // 1. 자식 enqueue
-      if ("children" in item) {
-        for (const child of item.children) {
-          queue.push({
-            item: child,
-            titleChain: currTitleChain,
-            codeChain: currCodeChain,
-            modulesChain: currModulesChain,
-            requiredModulesChain: currRequiredModulesChain,
-          });
-        }
-      }
-
-      // 1. 직접 perms 처리
-      if ("perms" in item) {
-        for (const perm of item.perms ?? []) {
-          results.push({
-            titleChain: currTitleChain,
-            codeChain: [...currCodeChain, perm],
-            modulesChain: currModulesChain,
-          });
-        }
-      }
-
-      // 2. subPerms 처리
-      if ("subPerms" in item) {
-        for (const subPerm of item.subPerms ?? []) {
-          // subPerm도 모듈 체크
-          if (!this._isUsableModules(subPerm.modules, subPerm.requiredModules, usableModules))
-            continue;
-
-          for (const perm of subPerm.perms) {
-            results.push({
-              titleChain: currTitleChain,
-              codeChain: [...currCodeChain, subPerm.code, perm],
-              modulesChain: [...currModulesChain, subPerm.modules ?? []],
-            });
-          }
-        }
-      }
-    }
-
-    return results;
-  }
-
-  //-- Modules (private)
-
-  private static _isUsableModulesChain<TModule>(
-    modulesChain: TModule[][],
-    requiredModulesChain: TModule[][],
-    usableModules: TModule[] | undefined,
-  ) {
-    // 각 레벨의 modules (OR) 체크
-    for (const modules of modulesChain) {
-      if (!this._isUsableModules(modules, undefined, usableModules)) {
-        return false;
-      }
-    }
-
-    // 각 레벨의 requiredModules (AND) 체크
-    for (const requiredModules of requiredModulesChain) {
-      if (!this._isUsableModules(undefined, requiredModules, usableModules)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  private static _isUsableModules<TModule>(
-    modules: TModule[] | undefined,
-    requiredModules: TModule[] | undefined,
-    usableModules: TModule[] | undefined,
-  ): boolean {
-    // 1. requiredModules: 모두 있어야 함 (AND)
-    if (requiredModules && requiredModules.length > 0) {
-      if (!requiredModules.every((m) => usableModules?.includes(m))) {
-        return false;
-      }
-    }
-
-    // 2. modules: 하나라도 있으면 됨 (OR)
-    return (
-      modules == null || modules.length === 0 || modules.some((m) => usableModules?.includes(m))
-    );
+    return getFlatPermissions(items, usableModules);
   }
 }

package/src/core/providers/sd-busy.provider.ts

@@ -8,23 +8,23 @@ import {
   signal,
   type ComponentRef,
 } from "@angular/core";
-import { SdBusyContainerControl } from "../../ui/overlay/busy/sd-busy-container.control";
+import { SdBusyContainer } from "../../ui/overlay/busy/sd-busy-container";
 
-export type TSdBusyType = "spinner" | "bar" | "cube";
+export type SdBusyType = "spinner" | "bar" | "cube";
 
 @Injectable({ providedIn: "root" })
 export class SdBusyProvider {
   private readonly _appRef = inject(ApplicationRef);
   private readonly _envInjector = inject(EnvironmentInjector);
 
-  type = signal<TSdBusyType>("bar");
+  type = signal<SdBusyType>("bar");
   globalBusyCount = signal(0);
 
-  private _containerRef: ComponentRef<SdBusyContainerControl> | undefined;
+  private _containerRef: ComponentRef<SdBusyContainer> | undefined;
 
-  get containerRef(): ComponentRef<SdBusyContainerControl> {
+  get containerRef(): ComponentRef<SdBusyContainer> {
     if (this._containerRef === undefined) {
-      this._containerRef = createComponent(SdBusyContainerControl, {
+      this._containerRef = createComponent(SdBusyContainer, {
         environmentInjector: this._envInjector,
       });
       this._appRef.attachView(this._containerRef.hostView);

package/src/core/providers/sd-print.provider.ts

@@ -7,26 +7,26 @@ import {
   type Signal,
   type Type,
 } from "@angular/core";
-import type { TDirectiveInputSignals, TWithOptional } from "../utils/TDirectiveInputSignals";
+import type { DirectiveInputSignals, WithOptional } from "../utils/directive-input-signals";
 import { SdBusyProvider } from "./sd-busy.provider";
 import { wait } from "@simplysm/core-common";
 import { jsPDF } from "jspdf";
 import * as htmlToImage from "html-to-image";
 
-export interface ISdPrint {
+export interface SdPrint {
   initialized: Signal<boolean>;
   readonly _optionalPrintInputs?: string;
 }
 
-type TSdPrintOptionalKeys<T> = T extends { _optionalPrintInputs?: infer K extends string }
+type SdPrintOptionalKeys<T> = T extends { _optionalPrintInputs?: infer K extends string }
   ? K
   : never;
 
-export interface ISdPrintInput<T, X extends keyof any = ""> {
+export interface SdPrintInput<T, X extends keyof any = ""> {
   type: Type<T>;
-  inputs: TWithOptional<
-    Omit<TDirectiveInputSignals<T>, "_optionalPrintInputs" | X>,
-    TSdPrintOptionalKeys<T> & keyof Omit<TDirectiveInputSignals<T>, "_optionalPrintInputs" | X>
+  inputs: WithOptional<
+    Omit<DirectiveInputSignals<T>, "_optionalPrintInputs" | X>,
+    SdPrintOptionalKeys<T> & keyof Omit<DirectiveInputSignals<T>, "_optionalPrintInputs" | X>
   >;
 }
 
@@ -35,8 +35,8 @@ export class SdPrintProvider {
   private readonly _appRef = inject(ApplicationRef);
   private readonly _sdBusy = inject(SdBusyProvider);
 
-  async printAsync<T extends ISdPrint>(
-    template: ISdPrintInput<T>,
+  async printAsync<T extends SdPrint>(
+    template: SdPrintInput<T>,
     options?: {
       size?: string;
       margin?: string;
@@ -90,8 +90,8 @@ export class SdPrintProvider {
     }
   }
 
-  async getPdfBufferAsync<T extends ISdPrint>(
-    template: ISdPrintInput<T>,
+  async getPdfBufferAsync<T extends SdPrint>(
+    template: SdPrintInput<T>,
     options?: {
       orientation?: "portrait" | "landscape";
       pageSize?: string;

package/src/core/providers/sd-shared-data.provider.ts

@@ -4,21 +4,21 @@ import { obj, wait as waitUtil } from "@simplysm/core-common";
 import { SdServiceClientFactoryProvider } from "./sd-service-client-factory.provider";
 import "@simplysm/core-common";
 
-export interface ISharedDataBase<TKey extends string | number> {
+export interface SharedDataBase<TKey extends string | number> {
   __valueKey: TKey;
   __searchText: string;
   __isHidden: boolean;
   __parentKey?: TKey;
 }
 
-export interface ISharedDataInfo<T extends ISharedDataBase<string | number>> {
+export interface SharedDataInfo<T extends SharedDataBase<string | number>> {
   serviceKey: string;
   getter: (changeKeys?: (string | number)[]) => Promise<T[]>;
   filter?: unknown;
   orderBy?: (a: T, b: T) => number;
 }
 
-export interface SharedDataHandle<T extends ISharedDataBase<string | number>> {
+export interface SharedDataHandle<T extends SharedDataBase<string | number>> {
   items: Signal<T[]>;
   get(key: T["__valueKey"] | undefined): T | undefined;
 }
@@ -28,8 +28,8 @@ export const SdSharedDataChangeEvent = defineEvent<
   (string | number)[] | undefined
 >("SdSharedDataChange");
 
-interface ISharedDataEntry<T extends ISharedDataBase<string | number>> {
-  info: ISharedDataInfo<T>;
+interface SharedDataEntry<T extends SharedDataBase<string | number>> {
+  info: SharedDataInfo<T>;
   itemsSignal: WritableSignal<T[]>;
   handle: SharedDataHandle<T>;
   listenerKey?: string;
@@ -38,17 +38,17 @@ interface ISharedDataEntry<T extends ISharedDataBase<string | number>> {
 }
 
 @Injectable()
-export abstract class SdSharedDataProvider<T extends Record<string, ISharedDataBase<string | number>>> {
+export abstract class SdSharedDataProvider<T extends Record<string, SharedDataBase<string | number>>> {
   private readonly _clientFactory = inject(SdServiceClientFactoryProvider);
   private readonly _errorHandler = inject(ErrorHandler);
 
   readonly loadingCount: WritableSignal<number> = signal(0);
 
-  private readonly _entries = new Map<string, ISharedDataEntry<any>>();
+  private readonly _entries = new Map<string, SharedDataEntry<any>>();
 
   abstract initialize(): void;
 
-  register<K extends string & keyof T>(name: K, info: ISharedDataInfo<T[K]>): void {
+  register<K extends string & keyof T>(name: K, info: SharedDataInfo<T[K]>): void {
     const existing = this._entries.get(name as string);
     if (existing != null) {
       // 기존 리스너 키 초기화
@@ -107,8 +107,8 @@ export abstract class SdSharedDataProvider<T extends Record<string, ISharedDataB
     }
 
     const client = this._clientFactory.get(entry.info.serviceKey);
-    await client.emitEvent(
-      SdSharedDataChangeEvent,
+    const event = client.getEvent<typeof SdSharedDataChangeEvent>("SdSharedDataChange");
+    await event.emit(
       (item) => item.name === (name as string) && obj.equal(item.filter, entry.info.filter),
       changeKeys,
     );
@@ -118,7 +118,7 @@ export abstract class SdSharedDataProvider<T extends Record<string, ISharedDataB
     await waitUtil.until(() => this.loadingCount() <= 0);
   }
 
-  private _loadAndListen(name: string, entry: ISharedDataEntry<any>): void {
+  private _loadAndListen(name: string, entry: SharedDataEntry<any>): void {
     entry.isLoading = true;
     this.loadingCount.update((v) => v + 1);
 
@@ -131,8 +131,8 @@ export abstract class SdSharedDataProvider<T extends Record<string, ISharedDataB
         // 이벤트 리스너 등록
         if (entry.listenerKey == null) {
           const client = this._clientFactory.get(entry.info.serviceKey);
-          entry.listenerKey = await client.addListener(
-            SdSharedDataChangeEvent,
+          const event = client.getEvent<typeof SdSharedDataChangeEvent>("SdSharedDataChange");
+          entry.listenerKey = await event.addListener(
             { name, filter: entry.info.filter },
             async (changeKeys) => {
               await this._onEvent(name, entry, changeKeys);
@@ -155,7 +155,7 @@ export abstract class SdSharedDataProvider<T extends Record<string, ISharedDataB
 
   private async _onEvent(
     name: string,
-    entry: ISharedDataEntry<any>,
+    entry: SharedDataEntry<any>,
     changeKeys: (string | number)[] | undefined,
   ): Promise<void> {
     this.loadingCount.update((v) => v + 1);