tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor: reverse the higher-order functions

pull/3996/head
Arman Ozak 6 years ago
parent
20bfd29a5c
commit
6eb28e35c9
5 changed files with 179 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      npm/ng-packs/packages/core/src/lib/services/localization.service.ts
  2. 90
      npm/ng-packs/packages/core/src/lib/tests/localization-utils.spec.ts
  3. 108
      npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
  4. 1
      npm/ng-packs/packages/core/src/lib/utils/index.ts
  5. 30
      npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts

30
npm/ng-packs/packages/core/src/lib/services/localization.service.ts
View File

@ -7,7 +7,7 @@ import { SetLanguage } from '../actions/session.actions';
import { Config } from '../models/config'; import { Config } from '../models/config';
import { ConfigState } from '../states/config.state'; import { ConfigState } from '../states/config.state';
import { registerLocale } from '../utils/initial-utils'; import { registerLocale } from '../utils/initial-utils';
import { localize, localizeWithFallback } from '../utils/localization-utils'; import { createLocalizer, createLocalizerWithFallback } from '../utils/localization-utils';
type ShouldReuseRoute = (future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot) => boolean; type ShouldReuseRoute = (future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot) => boolean;
@ -79,17 +79,15 @@ export class LocalizationService {
} }
localize(resourceName: string, key: string, defaultValue: string): Observable<string> { localize(resourceName: string, key: string, defaultValue: string): Observable<string> {
return this.store return this.store.select(ConfigState.getOne('localization')).pipe(
.select(ConfigState.getOne('localization')) map(createLocalizer),
.pipe(map(localize(resourceName, key, defaultValue))); map(localize => localize(resourceName, key, defaultValue)),
);
} }
localizeSync(resourceName: string, key: string, defaultValue: string): string { localizeSync(resourceName: string, key: string, defaultValue: string): string {
return localize( const localization = this.store.selectSnapshot(ConfigState.getOne('localization'));
resourceName, return createLocalizer(localization)(resourceName, key, defaultValue);
key,
defaultValue,
)(this.store.selectSnapshot(ConfigState.getOne('localization')));
} }
localizeWithFallback( localizeWithFallback(
@ -97,16 +95,14 @@ export class LocalizationService {
keys: string[], keys: string[],
defaultValue: string, defaultValue: string,
): Observable<string> { ): Observable<string> {
return this.store return this.store.select(ConfigState.getOne('localization')).pipe(
.select(ConfigState.getOne('localization')) map(createLocalizerWithFallback),
.pipe(map(localizeWithFallback(resourceNames, keys, defaultValue))); map(localizeWithFallback => localizeWithFallback(resourceNames, keys, defaultValue)),
);
} }
localizeWithFallbackSync(resourceNames: string[], keys: string[], defaultValue: string): string { localizeWithFallbackSync(resourceNames: string[], keys: string[], defaultValue: string): string {
return localizeWithFallback( const localization = this.store.selectSnapshot(ConfigState.getOne('localization'));
resourceNames, return createLocalizerWithFallback(localization)(resourceNames, keys, defaultValue);
keys,
defaultValue,
)(this.store.selectSnapshot(ConfigState.getOne('localization')));
} }
} }

90
npm/ng-packs/packages/core/src/lib/tests/localization-utils.spec.ts
View File

