Add types file in API

jalr · Aug 27, 2021 · 706f531 · 706f531
1 parent a195870
commit 706f531
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/front/dist/service-worker-prod.js b/front/dist/service-worker-prod.js
@@ -57,4 +57,5 @@ self.addEventListener('update', function(event) {
 });
 
 self.addEventListener('beforeinstallprompt', (e) => {
-//TODO change prompt
+    //TODO change prompt
+});
diff --git a/front/src/Api/iframe/ui.ts b/front/src/Api/iframe/ui.ts
@@ -7,7 +7,7 @@ import { Popup } from "./Ui/Popup";
 import { ActionMessage } from "./Ui/ActionMessage";
 import { isMessageReferenceEvent } from "../Events/ui/TriggerActionMessageEvent";
 import { Menu } from "./Ui/Menu";
-import type { RequireOnlyOne } from "../../types";
+import type { RequireOnlyOne } from "../types";
 
 let popupId = 0;
 const popups: Map<number, Popup> = new Map<number, Popup>();
@@ -26,7 +26,7 @@ interface MenuDescriptor {
     allowApi?: boolean;
 }
 
-type CallbackOrIframe = RequireOnlyOne<MenuDescriptor, "callback" | "iframe">;
+export type MenuOptions = RequireOnlyOne<MenuDescriptor, "callback" | "iframe">;
 
 interface ZonedPopupOptions {
     zone: string;
@@ -119,10 +119,7 @@ export class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventure
         return popup;
     }
 
-    registerMenuCommand(
-        commandDescriptor: string,
-        options: CallbackOrIframe | ((commandDescriptor: string) => void)
-    ): Menu {
+    registerMenuCommand(commandDescriptor: string, options: MenuOptions | ((commandDescriptor: string) => void)): Menu {
         const menu = new Menu(commandDescriptor);
 
         if (typeof options === "function") {

diff --git a/front/src/Api/types.ts b/front/src/Api/types.ts
@@ -0,0 +1,4 @@
+export type RequireOnlyOne<T, keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, keys>> &
+    {
+        [K in keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<keys, K>, undefined>>;
+    }[keys];
diff --git a/front/src/Components/Menu/Menu.svelte b/front/src/Components/Menu/Menu.svelte
@@ -9,7 +9,8 @@
     import CustomSubMenu from "./CustomSubMenu.svelte"
     import {customMenuIframe, menuVisiblilityStore, SubMenusInterface, subMenusStore} from "../../Stores/MenuStore";
     import {onDestroy, onMount} from "svelte";
-    import {get, Unsubscriber} from "svelte/store";
+    import {get} from "svelte/store";
+    import type {Unsubscriber} from "svelte/store";
     import {sendMenuClickedEvent} from "../../Api/iframe/Ui/MenuItem";
 
     let activeSubMenu: string = SubMenusInterface.settings;

diff --git a/front/src/types.ts b/front/src/types.ts
@@ -21,8 +21,3 @@ export interface IVirtualJoystick extends Phaser.GameObjects.GameObject {
     visible: boolean;
     createCursorKeys: () => CursorKeys;
 }
-
-export type RequireOnlyOne<T, keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, keys>> &
-    {
-        [K in keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<keys, K>, undefined>>;
-    }[keys];