@pablozaiden/webapp 0.6.2 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -3
- package/src/web/theme.tsx +4 -4
- package/src/web/webapp-config.tsx +15 -15
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pablozaiden/webapp",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3",
|
|
4
4
|
"description": "Opinionated Bun + React webapp framework for single-server apps",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -33,13 +33,15 @@
|
|
|
33
33
|
"dev": "bun run --cwd examples/notes-todo dev",
|
|
34
34
|
"dev:kitchen-sink": "bun run --cwd examples/kitchen-sink dev",
|
|
35
35
|
"dev:notes-todo": "bun run --cwd examples/notes-todo dev",
|
|
36
|
-
"build": "bun run
|
|
36
|
+
"build": "bun run typecheck && bun run build:examples",
|
|
37
|
+
"build:examples": "bun run --cwd examples/kitchen-sink build && bun run --cwd examples/notes-todo build",
|
|
37
38
|
"build:kitchen-sink": "bun run --cwd examples/kitchen-sink build",
|
|
38
39
|
"build:notes-todo": "bun run --cwd examples/notes-todo build",
|
|
39
40
|
"test": "bun run test:build-binary && bun run test:remaining",
|
|
40
41
|
"test:build-binary": "bun test tests/build-binary.test.ts",
|
|
41
42
|
"test:remaining": "bun test --path-ignore-patterns=**/build-binary.test.ts",
|
|
42
|
-
"
|
|
43
|
+
"typecheck": "mkdir -p .cache/tsc && bunx tsc --noEmit --pretty false --incremental --tsBuildInfoFile .cache/tsc/build.tsbuildinfo",
|
|
44
|
+
"tsc": "bun run typecheck"
|
|
43
45
|
},
|
|
44
46
|
"dependencies": {
|
|
45
47
|
"@simplewebauthn/browser": "13.3.0",
|
package/src/web/theme.tsx
CHANGED
|
@@ -43,10 +43,10 @@ function readSystemTheme(): ResolvedTheme {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
function parseThemeResponse(value: unknown): ThemePreference {
|
|
46
|
-
if (!isRecord(value) || !isThemePreference(value
|
|
46
|
+
if (!isRecord(value) || !isThemePreference(value["theme"])) {
|
|
47
47
|
throw new Error("Theme preference response was invalid.");
|
|
48
48
|
}
|
|
49
|
-
return value
|
|
49
|
+
return value["theme"];
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
function toError(value: unknown): Error {
|
|
@@ -97,8 +97,8 @@ export function ThemeProvider({ userId, children }: { userId?: string; children:
|
|
|
97
97
|
const root = document.documentElement;
|
|
98
98
|
root.classList.toggle("dark", resolvedTheme === "dark");
|
|
99
99
|
root.style.colorScheme = resolvedTheme;
|
|
100
|
-
root.dataset
|
|
101
|
-
root.dataset
|
|
100
|
+
root.dataset["theme"] = preference;
|
|
101
|
+
root.dataset["resolvedTheme"] = resolvedTheme;
|
|
102
102
|
window.localStorage.setItem(THEME_STORAGE_KEY, preference);
|
|
103
103
|
}, [preference, resolvedTheme]);
|
|
104
104
|
|
|
@@ -21,11 +21,11 @@ function isLogLevelName(value: unknown): boolean {
|
|
|
21
21
|
|
|
22
22
|
function isCurrentUser(value: unknown): boolean {
|
|
23
23
|
return isRecord(value)
|
|
24
|
-
&& typeof value
|
|
25
|
-
&& typeof value
|
|
26
|
-
&& (value
|
|
27
|
-
&& typeof value
|
|
28
|
-
&& typeof value
|
|
24
|
+
&& typeof value["id"] === "string"
|
|
25
|
+
&& typeof value["username"] === "string"
|
|
26
|
+
&& (value["role"] === "owner" || value["role"] === "admin" || value["role"] === "user")
|
|
27
|
+
&& typeof value["isOwner"] === "boolean"
|
|
28
|
+
&& typeof value["isAdmin"] === "boolean";
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
function hasBooleanFields(value: unknown, fields: readonly string[]): boolean {
|
|
@@ -34,10 +34,10 @@ function hasBooleanFields(value: unknown, fields: readonly string[]): boolean {
|
|
|
34
34
|
|
|
35
35
|
function isWebAppConfigResponse(value: unknown): value is WebAppConfigResponse {
|
|
36
36
|
return isRecord(value)
|
|
37
|
-
&& typeof value
|
|
38
|
-
&& typeof value
|
|
39
|
-
&& (value
|
|
40
|
-
&& hasBooleanFields(value
|
|
37
|
+
&& typeof value["appName"] === "string"
|
|
38
|
+
&& typeof value["version"] === "string"
|
|
39
|
+
&& (value["currentUser"] === undefined || isCurrentUser(value["currentUser"]))
|
|
40
|
+
&& hasBooleanFields(value["passkeyAuth"], [
|
|
41
41
|
"enabled",
|
|
42
42
|
"passkeyConfigured",
|
|
43
43
|
"passkeyDisabled",
|
|
@@ -46,12 +46,12 @@ function isWebAppConfigResponse(value: unknown): value is WebAppConfigResponse {
|
|
|
46
46
|
"bootstrapRequired",
|
|
47
47
|
"ownerPasskeySetupRequired",
|
|
48
48
|
])
|
|
49
|
-
&& hasBooleanFields(value
|
|
50
|
-
&& isRecord(value
|
|
51
|
-
&& isLogLevelName(value
|
|
52
|
-
&& typeof value
|
|
53
|
-
&& hasBooleanFields(value
|
|
54
|
-
&& hasBooleanFields(value
|
|
49
|
+
&& hasBooleanFields(value["userManagement"], ["enabled", "canManageUsers"])
|
|
50
|
+
&& isRecord(value["logLevel"])
|
|
51
|
+
&& isLogLevelName(value["logLevel"]["level"])
|
|
52
|
+
&& typeof value["logLevel"]["fromEnv"] === "boolean"
|
|
53
|
+
&& hasBooleanFields(value["deviceAuth"], ["enabled"])
|
|
54
|
+
&& hasBooleanFields(value["apiKeys"], ["enabled"]);
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
export function parseWebAppConfigResponse(value: unknown): WebAppConfigResponse {
|