(
+ values: unknown,
+ checker: (value: unknown) => value is T
+): values is T[] {
+ return Array.isArray(values) && values.every(checker);
+}
+
+export function isStringArray(values: unknown): values is string[] {
+ return isTypeArray(values, isString);
+}
diff --git a/src/lib/layout/container.svelte b/src/lib/layout/container.svelte
index fb9ec29dd..1eed9c6bf 100644
--- a/src/lib/layout/container.svelte
+++ b/src/lib/layout/container.svelte
@@ -1,6 +1,6 @@
diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte
index e34799528..09e7151db 100644
--- a/src/lib/layout/usage.svelte
+++ b/src/lib/layout/usage.svelte
@@ -35,7 +35,7 @@
export let readMetadata: MetricMetadata;
export let updatedMetadata: MetricMetadata;
export let deletedMetadata: MetricMetadata;
- export let path: string = null;
+ export let path: string | null = null;
diff --git a/src/lib/layout/wizardStep.svelte b/src/lib/layout/wizardStep.svelte
index 73e50eeac..6ba9de776 100644
--- a/src/lib/layout/wizardStep.svelte
+++ b/src/lib/layout/wizardStep.svelte
@@ -5,7 +5,7 @@
/**
* Pass callback that is run before the Form submit, can be canceled with throwing an exception.
*/
- export let beforeSubmit: () => Promise = null;
+ export let beforeSubmit: () => Promise | null = null;
if (beforeSubmit) {
wizard.setInterceptor(beforeSubmit);
diff --git a/src/lib/mock/tabs.test.svelte b/src/lib/mock/tabs.test.svelte
index 319139817..088cb426c 100644
--- a/src/lib/mock/tabs.test.svelte
+++ b/src/lib/mock/tabs.test.svelte
@@ -1,7 +1,7 @@
-
diff --git a/src/lib/mock/wizard.step1.test.svelte b/src/lib/mock/wizard.step1.test.svelte
index 48ef8cd02..3a70cbe80 100644
--- a/src/lib/mock/wizard.step1.test.svelte
+++ b/src/lib/mock/wizard.step1.test.svelte
@@ -2,7 +2,7 @@
import InputText from '$lib/elements/forms/inputText.svelte';
import WizardStep from '$lib/layout/wizardStep.svelte';
- let value: string = null;
+ let value: string | null = null;
async function beforeSubmit() {
if (value === 'fail') {
diff --git a/src/lib/stores/project-services.ts b/src/lib/stores/project-services.ts
index 6f4a8cb0d..ce80f780c 100644
--- a/src/lib/stores/project-services.ts
+++ b/src/lib/stores/project-services.ts
@@ -7,8 +7,12 @@ export type Service = {
value: boolean | null;
};
+type ServicesObj = {
+ list: Array;
+};
+
function createServices() {
- const { subscribe, set } = writable({
+ const { subscribe, set } = writable({
list: [
{
label: 'Account',
diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte
index e423672b9..effdfabf7 100644
--- a/src/routes/console/account/+page.svelte
+++ b/src/routes/console/account/+page.svelte
@@ -12,7 +12,7 @@
import { Dependencies } from '$lib/constants';
import { trackEvent } from '$lib/actions/analytics';
- let name: string = null,
+ let name: string | null = null,
email: string = null,
emailPassword: string = null,
newPassword: string = null,
diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte
index 5268a354c..5bbfe2914 100644
--- a/src/routes/console/project-[project]/auth/appleOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte
@@ -12,11 +12,11 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let keyID: string = null;
- let teamID: string = null;
- let p8: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let keyID: string | null = null;
+ let teamID: string | null = null;
+ let p8: string | null = null;
onMount(() => {
appId ??= provider.appId;
diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
index a6d25ec4e..bf4f2c775 100644
--- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte
+++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
@@ -12,10 +12,10 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let clientSecret: string = null;
- let auth0Domain: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let clientSecret: string | null = null;
+ let auth0Domain: string | null = null;
let error: string;
onMount(() => {
diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
index 105a33e58..4f9b78e4f 100644
--- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
@@ -12,10 +12,10 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let clientSecret: string = null;
- let authentikDomain: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let clientSecret: string | null = null;
+ let authentikDomain: string | null = null;
let error: string;
onMount(() => {
diff --git a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
index f179f74bc..07146e8d2 100644
--- a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
@@ -12,10 +12,10 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let clientSecret: string = null;
- let endpoint: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let clientSecret: string | null = null;
+ let endpoint: string | null = null;
let error: string;
onMount(() => {
diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte
index b3be6f62a..ff5cf64ae 100644
--- a/src/routes/console/project-[project]/auth/mainOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte
@@ -14,9 +14,9 @@
const projectId = $page.params.project;
- let enabled: boolean = null;
- let appId: string = null;
- let secret: string = null;
+ let enabled: boolean | null = null;
+ let appId: string | null = null;
+ let secret: string | null = null;
onMount(() => {
enabled ??= provider.enabled;
diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
index fc0b38d0a..b257edf18 100644
--- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
@@ -12,10 +12,10 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let clientSecret: string = null;
- let tenantID: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let clientSecret: string | null = null;
+ let tenantID: string | null = null;
let error: string;
onMount(() => {
diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
index 2fa6dbcb8..ac2f1d844 100644
--- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
@@ -12,11 +12,11 @@
export let provider: Provider;
- let appId: string = null;
- let enabled: boolean = null;
- let clientSecret: string = null;
- let oktaDomain: string = null;
- let authorizationServerId: string = null;
+ let appId: string | null = null;
+ let enabled: boolean | null = null;
+ let clientSecret: string | null = null;
+ let oktaDomain: string | null = null;
+ let authorizationServerId: string | null = null;
onMount(() => {
appId ??= provider.appId;
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte
index ecf2c008f..7a970d4ee 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte
+++ b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte
@@ -14,7 +14,7 @@
import { trackEvent } from '$lib/actions/analytics';
let showDelete = false;
- let teamName: string = null;
+ let teamName: string | null = null;
onMount(async () => {
teamName ??= $team.name;
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
index 5eecbbbed..c7b244854 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
@@ -9,7 +9,7 @@
import { onMount } from 'svelte';
import { user } from './store';
- let userEmail: string = null;
+ let userEmail: string | null = null;
onMount(async () => {
userEmail ??= $user.email;
});
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte
index 1b4119579..d0cd7fade 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte
@@ -9,7 +9,7 @@
import { onMount } from 'svelte';
import { user } from './store';
- let userName: string = null;
+ let userName: string | null = null;
onMount(async () => {
userName ??= $user.name;
});
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte
index 66116f2c6..73cf30240 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte
@@ -6,7 +6,7 @@
import { sdkForProject } from '$lib/stores/sdk';
import { user } from './store';
- let newPassword: string = null;
+ let newPassword: string | null = null;
async function updatePassword() {
try {
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte
index d77cd778b..67e1b36ba 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte
@@ -9,7 +9,7 @@
import { onMount } from 'svelte';
import { user } from './store';
- let userPhone: string = null;
+ let userPhone: string | null = null;
onMount(async () => {
userPhone ??= $user.phone;
});
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
index c000793bc..dbc88c540 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
@@ -21,7 +21,7 @@
}
}
- let prefs: [string, unknown][] = null;
+ let prefs: [string, unknown][] | null = null;
let arePrefsDisabled = true;
onMount(async () => {
diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte
index 8c9dac6da..6d472e4d0 100644
--- a/src/routes/console/project-[project]/databases/create.svelte
+++ b/src/routes/console/project-[project]/databases/create.svelte
@@ -11,7 +11,7 @@
const dispatch = createEventDispatcher();
let name = '';
- let id: string = null;
+ let id: string | null = null;
let showCustomId = false;
const create = async () => {
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
index 1b7c7501e..d59443f48 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
@@ -19,7 +19,7 @@
import Overview from './overview.svelte';
let showDropdown = [];
- let selectedAttribute: Attributes = null;
+ let selectedAttribute: Attributes | null = null;
let showCreate = false;
let showDelete = false;
let showOverview = false;
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
index a2ab21070..f388f0927 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
@@ -22,7 +22,7 @@
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
index bf401a66e..104a79b24 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
@@ -22,7 +22,7 @@
let showError: false | 'name' | 'size' = false,
errorMessage = 'Something went wrong',
errorType: 'error' | 'warning' | 'success' = 'error';
- let enabled: boolean = null,
+ let enabled: boolean | null = null,
collectionName: string = null,
collectionDocumentSecurity: boolean = null,
collectionPermissions: string[] = null,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/create.svelte b/src/routes/console/project-[project]/databases/database-[database]/create.svelte
index de2e4bf29..ba0e98ab0 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte
@@ -15,7 +15,7 @@
const dispatch = createEventDispatcher();
let name = '';
- let id: string = null;
+ let id: string | null = null;
let showCustomId = false;
const create = async () => {
diff --git a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte
index 9c7773b7d..e90553d91 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte
@@ -17,7 +17,7 @@
let showError: false | 'name' | 'email' | 'password' = false;
let errorMessage = 'Something went wrong';
let errorType: 'error' | 'warning' | 'success' = 'error';
- let databaseName: string = null;
+ let databaseName: string | null = null;
onMount(async () => {
databaseName ??= $database.name;
diff --git a/src/routes/console/project-[project]/functions/createVariable.svelte b/src/routes/console/project-[project]/functions/createVariable.svelte
index 0fa4a6706..a9d6ba9dc 100644
--- a/src/routes/console/project-[project]/functions/createVariable.svelte
+++ b/src/routes/console/project-[project]/functions/createVariable.svelte
@@ -6,7 +6,7 @@
import type { Models } from '@aw-labs/appwrite-console';
export let showCreate = false;
- export let selectedVar: Partial = null;
+ export let selectedVar: Partial | null = null;
let pair = {
$id: selectedVar?.$id,
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
index 1ffec2be6..1ef0e5b4a 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
@@ -47,7 +47,7 @@
let showDelete = false;
let showActivate = false;
- let selectedDeployment: Models.Deployment = null;
+ let selectedDeployment: Models.Deployment | null = null;
const handleActivate = () => {
invalidate(Dependencies.DEPLOYMENTS);
diff --git a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte
index c30bd327c..2ae1df794 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte
@@ -8,7 +8,7 @@
import { createEventDispatcher } from 'svelte';
export let showActivate = false;
- export let selectedDeployment: Models.Deployment = null;
+ export let selectedDeployment: Models.Deployment | null = null;
const dispatch = createEventDispatcher();
diff --git a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte
index 5a2bf30ec..0934a25f8 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte
@@ -9,7 +9,7 @@
import type { Models } from '@aw-labs/appwrite-console';
export let showDelete = false;
- export let selectedDeployment: Models.Deployment = null;
+ export let selectedDeployment: Models.Deployment | null = null;
const handleSubmit = async () => {
try {
diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
index 24f026f25..6ebd780e3 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
@@ -8,10 +8,10 @@
import { sdkForProject } from '$lib/stores/sdk';
import type { Models } from '@aw-labs/appwrite-console';
- export let selectedFunction: Models.Function = null;
+ export let selectedFunction: Models.Function | null = null;
let show = false;
- let data: string = null;
+ let data: string | null = null;
let showJson = false;
let submitting = false;
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
index 9313c97a0..4e2d1a681 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
@@ -37,14 +37,14 @@
const functionId = $page.params.function;
let showDelete = false;
- let selectedVar: Models.Variable = null;
+ let selectedVar: Models.Variable | null = null;
// let showVariablesUpload = false;
let showVariablesModal = false;
let showVariablesValue = [];
let showVariablesDropdown = [];
- let timeout: number = null;
- let functionName: string = null;
- let functionSchedule: string = null;
+ let timeout: number | null = null;
+ let functionName: string | null = null;
+ let functionSchedule: string | null = null;
let permissions: string[] = [];
let arePermsDisabled = true;
diff --git a/src/routes/console/project-[project]/functions/wizard/step5.svelte b/src/routes/console/project-[project]/functions/wizard/step5.svelte
index f3cf1c9ae..552913f8e 100644
--- a/src/routes/console/project-[project]/functions/wizard/step5.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step5.svelte
@@ -17,7 +17,7 @@
let showCreate = false;
- let selectedVar: Partial = null;
+ let selectedVar: Partial | null = null;
let showDropdown = [];
function handleCreated(dispatchEvent: CustomEvent) {
diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte
index fbed69cfb..4db545086 100644
--- a/src/routes/console/project-[project]/overview/+layout.svelte
+++ b/src/routes/console/project-[project]/overview/+layout.svelte
@@ -3,18 +3,13 @@
notation: 'compact'
});
- // TODO: metric type is wrong
- export function last(set: Array): Models.Metric | null {
- return (set as Models.Metric[]).slice(-1)[0] ?? null;
- }
-
// TODO: metric type is wrong
export function total(set: Array): number {
return (set as Models.Metric[]).reduce((prev, curr) => prev + curr.value, 0);
}
- export function format(number: number): string {
- return formatter.format(number);
+ export function format(number: number | undefined): string {
+ return formatter.format(number ?? 0);
}
@@ -33,8 +28,9 @@
import Bandwith from './bandwith.svelte';
import Requests from './requests.svelte';
import Onboard from './onboard.svelte';
+ import { last } from '$lib/layout/usage.svelte';
- $: projectId = $page.params.project;
+ $: projectId = $page.params.project ?? '';
$: path = `/console/project-${projectId}/overview`;
let period: UsagePeriods = '30d';
@@ -65,7 +61,7 @@
{:else}
{#if $usage}
- {@const storage = humanFileSize(last($usage.storage).value)}
+ {@const storage = humanFileSize(last($usage.storage)?.value ?? 0)}
@@ -89,14 +85,14 @@
- {format(last($usage.documents).value)}
+ {format(last($usage.documents)?.value)}
Documents
- Databases: {format(last($usage.databases).value)}
+ Databases: {format(last($usage.databases)?.value)}
@@ -124,7 +120,7 @@
- Buckets: {format(last($usage.buckets).value)}
+ Buckets: {format(last($usage.buckets)?.value)}
@@ -144,7 +140,7 @@
- {format(last($usage.users).value)}
+ {format(last($usage.users)?.value ?? 0)}
Users
@@ -165,7 +161,7 @@
- {format(last($usage.executions).value)}
+ {format(last($usage.executions)?.value)}
Executions
@@ -196,9 +192,10 @@
aria-label="Show items in end side">
-
+
-
@@ -207,6 +204,7 @@
-
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index ff3f5b24b..16b2c05ce 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -16,10 +16,10 @@
import { trackEvent } from '$lib/actions/analytics';
let showDelete = false;
- let name: string = null;
- let secret: string = null;
- let expire: string = null;
- let scopes: string[] = null;
+ let name: string = '';
+ let secret: string = '';
+ let expire: string = '';
+ let scopes: string[] = [];
onMount(() => {
name ??= $key.name;
diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/console/project-[project]/overview/keys/wizard.svelte
index e302d0b74..c76ee305d 100644
--- a/src/routes/console/project-[project]/overview/keys/wizard.svelte
+++ b/src/routes/console/project-[project]/overview/keys/wizard.svelte
@@ -13,8 +13,17 @@
import { onboarding } from '../../store';
import { Dependencies } from '$lib/constants';
import { trackEvent } from '$lib/actions/analytics';
+ import { isString, isStringArray } from '$lib/helpers/type';
async function onFinish() {
+ if (
+ !isString($page.params.project) ||
+ !isString($key.name) ||
+ !isStringArray($key.scopes)
+ ) {
+ return;
+ }
+
try {
const { $id } = await sdkForConsole.projects.createKey(
$page.params.project,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
index b66a71d9e..9da659242 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
@@ -40,7 +40,7 @@
};
let showDelete = false;
- let name: string = null;
+ let name: string;
onMount(() => {
name ??= data.platform.name;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
index ebcd4ce21..c36363a42 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let hostname: string = null;
+ let hostname: string;
onMount(() => {
hostname ??= $platform.hostname;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
index 1d7fe0aab..25a4da545 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
index ef7788d85..63e0e40c0 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
index ca957f34a..d73dac43f 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
index 04dca1a43..ab2795398 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
index 747f28574..a5171bd50 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
index a703208f4..530a71c0d 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
index aec777f88..c8aab33e8 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
index b88733f76..92dc16362 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
index 6d4a70864..717164fe6 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
@@ -10,7 +10,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let key: string = null;
+ let key: string;
onMount(() => {
key ??= $platform.key;
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
index 43546c5eb..0b52c8e84 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
@@ -9,7 +9,7 @@
import { project } from '../../../store';
import { platform } from './store';
- let hostname: string = null;
+ let hostname: string;
onMount(() => {
hostname ??= $platform.hostname;
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte
index 397054b1a..ba03c1694 100644
--- a/src/routes/console/project-[project]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/settings/+page.svelte
@@ -15,7 +15,7 @@
import { page } from '$app/stores';
import { trackEvent } from '$lib/actions/analytics';
- let name: string = null;
+ let name: string;
let showDelete = false;
const endpoint = sdkForConsole.client.config.endpoint;
const projectId = $page.params.project;
@@ -46,7 +46,8 @@
await sdkForConsole.projects.updateServiceStatus(
$project.$id,
service.method,
- service.value
+ // Worst case scenario, an error notification will be shown
+ service.value as boolean
);
invalidate(Dependencies.PROJECT);
addNotification({
diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/console/project-[project]/settings/deleteProject.svelte
index de2314f16..4f8c524e1 100644
--- a/src/routes/console/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/console/project-[project]/settings/deleteProject.svelte
@@ -10,8 +10,8 @@
export let showDelete = false;
- let password: string = null;
- let name: string = null;
+ let password: string;
+ let name: string;
const handleDelete = async () => {
try {
diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
index 79f81461d..be0f5a8cf 100644
--- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
@@ -23,6 +23,7 @@
import Create from '../create.svelte';
import Delete from '../delete.svelte';
import { trackEvent } from '$lib/actions/analytics';
+ import { isString } from '$lib/helpers/type';
export let data: PageData;
@@ -37,6 +38,7 @@
};
const refreshDomain = async (domain: Models.Domain) => {
+ if (!isString(projectId)) return;
const domainId = domain.$id;
try {
isVerifying[domainId] = true;
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
index 55eff5170..5e416bc8f 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
@@ -13,9 +13,9 @@
import { domain } from './store';
const target = window?.location.hostname ?? '';
- $: parts = $domain.domain.split('.');
+ $: parts = $domain.domain?.split('.') || [];
$: registerable = [parts[parts.length - 2], parts[parts.length - 1]].join('.');
- $: cnameValue = $domain.domain.replace('.' + registerable, '');
+ $: cnameValue = $domain.domain?.replace('.' + registerable, '');
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
index ed800c177..b2927dee6 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
@@ -1,6 +1,7 @@
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
index b7fd139e5..a0581ff58 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
@@ -29,36 +29,36 @@
let showDelete = false;
- let enabled: boolean = null,
- bucketName: string = null,
- bucketFileSecurity: boolean = null,
- bucketPermissions: string[] = null,
- arePermsDisabled = true,
- encryption: boolean = null,
- antivirus: boolean = null,
- maxSize: number;
+ let enabled: boolean | null = null;
+ let bucketName: string = '';
+ let bucketFileSecurity: boolean | null = null;
+ let bucketPermissions: string[] | null = null;
+ let arePermsDisabled = true;
+ let encryption: boolean | null = null;
+ let antivirus: boolean | null = null;
+ let maxSize: number;
let byteUnit = writable('KB');
- let sizeInBytes: number = null;
+ let sizeInBytes: number | null = null;
+ let suggestedExtensions = ['jpg', 'png', 'svg', 'gif', 'html', 'pdf', 'mp4'];
+ let extensions = $bucket.allowedFileExtensions;
+ let isExtensionsDisabled = true;
const options = [
{ label: 'Bytes', value: 'Bytes' },
{ label: 'Kilobytes', value: 'KB' },
{ label: 'Megabytes', value: 'MB' },
{ label: 'Gigabytes', value: 'GB' }
];
- let suggestedExtensions = ['jpg', 'png', 'svg', 'gif', 'html', 'pdf', 'mp4'];
- let extensions = $bucket.allowedFileExtensions;
- let isExtensionsDisabled = true;
onMount(async () => {
enabled ??= $bucket.enabled;
bucketName ??= $bucket.name;
- bucketName ??= $bucket.name;
bucketFileSecurity ??= $bucket.fileSecurity;
bucketPermissions ??= $bucket.$permissions;
encryption ??= $bucket.encryption;
antivirus ??= $bucket.antivirus;
maxSize = $bucket.maximumFileSize / 1024;
});
+
$: if (bucketPermissions) {
if (symmetricDifference(bucketPermissions, $bucket.$permissions).length) {
arePermsDisabled = false;
@@ -117,6 +117,7 @@
}
function toggleBucket() {
+ if (enabled === null) return;
updateBucket(
{
enabled
@@ -143,6 +144,7 @@
}
function updatePermissions() {
+ if (bucketPermissions === null) return;
updateBucket(
{
$permissions: bucketPermissions
@@ -156,6 +158,7 @@
}
function updateFileSecurity() {
+ if (bucketFileSecurity === null) return;
updateBucket(
{
fileSecurity: bucketFileSecurity
@@ -169,6 +172,7 @@
}
function updateSecurity() {
+ if (encryption === null || antivirus === null) return;
updateBucket(
{
encryption,
@@ -204,6 +208,8 @@
}
byteUnit.subscribe((b) => {
+ if (sizeInBytes === null) return;
+
if (b === 'Bytes') {
maxSize = sizeInBytes;
} else if (b === 'KB') {
diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/console/project-[project]/storage/create.svelte
index 572b5166e..a8f889b4e 100644
--- a/src/routes/console/project-[project]/storage/create.svelte
+++ b/src/routes/console/project-[project]/storage/create.svelte
@@ -3,6 +3,7 @@
import { Modal, CustomId } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button, InputText, FormList } from '$lib/elements/forms';
+ import { isString } from '$lib/helpers/type';
import { addNotification } from '$lib/stores/notifications';
import { sdkForProject } from '$lib/stores/sdk';
import { createEventDispatcher } from 'svelte';
@@ -11,12 +12,13 @@
const dispatch = createEventDispatcher();
- let name = '';
- let id: string = null;
+ let name: string | null = '';
+ let id: string | null = null;
let showCustomId = false;
- let error: string;
+ let error: string | null;
const create = async () => {
+ if (!isString(name)) return;
try {
const bucket = await sdkForProject.storage.createBucket(id ? id : 'unique()', name);
showCreate = false;
diff --git a/src/routes/invite/+page.svelte b/src/routes/invite/+page.svelte
index 69614f0a6..b958a7196 100644
--- a/src/routes/invite/+page.svelte
+++ b/src/routes/invite/+page.svelte
@@ -13,10 +13,10 @@
let terms = false;
onMount(() => {
- userId = $page.url.searchParams.get('userId');
- secret = $page.url.searchParams.get('secret');
- teamId = $page.url.searchParams.get('teamId');
- membershipId = $page.url.searchParams.get('membershipId');
+ userId = $page.url.searchParams.get('userId') || '';
+ secret = $page.url.searchParams.get('secret') || '';
+ teamId = $page.url.searchParams.get('teamId') || '';
+ membershipId = $page.url.searchParams.get('membershipId') || '';
});
const acceptInvite = async () => {
diff --git a/src/routes/recover/+page.svelte b/src/routes/recover/+page.svelte
index ba3985210..4ffe53f48 100644
--- a/src/routes/recover/+page.svelte
+++ b/src/routes/recover/+page.svelte
@@ -24,8 +24,8 @@
let confirmPassword: string;
onMount(() => {
- userId = $page.url.searchParams.get('userId');
- secret = $page.url.searchParams.get('secret');
+ userId = $page.url.searchParams.get('userId') || '';
+ secret = $page.url.searchParams.get('secret') || '';
});
async function recover() {
diff --git a/tests/unit/components/code.test.ts b/tests/unit/components/code.test.ts
index 4a02795af..f1fb4ee14 100644
--- a/tests/unit/components/code.test.ts
+++ b/tests/unit/components/code.test.ts
@@ -9,7 +9,7 @@ test('default props', async () => {
language: 'js'
});
- expect(container.querySelector('.controls').children.length).toEqual(0);
+ expect(container.querySelector('.controls')?.children.length).toEqual(0);
});
test('shows label', async () => {
@@ -70,8 +70,9 @@ test('copy to clipboard function called on click', async () => {
});
const button = container.querySelector('.icon-duplicate');
+ expect(button).not.toBeNull();
- await fireEvent.click(button);
+ await fireEvent.click(button as Element);
expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith('console.log("test");');
});
diff --git a/tests/unit/components/dropList.test.ts b/tests/unit/components/dropList.test.ts
index 014302225..7de7eff36 100644
--- a/tests/unit/components/dropList.test.ts
+++ b/tests/unit/components/dropList.test.ts
@@ -24,7 +24,8 @@ test('hide drop list on body click', async () => {
test('hide drop list on wrapper click', async () => {
const { component } = render(DropList, { ...data });
const wrapper = document.querySelector('div');
+ expect(wrapper).not.toBeNull();
- await fireEvent.click(wrapper);
+ await fireEvent.click(wrapper as Element);
expect(component.show).toStrictEqual(false);
});
diff --git a/tests/unit/components/heading.test.ts b/tests/unit/components/heading.test.ts
index 13d544619..82262582d 100644
--- a/tests/unit/components/heading.test.ts
+++ b/tests/unit/components/heading.test.ts
@@ -10,5 +10,5 @@ test('shows heading', () => {
const headings = container.querySelectorAll(tag);
expect(headings.length).toEqual(1);
- expect(headings[0].className).includes(`heading-level-${size}`);
+ expect(headings[0]?.className).includes(`heading-level-${size}`);
});
diff --git a/tests/unit/components/secret.test.ts b/tests/unit/components/secret.test.ts
index 7225ede9a..6de1ad9de 100644
--- a/tests/unit/components/secret.test.ts
+++ b/tests/unit/components/secret.test.ts
@@ -19,22 +19,24 @@ test('shows Secret component', () => {
test('toggle secret', async () => {
const { container } = render(Secret, { value });
const toggle = container.querySelector('[aria-label="show hidden text"]');
+ expect(toggle).not.toBeNull();
let secret = container.querySelector('span.text');
expect(secret).not.toContainEqual(value);
- await fireEvent.click(toggle);
+ await fireEvent.click(toggle as Element);
secret = container.querySelector('span.text');
- expect(secret.textContent).toEqual(value);
- await fireEvent.click(toggle);
+ expect(secret?.textContent).toEqual(value);
+ await fireEvent.click(toggle as Element);
secret = container.querySelector('span.text');
- expect(secret.textContent).not.toEqual(value);
+ expect(secret?.textContent).not.toEqual(value);
});
test('copy to clipboard on click', async () => {
const { container } = render(Secret, { value });
const copy = container.querySelector('[aria-label="copy text"]');
+ expect(copy).not.toBeNull();
Object.assign(window.navigator, {
clipboard: {
@@ -42,7 +44,7 @@ test('copy to clipboard on click', async () => {
}
});
- await fireEvent.click(copy);
+ await fireEvent.click(copy as Element);
expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith(value);
});
diff --git a/tests/unit/components/tabs.test.ts b/tests/unit/components/tabs.test.ts
index b9a47c102..79b74f4fd 100644
--- a/tests/unit/components/tabs.test.ts
+++ b/tests/unit/components/tabs.test.ts
@@ -20,8 +20,8 @@ const list = [
test('shows Tabs component', () => {
const { container } = render(Tabs, { tabs: list });
const tabs = container.querySelector('div.tabs');
- const children = tabs.childNodes;
+ const children = tabs?.childNodes;
expect(tabs).toBeInTheDocument();
- expect(children.length).toBe(list.length);
+ expect(children?.length).toBe(list.length);
});
diff --git a/tests/unit/elements/inputSelect.test.ts b/tests/unit/elements/inputSelect.test.ts
index b199e0861..dcc631fb7 100644
--- a/tests/unit/elements/inputSelect.test.ts
+++ b/tests/unit/elements/inputSelect.test.ts
@@ -97,8 +97,8 @@ test('state', async () => {
expect(component.value).toEqual('');
await userEvent.selectOptions(select, '1');
- expect(component.value).toEqual(options[1].value);
+ expect(component.value).toEqual(options[1]?.value);
await userEvent.selectOptions(select, '2');
- expect(component.value).toEqual(options[2].value);
+ expect(component.value).toEqual(options[2]?.value);
});
diff --git a/tests/unit/elements/inputTags.test.ts b/tests/unit/elements/inputTags.test.ts
index 382c5d57f..66f1bf86b 100644
--- a/tests/unit/elements/inputTags.test.ts
+++ b/tests/unit/elements/inputTags.test.ts
@@ -75,14 +75,14 @@ test('removes tag on click', async () => {
expect(component.tags).toContain('second');
const first = getByText('first').nextElementSibling;
- await fireEvent.click(first);
+ first && (await fireEvent.click(first));
expect(component.tags).toHaveLength(1);
expect(component.tags).toContain('second');
expect(component.tags).not.toContain('first');
expect(queryByText('first')).not.toBeInTheDocument();
const second = getByText('second').nextElementSibling;
- await fireEvent.click(second);
+ second && (await fireEvent.click(second));
expect(component.tags).toHaveLength(0);
expect(component.tags).not.toContain('second');
expect(component.tags).not.toContain('first');
diff --git a/tests/unit/helpers/date.test.ts b/tests/unit/helpers/date.test.ts
index 4b67f4f3d..91508f56e 100644
--- a/tests/unit/helpers/date.test.ts
+++ b/tests/unit/helpers/date.test.ts
@@ -2,10 +2,12 @@ import '@testing-library/jest-dom';
import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
describe('local date', () => {
- [
+ const dates = [
['2022-11-15 08:26:28', 'Nov 15, 2022'],
['2022-11-15 00:26:28', 'Nov 15, 2022']
- ].forEach(([value, expected]) => {
+ ] as const;
+
+ dates.forEach(([value, expected]) => {
it(value, () => {
expect(toLocaleDate(value)).toBe(expected);
});
@@ -13,10 +15,12 @@ describe('local date', () => {
});
describe('local date time', () => {
- [
+ const dates = [
['2022-11-15 08:26:28', 'Nov 15, 2022, 08:26'],
['2022-11-15 00:26:28', 'Nov 15, 2022, 00:26']
- ].forEach(([value, expected]) => {
+ ] as const;
+
+ dates.forEach(([value, expected]) => {
it(value, () => {
expect(toLocaleDateTime(value)).toBe(expected);
});
diff --git a/tests/unit/layout/wizard.test.ts b/tests/unit/layout/wizard.test.ts
index b985b96d1..699b8b4a2 100644
--- a/tests/unit/layout/wizard.test.ts
+++ b/tests/unit/layout/wizard.test.ts
@@ -95,7 +95,7 @@ test('intercepts submit', async () => {
expect(step1Required).toBeInTheDocument();
expect(step1Optional).toBeInTheDocument();
- await userEvent.type(step1Required, 'fail');
+ await userEvent.type(step1Required as Element, 'fail');
form.submit();
await tick();
@@ -103,7 +103,7 @@ test('intercepts submit', async () => {
expect(step1Required).toBeInTheDocument();
expect(step1Optional).toBeInTheDocument();
- await userEvent.type(step1Required, 'works');
+ await userEvent.type(step1Required as Element, 'works');
form.submit();
await tick();
diff --git a/tsconfig.json b/tsconfig.json
index d164d251e..9716fecb7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,9 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
- "lib": ["webworker"],
+ "lib": [
+ "webworker"
+ ],
"module": "ESNext",
"moduleResolution": "Node",
"importsNotUsedAsValues": "error",
@@ -9,6 +11,7 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"esModuleInterop": true,
- "resolveJsonModule": true
+ "resolveJsonModule": true,
+ "strictNullChecks": true
}
-}
+}
\ No newline at end of file