Type svelte components

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import ScreenDetailsModal from "@/components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import TypeModal from "./TypeModal.svelte"
@@ -19,21 +19,33 @@
   import * as screenTemplating from "@/templates/screenTemplating"
   import { Roles } from "@/constants/backend"
   import { AutoScreenTypes } from "@/constants"
+  import type { SourceOption } from "./utils"
   import { makeTableOption, makeViewOption } from "./utils"
+  import type { Screen, Table, ViewV2 } from "@budibase/types"
 
-  let mode
+  let mode: string
 
-  let screenDetailsModal
+  let screenDetailsModal: Modal
-  let datasourceModal
+  let datasourceModal: Modal
-  let formTypeModal
+  let formTypeModal: Modal
-  let tableTypeModal
+  let tableTypeModal: Modal
-  let selectedTablesAndViews = []
+  let selectedTablesAndViews: SourceOption[] = []
-  let permissions = {}
+  let permissions: Record<
+    string,
+    {
+      loading: boolean
+      read: string
+      write: string
+    }
+  > = {}
   let hasPreselectedDatasource = false
 
   $: screens = $screenStore.screens
 
-  export const show = (newMode, preselectedDatasource) => {
+  export const show = (
+    newMode: string,
+    preselectedDatasource: Table | ViewV2 | null
+  ) => {
     mode = newMode
     selectedTablesAndViews = []
     permissions = {}
@@ -60,17 +72,20 @@
     }
   }
 
-  const createScreen = async screenTemplate => {
+  const createScreen = async (screenTemplate: Screen): Promise<Screen> => {
     try {
       return await screenStore.save(screenTemplate)
     } catch (error) {
       console.error(error)
       notifications.error("Error creating screens")
+      throw error
     }
   }
 
-  const createScreens = async screenTemplates => {
+  const createScreens = async (
-    const newScreens = []
+    screenTemplates: { data: Screen; navigationLinkLabel: string | null }[]
+  ) => {
+    const newScreens: Screen[] = []
 
     for (let screenTemplate of screenTemplates) {
       await addNavigationLink(
@@ -83,7 +98,10 @@
     return newScreens
   }
 
-  const addNavigationLink = async (screen, linkLabel) => {
+  const addNavigationLink = async (
+    screen: Screen,
+    linkLabel: string | null
+  ) => {
     if (linkLabel == null) return
 
     await navigationStore.saveLink(
@@ -101,7 +119,7 @@
     }
   }
 
-  const createBasicScreen = async ({ route }) => {
+  const createBasicScreen = async ({ route }: { route: string }) => {
     const screenTemplates =
       mode === AutoScreenTypes.BLANK
         ? screenTemplating.blank({ route, screens })
@@ -110,7 +128,7 @@
     loadNewScreen(newScreens[0])
   }
 
-  const createTableScreen = async type => {
+  const createTableScreen = async (type: string) => {
     const screenTemplates = (
       await Promise.all(
         selectedTablesAndViews.map(tableOrView =>
@@ -127,7 +145,7 @@
     loadNewScreen(newScreens[0])
   }
 
-  const createFormScreen = async type => {
+  const createFormScreen = async (type: string | null) => {
     const screenTemplates = (
       await Promise.all(
         selectedTablesAndViews.map(tableOrView =>
@@ -157,10 +175,10 @@
     loadNewScreen(newScreens[0])
   }
 
-  const loadNewScreen = screen => {
+  const loadNewScreen = (screen: Screen) => {
-    if (screen?.props?._children.length) {
+    if (screen.props?._children?.length) {
       // Focus on the main component for the screen type
-      const mainComponent = screen?.props?._children?.[0]._id
+      const mainComponent = screen.props?._children?.[0]._id
       $goto(
         `/builder/app/${$appStore.appId}/design/${screen._id}/${mainComponent}`
       )
@@ -168,10 +186,10 @@
       $goto(`/builder/app/${$appStore.appId}/design/${screen._id}`)
     }
 
-    screenStore.select(screen._id)
+    screenStore.select(screen._id!)
   }
 
-  const fetchPermission = resourceId => {
+  const fetchPermission = (resourceId: string) => {
     permissions[resourceId] = {
       loading: true,
       read: Roles.BASIC,
@@ -202,12 +220,16 @@
       })
   }
 
-  const deletePermission = resourceId => {
+  const deletePermission = (resourceId: string) => {
     delete permissions[resourceId]
     permissions = permissions
   }
 
-  const handleTableOrViewToggle = ({ detail: tableOrView }) => {
+  const handleTableOrViewToggle = ({
+    detail: tableOrView,
+  }: {
+    detail: SourceOption
+  }) => {
     const alreadySelected = selectedTablesAndViews.some(
       selected => selected.id === tableOrView.id
     )

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/TypeModal.svelte

@@ -13,18 +13,22 @@
 
   export let title: string
   export let types: SelectableType[]
-  export let onConfirm: (_selectedType: string | null) => Promise<void>
+  export let onConfirm: (_selectedType: string) => Promise<void>
   export let onCancel: () => void
   export let showCancelButton: boolean = true
 
   let selectedType: string | null = null
+
+  function confirm() {
+    onConfirm(selectedType!)
+  }
 </script>
 
 <ModalContent
   {title}
   confirmText="Done"
   cancelText="Back"
-  onConfirm={() => onConfirm(selectedType)}
+  onConfirm={confirm}
   {onCancel}
   disabled={!selectedType}
   size="L"

packages/builder/src/templates/screenTemplating/Screen.ts

@@ -1,10 +1,6 @@
 import { BaseStructure } from "../BaseStructure"
 import { Helpers } from "@budibase/bbui"
-import {
+import { ScreenVariant, Screen as ScreenDoc } from "@budibase/types"
-  ScreenVariant,
-  Screen as ScreenDoc,
-  ScreenProps,
-} from "@budibase/types"
 
 export class Screen extends BaseStructure<ScreenDoc> {
   constructor() {
@@ -78,7 +74,7 @@ export class Screen extends BaseStructure<ScreenDoc> {
     return this
   }
 
-  customProps(props: ScreenProps) {
+  customProps(props: Record<string, string>) {
     for (let key of Object.keys(props)) {
       this._json.props[key] = props[key]
     }