@ -0,0 +1,90 @@
import { createLocalizer, createLocalizerWithFallback } from '../utils/localization-utils';
describe('Localization Utils', () => {
describe('#createLocalizer', () => {
const localize = createLocalizer({
values: { foo: { bar: 'baz' }, x: { y: 'z' } },
defaultResourceName: 'x',
currentCulture: null,
languages: [],
});
test.each`
resource | key | defaultValue | expected
${'_'} | ${'TEST'} | ${'DEFAULT'} | ${'TEST'}
${'foo'} | ${'bar'} | ${'DEFAULT'} | ${'baz'}
${'x'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${'a'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${''} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${undefined} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${'foo'} | ${'y'} | ${'DEFAULT'} | ${'DEFAULT'}
${'x'} | ${'y'} | ${'DEFAULT'} | ${'z'}
${'a'} | ${'y'} | ${'DEFAULT'} | ${'DEFAULT'}
${''} | ${'y'} | ${'DEFAULT'} | ${'DEFAULT'}
${undefined} | ${'y'} | ${'DEFAULT'} | ${'DEFAULT'}
${'foo'} | ${''} | ${'DEFAULT'} | ${'DEFAULT'}
${'x'} | ${''} | ${'DEFAULT'} | ${'DEFAULT'}
${'a'} | ${''} | ${'DEFAULT'} | ${'DEFAULT'}
${''} | ${''} | ${'DEFAULT'} | ${'DEFAULT'}
${undefined} | ${''} | ${'DEFAULT'} | ${'DEFAULT'}
${'foo'} | ${undefined} | ${'DEFAULT'} | ${'DEFAULT'}
${'x'} | ${undefined} | ${'DEFAULT'} | ${'DEFAULT'}
${'a'} | ${undefined} | ${'DEFAULT'} | ${'DEFAULT'}
${''} | ${undefined} | ${'DEFAULT'} | ${'DEFAULT'}
${undefined} | ${undefined} | ${'DEFAULT'} | ${'DEFAULT'}
`(
'should return $expected when resource name is $resource and key is $key',
({ resource, key, defaultValue, expected }) => {
const result = localize(resource, key, defaultValue);
expect(result).toBe(expected);
},
);
});
describe('#createLocalizerWithFallback', () => {
const localizeWithFallback = createLocalizerWithFallback({
values: { foo: { bar: 'baz' }, x: { y: 'z' } },
defaultResourceName: 'x',
currentCulture: null,
languages: [],
});
test.each`
resources | keys | defaultValue | expected
${['', '_']} | ${['TEST', 'OTHER']} | ${'DEFAULT'} | ${'TEST'}
${['foo']} | ${['bar']} | ${'DEFAULT'} | ${'baz'}
${['x']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['x']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['a', 'b', 'c']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'baz'}
${['x']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['a', 'b', 'c']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
`(
'should return $expected when resource names are $resources and keys are $keys',
({ resources, keys, defaultValue, expected }) => {
const result = localizeWithFallback(resources, keys, defaultValue);
expect(result).toBe(expected);
},
);
});
});

108
npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
View File

