@ng-atomic/common 19.51.0 → 19.80.0

package/fesm2022/ng-atomic-common-pipes-smart-field.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-pipes-smart-field.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/pipes/smart-field/smart-field.pipe.ts","../../../../../packages/@ng-atomic/common/src/lib/pipes/smart-field/ng-atomic-common-pipes-smart-field.ts"],"sourcesContent":["import { InjectionToken, Pipe, PipeTransform, Signal, inject } from '@angular/core';\nimport { Action } from '@ng-atomic/core';\nimport { SignalOrValue } from '@ng-atomic/common/pipes/signal';\nimport { get } from 'lodash-es';\n\n\nexport interface Option<T> {\n  name: string;\n  value: T;\n}\n\ninterface BaseField {\n  placeholder?: string;\n  hint?: SignalOrValue<string>;\n  actions?: Action[] | Signal<Action[]>;\n}\n\ninterface TextField extends BaseField {\n  type: 'text';\n  autoComplete?: SignalOrValue<string[]>;\n}\n\ninterface PasswordField extends BaseField {\n  type: 'password';\n}\n\ninterface NumberField extends BaseField {\n  type: 'number';\n}\n\ninterface TextareaField extends BaseField {\n  type: 'textarea';\n  rows?: number;\n}\n\ninterface DateInputField extends BaseField {\n  type: 'date';\n}\n\ninterface DateRangeInputField extends BaseField {\n  type: 'date-range';\n}\n\ninterface SelectField<T> extends BaseField {\n  type: 'select';\n  options: Option<T>[] | Signal<Option<T>[]>;\n  multiple?: boolean;\n}\n\ninterface TimeRangeField extends BaseField {\n  type: 'time-range';\n}\n\n//* @deprecated use multiple option */\ninterface MultiSelectField<T> extends BaseField {\n  type: 'multi-select';\n  options: Option<T>[] | Signal<Option<T>[]>;\n}\n\ninterface FileField extends BaseField {\n  type: 'file';\n  progress?: Signal<number | null>;\n}\n\ninterface ActionField extends BaseField {\n  type: 'action';\n  actions: Action[] | Signal<Action[]>;\n  buttonType?: 'flat' | 'raised' | 'stroked' | 'icon';\n  disabled?: boolean;\n}\n\ninterface AgreementField {\n  type: 'agreement';\n  labelTemp: null | any;\n}\n\ninterface SliderField extends BaseField {\n  type: 'slider';\n  slider: {\n    min?: number;\n    max?: number;\n    step?: number;\n  }\n}\n\ninterface HiddenField {\n  type: 'hidden';\n}\n\ninterface PreviewField extends BaseField {\n  type: 'preview';\n}\n\ninterface PreviewImageField extends BaseField {\n  type: 'preview:image';\n}\n\nexport type FormField<V = any> = \n  | TextField\n  | PasswordField\n  | TextareaField\n  | DateInputField\n  | DateRangeInputField\n  | SelectField<V>\n  | TimeRangeField\n  | MultiSelectField<V>\n  | FileField\n  | ActionField\n  | HiddenField\n  | NumberField\n  | PreviewField\n  | AgreementField\n  | SliderField\n  | PreviewImageField;\n\nexport interface FormFieldMap {\n  [key: string]: FormField<any> | FormFieldMap;\n}\n\n/** @deprecated */\nexport const FORM_FIELD_MAP = new InjectionToken<FormFieldMap>('[@ng-atomic] Smart Form Field');\n\n/** @deprecated use fieldMap input*/\nexport function provideFormFieldMap(useFactory: () => FormFieldMap) {\n  return { provide: FORM_FIELD_MAP, useFactory };\n}\n\ntype Enum<T> = Record<string, T>;\n\nexport function buildOptions<T>(_enum: Enum<T> | any[]): Option<T>[] {\n  if (Array.isArray(_enum)) {\n    return _enum.map(value => ({value, name: value}) as Option<T>);\n  }\n  return Object.values(_enum).map(value => ({value, name: value}) as Option<T>);\n}\n\nexport function buildEnumOptions<T>(_enum: Enum<T>): Option<T>[] {\n  return Object.entries(_enum).map(([key, value]) => ({value, name: key}) as Option<T>);\n}\n\n/** @deprecated */\n@Pipe({name: 'smartField', standalone: true, pure: true})\nexport class SmartFieldPipe implements PipeTransform {\n  protected map = inject(FORM_FIELD_MAP, {optional: true}) ?? {\n    createdAt: { type: 'date' },\n    updatedAt: { type: 'date' },\n    deletedAt: { type: 'date' },\n  };\n\n  transform(key: string, map: FormFieldMap = this.map): FormField<any> {\n    return (get(map, key) ?? {type: 'text'}) as FormField<any>;\n  }\n}\n\nexport function resolveFormField(fieldMap: FormFieldMap, name: string) {\n  if (get(fieldMap, name)) return get(fieldMap, name);\n  for (const key of Object.keys(fieldMap ?? {})) {\n    if (new RegExp(key).test(name)) return get(fieldMap, key);\n  }\n  return { type: 'text' } as FormField;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;AAuHA;MACa,cAAc,GAAG,IAAI,cAAc,CAAe,+BAA+B;AAE9F;AACM,SAAU,mBAAmB,CAAC,UAA8B,EAAA;AAChE,IAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE;AAChD;AAIM,SAAU,YAAY,CAAI,KAAsB,EAAA;AACpD,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,QAAA,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,CAAc,CAAC;IAChE;IACA,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,CAAc,CAAC;AAC/E;AAEM,SAAU,gBAAgB,CAAI,KAAc,EAAA;AAChD,IAAA,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAc,CAAC;AACvF;AAEA;MAEa,cAAc,CAAA;AAD3B,IAAA,WAAA,GAAA;QAEY,IAAA,CAAA,GAAG,GAAG,MAAM,CAAC,cAAc,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,IAAI;AAC1D,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;AAC3B,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;AAC3B,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SAC5B;AAKF,IAAA;AAHC,IAAA,SAAS,CAAC,GAAW,EAAE,GAAA,GAAoB,IAAI,CAAC,GAAG,EAAA;AACjD,QAAA,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAC,IAAI,EAAE,MAAM,EAAC;IACzC;8GATW,cAAc,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,IAAA,EAAA,CAAA,CAAA;4GAAd,cAAc,EAAA,YAAA,EAAA,IAAA,EAAA,IAAA,EAAA,YAAA,EAAA,CAAA,CAAA;;2FAAd,cAAc,EAAA,UAAA,EAAA,CAAA;kBAD1B,IAAI;mBAAC,EAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC;;AAalD,SAAU,gBAAgB,CAAC,QAAsB,EAAE,IAAY,EAAA;AACnE,IAAA,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC;AACnD,IAAA,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE;QAC7C,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AAAE,YAAA,OAAO,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;IAC3D;AACA,IAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe;AACtC;;AChKA;;AAEG;;;;"}
+{"version":3,"file":"ng-atomic-common-pipes-smart-field.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/pipes/smart-field/smart-field.pipe.ts","../../../../../packages/@ng-atomic/common/src/lib/pipes/smart-field/ng-atomic-common-pipes-smart-field.ts"],"sourcesContent":["import { InjectionToken, Pipe, PipeTransform, Signal, inject } from '@angular/core';\nimport { Action } from '@ng-atomic/core';\nimport { SignalOrValue } from '@ng-atomic/common/pipes/signal';\nimport { get } from 'lodash-es';\n\n\nexport interface Option<T> {\n  name: string;\n  value: T;\n}\n\ninterface BaseField {\n  placeholder?: string;\n  hint?: SignalOrValue<string>;\n  actions?: Action[] | Signal<Action[]>;\n}\n\ninterface TextField extends BaseField {\n  type: 'text';\n  autoComplete?: SignalOrValue<string[]>;\n}\n\ninterface PasswordField extends BaseField {\n  type: 'password';\n}\n\ninterface NumberField extends BaseField {\n  type: 'number';\n}\n\ninterface TextareaField extends BaseField {\n  type: 'textarea';\n  rows?: number;\n}\n\ninterface DateInputField extends BaseField {\n  type: 'date';\n}\n\ninterface DateRangeInputField extends BaseField {\n  type: 'date-range';\n}\n\ninterface SelectField<T> extends BaseField {\n  type: 'select';\n  options: Option<T>[] | Signal<Option<T>[]>;\n  multiple?: boolean;\n}\n\ninterface TimeRangeField extends BaseField {\n  type: 'time-range';\n}\n\n\ninterface MultiSelectField<T> extends BaseField {\n  type: 'multi-select';\n  options: Option<T>[] | Signal<Option<T>[]>;\n}\n\ninterface FileField extends BaseField {\n  type: 'file';\n  progress?: Signal<number | null>;\n}\n\ninterface ActionField extends BaseField {\n  type: 'action';\n  actions: Action[] | Signal<Action[]>;\n  buttonType?: 'flat' | 'raised' | 'stroked' | 'icon';\n  disabled?: boolean;\n}\n\ninterface AgreementField {\n  type: 'agreement';\n  labelTemp: null | any;\n}\n\ninterface SliderField extends BaseField {\n  type: 'slider';\n  slider: {\n    min?: number;\n    max?: number;\n    step?: number;\n  }\n}\n\ninterface HiddenField {\n  type: 'hidden';\n}\n\ninterface PreviewField extends BaseField {\n  type: 'preview';\n}\n\ninterface PreviewImageField extends BaseField {\n  type: 'preview:image';\n}\n\nexport type FormField<V = any> = \n  | TextField\n  | PasswordField\n  | TextareaField\n  | DateInputField\n  | DateRangeInputField\n  | SelectField<V>\n  | TimeRangeField\n  | MultiSelectField<V>\n  | FileField\n  | ActionField\n  | HiddenField\n  | NumberField\n  | PreviewField\n  | AgreementField\n  | SliderField\n  | PreviewImageField;\n\nexport interface FormFieldMap {\n  [key: string]: FormField<any> | FormFieldMap;\n}\n\n\nexport const FORM_FIELD_MAP = new InjectionToken<FormFieldMap>('[@ng-atomic] Smart Form Field');\n\n\nexport function provideFormFieldMap(useFactory: () => FormFieldMap) {\n  return { provide: FORM_FIELD_MAP, useFactory };\n}\n\ntype Enum<T> = Record<string, T>;\n\nexport function buildOptions<T>(_enum: Enum<T> | any[]): Option<T>[] {\n  if (Array.isArray(_enum)) {\n    return _enum.map(value => ({value, name: value}) as Option<T>);\n  }\n  return Object.values(_enum).map(value => ({value, name: value}) as Option<T>);\n}\n\nexport function buildEnumOptions<T>(_enum: Enum<T>): Option<T>[] {\n  return Object.entries(_enum).map(([key, value]) => ({value, name: key}) as Option<T>);\n}\n\n\n@Pipe({name: 'smartField', standalone: true, pure: true})\nexport class SmartFieldPipe implements PipeTransform {\n  protected map = inject(FORM_FIELD_MAP, {optional: true}) ?? {\n    createdAt: { type: 'date' },\n    updatedAt: { type: 'date' },\n    deletedAt: { type: 'date' },\n  };\n\n  transform(key: string, map: FormFieldMap = this.map): FormField<any> {\n    return (get(map, key) ?? {type: 'text'}) as FormField<any>;\n  }\n}\n\nexport function resolveFormField(fieldMap: FormFieldMap, name: string) {\n  if (get(fieldMap, name)) return get(fieldMap, name);\n  for (const key of Object.keys(fieldMap ?? {})) {\n    if (new RegExp(key).test(name)) return get(fieldMap, key);\n  }\n  return { type: 'text' } as FormField;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;MAwHa,cAAc,GAAG,IAAI,cAAc,CAAe,+BAA+B;AAGxF,SAAU,mBAAmB,CAAC,UAA8B,EAAA;AAChE,IAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE;AAChD;AAIM,SAAU,YAAY,CAAI,KAAsB,EAAA;AACpD,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,QAAA,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,CAAc,CAAC;IAChE;IACA,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,CAAc,CAAC;AAC/E;AAEM,SAAU,gBAAgB,CAAI,KAAc,EAAA;AAChD,IAAA,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAc,CAAC;AACvF;MAIa,cAAc,CAAA;AAD3B,IAAA,WAAA,GAAA;QAEY,IAAA,CAAA,GAAG,GAAG,MAAM,CAAC,cAAc,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,IAAI;AAC1D,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;AAC3B,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;AAC3B,YAAA,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SAC5B;AAKF,IAAA;AAHC,IAAA,SAAS,CAAC,GAAW,EAAE,GAAA,GAAoB,IAAI,CAAC,GAAG,EAAA;AACjD,QAAA,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAC,IAAI,EAAE,MAAM,EAAC;IACzC;8GATW,cAAc,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,IAAA,EAAA,CAAA,CAAA;4GAAd,cAAc,EAAA,YAAA,EAAA,IAAA,EAAA,IAAA,EAAA,YAAA,EAAA,CAAA,CAAA;;2FAAd,cAAc,EAAA,UAAA,EAAA,CAAA;kBAD1B,IAAI;mBAAC,EAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC;;AAalD,SAAU,gBAAgB,CAAC,QAAsB,EAAE,IAAY,EAAA;AACnE,IAAA,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC;AACnD,IAAA,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE;QAC7C,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AAAE,YAAA,OAAO,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;IAC3D;AACA,IAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe;AACtC;;AChKA;;AAEG;;;;"}

