yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjusting types for registry

Browse Source
This commit is contained in:
Niels Lyngsø
2023-08-02 10:59:05 +02:00
parent 32b19e65ee
commit b4af716fa6
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/libs/localization-api/registry/translation.registry.ts
View File

@@ -1,9 +1,13 @@
import { Translation, registerTranslation } from '../manager.js';
import { hasDefaultExport, loadExtension } from '@umbraco-cms/backoffice/extension-api';
import { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
import {
UmbBackofficeExtensionRegistry,
UmbTranslationEntry,
UmbTranslationsDictionary,
} from '@umbraco-cms/backoffice/extension-registry';
import { Subject, combineLatest } from '@umbraco-cms/backoffice/external/rxjs';
export type UmbTranslationDictionary = Record<string, unknown>;
export type UmbTranslationsSquashedDictionary = Record<string, UmbTranslationEntry>;
export class UmbTranslationRegistry {
#registry;
@@ -18,7 +22,7 @@ export class UmbTranslationRegistry {
extensions
.filter((x) => x.meta.culture.toLowerCase() === userCulture)
.map(async (extension) => {
const innerDictionary: UmbTranslationDictionary = {};
const innerDictionary: UmbTranslationsSquashedDictionary = {};
// If extension contains a dictionary, add it to the inner dictionary.
if (extension.meta.translations) {
@@ -30,7 +34,7 @@ export class UmbTranslationRegistry {
// If extension contains a js file, load it and add the default dictionary to the inner dictionary.
const loadedExtension = await loadExtension(extension);
if (loadedExtension && hasDefaultExport(loadedExtension)) {
if (loadedExtension && hasDefaultExport<UmbTranslationsDictionary>(loadedExtension)) {
for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
}
@@ -58,9 +62,9 @@ export class UmbTranslationRegistry {
}
#addOrUpdateDictionary(
innerDictionary: UmbTranslationDictionary,
innerDictionary: UmbTranslationsSquashedDictionary,
dictionaryName: string,
dictionary: UmbTranslationDictionary
dictionary: UmbTranslationsDictionary['value']
) {
for (const [key, value] of Object.entries(dictionary)) {
innerDictionary[`${dictionaryName}_${key}`] = value;

1
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
View File

@@ -52,6 +52,7 @@ export * from './section.model.js';
export * from './store.model.js';
export * from './theme.model.js';
export * from './tinymce-plugin.model.js';
export * from './translations.model.js';
export * from './tree-item.model.js';
export * from './tree.model.js';
export * from './user-profile-app.model.js';

7
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/translations.model.ts
View File

@@ -1,8 +1,9 @@
import type { ManifestWithLoaderDefaultExport } from '@umbraco-cms/backoffice/extension-api';
import type { ManifestWithLoaderIncludingDefaultExport } from '@umbraco-cms/backoffice/extension-api';
export type UmbTranslationsDictionary = Record<string, Record<string, unknown>>;
export type UmbTranslationEntry = string;
export type UmbTranslationsDictionary = Record<string, Record<string, UmbTranslationEntry>>;
export interface ManifestTranslations extends ManifestWithLoaderDefaultExport<UmbTranslationsDictionary> {
export interface ManifestTranslations extends ManifestWithLoaderIncludingDefaultExport<UmbTranslationsDictionary> {
type: 'translations';
meta: MetaTranslations;
}