sillsdev · longrunningprocess · Jan 10, 2023 · Dec 8, 2022 · Dec 9, 2022 · Dec 9, 2022
diff --git a/next-app/package-lock.json b/next-app/package-lock.json
diff --git a/next-app/package.json b/next-app/package.json
@@ -12,15 +12,15 @@
     "clean": "rimraf .svelte-kit build node_modules && echo '🔔 reminder: you will need to reinstall deps, `npm i`'"
   },
   "devDependencies": {
-    "@sveltejs/adapter-node": "next",
-    "@sveltejs/kit": "next",
+    "@sveltejs/adapter-node": "^1",
+    "@sveltejs/kit": "^1",
     "@tailwindcss/typography": "^0.5.2",
     "autoprefixer": "^10",
     "daisyui": "^2",
     "rimraf": "^3",
     "svelte": "^3",
     "svelte-check": "^2",
-    "tailwindcss": "^3.0.23",
+    "tailwindcss": "^3",
     "tslib": "^2",
     "typescript": "^4",
     "vite": "^4"

diff --git a/next-app/src/app.html b/next-app/src/app.html
@@ -7,7 +7,7 @@
 
 		%sveltekit.head%
 	</head>
-	<body data-sveltekit-preload-data="hover">
-		<div style="display: contents">%sveltekit.body%</div>
+	<body data-sveltekit-preload-data=hover>
+		<div style='display: contents'>%sveltekit.body%</div>
 	</body>
 </html>
diff --git a/next-app/src/lib/PageHeader.svelte b/next-app/src/lib/PageHeader.svelte
@@ -1,3 +1,3 @@
-<h1 class='text-2xl md:text-3xl { $$props.class }'>
+<h1 class='text-2xl md:text-3xl'>
 	<slot />
 </h1>
diff --git a/next-app/src/lib/error/index.ts b/next-app/src/lib/error/index.ts
@@ -1,7 +1,7 @@
 import { browser } from '$app/environment'
 import { writable, type Writable } from 'svelte/store'
 
-interface LfError {
+type LfError = {
 	message: string,
 	code?: number,
 }
@@ -11,7 +11,7 @@ export function throw_error(message: string, code: number = 0) {
 	throw set({ message, code })
 }
 
-export const dismiss = set
+export const dismiss = () => set({ message: '' })
 
 if (browser) {
 	// https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers/onerror#window.addEventListenererror

diff --git a/next-app/src/lib/fetch.ts b/next-app/src/lib/fetch.ts
@@ -1,40 +1,29 @@
 import { throw_error } from '$lib/error'
 import { start, stop } from '$lib/progress'
+import type { AdaptedFetchArgs, FetchArgs } from './types'
 
-export async function CREATE(url, body) { return await custom_fetch('post'  , url, body) }
-export async function GET   (url      ) { return await custom_fetch('get'   , url      ) }
-export async function UPDATE(url, body) { return await custom_fetch('put'   , url, body) }
-export async function DELETE(url      ) { return await custom_fetch('delete', url      ) }
-
-// https://developer.mozilla.org/en-US/docs/Web/API/FormData/FormData
-// export const upload = async formData => await CREATE('post', formData)
+export async function CREATE({url, body}: FetchArgs) { return await adapted_fetch({method: 'POST'  , url, body}) }
+export async function GET   ({url      }: FetchArgs) { return await adapted_fetch({method: 'GET'   , url      }) }
+export async function UPDATE({url, body}: FetchArgs) { return await adapted_fetch({method: 'PUT'   , url, body}) }
+export async function DELETE({url      }: FetchArgs) { return await adapted_fetch({method: 'DELETE', url      }) }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#Supplying_request_options
-async function custom_fetch(method, url, body) {
-	const headers = {
-		'content-type': 'application/json',
-	}
-
-	// when dealing with FormData, i.e., when uploading files, allow the browser to set the request up
-	// so boundary information is built properly.
-	if (body instanceof FormData) {
-		delete headers['content-type']
-	} else {
-		body = JSON.stringify(body)
-	}
-
+async function adapted_fetch({method, url, body}: AdaptedFetchArgs) {
 	start(url)
-	const response = await fetch(url, {
+
+	// @ts-expect-error, not sure how to correct this one via typescript
+	const response: Response = await fetch(url, {
 		method,
-		headers,
-		body,
-	})
-	.catch (throw_error) // these only occur for network errors, like these:
-						//	  * request made with a bad host, e.g., //httpbin
-						//	  * the host is refusing connections
-						//	  * client is offline, i.e., airplane mode or something
-						//	  * CORS preflight failures
-	.finally(() => stop(url))
+		headers: {
+			'content-type': 'application/json',
+		},
+		body: JSON.stringify(body),
+	}).catch(throw_error) // these only occur for network errors, like these:
+						  //	  * request made with a bad host, e.g., //httpbin
+						  //	  * the host is refusing connections
+						  //	  * client is offline, i.e., airplane mode or something
+						  //	  * CORS preflight failures
+	  .finally(() => stop(url))
 
 	// reminder: fetch does not throw exceptions for non-200 responses (https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch)
 	if (! response.ok) {

diff --git a/next-app/src/lib/forms/Button.svelte b/next-app/src/lib/forms/Button.svelte
@@ -1,9 +1,12 @@
 <script>
 	export let danger = false
+	export {clazz as class}
+
+	let clazz = ''
 </script>
 
 <!-- https://daisyui.com/components/button -->
-<button on:click class:danger class='btn btn-primary { $$props.class }'>
+<button on:click class:danger class='btn btn-primary { clazz }'>
 	<slot />
 </button>
 

diff --git a/next-app/src/lib/forms/Input.svelte b/next-app/src/lib/forms/Input.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang=ts>
 	import { onMount } from 'svelte'
 
 	export let label = ''
@@ -8,7 +8,7 @@
 	export let autofocus = false
 
 	let id = randomId()
-	let input = {}
+	let input: HTMLInputElement
 
 	onMount(autofocusIfRequested)
 
@@ -17,11 +17,11 @@
 	}
 
 	function autofocusIfRequested() {
-		autofocus && input.focus()
+		autofocus && input?.focus()
 	}
 
 	// works around "svelte(invalid-type)" warning, i.e., can't have a dynamic type AND bind:value...keep an eye on https://github.com/sveltejs/svelte/issues/3921
-	function typeWorkaround(node) {
+	function typeWorkaround(node: HTMLInputElement) {
 		node.type = type
 	}
 </script>

diff --git a/next-app/src/lib/progress/index.ts b/next-app/src/lib/progress/index.ts
@@ -1,17 +1,17 @@
-import { writable } from 'svelte/store'
+import { writable, type Writable } from 'svelte/store'
 
-export const loading = writable(false)
+export const loading: Writable<boolean> = writable(false)
 
-const pending = []
+const pending: Id[] = []
 
-export function start(id) {
+export function start(id: Id) {
   loading.set(true)
 
   pending.push(id)
 }
 
-export function stop(id) {
-  const i = pending.findIndex(anId => anId === id)
+export function stop(id: Id) {
+  const i = pending.findIndex(_id => _id === id)
 
   if (i >= 0) {
     pending.splice(i,1)

diff --git a/next-app/src/lib/progress/types.d.ts b/next-app/src/lib/progress/types.d.ts
@@ -0,0 +1 @@
+type Id = string | number
diff --git a/next-app/src/lib/server/sf.ts b/next-app/src/lib/server/sf.ts
@@ -1,18 +1,7 @@
 import { error } from '@sveltejs/kit'
+import type { Rpc, FetchArgs, SfResponse } from './types'
 
-/**
- *
- * @typedef RPC
- * @type {object}
- * @property {string} name Name of the remote procedure to call
- * @property {string[]} [args] Arguments to pass to the remote procedure
- * @property {string} [cookie] https://developer.mozilla.org/en-US/docs/Web/API/Document/cookie
- *
- * @param { RPC } rpc
- */
-export async function sf(rpc) {
-	const { name, args = [], cookie } = rpc
-
+export async function sf({name, args = [], cookie = ''}: Rpc) {
 	const body = {
 		id: Date.now(),
 		method: name,
@@ -21,7 +10,7 @@ export async function sf(rpc) {
 		},
 	}
 
-	const results = await custom_fetch(`${process.env.API_HOST}/api/sf`, 'post', body, cookie)
+	const results = await adapted_fetch({url: `${process.env.API_HOST}/api/sf`, method: 'POST', body, cookie})
 
 	if (results.error) {
 		console.log('lib/server/sf.ts.sf results.error: ', {results})
@@ -36,27 +25,25 @@ export async function sf(rpc) {
 	return results.result
 }
 
-async function custom_fetch(url, method, body, cookie) {
-	const bodyAsJSON = JSON.stringify(body)
-
+async function adapted_fetch({url, method, body, cookie = ''}: FetchArgs): Promise<SfResponse> {
 	// https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#Supplying_request_options
 	const response: Response = await fetch(url, {
 		method,
 		headers: {
 			'content-type': 'application/json',
 			cookie,
 		},
-		body: bodyAsJSON,
+		body: JSON.stringify(body),
 	}).catch(e => {
 		// these only occur for network errors, like these:
 		//	request made with a bad host, e.g., //httpbin
 		//	the host is refusing connections
-		console.log(`lib/server/sf.ts.custom_fetch caught error on ${url}=>${bodyAsJSON}: `, {e})
+		console.log(`lib/server/sf.ts.adapted_fetch caught error on ${{url, body}}: `, {e})
 		throw error(500, 'NETWORK ERROR with legacy app')
 	})
 
 	if (! response.ok) {
-		console.log(`lib/server/sf.ts.custom_fetch response !ok ${url}=>${bodyAsJSON}: `, await response.text())
+		console.log(`lib/server/sf.ts.adapted_fetch response !ok ${{url, body}}: `, await response.text())
 		throw error(response.status, response.statusText)
 	}
 

diff --git a/next-app/src/lib/server/types.d.ts b/next-app/src/lib/server/types.d.ts
@@ -0,0 +1,31 @@
+import type { HttpMethod } from '@sveltejs/kit/types/private'
+
+type Rpc = {
+	name: string,
+	args?: string[] | object[],
+	cookie?: string,
+}
+
+type FetchArgs = {
+	url: string,
+	method: HttpMethod,
+	body: object,
+	cookie?: string,
+}
+
+type SfResponse = {
+	error?: {
+		message: string
+	},
+	result?: any,
+}
+
+type LegacySession = {
+	userId: string,
+	userProjectRole: string,
+}
+
+type User = {
+	id: string,
+	role: string,
+}
diff --git a/next-app/src/lib/server/user.ts b/next-app/src/lib/server/user.ts
@@ -1,8 +1,9 @@
 import { error } from '@sveltejs/kit'
 import { sf } from '$lib/server/sf'
+import type { LegacySession, User } from './types'
 
-export async function fetch_current_user(cookie) {
-	const { userId, userProjectRole } = await sf({
+export async function fetch_current_user(cookie: string): Promise<User> {
+	const { userId, userProjectRole }: LegacySession = await sf({
 		name: 'session_getSessionData',
 		cookie,
 	})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		type Id = string \| number
hahn-kev marked this conversation as resolved. Show resolved Hide resolved myieye marked this conversation as resolved. Show resolved Hide resolved