diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-class.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-class.function.ts index be6781fe16..5e5fe9c57c 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-class.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-class.function.ts @@ -1,5 +1,5 @@ import { hasDefaultExport } from './has-default-export.function'; -import { isManifestClassConstructorType } from './is-manifest-class-instance-type.function'; +import { isManifestClassConstructorType } from './type-guards'; import { loadExtension } from './load-extension.function'; import type { ClassConstructor } from '@umbraco-cms/backoffice/models'; import type { ManifestClass } from '@umbraco-cms/backoffice/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element-or-fallback.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element-or-fallback.function.ts index 8b207b1191..19fae25b4f 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element-or-fallback.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element-or-fallback.function.ts @@ -1,7 +1,10 @@ import { createExtensionElement } from './create-extension-element.function'; -import { isManifestElementableType } from './is-manifest-elementable-type.function'; +import { isManifestElementableType } from './type-guards'; -export async function createExtensionElementOrFallback(manifest: any, fallbackElementName: string): Promise { +export async function createExtensionElementOrFallback( + manifest: any, + fallbackElementName: string +): Promise { if (isManifestElementableType(manifest)) { return createExtensionElement(manifest); } diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element.function.ts index 4b051ceea7..ee12ef1b55 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/create-extension-element.function.ts @@ -1,5 +1,5 @@ import { hasDefaultExport } from './has-default-export.function'; -import { isManifestElementNameType } from './is-manifest-element-name-type.function'; +import { isManifestElementNameType } from './type-guards'; import { loadExtension } from './load-extension.function'; import type { HTMLElementConstructor } from '@umbraco-cms/backoffice/models'; import type { ManifestElement } from '@umbraco-cms/backoffice/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/index.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/index.ts index 1774a85614..fd515e6f52 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/index.ts @@ -1,11 +1,8 @@ export * from './registry/extension.registry'; +export * from './type-guards'; export * from './create-extension-element.function'; export * from './has-default-export.function'; export * from './has-init-export.function'; -export * from './is-manifest-element-name-type.function'; -export * from './is-manifest-elementable-type.function'; -export * from './is-manifest-js-type.function'; -export * from './is-manifest-loader-type.function'; export * from './load-extension.function'; export * from './create-extension-element-or-fallback.function'; export * from './create-extension-class.function'; diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/load-extension.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/load-extension.function.ts index 68a6ff713c..fde314455c 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/load-extension.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/load-extension.function.ts @@ -1,5 +1,4 @@ -import { isManifestJSType } from './is-manifest-js-type.function'; -import { isManifestLoaderType } from './is-manifest-loader-type.function'; +import { isManifestJSType, isManifestLoaderType } from './type-guards'; import type { ManifestWithLoader } from '@umbraco-cms/backoffice/extensions-registry'; export async function loadExtension(manifest: ManifestWithLoader): Promise { diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/index.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/index.ts new file mode 100644 index 0000000000..a314097c9b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/index.ts @@ -0,0 +1,6 @@ +export * from './is-manifest-class-instance-type.function'; +export * from './is-manifest-classable-type.function'; +export * from './is-manifest-element-name-type.function'; +export * from './is-manifest-elementable-type.function'; +export * from './is-manifest-js-type.function'; +export * from './is-manifest-loader-type.function'; diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-class-instance-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-class-instance-type.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-class-instance-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-class-instance-type.function.ts diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-classable-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-classable-type.function.ts similarity index 75% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-classable-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-classable-type.function.ts index d464e0bb99..7fefb4ff02 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-classable-type.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-classable-type.function.ts @@ -4,5 +4,9 @@ import { isManifestClassConstructorType } from './is-manifest-class-instance-typ import type { ManifestBase, ManifestClass } from '@umbraco-cms/backoffice/extensions-registry'; export function isManifestClassableType(manifest: ManifestBase): manifest is ManifestClass { - return isManifestClassConstructorType(manifest) || isManifestLoaderType(manifest) || isManifestJSType(manifest); + return ( + isManifestClassConstructorType(manifest) || + isManifestLoaderType(manifest) || + isManifestJSType(manifest) + ); } diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-element-name-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-element-name-type.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-element-name-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-element-name-type.function.ts diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-elementable-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-elementable-type.function.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-elementable-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-elementable-type.function.ts index 48ac06a7e0..603ded315d 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-elementable-type.function.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-elementable-type.function.ts @@ -3,7 +3,9 @@ import { isManifestJSType } from './is-manifest-js-type.function'; import { isManifestLoaderType } from './is-manifest-loader-type.function'; import type { ManifestElement, ManifestBase } from '@umbraco-cms/backoffice/extensions-registry'; -export function isManifestElementableType(manifest: ManifestBase): manifest is ManifestElement { +export function isManifestElementableType( + manifest: ManifestBase +): manifest is ManifestElement { return ( isManifestElementNameType(manifest) || isManifestLoaderType(manifest) || diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-js-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-js-type.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-js-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-js-type.function.ts diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-loader-type.function.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-loader-type.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/extensions-api/is-manifest-loader-type.function.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-api/type-guards/is-manifest-loader-type.function.ts