Merge pull request #55 from bartstc/chore/typecheck

bartstc · web-flow · commit d0eaf708fc1f · 2026-04-17T23:48:59.000+02:00
chore: add typecheck script and CI job, fix Permission imports
diff --git a/.claude/rules/architecture.md b/.claude/rules/architecture.md
@@ -9,8 +9,9 @@ paths:
 ## Project Structure
 
 - `src/features/` — feature modules using feature slice architecture
-- `src/lib/api/` — centralized API layer: queryOptions factories, mutations, DTOs by resource
 - `src/lib/` — shared utilities, components, HTTP client, i18n, routing, theme
+  . `src/lib/api/` — centralized API layer: queryOptions factories, mutations, DTOs by resource
+  - `src/lib/permissions/` — permission gating utilities. Available permissions: `@/features/authv2/models/permissions`
 - `src/pages/` — route-level page components composing features
 - `src/app/` — app-level config (App.tsx, Providers.tsx)
 - `e2e/` — Playwright end-to-end tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,12 @@ jobs:
       test-type: lint
       test-command: pnpm lint
 
+  typecheck:
+    uses: ./.github/workflows/run-tests.yml
+    with:
+      test-type: typecheck
+      test-command: pnpm typecheck
+
   playwright-tests:
     uses: ./.github/workflows/playwright.yml
     with:
@@ -152,7 +158,8 @@ jobs:
           path: coverage/**/*
 
   build:
-    needs: [lint-tests, unit-tests, storybook-tests, playwright-tests]
+    needs:
+      [lint-tests, typecheck, unit-tests, storybook-tests, playwright-tests]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -9,6 +9,7 @@ TypeScript SPA. React 19, Vite 7, React Router 7, TanStack Query, Zustand, XStat
 ## Commands
 
 - `pnpm dev` — start dev server (port 5173)
+- `pnpm typecheck` — type-check all sources (src, e2e, stories, tests)
 - `pnpm lint --fix` — lint and auto-fix
 - `pnpm test` — all tests (unit + storybook)
 - `pnpm test:e2e` — Playwright E2E (headless)
diff --git a/README.md b/README.md
@@ -79,6 +79,7 @@ It's recommended to run the dev server inside a container for consistent Node/PN
 | `pnpm dev`             | Dev server with HMR on port `5173`         |
 | `pnpm dev:server`      | Local API server only on port `3001`       |
 | `pnpm dev:all`         | Frontend + API server together             |
+| `pnpm typecheck`       | Type-check all sources without emitting    |
 | `pnpm lint`            | Check for lint errors                      |
 | `pnpm build`           | Production build                           |
 | `pnpm test`            | Run all tests (unit + storybook)           |
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "test:e2e:ci": "playwright test --reporter=junit --reporter=html --reporter=json",
     "test:coverage": "vitest run --coverage",
     "preview": "vite preview",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint . --ignore-pattern '*.d.ts' --report-unused-disable-directives --max-warnings 0",
     "prepare": "husky install",
     "storybook": "storybook dev -p 6006",