package/fesm2022/ng-atomic-common-services-app.mjs

@@ -17,7 +17,7 @@ class HistoryInjectorService {
         this.isInitialNavigation = true;
         this.router.events.subscribe((event) => {
             if (event instanceof NavigationStart && this.isInitialNavigation) {
-                this.isInitialNavigation = false; // 最初のナビゲーションのみ適用
+                this.isInitialNavigation = false;
                 this.injectParentRoutes(event.url);
             }
         });
@@ -32,13 +32,11 @@ class HistoryInjectorService {
                 console.debug('[HistoryInjector] Adding parent URL to history:', parentUrl);
                 await this.router.navigateByUrl(parentUrl);
             }
-            // 最終的に元のURLに遷移
             await this.router.navigateByUrl(currentUrl);
         }
     }
     getFilteredSegments(urlTree) {
         const segments = urlTree.root.children['primary']?.segments || [];
-        // `skip=true`のマトリクスパラメーターが含まれるセグメントを除外
         return segments.filter(segment => {
             const skip = segment.parameterMap.get('skip');
             return skip !== 'true';

package/fesm2022/ng-atomic-common-services-app.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-services-app.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/app/app.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/app/ng-atomic-common-services-app.ts"],"sourcesContent":["import { Injectable, inject } from '@angular/core';\nimport { NavigationStart, Router, UrlSegment, UrlTree } from '@angular/router';\nimport { LoadingService } from '@ng-atomic/common/services/loading';\nimport { SideAppService } from '@ng-atomic/common/services/side-app';\nimport { SideNavModeService } from '@ng-atomic/common/services/side-nav-mode';\nimport { FabService } from '@ng-atomic/common/services/fab';\nimport { SnackBarService } from '@ng-atomic/common/services/snack-bar';\nimport { Clipboard } from '@angular/cdk/clipboard';\nimport { MatDialog } from '@angular/material/dialog';\nimport { SheetService } from '@ng-atomic/common/services/sheets';\n\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class HistoryInjectorService {\n  private isInitialNavigation = true;\n\n  constructor(private router: Router) {\n    this.router.events.subscribe((event) => {\n      if (event instanceof NavigationStart && this.isInitialNavigation) {\n        this.isInitialNavigation = false; // 最初のナビゲーションのみ適用\n        this.injectParentRoutes(event.url);\n      }\n    });\n  }\n\n  private async injectParentRoutes(currentUrl: string): Promise<void> {\n    const urlTree: UrlTree = this.router.parseUrl(currentUrl);\n    const segments = this.getFilteredSegments(urlTree);\n\n    console.debug('[HistoryInjector] Filtered segments:', segments);\n\n    if (segments.length > 1) {\n      for (let i = 1; i < segments.length; i++) {\n        const parentUrl = '/' + segments.slice(0, i).map(segment => segment.path).join('/');\n        console.debug('[HistoryInjector] Adding parent URL to history:', parentUrl);\n        await this.router.navigateByUrl(parentUrl);\n      }\n\n      // 最終的に元のURLに遷移\n      await this.router.navigateByUrl(currentUrl);\n    }\n  }\n\n  private getFilteredSegments(urlTree: UrlTree): UrlSegment[] {\n    const segments = urlTree.root.children['primary']?.segments || [];\n\n    // `skip=true`のマトリクスパラメーターが含まれるセグメントを除外\n    return segments.filter(segment => {\n      const skip = segment.parameterMap.get('skip');\n      return skip !== 'true';\n    });\n  }\n}\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class AppService {\n  readonly dialog = inject(MatDialog);\n  readonly loading = inject(LoadingService);\n  readonly sheet = inject(SheetService);\n  readonly sideApp = inject(SideAppService);\n  readonly sideNavMode = inject(SideNavModeService);\n  readonly sideNav = inject(SideNavModeService);\n  readonly router = inject(Router);\n  readonly fab = inject(FabService);\n  readonly snackBar = inject(SnackBarService);\n  readonly clipboard = inject(Clipboard);\n  readonly navigationInterceptor = inject(HistoryInjectorService);\n  \n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ng-atomic-common-services-app.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/app/app.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/app/ng-atomic-common-services-app.ts"],"sourcesContent":["import { Injectable, inject } from '@angular/core';\nimport { NavigationStart, Router, UrlSegment, UrlTree } from '@angular/router';\nimport { LoadingService } from '@ng-atomic/common/services/loading';\nimport { SideAppService } from '@ng-atomic/common/services/side-app';\nimport { SideNavModeService } from '@ng-atomic/common/services/side-nav-mode';\nimport { FabService } from '@ng-atomic/common/services/fab';\nimport { SnackBarService } from '@ng-atomic/common/services/snack-bar';\nimport { Clipboard } from '@angular/cdk/clipboard';\nimport { MatDialog } from '@angular/material/dialog';\nimport { SheetService } from '@ng-atomic/common/services/sheets';\n\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class HistoryInjectorService {\n  private isInitialNavigation = true;\n\n  constructor(private router: Router) {\n    this.router.events.subscribe((event) => {\n      if (event instanceof NavigationStart && this.isInitialNavigation) {\n        this.isInitialNavigation = false; \n        this.injectParentRoutes(event.url);\n      }\n    });\n  }\n\n  private async injectParentRoutes(currentUrl: string): Promise<void> {\n    const urlTree: UrlTree = this.router.parseUrl(currentUrl);\n    const segments = this.getFilteredSegments(urlTree);\n\n    console.debug('[HistoryInjector] Filtered segments:', segments);\n\n    if (segments.length > 1) {\n      for (let i = 1; i < segments.length; i++) {\n        const parentUrl = '/' + segments.slice(0, i).map(segment => segment.path).join('/');\n        console.debug('[HistoryInjector] Adding parent URL to history:', parentUrl);\n        await this.router.navigateByUrl(parentUrl);\n      }\n\n      \n      await this.router.navigateByUrl(currentUrl);\n    }\n  }\n\n  private getFilteredSegments(urlTree: UrlTree): UrlSegment[] {\n    const segments = urlTree.root.children['primary']?.segments || [];\n\n    \n    return segments.filter(segment => {\n      const skip = segment.parameterMap.get('skip');\n      return skip !== 'true';\n    });\n  }\n}\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class AppService {\n  readonly dialog = inject(MatDialog);\n  readonly loading = inject(LoadingService);\n  readonly sheet = inject(SheetService);\n  readonly sideApp = inject(SideAppService);\n  readonly sideNavMode = inject(SideNavModeService);\n  readonly sideNav = inject(SideNavModeService);\n  readonly router = inject(Router);\n  readonly fab = inject(FabService);\n  readonly snackBar = inject(SnackBarService);\n  readonly clipboard = inject(Clipboard);\n  readonly navigationInterceptor = inject(HistoryInjectorService);\n  \n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}

package/fesm2022/ng-atomic-common-services-auth.mjs

@@ -1,44 +1,39 @@
 import * as i0 from '@angular/core';
 import { inject, Injectable } from '@angular/core';
 import { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Auth, authState, TwitterAuthProvider, signInWithPopup, GoogleAuthProvider, onAuthStateChanged, signInWithEmailAndPassword, createUserWithEmailAndPassword, signInWithCustomToken, signOut } from '@angular/fire/auth';
+import { Auth, authState, getRedirectResult, TwitterAuthProvider, signInWithPopup, GoogleAuthProvider, signInWithRedirect, onAuthStateChanged, signInWithEmailAndPassword, createUserWithEmailAndPassword, signInWithCustomToken, signOut } from '@angular/fire/auth';
 import { get } from 'lodash-es';
-import { switchMap, of, distinctUntilChanged, shareReplay, map } from 'rxjs';
+import { ReplaySubject, switchMap, of, distinctUntilChanged, shareReplay, map } from 'rxjs';
 
+const redirectError$ = new ReplaySubject(1);
 class AuthService {
+    #auth;
     constructor() {
         this.#auth = inject(Auth);
+        this.redirectError$ = redirectError$;
         this.auth$ = authState(this.#auth);
         this.auth = toSignal(this.auth$);
         this.accessToken$ = this.auth$.pipe(switchMap(auth => auth ? auth.getIdToken() : of(null)), distinctUntilChanged(), shareReplay(1), takeUntilDestroyed());
         this.accessToken = toSignal(this.accessToken$);
         this.userId$ = this.auth$.pipe(map(auth => auth?.uid ?? null), distinctUntilChanged(), shareReplay(1), takeUntilDestroyed());
         this.customClaims$ = this.auth$.pipe(switchMap(auth => auth ? auth.getIdTokenResult() : of(null)), map(token => token?.claims ?? {}), distinctUntilChanged(), shareReplay(1), takeUntilDestroyed());
+        if (typeof window !== 'undefined' && window.self !== window.top) {
+            return;
+        }
+        getRedirectResult(this.#auth).catch(error => {
+            console.warn('[AuthService] getRedirectResult error:', error);
+            redirectError$.next(error);
+        });
     }
-    #auth;
     signInWithTwitter() {
         const provider = new TwitterAuthProvider();
         return signInWithPopup(this.#auth, provider);
     }
-    // signInWithGoogle() {
-    //   const provider = new GoogleAuthProvider();
-    //   return signInWithPopup(this.#auth, provider);
-    // }
     async signInWithGoogle(scopes = []) {
         const provider = new GoogleAuthProvider();
         for (const scope of scopes)
             provider.addScope(scope);
-        return signInWithPopup(this.#auth, provider).catch(async (error) => {
-            if (error.code === 'auth/popup-closed-by-user') {
-                const user = await this.#waitForAuthState();
-                if (user)
-                    return { user };
-            }
-            if (error.code === 'auth/account-exists-with-different-credential') {
-                this.onFailedForAccountExistsWithDifferentCredential(error);
-            }
-            throw error;
-        });
+        return signInWithRedirect(this.#auth, provider);
     }
     #waitForAuthState(timeoutMs = 3000) {
         return new Promise(resolve => {
@@ -69,13 +64,7 @@ class AuthService {
     }
     onFailedForAccountExistsWithDifferentCredential(error) {
         const credential = error.customData._tokenResponse;
-        // const pending = FacebookAuthProvider.credential(credential.oauthAccessToken);
         const providerId = error.customData._tokenResponse.providerId;
-        // this.pends.update(pends => [...pends, {
-        //   credential: pending,
-        //   providerId: providerId,
-        //   email: credential.email,
-        // }]);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.6", ngImport: i0, type: AuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.6", ngImport: i0, type: AuthService, providedIn: 'root' }); }
@@ -85,7 +74,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 function injectAuthState$() {
     return inject(AuthService).auth$;
 }

package/fesm2022/ng-atomic-common-services-auth.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-services-auth.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/auth/auth.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/auth/ng-atomic-common-services-auth.ts"],"sourcesContent":["import { Injectable, Signal, inject } from '@angular/core';\nimport { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';\nimport { Auth, authState, signInWithCustomToken, GoogleAuthProvider, TwitterAuthProvider, signInWithPopup, signOut, UserCredential, signInWithEmailAndPassword, createUserWithEmailAndPassword, User, onAuthStateChanged } from '@angular/fire/auth';\nimport { get } from 'lodash-es';\nimport { Observable, distinctUntilChanged, map, of, shareReplay, switchMap } from 'rxjs';\n\nexport interface TwitterCredential {\n  context: string;\n  displayName: string;\n  email: string;\n  emailVerified: boolean;\n  expiresIn: string;\n  federatedId: string;\n  fullName: string;\n  idToken: string;\n  kind: 'identitytoolkit#VerifyAssertionResponse';\n  localId: string;\n  oauthAccessToken: string;\n  oauthTokenSecret: string;\n  photoUrl: string;\n  providerId: 'twitter.com';\n  rawUserInfo: string;\n  refreshToken: string;\n  screenName: string;\n}\n\nexport type Result = UserCredential & {_tokenResponse: TwitterCredential};\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class AuthService {\n  readonly #auth = inject(Auth);\n  readonly auth$: Observable<User | null> = authState(this.#auth);\n  readonly auth: Signal<User | null | undefined> = toSignal(this.auth$);\n  readonly accessToken$ = this.auth$.pipe(\n    switchMap(auth => auth ? auth.getIdToken() : of(null)),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n  readonly accessToken = toSignal(this.accessToken$);\n\n  userId$ = this.auth$.pipe(\n    map(auth => auth?.uid ?? null),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n\n  readonly customClaims$: Observable<Record<string, unknown>> = this.auth$.pipe(\n    switchMap(auth => auth ? auth.getIdTokenResult() : of(null)),\n    map(token => token?.claims ?? {}),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n\n  signInWithTwitter(): Promise<Result> {\n    const provider = new TwitterAuthProvider();\n    return signInWithPopup(this.#auth, provider) as Promise<Result>\n  }\n\n  // signInWithGoogle() {\n  //   const provider = new GoogleAuthProvider();\n  //   return signInWithPopup(this.#auth, provider);\n  // }\n\n  async signInWithGoogle(scopes: string[] = []) {\n    const provider = new GoogleAuthProvider();\n    for (const scope of scopes) provider.addScope(scope);\n    return signInWithPopup(this.#auth, provider).catch(async error => {\n      if (error.code === 'auth/popup-closed-by-user') {\n        const user = await this.#waitForAuthState();\n        if (user) return { user } as UserCredential;\n      }\n      if (error.code === 'auth/account-exists-with-different-credential') {\n        this.onFailedForAccountExistsWithDifferentCredential(error);\n      }\n      throw error;\n    });\n  }\n\n  #waitForAuthState(timeoutMs = 3000): Promise<User | null> {\n    return new Promise(resolve => {\n      let skip = true;\n      const timer = setTimeout(() => { unsub(); resolve(null); }, timeoutMs);\n      const unsub = onAuthStateChanged(this.#auth, user => {\n        if (skip) { skip = false; return; }\n        clearTimeout(timer); unsub(); resolve(user);\n      });\n    });\n  }\n\n  signInWithEmailAndPassword(email: string, password: string) {\n    return signInWithEmailAndPassword(this.#auth, email, password);\n  }\n\n  createUserWithEmailAndPassword(email: string, password: string) {\n    return createUserWithEmailAndPassword(this.#auth, email, password);\n  }\n\n  signInWithCustomToken(customToken: string): Promise<Result> {\n    return signInWithCustomToken(this.#auth, customToken) as Promise<Result>;\n  }\n\n  signOut() {\n    return signOut(this.#auth);\n  }\n\n  private onFailedForAccountExistsWithDifferentCredential(error: any) {\n    const credential = error.customData._tokenResponse;\n    // const pending = FacebookAuthProvider.credential(credential.oauthAccessToken);\n    const providerId = error.customData._tokenResponse.providerId;\n    // this.pends.update(pends => [...pends, {\n    //   credential: pending,\n    //   providerId: providerId,\n    //   email: credential.email,\n    // }]);\n  }\n}\n\nexport function injectAuthState$(): Observable<User | null> {\n  return inject(AuthService).auth$;\n}\n\nexport function injectAuthState(): Signal<User | null | undefined> {\n  return toSignal(injectAuthState$());\n}\n\nexport function injectUserId$(): Observable<string | null> {\n  return inject(AuthService).userId$.pipe(\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n}\n\nexport function injectUserId(): Signal<string | null> {\n  return toSignal(injectUserId$()) as Signal<string | null>;\n}\n\nexport function injectTwitterId$() {\n  return inject(AuthService).auth$.pipe(\n    map(auth => auth?.providerData?.[0]?.uid ?? null),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n}\n\nexport function injectClaim$<T = string>(claim: string): Observable<T> {\n  return inject(AuthService).customClaims$.pipe(\n    map(token => claim ? get(token, claim) : token),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  ) as any;\n}\n\nexport function injectClaim<T = string>(claim: string): Signal<T> {\n  return toSignal(injectClaim$<T>(claim)) as Signal<T>;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ng-atomic-common-services-auth.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/auth/auth.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/auth/ng-atomic-common-services-auth.ts"],"sourcesContent":["import { Injectable, Signal, inject } from '@angular/core';\nimport { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';\nimport { Auth, authState, signInWithCustomToken, GoogleAuthProvider, TwitterAuthProvider, signInWithPopup, signInWithRedirect, getRedirectResult, signOut, UserCredential, signInWithEmailAndPassword, createUserWithEmailAndPassword, User, onAuthStateChanged } from '@angular/fire/auth';\nimport { get } from 'lodash-es';\nimport { Observable, ReplaySubject, distinctUntilChanged, map, of, shareReplay, switchMap } from 'rxjs';\n\nexport interface TwitterCredential {\n  context: string;\n  displayName: string;\n  email: string;\n  emailVerified: boolean;\n  expiresIn: string;\n  federatedId: string;\n  fullName: string;\n  idToken: string;\n  kind: 'identitytoolkit#VerifyAssertionResponse';\n  localId: string;\n  oauthAccessToken: string;\n  oauthTokenSecret: string;\n  photoUrl: string;\n  providerId: 'twitter.com';\n  rawUserInfo: string;\n  refreshToken: string;\n  screenName: string;\n}\n\nexport type Result = UserCredential & {_tokenResponse: TwitterCredential};\n\n\nconst redirectError$ = new ReplaySubject<unknown>(1);\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class AuthService {\n  readonly #auth = inject(Auth);\n\n  readonly redirectError$ = redirectError$;\n\n  constructor() {\n    \n    \n    \n    \n    \n    if (typeof window !== 'undefined' && window.self !== window.top) {\n      return;\n    }\n    \n    \n    \n    getRedirectResult(this.#auth).catch(error => {\n      \n      console.warn('[AuthService] getRedirectResult error:', error);\n      \n      redirectError$.next(error);\n    });\n  }\n\n  readonly auth$: Observable<User | null> = authState(this.#auth);\n  readonly auth: Signal<User | null | undefined> = toSignal(this.auth$);\n  readonly accessToken$ = this.auth$.pipe(\n    switchMap(auth => auth ? auth.getIdToken() : of(null)),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n  readonly accessToken = toSignal(this.accessToken$);\n\n  userId$ = this.auth$.pipe(\n    map(auth => auth?.uid ?? null),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n\n  readonly customClaims$: Observable<Record<string, unknown>> = this.auth$.pipe(\n    switchMap(auth => auth ? auth.getIdTokenResult() : of(null)),\n    map(token => token?.claims ?? {}),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n\n  signInWithTwitter(): Promise<Result> {\n    const provider = new TwitterAuthProvider();\n    return signInWithPopup(this.#auth, provider) as Promise<Result>\n  }\n\n  \n  \n  \n  \n\n  async signInWithGoogle(scopes: string[] = []) {\n    const provider = new GoogleAuthProvider();\n    for (const scope of scopes) provider.addScope(scope);\n    \n    \n    \n    return signInWithRedirect(this.#auth, provider);\n  }\n\n  #waitForAuthState(timeoutMs = 3000): Promise<User | null> {\n    return new Promise(resolve => {\n      let skip = true;\n      const timer = setTimeout(() => { unsub(); resolve(null); }, timeoutMs);\n      const unsub = onAuthStateChanged(this.#auth, user => {\n        if (skip) { skip = false; return; }\n        clearTimeout(timer); unsub(); resolve(user);\n      });\n    });\n  }\n\n  signInWithEmailAndPassword(email: string, password: string) {\n    return signInWithEmailAndPassword(this.#auth, email, password);\n  }\n\n  createUserWithEmailAndPassword(email: string, password: string) {\n    return createUserWithEmailAndPassword(this.#auth, email, password);\n  }\n\n  signInWithCustomToken(customToken: string): Promise<Result> {\n    return signInWithCustomToken(this.#auth, customToken) as Promise<Result>;\n  }\n\n  signOut() {\n    return signOut(this.#auth);\n  }\n\n  private onFailedForAccountExistsWithDifferentCredential(error: any) {\n    const credential = error.customData._tokenResponse;\n    \n    const providerId = error.customData._tokenResponse.providerId;\n    \n    \n    \n    \n    \n  }\n}\n\nexport function injectAuthState$(): Observable<User | null> {\n  return inject(AuthService).auth$;\n}\n\nexport function injectAuthState(): Signal<User | null | undefined> {\n  return toSignal(injectAuthState$());\n}\n\nexport function injectUserId$(): Observable<string | null> {\n  return inject(AuthService).userId$.pipe(\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n}\n\nexport function injectUserId(): Signal<string | null> {\n  return toSignal(injectUserId$()) as Signal<string | null>;\n}\n\nexport function injectTwitterId$() {\n  return inject(AuthService).auth$.pipe(\n    map(auth => auth?.providerData?.[0]?.uid ?? null),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  );\n}\n\nexport function injectClaim$<T = string>(claim: string): Observable<T> {\n  return inject(AuthService).customClaims$.pipe(\n    map(token => claim ? get(token, claim) : token),\n    distinctUntilChanged(),\n    shareReplay(1),\n    takeUntilDestroyed(),\n  ) as any;\n}\n\nexport function injectClaim<T = string>(claim: string): Signal<T> {\n  return toSignal(injectClaim$<T>(claim)) as Signal<T>;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}

package/fesm2022/ng-atomic-common-services-editing.mjs

@@ -2,23 +2,12 @@ import * as i0 from '@angular/core';
 import { signal, computed, Injectable } from '@angular/core';
 import { toObservable } from '@angular/core/rxjs-interop';
 
-/**
- * EditingStateManager Service
- *
- * Manages global editing state for preventing data updates during cell editing.
- * Uses Angular Signals for reactive state management.
- */
 class EditingStateManager {
     constructor() {
         this.editingCells = signal([], ...(ngDevMode ? [{ debugName: "editingCells" }] : []));
         this.isEditing = computed(() => this.editingCells().length > 0, ...(ngDevMode ? [{ debugName: "isEditing" }] : []));
         this.isEditing$ = toObservable(this.isEditing);
     }
-    /**
-     * Start editing a cell
-     * @param rowId Row identifier
-     * @param columnId Column identifier
-     */
     startEditing(rowId, columnId) {
         const cellKey = `${rowId}-${columnId}`;
         this.editingCells.update(cells => {
@@ -27,11 +16,6 @@ class EditingStateManager {
             return [...newCells];
         });
     }
-    /**
-     * Stop editing a cell
-     * @param rowId Row identifier
-     * @param columnId Column identifier
-     */
     stopEditing(rowId, columnId) {
         const cellKey = `${rowId}-${columnId}`;
         this.editingCells.update(cells => {

package/fesm2022/ng-atomic-common-services-editing.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-services-editing.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/editing/editing-state-manager.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/editing/ng-atomic-common-services-editing.ts"],"sourcesContent":["import { Injectable, signal, computed } from '@angular/core';\nimport { toObservable } from '@angular/core/rxjs-interop';\nimport { Observable } from 'rxjs';\n\n/**\n * EditingStateManager Service\n * \n * Manages global editing state for preventing data updates during cell editing.\n * Uses Angular Signals for reactive state management.\n */\n@Injectable({ providedIn: 'root' })\nexport class EditingStateManager {\n  private readonly editingCells = signal<string[]>([]);\n  readonly isEditing = computed(() => this.editingCells().length > 0);\n  readonly isEditing$: Observable<boolean> = toObservable(this.isEditing);\n  \n  /**\n   * Start editing a cell\n   * @param rowId Row identifier\n   * @param columnId Column identifier\n   */\n  startEditing(rowId: string | number, columnId: string): void {\n    const cellKey = `${rowId}-${columnId}`;\n    this.editingCells.update(cells => {\n      const newCells = new Set(cells);\n      newCells.add(cellKey);\n      return [...newCells];\n    });\n  }\n  \n  /**\n   * Stop editing a cell\n   * @param rowId Row identifier\n   * @param columnId Column identifier\n   */\n  stopEditing(rowId: string | number, columnId: string): void {\n    const cellKey = `${rowId}-${columnId}`;\n    this.editingCells.update(cells => {\n      const newCells = new Set(cells);\n      newCells.delete(cellKey);\n      return [...newCells];\n    });\n  }\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;AAIA;;;;;AAKG;MAEU,mBAAmB,CAAA;AADhC,IAAA,WAAA,GAAA;AAEmB,QAAA,IAAA,CAAA,YAAY,GAAG,MAAM,CAAW,EAAE,wDAAC;AAC3C,QAAA,IAAA,CAAA,SAAS,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC,qDAAC;AAC1D,QAAA,IAAA,CAAA,UAAU,GAAwB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;AA6BxE,IAAA;AA3BC;;;;AAIG;IACH,YAAY,CAAC,KAAsB,EAAE,QAAgB,EAAA;AACnD,QAAA,MAAM,OAAO,GAAG,CAAA,EAAG,KAAK,CAAA,CAAA,EAAI,QAAQ,EAAE;AACtC,QAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,IAAG;AAC/B,YAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC;AAC/B,YAAA,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AACrB,YAAA,OAAO,CAAC,GAAG,QAAQ,CAAC;AACtB,QAAA,CAAC,CAAC;IACJ;AAEA;;;;AAIG;IACH,WAAW,CAAC,KAAsB,EAAE,QAAgB,EAAA;AAClD,QAAA,MAAM,OAAO,GAAG,CAAA,EAAG,KAAK,CAAA,CAAA,EAAI,QAAQ,EAAE;AACtC,QAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,IAAG;AAC/B,YAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC;AAC/B,YAAA,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;AACxB,YAAA,OAAO,CAAC,GAAG,QAAQ,CAAC;AACtB,QAAA,CAAC,CAAC;IACJ;8GA/BW,mBAAmB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAnB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,mBAAmB,cADN,MAAM,EAAA,CAAA,CAAA;;2FACnB,mBAAmB,EAAA,UAAA,EAAA,CAAA;kBAD/B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;;ACVlC;;AAEG;;;;"}
+{"version":3,"file":"ng-atomic-common-services-editing.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/editing/editing-state-manager.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/editing/ng-atomic-common-services-editing.ts"],"sourcesContent":["import { Injectable, signal, computed } from '@angular/core';\nimport { toObservable } from '@angular/core/rxjs-interop';\nimport { Observable } from 'rxjs';\n\n\n@Injectable({ providedIn: 'root' })\nexport class EditingStateManager {\n  private readonly editingCells = signal<string[]>([]);\n  readonly isEditing = computed(() => this.editingCells().length > 0);\n  readonly isEditing$: Observable<boolean> = toObservable(this.isEditing);\n  \n  \n  startEditing(rowId: string | number, columnId: string): void {\n    const cellKey = `${rowId}-${columnId}`;\n    this.editingCells.update(cells => {\n      const newCells = new Set(cells);\n      newCells.add(cellKey);\n      return [...newCells];\n    });\n  }\n  \n  \n  stopEditing(rowId: string | number, columnId: string): void {\n    const cellKey = `${rowId}-${columnId}`;\n    this.editingCells.update(cells => {\n      const newCells = new Set(cells);\n      newCells.delete(cellKey);\n      return [...newCells];\n    });\n  }\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;MAMa,mBAAmB,CAAA;AADhC,IAAA,WAAA,GAAA;AAEmB,QAAA,IAAA,CAAA,YAAY,GAAG,MAAM,CAAW,EAAE,wDAAC;AAC3C,QAAA,IAAA,CAAA,SAAS,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC,qDAAC;AAC1D,QAAA,IAAA,CAAA,UAAU,GAAwB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;AAqBxE,IAAA;IAlBC,YAAY,CAAC,KAAsB,EAAE,QAAgB,EAAA;AACnD,QAAA,MAAM,OAAO,GAAG,CAAA,EAAG,KAAK,CAAA,CAAA,EAAI,QAAQ,EAAE;AACtC,QAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,IAAG;AAC/B,YAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC;AAC/B,YAAA,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;AACrB,YAAA,OAAO,CAAC,GAAG,QAAQ,CAAC;AACtB,QAAA,CAAC,CAAC;IACJ;IAGA,WAAW,CAAC,KAAsB,EAAE,QAAgB,EAAA;AAClD,QAAA,MAAM,OAAO,GAAG,CAAA,EAAG,KAAK,CAAA,CAAA,EAAI,QAAQ,EAAE;AACtC,QAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,IAAG;AAC/B,YAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC;AAC/B,YAAA,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;AACxB,YAAA,OAAO,CAAC,GAAG,QAAQ,CAAC;AACtB,QAAA,CAAC,CAAC;IACJ;8GAvBW,mBAAmB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAnB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,mBAAmB,cADN,MAAM,EAAA,CAAA,CAAA;;2FACnB,mBAAmB,EAAA,UAAA,EAAA,CAAA;kBAD/B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;;ACLlC;;AAEG;;;;"}

package/fesm2022/ng-atomic-common-services-form-_index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-services-form-_index.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/form/_index/index.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/_index/ng-atomic-common-services-form-_index.ts"],"sourcesContent":["import { Injectable, inject } from \"@angular/core\";\nimport { FormBuilder } from \"@angular/forms\";\nimport { PaginationFormValue, PaginationService } from \"@ng-atomic/common/services/form/pagination\";\nimport { SortFormValue, SortService } from \"@ng-atomic/common/services/form/sort\";\nimport { injectProps } from \"@ng-atomic/common/pipes/domain\";\nimport { ColumnsFormBuilder, buildColumns, ColumnsFormValue } from \"@ng-atomic/common/services/form/columns\";\nimport { omitBy } from \"lodash-es\";\nexport { buildColumns }; \n\n@Injectable({ providedIn: 'root' })\nexport class IndexFormBuilder {\n  readonly columns = inject(ColumnsFormBuilder);\n  readonly sort = inject(SortService);\n  readonly pagination = inject(PaginationService)\n  readonly fb = inject(FormBuilder);\n\n  build({\n    query = undefined,\n    sort = {},\n    page,\n    columns = buildColumns(['__checkbox', ...injectProps()(), '__actions'])\n  }: {\n    query?: string,\n    page?: Partial<PaginationFormValue>,\n    sort?: Partial<SortFormValue>,\n    columns?: ColumnsFormValue,\n  } = {}) {\n    const omit = <T extends object>(obj: T) => omitBy(obj, value => value === undefined) as T;\n    return this.fb.group(omit({\n      query: typeof query !== 'undefined' ? this.fb.control(query) : undefined,\n      page: page ? this.pagination.build(page) : undefined,\n      sort: this.sort.build(sort),\n      columns: this.columns.build(columns),\n    }));\n  }\n}\n\n\nexport function injectIndexFormBuilder() {\n  return inject(IndexFormBuilder);\n}\n\nexport function injectIndexForm({\n  columns = undefined,\n  sort = undefined,\n  query = undefined,\n  page = undefined\n}: {\n  columns?: ColumnsFormValue,\n  sort?: Partial<SortFormValue>,\n  query?: string,\n  page?: Partial<PaginationFormValue>,\n} = {}) {\n  return injectIndexFormBuilder().build({\n    columns,\n    sort,\n    query,\n    page,\n  });\n}\n\nexport {\n  /** @deprecates use instead `IndexFormBuilder` */\n  IndexFormBuilder as IndexTemplateFormBuilder,\n  /** @deprecates use instead `injectIndexForm` */\n  injectIndexForm as injectIndexTemplateForm,\n  /** @deprecates use instead `injectIndexFormBuilder` */\n  injectIndexFormBuilder as injectIndexTemplateFormBuilder,\n};\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;;;;;;;MAUa,gBAAgB,CAAA;AAD7B,IAAA,WAAA,GAAA;AAEW,QAAA,IAAA,CAAA,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC;AACpC,QAAA,IAAA,CAAA,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;AAC1B,QAAA,IAAA,CAAA,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC;AACtC,QAAA,IAAA,CAAA,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;AAqBlC,IAAA;AAnBC,IAAA,KAAK,CAAC,EACJ,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,OAAO,GAAG,YAAY,CAAC,CAAC,YAAY,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC,EAAA,GAMrE,EAAE,EAAA;AACJ,QAAA,MAAM,IAAI,GAAG,CAAmB,GAAM,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,KAAK,KAAK,SAAS,CAAM;AACzF,QAAA,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;AACxB,YAAA,KAAK,EAAE,OAAO,KAAK,KAAK,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS;AACxE,YAAA,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS;YACpD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;AACrC,SAAA,CAAC,CAAC;IACL;8GAxBW,gBAAgB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAhB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,gBAAgB,cADH,MAAM,EAAA,CAAA,CAAA;;2FACnB,gBAAgB,EAAA,UAAA,EAAA,CAAA;kBAD5B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;SA6BlB,sBAAsB,GAAA;AACpC,IAAA,OAAO,MAAM,CAAC,gBAAgB,CAAC;AACjC;AAEM,SAAU,eAAe,CAAC,EAC9B,OAAO,GAAG,SAAS,EACnB,IAAI,GAAG,SAAS,EAChB,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,SAAS,KAMd,EAAE,EAAA;AACJ,IAAA,OAAO,sBAAsB,EAAE,CAAC,KAAK,CAAC;QACpC,OAAO;QACP,IAAI;QACJ,KAAK;QACL,IAAI;AACL,KAAA,CAAC;AACJ;;AC3DA;;AAEG;;;;"}
+{"version":3,"file":"ng-atomic-common-services-form-_index.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/form/_index/index.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/_index/ng-atomic-common-services-form-_index.ts"],"sourcesContent":["import { Injectable, inject } from \"@angular/core\";\nimport { FormBuilder } from \"@angular/forms\";\nimport { PaginationFormValue, PaginationService } from \"@ng-atomic/common/services/form/pagination\";\nimport { SortFormValue, SortService } from \"@ng-atomic/common/services/form/sort\";\nimport { injectProps } from \"@ng-atomic/common/pipes/domain\";\nimport { ColumnsFormBuilder, buildColumns, ColumnsFormValue } from \"@ng-atomic/common/services/form/columns\";\nimport { omitBy } from \"lodash-es\";\nexport { buildColumns }; \n\n@Injectable({ providedIn: 'root' })\nexport class IndexFormBuilder {\n  readonly columns = inject(ColumnsFormBuilder);\n  readonly sort = inject(SortService);\n  readonly pagination = inject(PaginationService)\n  readonly fb = inject(FormBuilder);\n\n  build({\n    query = undefined,\n    sort = {},\n    page,\n    columns = buildColumns(['__checkbox', ...injectProps()(), '__actions'])\n  }: {\n    query?: string,\n    page?: Partial<PaginationFormValue>,\n    sort?: Partial<SortFormValue>,\n    columns?: ColumnsFormValue,\n  } = {}) {\n    const omit = <T extends object>(obj: T) => omitBy(obj, value => value === undefined) as T;\n    return this.fb.group(omit({\n      query: typeof query !== 'undefined' ? this.fb.control(query) : undefined,\n      page: page ? this.pagination.build(page) : undefined,\n      sort: this.sort.build(sort),\n      columns: this.columns.build(columns),\n    }));\n  }\n}\n\n\nexport function injectIndexFormBuilder() {\n  return inject(IndexFormBuilder);\n}\n\nexport function injectIndexForm({\n  columns = undefined,\n  sort = undefined,\n  query = undefined,\n  page = undefined\n}: {\n  columns?: ColumnsFormValue,\n  sort?: Partial<SortFormValue>,\n  query?: string,\n  page?: Partial<PaginationFormValue>,\n} = {}) {\n  return injectIndexFormBuilder().build({\n    columns,\n    sort,\n    query,\n    page,\n  });\n}\n\nexport {\n  \n  IndexFormBuilder as IndexTemplateFormBuilder,\n  \n  injectIndexForm as injectIndexTemplateForm,\n  \n  injectIndexFormBuilder as injectIndexTemplateFormBuilder,\n};\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;;;;;;;MAUa,gBAAgB,CAAA;AAD7B,IAAA,WAAA,GAAA;AAEW,QAAA,IAAA,CAAA,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC;AACpC,QAAA,IAAA,CAAA,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;AAC1B,QAAA,IAAA,CAAA,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC;AACtC,QAAA,IAAA,CAAA,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;AAqBlC,IAAA;AAnBC,IAAA,KAAK,CAAC,EACJ,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,OAAO,GAAG,YAAY,CAAC,CAAC,YAAY,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC,EAAA,GAMrE,EAAE,EAAA;AACJ,QAAA,MAAM,IAAI,GAAG,CAAmB,GAAM,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,KAAK,KAAK,SAAS,CAAM;AACzF,QAAA,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;AACxB,YAAA,KAAK,EAAE,OAAO,KAAK,KAAK,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS;AACxE,YAAA,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS;YACpD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;AACrC,SAAA,CAAC,CAAC;IACL;8GAxBW,gBAAgB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAhB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,gBAAgB,cADH,MAAM,EAAA,CAAA,CAAA;;2FACnB,gBAAgB,EAAA,UAAA,EAAA,CAAA;kBAD5B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;SA6BlB,sBAAsB,GAAA;AACpC,IAAA,OAAO,MAAM,CAAC,gBAAgB,CAAC;AACjC;AAEM,SAAU,eAAe,CAAC,EAC9B,OAAO,GAAG,SAAS,EACnB,IAAI,GAAG,SAAS,EAChB,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,SAAS,KAMd,EAAE,EAAA;AACJ,IAAA,OAAO,sBAAsB,EAAE,CAAC,KAAK,CAAC;QACpC,OAAO;QACP,IAAI;QACJ,KAAK;QACL,IAAI;AACL,KAAA,CAAC;AACJ;;AC3DA;;AAEG;;;;"}

package/fesm2022/ng-atomic-common-services-form-json-schema.mjs

@@ -39,7 +39,7 @@ const additionalConverters = {
     isDayjs: (meta) => {
         return {
             type: 'string',
-            format: 'date-time', // JSON Schemaで日付型を指定
+            format: 'date-time',
         };
     },
 };
@@ -71,7 +71,6 @@ class JsonSchemaFormUtils {
     }
     static buildFormGroupByJsonSchema(schema, { fb = inject(FormBuilder).nonNullable, value = {}, } = {}) {
         console.debug('[buildFormGroupByJsonSchema] schema:', schema);
-        // oneOf/discriminatedUnionを解決
         const resolvedSchema = this.resolveOneOf(schema);
         if (!resolvedSchema || !resolvedSchema?.properties) {
             return fb.group({});
@@ -83,14 +82,11 @@ class JsonSchemaFormUtils {
             if (resolvedSchema.required && resolvedSchema.required.includes(key) && !property.nullable) {
                 validators.push(Validators.required);
             }
-            // allOfを解決
             const resolvedProperty = this.resolveAllOf(property);
             group[key] = this.buildFormByJsonSchemaProperty(resolvedProperty, { fb, value: value?.[key], validators });
-            // MEMO(@NozomuMiyamoto): オブジェクト型Arrayなら追加用のダミーコントロールを追加する
             if (resolvedProperty.type === 'array') {
                 const itemType = resolvedProperty.items?.type;
                 if (itemType !== 'string' && itemType !== 'number' && itemType !== 'boolean') {
-                    // オブジェクト型配列の場合のみ __add_action を追加
                     group[`${key}__add_action`] = fb.control(resolvedProperty);
                 }
             }
@@ -102,25 +98,20 @@ class JsonSchemaFormUtils {
             return fb.array([]);
         }
         console.debug('[buildFormArrayByJsonSchema] schema:', schema);
-        // items.typeがプリミティブ型（string, number, boolean）の場合は空の配列
         const itemType = schema.items.type;
         if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {
-            // 既存値があればそれを使用、なければ空配列
             const arrayValue = Array.isArray(value) ? value.map(v => fb.control(v)) : [];
             return fb.array(arrayValue);
         }
-        // オブジェクト型の場合は従来通り（ダミーフォームグループを1つ追加）
         const formArray = fb.array([
             this.buildFormGroupByJsonSchema(schema.items, { fb }),
         ]);
         return formArray;
     }
     static resolveAllOf(property) {
-        // allOfがある場合、スキーマをマージ
         if (property.allOf && Array.isArray(property.allOf)) {
             const merged = { ...property };
             delete merged.allOf;
-            // allOf内の各スキーマをマージ
             for (const schema of property.allOf) {
                 if (schema.properties) {
                     merged.properties = { ...merged.properties, ...schema.properties };
@@ -128,7 +119,6 @@ class JsonSchemaFormUtils {
                 if (schema.required) {
                     merged.required = [...(merged.required || []), ...schema.required];
                 }
-                // typeが未設定の場合は設定
                 if (!merged.type && schema.type) {
                     merged.type = schema.type;
                 }
@@ -138,7 +128,6 @@ class JsonSchemaFormUtils {
         return property;
     }
     static resolveOneOf(property) {
-        // oneOfがある場合、全スキーマのプロパティをマージ（discriminated union対応）
         if (property.oneOf && Array.isArray(property.oneOf)) {
             console.debug('[resolveOneOf] oneOf detected, merging schemas...');
             const merged = { ...property };
@@ -146,21 +135,16 @@ class JsonSchemaFormUtils {
             merged.type = 'object';
             merged.properties = {};
             merged.required = [];
-            // oneOf内の各スキーマからプロパティを収集
             for (const schema of property.oneOf) {
                 if (schema.properties) {
-                    // 全プロパティをマージ（discriminatorフィールドを含む）
                     for (const key in schema.properties) {
                         const sourceProp = schema.properties[key];
                         if (!merged.properties[key]) {
-                            // 新しいプロパティはそのまま追加
                             merged.properties[key] = sourceProp;
                         }
                         else {
-                            // 既存のプロパティがある場合、ネストされたオブジェクトならマージ
                             const existingProp = merged.properties[key];
                             if (sourceProp.type === 'object' && existingProp.type === 'object') {
-                                // オブジェクト型の場合、propertiesをマージ
                                 if (sourceProp.properties && existingProp.properties) {
                                     merged.properties[key] = {
                                         ...existingProp,
@@ -171,12 +155,10 @@ class JsonSchemaFormUtils {
                                     };
                                 }
                             }
-                            // enumフィールドの場合は最初のものを維持
                         }
                     }
                 }
                 if (schema.required) {
-                    // 共通のrequiredフィールドのみマージ
                     for (const req of schema.required) {
                         if (!merged.required.includes(req)) {
                             merged.required.push(req);
@@ -214,16 +196,13 @@ class JsonSchemaFormUtils {
             case 'object':
                 return this.buildFormGroupByJsonSchema(property, { fb, value: value });
             case 'array': {
-                // プリミティブ型配列の場合は FormControl で配列値を保持
                 const itemType = property.items?.type;
                 if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {
                     return fb.control(value ?? property.default ?? [], { nonNullable: !property.nullable, validators });
                 }
-                // オブジェクト型配列の場合は FormArray
                 return this.buildFormArrayByJsonSchema(property, { fb, value: value });
             }
             default:
-                // allOfがある場合の処理
                 const resolved = this.resolveAllOf(property);
                 if (resolved !== property) {
                     return this.buildFormByJsonSchemaProperty(resolved, { fb, value, validators });
@@ -260,7 +239,6 @@ class JsonSchemaFormUtils {
         }
     }
     static buildFormFieldMapByJsonSchema(schema, options = {}) {
-        // oneOf/discriminatedUnionを解決
         const resolvedSchema = this.resolveOneOf(schema);
         if (!resolvedSchema || !resolvedSchema.properties) {
             return {
@@ -270,7 +248,6 @@ class JsonSchemaFormUtils {
         const fieldMap = {};
         for (const key in resolvedSchema.properties) {
             const property = resolvedSchema.properties[key];
-            // allOfを解決
             const resolvedProperty = this.resolveAllOf(property);
             switch (resolvedProperty.type) {
                 case 'object': {
@@ -283,7 +260,6 @@ class JsonSchemaFormUtils {
                 case 'array': {
                     const childFieldMap = this.buildFormFieldMapByJsonSchema(resolvedProperty.items, options);
                     for (const childKey in childFieldMap) {
-                        // TODO: 正規表現でパスマッチを判定できるようにする。
                         fieldMap[`${key}.\\d+.${childKey}`] = childFieldMap[childKey];
                     }
                     break;

package/fesm2022/ng-atomic-common-services-form-json-schema.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ng-atomic-common-services-form-json-schema.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/json-schema.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/json-schema.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/ng-atomic-common-services-form-json-schema.ts"],"sourcesContent":["import { ValidationTypes } from \"class-validator\"\nimport { targetConstructorToSchema as _targetConstructorToSchema } from \"class-validator-jsonschema\"\nimport { IOptions } from \"class-validator-jsonschema/build/options\";\nimport { JSONSchema7 } from 'json-schema';\n// TODO(@NozomuMiyamoto): fix\n// @ts-ignore\n// const { defaultMetadataStorage } = require('class-transformer/cjs/storage');\nimport { defaultMetadataStorage } from 'class-transformer/esm5/storage';\n\nfunction getPropType(target: object, property: string) {\n  return Reflect.getMetadata('design:type', target, property)\n}\n\nfunction targetToSchema(\n  type: any,\n  options: any\n): any {\n  if (typeof type === 'function') {\n    if (\n      type.prototype === String.prototype ||\n      type.prototype === Symbol.prototype\n    ) {\n      return { type: 'string' }\n    } else if (type.prototype === Number.prototype) {\n      return { type: 'number' }\n    } else if (type.prototype === Boolean.prototype) {\n      return { type: 'boolean' }\n    }\n\n    return targetConstructorToSchema(type, options)\n  }\n}\n\nconst additionalConverters= {\n  [ValidationTypes.NESTED_VALIDATION]: (meta: any, options: any) => {\n    if (typeof meta.target === 'function') {\n      const typeMeta = options.classTransformerMetadataStorage\n        ? options.classTransformerMetadataStorage.findTypeMetadata(\n            meta.target,\n            meta.propertyName\n          )\n        : null\n      const childType = typeMeta\n        ? typeMeta.typeFunction()\n        : getPropType(meta.target.prototype, meta.propertyName)\n      return targetToSchema(childType, options)\n    }\n  },\n  isDayjs: (meta: any): JSONSchema7 => {\n    return {\n      type: 'string',\n      format: 'date-time', // JSON Schemaで日付型を指定\n    };\n  },\n};\n\nexport function targetConstructorToSchema(target: Function, options: Partial<IOptions> = {}): JSONSchema7 {\n  return _targetConstructorToSchema(target, {\n    ...options,\n    additionalConverters,\n    classTransformerMetadataStorage: defaultMetadataStorage,\n  }) as JSONSchema7;\n}\n","import { Injectable, inject } from \"@angular/core\";\nimport { FormBuilder, FormGroup, NonNullableFormBuilder, Validators } from \"@angular/forms\";\nimport { JsonSchema } from \"json-schema-library\";\nimport { targetConstructorToSchema } from './json-schema';\nimport { merge } from \"lodash-es\";\nimport { FormFieldMap } from \"@ng-atomic/common/pipes/smart-field\";\n\nexport class JsonSchemaFormUtils {\n  static removeObjectPercent<T extends object>(value: T): any {\n    return Object.entries(value).reduce<Record<string, unknown>>((acc, [key, value]) => {\n      if (typeof value === 'string' && value.startsWith('%') && value.endsWith('%')) {\n        acc[key] = value.slice(1, -1);\n      } else if (typeof value === 'string' && value.startsWith('%')) {\n        acc[key] = value.slice(1);\n      } else if (typeof value === 'string' && value.endsWith('%')) {\n        acc[key] = value.slice(0, -1);\n      } else {\n        acc[key] = value;\n      }\n      return acc;\n    }, {});\n  }\n\n  static buildFormGroupByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n  } = {}): FormGroup {\n    console.debug('[buildFormGroupByJsonSchema] schema:', schema);\n\n    // oneOf/discriminatedUnionを解決\n    const resolvedSchema = this.resolveOneOf(schema);\n\n    if (!resolvedSchema || !resolvedSchema?.properties) {\n      return fb.group({});\n    }\n    const group: any = {};\n\n    for (const key in resolvedSchema.properties) {\n      const property = resolvedSchema.properties[key];\n      const validators = [];\n\n      if (resolvedSchema.required && resolvedSchema.required.includes(key) && !property.nullable) {\n        validators.push(Validators.required);\n      }\n\n      // allOfを解決\n      const resolvedProperty = this.resolveAllOf(property);\n\n      group[key] = this.buildFormByJsonSchemaProperty(resolvedProperty, {fb, value: (value as Record<string, unknown>)?.[key] as object, validators});\n      // MEMO(@NozomuMiyamoto): オブジェクト型Arrayなら追加用のダミーコントロールを追加する\n      if (resolvedProperty.type === 'array') {\n        const itemType = resolvedProperty.items?.type;\n        if (itemType !== 'string' && itemType !== 'number' && itemType !== 'boolean') {\n          // オブジェクト型配列の場合のみ __add_action を追加\n          group[`${key}__add_action`] = fb.control(resolvedProperty);\n        }\n      }\n    }\n    return fb.group(group);\n  }\n  \n  static buildFormArrayByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = [],\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: any[],\n  } = {}): any {\n    if (!schema || !schema.items) {\n      return fb.array([]);\n    }\n    console.debug('[buildFormArrayByJsonSchema] schema:', schema);\n\n    // items.typeがプリミティブ型（string, number, boolean）の場合は空の配列\n    const itemType = schema.items.type;\n    if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {\n      // 既存値があればそれを使用、なければ空配列\n      const arrayValue = Array.isArray(value) ? value.map(v => fb.control(v)) : [];\n      return fb.array(arrayValue);\n    }\n\n    // オブジェクト型の場合は従来通り（ダミーフォームグループを1つ追加）\n    const formArray = fb.array([\n      this.buildFormGroupByJsonSchema(schema.items, {fb}),\n    ]);\n    return formArray;\n  }\n  \n  static resolveAllOf(property: JsonSchema): JsonSchema {\n    // allOfがある場合、スキーマをマージ\n    if (property.allOf && Array.isArray(property.allOf)) {\n      const merged: any = { ...property };\n      delete merged.allOf;\n\n      // allOf内の各スキーマをマージ\n      for (const schema of property.allOf) {\n        if (schema.properties) {\n          merged.properties = { ...merged.properties, ...schema.properties };\n        }\n        if (schema.required) {\n          merged.required = [...(merged.required || []), ...schema.required];\n        }\n        // typeが未設定の場合は設定\n        if (!merged.type && schema.type) {\n          merged.type = schema.type;\n        }\n      }\n\n      return merged;\n    }\n    return property;\n  }\n\n  static resolveOneOf(property: JsonSchema): JsonSchema {\n    // oneOfがある場合、全スキーマのプロパティをマージ（discriminated union対応）\n    if (property.oneOf && Array.isArray(property.oneOf)) {\n      console.debug('[resolveOneOf] oneOf detected, merging schemas...');\n      const merged: any = { ...property };\n      delete merged.oneOf;\n      merged.type = 'object';\n      merged.properties = {};\n      merged.required = [];\n\n      // oneOf内の各スキーマからプロパティを収集\n      for (const schema of property.oneOf) {\n        if (schema.properties) {\n          // 全プロパティをマージ（discriminatorフィールドを含む）\n          for (const key in schema.properties) {\n            const sourceProp = schema.properties[key];\n\n            if (!merged.properties[key]) {\n              // 新しいプロパティはそのまま追加\n              merged.properties[key] = sourceProp;\n            } else {\n              // 既存のプロパティがある場合、ネストされたオブジェクトならマージ\n              const existingProp = merged.properties[key];\n\n              if (sourceProp.type === 'object' && existingProp.type === 'object') {\n                // オブジェクト型の場合、propertiesをマージ\n                if (sourceProp.properties && existingProp.properties) {\n                  merged.properties[key] = {\n                    ...existingProp,\n                    properties: {\n                      ...existingProp.properties,\n                      ...sourceProp.properties\n                    }\n                  };\n                }\n              }\n              // enumフィールドの場合は最初のものを維持\n            }\n          }\n        }\n        if (schema.required) {\n          // 共通のrequiredフィールドのみマージ\n          for (const req of schema.required) {\n            if (!merged.required.includes(req)) {\n              merged.required.push(req);\n            }\n          }\n        }\n      }\n\n      console.debug('[resolveOneOf] Merged properties:', Object.keys(merged.properties));\n      return merged;\n    }\n    return property;\n  }\n  \n  static buildFormByJsonSchemaProperty(property: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = null as object | object[] | null,\n    validators = [],\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object | object[] | null,\n    validators?: any[],\n  } = {}): any {\n    switch (property.type) {\n      case 'string': switch (property.format) {\n        case 'date':\n        case 'date-time':\n          return fb.control(value ?? property.default ?? null, { nonNullable: !property.nullable, validators });\n        case 'binary':\n          return fb.control(value ?? property.default ?? null, { nonNullable: !property.nullable, validators });\n        case 'email':\n          return fb.control(value ?? property.default ?? '', {\n            nonNullable: !property.nullable,\n            validators: [...validators, Validators.email],\n          });\n        default:\n          return fb.control(value ?? property.default ?? '', { nonNullable: !property.nullable, validators });\n      }\n      case 'boolean':\n        return fb.control(value ?? property.default ?? false, {nonNullable: !property.nullable, validators});\n      case 'integer':\n        return fb.control(value ?? property.default ?? 0, {nonNullable: !property.nullable, validators});\n      case 'number':\n        return fb.control(value ?? property.default ?? 0, {nonNullable: !property.nullable, validators});\n      case 'object':\n        return this.buildFormGroupByJsonSchema(property, {fb, value: value as object});\n      case 'array': {\n        // プリミティブ型配列の場合は FormControl で配列値を保持\n        const itemType = property.items?.type;\n        if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {\n          return fb.control(value ?? property.default ?? [], { nonNullable: !property.nullable, validators });\n        }\n        // オブジェクト型配列の場合は FormArray\n        return this.buildFormArrayByJsonSchema(property, {fb, value: value as any[]});\n      }\n      default:\n        // allOfがある場合の処理\n        const resolved = this.resolveAllOf(property);\n        if (resolved !== property) {\n          return this.buildFormByJsonSchemaProperty(resolved, {fb, value, validators});\n        }\n        return null;\n    }\n  }\n  \n\n  static buildFormByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = {},\n    fieldMap = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n    fieldMap?: object,\n  } = {}): any {\n    return {\n      form: this.buildFormGroupByJsonSchema(schema, {fb, value}),\n      fieldMap: this.buildFormFieldMapByJsonSchema(schema, {merge: fieldMap}),\n    };\n  }\n\n  static buildFormFieldByProperty(property: JsonSchema['properties']) {\n    switch (property.type) {\n      case 'string': {\n        if (property.enum) {\n          return { type: 'select', options: property.enum.map((v: string) => ({ value: v, name: v })) };\n        } else if (['date-time', 'date'].includes(property.format)) {\n          return { type: 'date' };\n        } else if (property.format === 'binary') {\n          return { type: 'file' };\n        } else {\n          return { type: 'text' };\n        }\n      }\n      case 'boolean': return { type: 'select', options: [{ value: true, name: 'はい' }, { value: false, name: 'いいえ' }] };\n      case 'integer': return { type: 'number' };\n      case 'number': return { type: 'number' };\n      default: return { type: property.type };\n    }\n  }\n\n  static buildFormFieldMapByJsonSchema(\n    schema: JsonSchema,\n    options: {\n      merge?: { [key: string]: any },\n    } = {},\n  ): any {\n    // oneOf/discriminatedUnionを解決\n    const resolvedSchema = this.resolveOneOf(schema);\n\n    if (!resolvedSchema || !resolvedSchema.properties) {\n      return {\n        id: { type: 'hidden' },\n      };\n    }\n    const fieldMap: any = {};\n\n    for (const key in resolvedSchema.properties) {\n      const property = resolvedSchema.properties[key];\n      // allOfを解決\n      const resolvedProperty = this.resolveAllOf(property);\n      switch (resolvedProperty.type) {\n        case 'object': {\n          const childFieldMap = this.buildFormFieldMapByJsonSchema(resolvedProperty, options);\n          for (const childKey in childFieldMap) {\n            fieldMap[`${key}.${childKey}`] = childFieldMap[childKey];\n          }\n          break;\n        }\n        case 'array': {\n          const childFieldMap = this.buildFormFieldMapByJsonSchema(resolvedProperty.items, options);\n          for (const childKey in childFieldMap) {\n            // TODO: 正規表現でパスマッチを判定できるようにする。\n            fieldMap[`${key}.\\\\d+.${childKey}`] = childFieldMap[childKey];\n          }\n          break;\n        }\n        default: {\n          fieldMap[key] = this.buildFormFieldByProperty(resolvedProperty);\n        }\n      }\n    }\n  \n    console.debug('[buildFormFieldMapByJsonSchema] fieldMap:', fieldMap);\n    console.debug('[buildFormFieldMapByJsonSchema] options.merge:', options.merge);\n  \n    return {...fieldMap, ...options.merge};\n  }\n}\n\nexport function buildFormGroup(klass: new() => any, {\n  fb = inject(FormBuilder).nonNullable,\n  value,\n}: {\n  fb?: FormBuilder | NonNullableFormBuilder,\n  value?: object,\n}): FormGroup {\n  const schema = targetConstructorToSchema(klass);\n  return JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value});\n}\n\n\nexport function buildFormFieldMap(klass: new() => any, options: {\n  merge?: { [key: string]: any },\n}): any {\n  const schema = targetConstructorToSchema(klass);\n  const map = JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, options);\n  return merge(map, options.merge);\n}\n\nexport function buildForm(klass: new() => any, {\n  fb = inject(FormBuilder).nonNullable,\n  value = {},\n  fieldMap = {},\n}: {\n  fb?: FormBuilder | NonNullableFormBuilder,\n  value?: object,\n  fieldMap?: FormFieldMap,\n} = {}): { form: FormGroup, fieldMap: FormFieldMap } {\n  const schema = targetConstructorToSchema(klass);\n  return {\n    form: JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value}),\n    fieldMap: JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, {merge: fieldMap}),\n  };\n}\n\n\n@Injectable({ providedIn: 'root' })\nexport class JsonSchemaFormService {\n  private fb = inject(FormBuilder);\n\n  build(schema: JsonSchema, {\n    fb = this.fb,\n    value = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n  } = {}): FormGroup {\n    return JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value});\n  }\n\n  buildFieldMap(\n    schema: JsonSchema,\n    options: {\n      merge?: { [key: string]: any },\n    } = {},\n  ): any {\n    return JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, options);\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["_targetConstructorToSchema"],"mappings":"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"}
+{"version":3,"file":"ng-atomic-common-services-form-json-schema.mjs","sources":["../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/json-schema.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/json-schema.service.ts","../../../../../packages/@ng-atomic/common/src/lib/services/form/json-schema/ng-atomic-common-services-form-json-schema.ts"],"sourcesContent":["import { ValidationTypes } from \"class-validator\"\nimport { targetConstructorToSchema as _targetConstructorToSchema } from \"class-validator-jsonschema\"\nimport { IOptions } from \"class-validator-jsonschema/build/options\";\nimport { JSONSchema7 } from 'json-schema';\n\n// @ts-ignore\n\nimport { defaultMetadataStorage } from 'class-transformer/esm5/storage';\n\nfunction getPropType(target: object, property: string) {\n  return Reflect.getMetadata('design:type', target, property)\n}\n\nfunction targetToSchema(\n  type: any,\n  options: any\n): any {\n  if (typeof type === 'function') {\n    if (\n      type.prototype === String.prototype ||\n      type.prototype === Symbol.prototype\n    ) {\n      return { type: 'string' }\n    } else if (type.prototype === Number.prototype) {\n      return { type: 'number' }\n    } else if (type.prototype === Boolean.prototype) {\n      return { type: 'boolean' }\n    }\n\n    return targetConstructorToSchema(type, options)\n  }\n}\n\nconst additionalConverters= {\n  [ValidationTypes.NESTED_VALIDATION]: (meta: any, options: any) => {\n    if (typeof meta.target === 'function') {\n      const typeMeta = options.classTransformerMetadataStorage\n        ? options.classTransformerMetadataStorage.findTypeMetadata(\n            meta.target,\n            meta.propertyName\n          )\n        : null\n      const childType = typeMeta\n        ? typeMeta.typeFunction()\n        : getPropType(meta.target.prototype, meta.propertyName)\n      return targetToSchema(childType, options)\n    }\n  },\n  isDayjs: (meta: any): JSONSchema7 => {\n    return {\n      type: 'string',\n      format: 'date-time', \n    };\n  },\n};\n\nexport function targetConstructorToSchema(target: Function, options: Partial<IOptions> = {}): JSONSchema7 {\n  return _targetConstructorToSchema(target, {\n    ...options,\n    additionalConverters,\n    classTransformerMetadataStorage: defaultMetadataStorage,\n  }) as JSONSchema7;\n}\n","import { Injectable, inject } from \"@angular/core\";\nimport { FormBuilder, FormGroup, NonNullableFormBuilder, Validators } from \"@angular/forms\";\nimport { JsonSchema } from \"json-schema-library\";\nimport { targetConstructorToSchema } from './json-schema';\nimport { merge } from \"lodash-es\";\nimport { FormFieldMap } from \"@ng-atomic/common/pipes/smart-field\";\n\nexport class JsonSchemaFormUtils {\n  static removeObjectPercent<T extends object>(value: T): any {\n    return Object.entries(value).reduce<Record<string, unknown>>((acc, [key, value]) => {\n      if (typeof value === 'string' && value.startsWith('%') && value.endsWith('%')) {\n        acc[key] = value.slice(1, -1);\n      } else if (typeof value === 'string' && value.startsWith('%')) {\n        acc[key] = value.slice(1);\n      } else if (typeof value === 'string' && value.endsWith('%')) {\n        acc[key] = value.slice(0, -1);\n      } else {\n        acc[key] = value;\n      }\n      return acc;\n    }, {});\n  }\n\n  static buildFormGroupByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n  } = {}): FormGroup {\n    console.debug('[buildFormGroupByJsonSchema] schema:', schema);\n\n    \n    const resolvedSchema = this.resolveOneOf(schema);\n\n    if (!resolvedSchema || !resolvedSchema?.properties) {\n      return fb.group({});\n    }\n    const group: any = {};\n\n    for (const key in resolvedSchema.properties) {\n      const property = resolvedSchema.properties[key];\n      const validators = [];\n\n      if (resolvedSchema.required && resolvedSchema.required.includes(key) && !property.nullable) {\n        validators.push(Validators.required);\n      }\n\n      \n      const resolvedProperty = this.resolveAllOf(property);\n\n      group[key] = this.buildFormByJsonSchemaProperty(resolvedProperty, {fb, value: (value as Record<string, unknown>)?.[key] as object, validators});\n      \n      if (resolvedProperty.type === 'array') {\n        const itemType = resolvedProperty.items?.type;\n        if (itemType !== 'string' && itemType !== 'number' && itemType !== 'boolean') {\n          \n          group[`${key}__add_action`] = fb.control(resolvedProperty);\n        }\n      }\n    }\n    return fb.group(group);\n  }\n  \n  static buildFormArrayByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = [],\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: any[],\n  } = {}): any {\n    if (!schema || !schema.items) {\n      return fb.array([]);\n    }\n    console.debug('[buildFormArrayByJsonSchema] schema:', schema);\n\n    \n    const itemType = schema.items.type;\n    if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {\n      \n      const arrayValue = Array.isArray(value) ? value.map(v => fb.control(v)) : [];\n      return fb.array(arrayValue);\n    }\n\n    \n    const formArray = fb.array([\n      this.buildFormGroupByJsonSchema(schema.items, {fb}),\n    ]);\n    return formArray;\n  }\n  \n  static resolveAllOf(property: JsonSchema): JsonSchema {\n    \n    if (property.allOf && Array.isArray(property.allOf)) {\n      const merged: any = { ...property };\n      delete merged.allOf;\n\n      \n      for (const schema of property.allOf) {\n        if (schema.properties) {\n          merged.properties = { ...merged.properties, ...schema.properties };\n        }\n        if (schema.required) {\n          merged.required = [...(merged.required || []), ...schema.required];\n        }\n        \n        if (!merged.type && schema.type) {\n          merged.type = schema.type;\n        }\n      }\n\n      return merged;\n    }\n    return property;\n  }\n\n  static resolveOneOf(property: JsonSchema): JsonSchema {\n    \n    if (property.oneOf && Array.isArray(property.oneOf)) {\n      console.debug('[resolveOneOf] oneOf detected, merging schemas...');\n      const merged: any = { ...property };\n      delete merged.oneOf;\n      merged.type = 'object';\n      merged.properties = {};\n      merged.required = [];\n\n      \n      for (const schema of property.oneOf) {\n        if (schema.properties) {\n          \n          for (const key in schema.properties) {\n            const sourceProp = schema.properties[key];\n\n            if (!merged.properties[key]) {\n              \n              merged.properties[key] = sourceProp;\n            } else {\n              \n              const existingProp = merged.properties[key];\n\n              if (sourceProp.type === 'object' && existingProp.type === 'object') {\n                \n                if (sourceProp.properties && existingProp.properties) {\n                  merged.properties[key] = {\n                    ...existingProp,\n                    properties: {\n                      ...existingProp.properties,\n                      ...sourceProp.properties\n                    }\n                  };\n                }\n              }\n              \n            }\n          }\n        }\n        if (schema.required) {\n          \n          for (const req of schema.required) {\n            if (!merged.required.includes(req)) {\n              merged.required.push(req);\n            }\n          }\n        }\n      }\n\n      console.debug('[resolveOneOf] Merged properties:', Object.keys(merged.properties));\n      return merged;\n    }\n    return property;\n  }\n  \n  static buildFormByJsonSchemaProperty(property: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = null as object | object[] | null,\n    validators = [],\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object | object[] | null,\n    validators?: any[],\n  } = {}): any {\n    switch (property.type) {\n      case 'string': switch (property.format) {\n        case 'date':\n        case 'date-time':\n          return fb.control(value ?? property.default ?? null, { nonNullable: !property.nullable, validators });\n        case 'binary':\n          return fb.control(value ?? property.default ?? null, { nonNullable: !property.nullable, validators });\n        case 'email':\n          return fb.control(value ?? property.default ?? '', {\n            nonNullable: !property.nullable,\n            validators: [...validators, Validators.email],\n          });\n        default:\n          return fb.control(value ?? property.default ?? '', { nonNullable: !property.nullable, validators });\n      }\n      case 'boolean':\n        return fb.control(value ?? property.default ?? false, {nonNullable: !property.nullable, validators});\n      case 'integer':\n        return fb.control(value ?? property.default ?? 0, {nonNullable: !property.nullable, validators});\n      case 'number':\n        return fb.control(value ?? property.default ?? 0, {nonNullable: !property.nullable, validators});\n      case 'object':\n        return this.buildFormGroupByJsonSchema(property, {fb, value: value as object});\n      case 'array': {\n        \n        const itemType = property.items?.type;\n        if (itemType === 'string' || itemType === 'number' || itemType === 'boolean') {\n          return fb.control(value ?? property.default ?? [], { nonNullable: !property.nullable, validators });\n        }\n        \n        return this.buildFormArrayByJsonSchema(property, {fb, value: value as any[]});\n      }\n      default:\n        \n        const resolved = this.resolveAllOf(property);\n        if (resolved !== property) {\n          return this.buildFormByJsonSchemaProperty(resolved, {fb, value, validators});\n        }\n        return null;\n    }\n  }\n  \n\n  static buildFormByJsonSchema(schema: JsonSchema, {\n    fb = inject(FormBuilder).nonNullable,\n    value = {},\n    fieldMap = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n    fieldMap?: object,\n  } = {}): any {\n    return {\n      form: this.buildFormGroupByJsonSchema(schema, {fb, value}),\n      fieldMap: this.buildFormFieldMapByJsonSchema(schema, {merge: fieldMap}),\n    };\n  }\n\n  static buildFormFieldByProperty(property: JsonSchema['properties']) {\n    switch (property.type) {\n      case 'string': {\n        if (property.enum) {\n          return { type: 'select', options: property.enum.map((v: string) => ({ value: v, name: v })) };\n        } else if (['date-time', 'date'].includes(property.format)) {\n          return { type: 'date' };\n        } else if (property.format === 'binary') {\n          return { type: 'file' };\n        } else {\n          return { type: 'text' };\n        }\n      }\n      case 'boolean': return { type: 'select', options: [{ value: true, name: 'はい' }, { value: false, name: 'いいえ' }] };\n      case 'integer': return { type: 'number' };\n      case 'number': return { type: 'number' };\n      default: return { type: property.type };\n    }\n  }\n\n  static buildFormFieldMapByJsonSchema(\n    schema: JsonSchema,\n    options: {\n      merge?: { [key: string]: any },\n    } = {},\n  ): any {\n    \n    const resolvedSchema = this.resolveOneOf(schema);\n\n    if (!resolvedSchema || !resolvedSchema.properties) {\n      return {\n        id: { type: 'hidden' },\n      };\n    }\n    const fieldMap: any = {};\n\n    for (const key in resolvedSchema.properties) {\n      const property = resolvedSchema.properties[key];\n      \n      const resolvedProperty = this.resolveAllOf(property);\n      switch (resolvedProperty.type) {\n        case 'object': {\n          const childFieldMap = this.buildFormFieldMapByJsonSchema(resolvedProperty, options);\n          for (const childKey in childFieldMap) {\n            fieldMap[`${key}.${childKey}`] = childFieldMap[childKey];\n          }\n          break;\n        }\n        case 'array': {\n          const childFieldMap = this.buildFormFieldMapByJsonSchema(resolvedProperty.items, options);\n          for (const childKey in childFieldMap) {\n            \n            fieldMap[`${key}.\\\\d+.${childKey}`] = childFieldMap[childKey];\n          }\n          break;\n        }\n        default: {\n          fieldMap[key] = this.buildFormFieldByProperty(resolvedProperty);\n        }\n      }\n    }\n  \n    console.debug('[buildFormFieldMapByJsonSchema] fieldMap:', fieldMap);\n    console.debug('[buildFormFieldMapByJsonSchema] options.merge:', options.merge);\n  \n    return {...fieldMap, ...options.merge};\n  }\n}\n\nexport function buildFormGroup(klass: new() => any, {\n  fb = inject(FormBuilder).nonNullable,\n  value,\n}: {\n  fb?: FormBuilder | NonNullableFormBuilder,\n  value?: object,\n}): FormGroup {\n  const schema = targetConstructorToSchema(klass);\n  return JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value});\n}\n\n\nexport function buildFormFieldMap(klass: new() => any, options: {\n  merge?: { [key: string]: any },\n}): any {\n  const schema = targetConstructorToSchema(klass);\n  const map = JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, options);\n  return merge(map, options.merge);\n}\n\nexport function buildForm(klass: new() => any, {\n  fb = inject(FormBuilder).nonNullable,\n  value = {},\n  fieldMap = {},\n}: {\n  fb?: FormBuilder | NonNullableFormBuilder,\n  value?: object,\n  fieldMap?: FormFieldMap,\n} = {}): { form: FormGroup, fieldMap: FormFieldMap } {\n  const schema = targetConstructorToSchema(klass);\n  return {\n    form: JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value}),\n    fieldMap: JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, {merge: fieldMap}),\n  };\n}\n\n\n@Injectable({ providedIn: 'root' })\nexport class JsonSchemaFormService {\n  private fb = inject(FormBuilder);\n\n  build(schema: JsonSchema, {\n    fb = this.fb,\n    value = {},\n  }: {\n    fb?: FormBuilder | NonNullableFormBuilder,\n    value?: object,\n  } = {}): FormGroup {\n    return JsonSchemaFormUtils.buildFormGroupByJsonSchema(schema, {fb, value});\n  }\n\n  buildFieldMap(\n    schema: JsonSchema,\n    options: {\n      merge?: { [key: string]: any },\n    } = {},\n  ): any {\n    return JsonSchemaFormUtils.buildFormFieldMapByJsonSchema(schema, options);\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["_targetConstructorToSchema"],"mappings":";;;;;;;;AASA,SAAS,WAAW,CAAC,MAAc,EAAE,QAAgB,EAAA;IACnD,OAAO,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC;AAC7D;AAEA,SAAS,cAAc,CACrB,IAAS,EACT,OAAY,EAAA;AAEZ,IAAA,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;AAC9B,QAAA,IACE,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS;AACnC,YAAA,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EACnC;AACA,YAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B;aAAO,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE;AAC9C,YAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B;aAAO,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE;AAC/C,YAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B;AAEA,QAAA,OAAO,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC;IACjD;AACF;AAEA,MAAM,oBAAoB,GAAE;IAC1B,CAAC,eAAe,CAAC,iBAAiB,GAAG,CAAC,IAAS,EAAE,OAAY,KAAI;AAC/D,QAAA,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE;AACrC,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC;AACvB,kBAAE,OAAO,CAAC,+BAA+B,CAAC,gBAAgB,CACtD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY;kBAEnB,IAAI;YACR,MAAM,SAAS,GAAG;AAChB,kBAAE,QAAQ,CAAC,YAAY;AACvB,kBAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC;AACzD,YAAA,OAAO,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC;QAC3C;IACF,CAAC;AACD,IAAA,OAAO,EAAE,CAAC,IAAS,KAAiB;QAClC,OAAO;AACL,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,MAAM,EAAE,WAAW;SACpB;IACH,CAAC;CACF;SAEe,yBAAyB,CAAC,MAAgB,EAAE,UAA6B,EAAE,EAAA;IACzF,OAAOA,2BAA0B,CAAC,MAAM,EAAE;AACxC,QAAA,GAAG,OAAO;QACV,oBAAoB;AACpB,QAAA,+BAA+B,EAAE,sBAAsB;AACxD,KAAA,CAAgB;AACnB;;MCvDa,mBAAmB,CAAA;IAC9B,OAAO,mBAAmB,CAAmB,KAAQ,EAAA;AACnD,QAAA,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAA0B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AACjF,YAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AAC7E,gBAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B;AAAO,iBAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC7D,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3B;AAAO,iBAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AAC3D,gBAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B;iBAAO;AACL,gBAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK;YAClB;AACA,YAAA,OAAO,GAAG;QACZ,CAAC,EAAE,EAAE,CAAC;IACR;AAEA,IAAA,OAAO,0BAA0B,CAAC,MAAkB,EAAE,EACpD,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAAG,EAAE,MAIR,EAAE,EAAA;AACJ,QAAA,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,MAAM,CAAC;QAG7D,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;QAEhD,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE;AAClD,YAAA,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB;QACA,MAAM,KAAK,GAAQ,EAAE;AAErB,QAAA,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,UAAU,EAAE;YAC3C,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC;YAC/C,MAAM,UAAU,GAAG,EAAE;AAErB,YAAA,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;AAC1F,gBAAA,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YACtC;YAGA,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;YAEpD,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,EAAC,EAAE,EAAE,KAAK,EAAG,KAAiC,GAAG,GAAG,CAAW,EAAE,UAAU,EAAC,CAAC;AAE/I,YAAA,IAAI,gBAAgB,CAAC,IAAI,KAAK,OAAO,EAAE;AACrC,gBAAA,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI;AAC7C,gBAAA,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE;AAE5E,oBAAA,KAAK,CAAC,CAAA,EAAG,GAAG,CAAA,YAAA,CAAc,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC5D;YACF;QACF;AACA,QAAA,OAAO,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;IACxB;AAEA,IAAA,OAAO,0BAA0B,CAAC,MAAkB,EAAE,EACpD,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAAG,EAAE,MAIR,EAAE,EAAA;QACJ,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;AAC5B,YAAA,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB;AACA,QAAA,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,MAAM,CAAC;AAG7D,QAAA,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI;AAClC,QAAA,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE;AAE5E,YAAA,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;AAC5E,YAAA,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;QAC7B;AAGA,QAAA,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC;YACzB,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,EAAE,EAAC,CAAC;AACpD,SAAA,CAAC;AACF,QAAA,OAAO,SAAS;IAClB;IAEA,OAAO,YAAY,CAAC,QAAoB,EAAA;AAEtC,QAAA,IAAI,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnD,YAAA,MAAM,MAAM,GAAQ,EAAE,GAAG,QAAQ,EAAE;YACnC,OAAO,MAAM,CAAC,KAAK;AAGnB,YAAA,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,KAAK,EAAE;AACnC,gBAAA,IAAI,MAAM,CAAC,UAAU,EAAE;AACrB,oBAAA,MAAM,CAAC,UAAU,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE;gBACpE;AACA,gBAAA,IAAI,MAAM,CAAC,QAAQ,EAAE;AACnB,oBAAA,MAAM,CAAC,QAAQ,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;gBACpE;gBAEA,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;AAC/B,oBAAA,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI;gBAC3B;YACF;AAEA,YAAA,OAAO,MAAM;QACf;AACA,QAAA,OAAO,QAAQ;IACjB;IAEA,OAAO,YAAY,CAAC,QAAoB,EAAA;AAEtC,QAAA,IAAI,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnD,YAAA,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC;AAClE,YAAA,MAAM,MAAM,GAAQ,EAAE,GAAG,QAAQ,EAAE;YACnC,OAAO,MAAM,CAAC,KAAK;AACnB,YAAA,MAAM,CAAC,IAAI,GAAG,QAAQ;AACtB,YAAA,MAAM,CAAC,UAAU,GAAG,EAAE;AACtB,YAAA,MAAM,CAAC,QAAQ,GAAG,EAAE;AAGpB,YAAA,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,KAAK,EAAE;AACnC,gBAAA,IAAI,MAAM,CAAC,UAAU,EAAE;AAErB,oBAAA,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE;wBACnC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;wBAEzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;AAE3B,4BAAA,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,UAAU;wBACrC;6BAAO;4BAEL,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;AAE3C,4BAAA,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,KAAK,QAAQ,EAAE;gCAElE,IAAI,UAAU,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,EAAE;AACpD,oCAAA,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG;AACvB,wCAAA,GAAG,YAAY;AACf,wCAAA,UAAU,EAAE;4CACV,GAAG,YAAY,CAAC,UAAU;4CAC1B,GAAG,UAAU,CAAC;AACf;qCACF;gCACH;4BACF;wBAEF;oBACF;gBACF;AACA,gBAAA,IAAI,MAAM,CAAC,QAAQ,EAAE;AAEnB,oBAAA,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;wBACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AAClC,4BAAA,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC3B;oBACF;gBACF;YACF;AAEA,YAAA,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAClF,YAAA,OAAO,MAAM;QACf;AACA,QAAA,OAAO,QAAQ;IACjB;IAEA,OAAO,6BAA6B,CAAC,QAAoB,EAAE,EACzD,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAAG,IAAgC,EACxC,UAAU,GAAG,EAAE,GAAA,GAKb,EAAE,EAAA;AACJ,QAAA,QAAQ,QAAQ,CAAC,IAAI;YACnB,KAAK,QAAQ,EAAE,QAAQ,QAAQ,CAAC,MAAM;AACpC,gBAAA,KAAK,MAAM;AACX,gBAAA,KAAK,WAAW;oBACd,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;AACvG,gBAAA,KAAK,QAAQ;oBACX,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;AACvG,gBAAA,KAAK,OAAO;oBACV,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE;AACjD,wBAAA,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ;wBAC/B,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;AAC9C,qBAAA,CAAC;AACJ,gBAAA;oBACE,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;;AAEvG,YAAA,KAAK,SAAS;gBACZ,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,KAAK,EAAE,EAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAC,CAAC;AACtG,YAAA,KAAK,SAAS;gBACZ,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,EAAE,EAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAC,CAAC;AAClG,YAAA,KAAK,QAAQ;gBACX,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,EAAE,EAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAC,CAAC;AAClG,YAAA,KAAK,QAAQ;AACX,gBAAA,OAAO,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,EAAC,EAAE,EAAE,KAAK,EAAE,KAAe,EAAC,CAAC;YAChF,KAAK,OAAO,EAAE;AAEZ,gBAAA,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,IAAI;AACrC,gBAAA,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC5E,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;gBACrG;AAEA,gBAAA,OAAO,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,EAAC,EAAE,EAAE,KAAK,EAAE,KAAc,EAAC,CAAC;YAC/E;AACA,YAAA;gBAEE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;AAC5C,gBAAA,IAAI,QAAQ,KAAK,QAAQ,EAAE;AACzB,oBAAA,OAAO,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,EAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAC,CAAC;gBAC9E;AACA,gBAAA,OAAO,IAAI;;IAEjB;IAGA,OAAO,qBAAqB,CAAC,MAAkB,EAAE,EAC/C,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAAG,EAAE,EACV,QAAQ,GAAG,EAAE,GAAA,GAKX,EAAE,EAAA;QACJ,OAAO;AACL,YAAA,IAAI,EAAE,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,CAAC;AAC1D,YAAA,QAAQ,EAAE,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;SACxE;IACH;IAEA,OAAO,wBAAwB,CAAC,QAAkC,EAAA;AAChE,QAAA,QAAQ,QAAQ,CAAC,IAAI;YACnB,KAAK,QAAQ,EAAE;AACb,gBAAA,IAAI,QAAQ,CAAC,IAAI,EAAE;AACjB,oBAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE;gBAC/F;AAAO,qBAAA,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AAC1D,oBAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;gBACzB;AAAO,qBAAA,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE;AACvC,oBAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;gBACzB;qBAAO;AACL,oBAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE;gBACzB;YACF;AACA,YAAA,KAAK,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;YAChH,KAAK,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzC,KAAK,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,SAAS,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;;IAE3C;AAEA,IAAA,OAAO,6BAA6B,CAClC,MAAkB,EAClB,UAEI,EAAE,EAAA;QAGN,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;QAEhD,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE;YACjD,OAAO;AACL,gBAAA,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aACvB;QACH;QACA,MAAM,QAAQ,GAAQ,EAAE;AAExB,QAAA,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,UAAU,EAAE;YAC3C,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC;YAE/C,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;AACpD,YAAA,QAAQ,gBAAgB,CAAC,IAAI;gBAC3B,KAAK,QAAQ,EAAE;oBACb,MAAM,aAAa,GAAG,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,OAAO,CAAC;AACnF,oBAAA,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE;AACpC,wBAAA,QAAQ,CAAC,CAAA,EAAG,GAAG,CAAA,CAAA,EAAI,QAAQ,CAAA,CAAE,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC;oBAC1D;oBACA;gBACF;gBACA,KAAK,OAAO,EAAE;AACZ,oBAAA,MAAM,aAAa,GAAG,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC;AACzF,oBAAA,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE;AAEpC,wBAAA,QAAQ,CAAC,CAAA,EAAG,GAAG,CAAA,MAAA,EAAS,QAAQ,CAAA,CAAE,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC;oBAC/D;oBACA;gBACF;gBACA,SAAS;oBACP,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC;gBACjE;;QAEJ;AAEA,QAAA,OAAO,CAAC,KAAK,CAAC,2CAA2C,EAAE,QAAQ,CAAC;QACpE,OAAO,CAAC,KAAK,CAAC,gDAAgD,EAAE,OAAO,CAAC,KAAK,CAAC;QAE9E,OAAO,EAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,EAAC;IACxC;AACD;SAEe,cAAc,CAAC,KAAmB,EAAE,EAClD,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAIN,EAAA;AACC,IAAA,MAAM,MAAM,GAAG,yBAAyB,CAAC,KAAK,CAAC;AAC/C,IAAA,OAAO,mBAAmB,CAAC,0BAA0B,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,CAAC;AAC5E;AAGM,SAAU,iBAAiB,CAAC,KAAmB,EAAE,OAEtD,EAAA;AACC,IAAA,MAAM,MAAM,GAAG,yBAAyB,CAAC,KAAK,CAAC;IAC/C,MAAM,GAAG,GAAG,mBAAmB,CAAC,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC;IAC9E,OAAO,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC;AAClC;AAEM,SAAU,SAAS,CAAC,KAAmB,EAAE,EAC7C,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EACpC,KAAK,GAAG,EAAE,EACV,QAAQ,GAAG,EAAE,GAAA,GAKX,EAAE,EAAA;AACJ,IAAA,MAAM,MAAM,GAAG,yBAAyB,CAAC,KAAK,CAAC;IAC/C,OAAO;AACL,QAAA,IAAI,EAAE,mBAAmB,CAAC,0BAA0B,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,CAAC;AACzE,QAAA,QAAQ,EAAE,mBAAmB,CAAC,6BAA6B,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;KACvF;AACH;MAIa,qBAAqB,CAAA;AADlC,IAAA,WAAA,GAAA;AAEU,QAAA,IAAA,CAAA,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;AAoBjC,IAAA;AAlBC,IAAA,KAAK,CAAC,MAAkB,EAAE,EACxB,EAAE,GAAG,IAAI,CAAC,EAAE,EACZ,KAAK,GAAG,EAAE,MAIR,EAAE,EAAA;AACJ,QAAA,OAAO,mBAAmB,CAAC,0BAA0B,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,CAAC;IAC5E;AAEA,IAAA,aAAa,CACX,MAAkB,EAClB,OAAA,GAEI,EAAE,EAAA;QAEN,OAAO,mBAAmB,CAAC,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3E;8GApBW,qBAAqB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAArB,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,qBAAqB,cADR,MAAM,EAAA,CAAA,CAAA;;2FACnB,qBAAqB,EAAA,UAAA,EAAA,CAAA;kBADjC,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;;ACzVlC;;AAEG;;;;"}

package/fesm2022/ng-atomic-common-services-form.mjs

@@ -61,11 +61,6 @@ function createSetupFormControl(setupFn) {
         return { control, value, field: setupFn({ control, value }) };
     };
 }
-/**
- * 指定されたフィールドをdisableにする
- * @param control フォームコントロールのSignal
- * @param fields disableにするフィールドのパス配列
- */
 function disableControls(control, fields) {
     fields.forEach(field => {
         control.get([field])?.disable();