@ -79,6 +79,7 @@ describe('LocalizationService', () => {
describe('#localize', () => { describe('#localize', () => {
test.each` test.each`
resource | key | defaultValue | expected resource | key | defaultValue | expected
${'_'} | ${'TEST'} | ${'DEFAULT'} | ${'TEST'}
${'foo'} | ${'bar'} | ${'DEFAULT'} | ${'baz'} ${'foo'} | ${'bar'} | ${'DEFAULT'} | ${'baz'}
${'x'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'} ${'x'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${'a'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'} ${'a'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
@ -119,6 +120,7 @@ describe('LocalizationService', () => {
describe('#localizeSync', () => { describe('#localizeSync', () => {
test.each` test.each`
resource | key | defaultValue | expected resource | key | defaultValue | expected
${'_'} | ${'TEST'} | ${'DEFAULT'} | ${'TEST'}
${'foo'} | ${'bar'} | ${'DEFAULT'} | ${'baz'} ${'foo'} | ${'bar'} | ${'DEFAULT'} | ${'baz'}
${'x'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'} ${'x'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
${'a'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'} ${'a'} | ${'bar'} | ${'DEFAULT'} | ${'DEFAULT'}
@ -156,32 +158,33 @@ describe('LocalizationService', () => {
describe('#localizeWithFallback', () => { describe('#localizeWithFallback', () => {
test.each` test.each`
resources | keys | defaultValue | expected resources | keys | defaultValue | expected
${['foo']} | ${['bar']} | ${'DEFAULT'} | ${'baz'} ${['', '_']} | ${['TEST', 'OTHER']} | ${'DEFAULT'} | ${'TEST'}
${['x']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${['bar']} | ${'DEFAULT'} | ${'baz'}
${['a', 'b', 'c']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${[]} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['foo']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['a', 'b', 'c']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['x']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['a', 'b', 'c']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'baz'} ${[]} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['x']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['foo']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'baz'}
${['a', 'b', 'c']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['x']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['a', 'b', 'c']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${[]} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['x']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${[]} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
`( `(
'should return observable $expected when resource names are $resources and keys are $keys', 'should return observable $expected when resource names are $resources and keys are $keys',
async ({ resources, keys, defaultValue, expected }) => { async ({ resources, keys, defaultValue, expected }) => {
@ -203,32 +206,33 @@ describe('LocalizationService', () => {
describe('#localizeWithFallbackSync', () => { describe('#localizeWithFallbackSync', () => {
test.each` test.each`
resources | keys | defaultValue | expected resources | keys | defaultValue | expected
${['foo']} | ${['bar']} | ${'DEFAULT'} | ${'baz'} ${['', '_']} | ${['TEST', 'OTHER']} | ${'DEFAULT'} | ${'TEST'}
${['x']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${['bar']} | ${'DEFAULT'} | ${'baz'}
${['a', 'b', 'c']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${[]} | ${['bar']} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['foo']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['a', 'b', 'c']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['x']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['a', 'b', 'c']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['y']} | ${'DEFAULT'} | ${'z'} ${['']} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'baz'} ${[]} | ${['y']} | ${'DEFAULT'} | ${'z'}
${['x']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['foo']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'baz'}
${['a', 'b', 'c']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['x']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['a', 'b', 'c']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${[]} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'} ${['']} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['foo']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${[]} | ${['bar', 'y']} | ${'DEFAULT'} | ${'z'}
${['x']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['foo']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${[]} | ${['']} | ${'DEFAULT'} | ${'DEFAULT'}
${['x']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['foo']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['a', 'b', 'c']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['x']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${['']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['a', 'b', 'c']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'} ${['']} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
${[]} | ${[]} | ${'DEFAULT'} | ${'DEFAULT'}
`( `(
'should return $expected when resource names are $resources and keys are $keys', 'should return $expected when resource names are $resources and keys are $keys',
({ resources, keys, defaultValue, expected }) => { ({ resources, keys, defaultValue, expected }) => {

1
npm/ng-packs/packages/core/src/lib/utils/index.ts
View File

@ -3,6 +3,7 @@ export * from './form-utils';
export * from './generator-utils'; export * from './generator-utils';
export * from './initial-utils'; export * from './initial-utils';
export * from './lazy-load-utils'; export * from './lazy-load-utils';
export * from './localization-utils';
export * from './number-utils'; export * from './number-utils';
export * from './route-utils'; export * from './route-utils';
export * from './rxjs-utils'; export * from './rxjs-utils';

30
npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts
View File

@ -1,8 +1,8 @@
import { ApplicationConfiguration } from '../models/application-configuration'; import { ApplicationConfiguration } from '../models/application-configuration';
export function localize(resourceName: string, key: string, defaultValue: string) { export function createLocalizer(localization: ApplicationConfiguration.Localization) {
/* tslint:disable-next-line:only-arrow-functions */ /* tslint:disable-next-line:only-arrow-functions */
return function(localization: ApplicationConfiguration.Localization) { return function(resourceName: string, key: string, defaultValue: string) {
if (resourceName === '_') return key; if (resourceName === '_') return key;
const resource = localization.values[resourceName]; const resource = localization.values[resourceName];
@ -13,13 +13,20 @@ export function localize(resourceName: string, key: string, defaultValue: string
}; };
} }
export function localizeWithFallback( export function createLocalizerWithFallback(localization: ApplicationConfiguration.Localization) {
resourceNames: string[], const findLocalization = createLocalizationFinder(localization);
keys: string[],
defaultValue: string,
) {
/* tslint:disable-next-line:only-arrow-functions */ /* tslint:disable-next-line:only-arrow-functions */
return function(localization: ApplicationConfiguration.Localization) { return function(resourceNames: string[], keys: string[], defaultValue: string) {
const { localized } = findLocalization(resourceNames, keys);
return localized || defaultValue;
};
}
function createLocalizationFinder(localization: ApplicationConfiguration.Localization) {
const localize = createLocalizer(localization);
/* tslint:disable-next-line:only-arrow-functions */
return function(resourceNames: string[], keys: string[]) {
resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean); resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean);
const resourceCount = resourceNames.length; const resourceCount = resourceNames.length;
@ -29,11 +36,12 @@ export function localizeWithFallback(
const resourceName = resourceNames[i]; const resourceName = resourceNames[i];
for (let j = 0; j < keyCount; j++) { for (let j = 0; j < keyCount; j++) {
const localized = localize(resourceName, keys[j], null)(localization); const key = keys[j];
if (localized) return localized; const localized = localize(resourceName, key, null);
if (localized) return { resourceName, key, localized };
} }
} }
return defaultValue; return { resourceName: undefined, key: undefined, localized: undefined };
}; };
} }

Write Preview
Loading…
Cancel
Save