diff --git a/server/src/db/db.json b/server/src/db/db.json
@@ -518,10 +518,18 @@
     {
       "id": "00000000-0000-0000-0000-000000000001",
       "userId": 1,
-      "date": "2026-04-11T08:01:51.825Z",
+      "date": "2026-04-14T14:13:41.156Z",
       "products": [
         {
-          "productId": "4f968992-1aab-49c9-8913-09405915c1c6",
+          "productId": "4f968992-1aab-49c9-8913-09405915c1c8",
+          "quantity": 1
+        },
+        {
+          "productId": "4f968992-1aab-49c9-8913-09405915c1c9",
+          "quantity": 1
+        },
+        {
+          "productId": "4f968992-1aab-49c9-8913-09405915c1c1",
           "quantity": 1
         }
       ]
diff --git a/src/features/authv2/application/auth-machine.test.ts b/src/features/authv2/application/auth-machine.test.ts
@@ -1,7 +1,8 @@
 import { describe, it, expect, vi } from "vitest";
 import { createActor, fromPromise } from "xstate";
 
-import { Permission, Role } from "@/features/authv2/models/user-roles";
+import { Permission } from "@/features/authv2/models/permissions";
+import { Role } from "@/features/authv2/models/user-roles";
 import { sleep } from "@/lib/sleep";
 import type { OneOfUnion } from "@/lib/types/one-of-union";
 import { UserFixture } from "@/test-lib/fixtures/user-fixture";
diff --git a/src/features/authv2/models/permissions.ts b/src/features/authv2/models/permissions.ts
@@ -0,0 +1,5 @@
+export enum Permission {
+  Read = "read",
+  Write = "write",
+  Edit = "edit",
+}
diff --git a/src/features/authv2/models/user-roles.ts b/src/features/authv2/models/user-roles.ts
@@ -1,8 +1,4 @@
-export enum Permission {
-  Read = "read",
-  Write = "write",
-  Edit = "edit",
-}
+import type { Permission } from "@/features/authv2/models/permissions";
 
 export enum Role {
   Reader = "reader",
diff --git a/src/features/authv2/providers/get-roles.ts b/src/features/authv2/providers/get-roles.ts
@@ -1,8 +1,5 @@
-import {
-  Permission,
-  Role,
-  type UserRoles,
-} from "@/features/authv2/models/user-roles";
+import { Permission } from "@/features/authv2/models/permissions";
+import { Role, type UserRoles } from "@/features/authv2/models/user-roles";
 import { sleep } from "@/lib/sleep";
 
 export async function getRoles(): Promise<UserRoles> {
diff --git a/src/lib/permissions/use-has-all-permissions.ts b/src/lib/permissions/use-has-all-permissions.ts
diff --git a/src/lib/permissions/use-has-permission.ts b/src/lib/permissions/use-has-permission.ts
@@ -1,17 +1,31 @@
 /* eslint-disable import/no-restricted-paths */
 import { useAuthorizedContextSelector } from "@/features/authv2/application/use-authorized-context-selector";
-import type { Permission } from "@/features/authv2/models/user-roles";
+import type { Permission } from "@/features/authv2/models/permissions";
 
-export const useHasPermission = (permission: Permission | Permission[]) => {
+type PermissionQuery =
+  | Permission
+  | { permissions: Permission[]; match?: "all" | "oneOf" };
+
+export const useHasPermission = (query: PermissionQuery): boolean => {
   const availablePermissions = useAuthorizedContextSelector(
     (context) => context.roles.permissions
   );
 
-  if (Array.isArray(permission)) {
-    return permission.some((perm) =>
+  if (typeof query === "string") {
+    return !!availablePermissions?.some((p) => p === query);
+  }
+
+  const { permissions, match = "all" } = query;
+
+  if (!permissions.length) return false;
+
+  if (match === "oneOf") {
+    return permissions.some((perm) =>
       availablePermissions?.some((p) => p === perm)
     );
   }
 
-  return !!availablePermissions?.find((p) => p === permission);
+  return permissions.every((perm) =>
+    availablePermissions?.some((p) => p === perm)
+  );
 };
diff --git a/src/lib/permissions/when-permitted-to.tsx b/src/lib/permissions/when-permitted-to.tsx
@@ -1,8 +1,7 @@
 import type { ComponentType } from "react";
 
 // eslint-disable-next-line import/no-restricted-paths
-import type { Permission } from "@/features/authv2/models/user-roles";
-import { useHasAllPermissions } from "@/lib/permissions/use-has-all-permissions";
+import type { Permission } from "@/features/authv2/models/permissions";
 import { useHasPermission } from "@/lib/permissions/use-has-permission";
 
 interface WhenPermittedToFn {
@@ -44,7 +43,7 @@ const whenPermittedToOneOf = <P extends object>(
 ) => {
   return (Component: ComponentType<P>): ComponentType<P> => {
     const WrapperComponent = (props: P) => {
-      const hasPermission = useHasPermission(permissions);
+      const hasPermission = useHasPermission({ permissions, match: "oneOf" });
 
       if (!hasPermission) {
         return Fallback ? <Fallback /> : null;
@@ -62,7 +61,7 @@ const whenPermittedToAll = <P extends object>(
 ) => {
   return (Component: ComponentType<P>): ComponentType<P> => {
     const WrapperComponent = (props: P) => {
-      const hasPermission = useHasAllPermissions(permissions);
+      const hasPermission = useHasPermission({ permissions, match: "all" });
 
       if (!hasPermission) {
         return Fallback ? <Fallback /> : null;

Original file line number	Diff line number	Diff line change
`@@ -518,10 +518,18 @@`
`518`	`518`	`{`
`519`	`519`	`"id": "00000000-0000-0000-0000-000000000001",`
`520`	`520`	`"userId": 1,`
`521`		`- "date": "2026-04-11T08:01:51.825Z",`
	`521`	`+ "date": "2026-04-14T14:13:41.156Z",`
`522`	`522`	`"products": [`
`523`	`523`	`{`
`524`		`- "productId": "4f968992-1aab-49c9-8913-09405915c1c6",`
	`524`	`+ "productId": "4f968992-1aab-49c9-8913-09405915c1c8",`
	`525`	`+ "quantity": 1`
	`526`	`+ },`
	`527`	`+ {`
	`528`	`+ "productId": "4f968992-1aab-49c9-8913-09405915c1c9",`
	`529`	`+ "quantity": 1`
	`530`	`+ },`
	`531`	`+ {`
	`532`	`+ "productId": "4f968992-1aab-49c9-8913-09405915c1c1",`
`525`	`533`	`"quantity": 1`
`526`	`534`	`}`
`527`	`535`	`]`