feat(cdk): add TuiSuggestiveString

taiga-family · Sep 17, 2024 · c856a41 · c856a41
1 parent 58cd205
commit c856a41
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 23 deletions.
diff --git a/projects/cdk/types/index.ts b/projects/cdk/types/index.ts
@@ -4,4 +4,5 @@ export * from './mapper';
 export * from './matcher';
 export * from './rounding';
 export * from './safe-html';
+export * from './suggestive-string';
 export * from './values-of';
diff --git a/projects/cdk/types/suggestive-string.ts b/projects/cdk/types/suggestive-string.ts
@@ -0,0 +1,3 @@
+type FallbackString<T extends string> = Omit<string, T>;
+
+export type TuiSuggestiveString<T extends string> = FallbackString<T> | T;
diff --git a/projects/core/directives/appearance/appearance.options.ts b/projects/core/directives/appearance/appearance.options.ts
@@ -1,10 +1,11 @@
 import type {ExistingProvider, ProviderToken} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 import {tuiCreateToken, tuiProvide} from '@taiga-ui/cdk/utils/miscellaneous';
 
 /**
  * Bundled appearances for autocomplete purposes, not exported on purpose
  */
-type Appearance =
+type Appearance = TuiSuggestiveString<
  | 'accent'
  | 'destructive'
  | 'error'
@@ -22,7 +23,7 @@ type Appearance =
  | 'textfield'
  | 'warning'
  | 'whiteblock'
- | (Record<never, never> & string);
+>;
 
 export interface TuiAppearanceOptions {
  readonly appearance: Appearance;

diff --git a/projects/core/pipes/flag/flag.pipe.ts b/projects/core/pipes/flag/flag.pipe.ts
@@ -1,27 +1,22 @@
 import type {PipeTransform} from '@angular/core';
 import {inject, Pipe} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 import {TUI_ASSETS_PATH} from '@taiga-ui/core/tokens';
 import type {TuiCountryIsoCode} from '@taiga-ui/i18n/types';
 
+type IsoCode = TuiSuggestiveString<TuiCountryIsoCode>;
+
 @Pipe({
  standalone: true,
  name: 'tuiFlag',
 })
 export class TuiFlagPipe implements PipeTransform {
  private readonly staticPath = inject(TUI_ASSETS_PATH);
 
- public transform(
- countryIsoCode: TuiCountryIsoCode | (Record<never, never> & string),
- ): string;
- public transform(
- countryIsoCode: TuiCountryIsoCode | (Record<never, never> & string) | undefined,
- ): string | null;
- public transform(
- countryIsoCode?: TuiCountryIsoCode | (Record<never, never> & string) | null,
- ): string | null;
- public transform(
- countryIsoCode?: TuiCountryIsoCode | (Record<never, never> & string) | null,
- ): string | null {
+ public transform(countryIsoCode: IsoCode): string;
+ public transform(countryIsoCode: IsoCode | undefined): string | null;
+ public transform(countryIsoCode?: IsoCode | null): string | null;
+ public transform(countryIsoCode?: IsoCode | null): string | null {
  if (!countryIsoCode) {
  return null;
  }

diff --git a/projects/i18n/types/language-names.ts b/projects/i18n/types/language-names.ts
@@ -1,4 +1,6 @@
-export type TuiLanguageName =
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
+
+export type TuiLanguageName = TuiSuggestiveString<
  | 'belarusian'
  | 'chinese'
  | 'dutch'
@@ -18,4 +20,4 @@ export type TuiLanguageName =
  | 'turkish'
  | 'ukrainian'
  | 'vietnamese'
- | (Record<never, never> & string);
+>;
diff --git a/projects/kit/components/badged-content/badged-content.directive.ts b/projects/kit/components/badged-content/badged-content.directive.ts
@@ -1,10 +1,11 @@
 import {Directive, Input} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 
 @Directive({
  standalone: true,
  selector: '[tuiSlot]',
 })
 export class TuiBadgedContentDirective {
  @Input()
- public tuiSlot: 'bottom' | 'top' | (Record<never, never> & string) = 'top';
+ public tuiSlot: TuiSuggestiveString<'bottom' | 'top'> = 'top';
 }
diff --git a/projects/layout/components/app-bar/app-bar.directive.ts b/projects/layout/components/app-bar/app-bar.directive.ts
@@ -1,10 +1,11 @@
 import {Directive, Input} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 
 @Directive({
  standalone: true,
  selector: '[tuiSlot]',
 })
 export class TuiAppBarDirective {
  @Input()
- public tuiSlot: 'left' | 'right' | (Record<never, never> & string) = 'left';
+ public tuiSlot: TuiSuggestiveString<'left' | 'right'> = 'left';
 }
diff --git a/projects/layout/components/block-status/block-status.directive.ts b/projects/layout/components/block-status/block-status.directive.ts
@@ -1,10 +1,11 @@
 import {Directive, Input} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 
 @Directive({
  standalone: true,
  selector: '[tuiSlot]',
 })
 export class TuiBlockStatusDirective {
  @Input()
- public tuiSlot: 'action' | 'top' | (Record<never, never> & string) = 'top';
+ public tuiSlot: TuiSuggestiveString<'action' | 'top'> = 'top';
 }
diff --git a/projects/legacy/directives/wrapper/wrapper.directive.ts b/projects/legacy/directives/wrapper/wrapper.directive.ts
@@ -1,4 +1,5 @@
 import {Directive, Input} from '@angular/core';
+import type {TuiSuggestiveString} from '@taiga-ui/cdk/types';
 import type {TuiInteractiveState} from '@taiga-ui/core/types';
 
 /**
@@ -46,10 +47,7 @@ export class TuiWrapperDirective {
  return this.focus && !this.disabled;
  }
 
- protected get interactiveState():
- | TuiInteractiveState
- | (Record<never, never> & string)
- | null {
+ protected get interactiveState(): TuiSuggestiveString<TuiInteractiveState> | null {
  if (this.disabled) {
  return 'disabled';
  }