@tailor-platform/erp-kit 0.3.0 → 0.4.1

package/src/shared/createContext.ts

@@ -3,7 +3,7 @@ import type { CommandContext } from "./types";
 interface ResolverContext {
   user: {
     id: string;
-    attributes: { permissions?: string[] } | null;
+    attributes: { permissions?: string[]; companyId?: string | null } | null;
   };
 }
 
@@ -11,5 +11,6 @@ export function createContext(context: ResolverContext): CommandContext {
   return {
     actorId: context.user.id,
     permissions: [...new Set(context.user.attributes?.permissions ?? [])],
+    companyId: context.user.attributes?.companyId,
   };
 }

package/src/shared/defineQuery.ts

@@ -1,4 +1,7 @@
 import type { QueryContext } from "./types";
+import type { Result } from "./result";
+import { requirePermission } from "./requirePermission";
+import type { InsufficientPermissionError } from "./errors";
 
 export type Query<TInput, TResult> = (
   db: unknown,
@@ -6,10 +9,42 @@ export type Query<TInput, TResult> = (
   ctx: QueryContext,
 ) => Promise<TResult>;
 
+type QueryResult<TReturn> =
+  TReturn extends Result<infer _V, infer _E>
+    ? TReturn | Result<never, InstanceType<typeof InsufficientPermissionError>>
+    : TReturn;
+
+// Overload: no permission
+export function defineQuery<TInput, TResult>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  impl: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
+): Query<TInput, TResult>;
+
+// Overload: with permission
 export function defineQuery<TInput, TResult>(
+  permission: string,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   impl: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
-): Query<TInput, TResult> {
+): Query<TInput, QueryResult<TResult>>;
+
+// Implementation
+export function defineQuery<TInput, TResult>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  permissionOrImpl: string | ((db: any, input: TInput, ctx: QueryContext) => Promise<TResult>),
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  maybeImpl?: (db: any, input: TInput, ctx: QueryContext) => Promise<TResult>,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+): Query<TInput, any> {
+  if (typeof permissionOrImpl === "string") {
+    const permission = permissionOrImpl;
+    const impl = maybeImpl!;
+    return async (db, input, ctx) => {
+      const check = requirePermission(ctx, permission);
+      if (!check.ok) return check;
+      return impl(db, input, ctx);
+    };
+  }
+  const impl = permissionOrImpl;
   return async (db, input, ctx) => {
     return impl(db, input, ctx);
   };

package/src/shared/requirePermission.ts

@@ -1,13 +1,13 @@
-import type { CommandContext } from "./types";
+import type { CommandContext, QueryContext } from "./types";
 import type { Result } from "./result";
 import { InsufficientPermissionError } from "./errors";
 import { ok, err } from "./result";
 
 export function requirePermission(
-  ctx: CommandContext,
+  ctx: CommandContext | QueryContext,
   key: string,
 ): Result<void, InstanceType<typeof InsufficientPermissionError>> {
-  if (!ctx.permissions.includes(key)) {
+  if (!ctx.permissions?.includes(key)) {
     return err(new InsufficientPermissionError(ctx.actorId, key));
   }
   return ok(undefined);

package/src/shared/types.ts

@@ -1,10 +1,13 @@
 export interface QueryContext {
   actorId: string;
+  permissions?: readonly string[];
+  companyId?: string | null;
 }
 
 export interface CommandContext {
   actorId: string;
   permissions: readonly string[];
+  companyId?: string | null;
 }
 
 // Strips write methods (updateTable, insertInto, deleteFrom) from a Kysely DB instance.

package/templates/scaffold/app/backend/package.json

@@ -15,14 +15,15 @@
   "dependencies": {
     "@tailor-platform/erp-kit": "workspace:*",
     "@tailor-platform/function-kysely-tailordb": "0.1.3",
-    "@tailor-platform/sdk": "1.25.1",
+    "@tailor-platform/sdk": "1.25.2",
     "kysely": "0.28.11"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.4",
+    "@eslint/js": "10.0.1",
     "@tailor-platform/function-types": "0.8.2",
     "@types/node": "24.12.0",
-    "eslint": "9.39.4",
+    "@typescript-eslint/parser": "^8.57.0",
+    "eslint": "10.0.3",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import-x": "4.16.2",
     "typescript": "5.9.3",

package/templates/scaffold/app/frontend/eslint.config.js

@@ -31,6 +31,18 @@ export default defineConfig([
     rules: {
       "import-x/order": "error",
       "import-x/no-unresolved": ["error", { ignore: ["^@tailor-platform/"] }],
+      "no-restricted-imports": [
+        "error",
+        {
+          paths: [
+            {
+              name: "@tailor-platform/app-shell",
+              importNames: ["useToast"],
+              message: "Import useToast from '@/hooks/use-toast' instead.",
+            },
+          ],
+        },
+      ],
     },
   },
   {

package/templates/scaffold/app/frontend/package.json

@@ -7,6 +7,7 @@
     "dev": "vite",
     "preview": "vite preview",
     "generate": "node --env-file=.env ./scripts/generate-graphql.mjs",
+    "gql-tada:check": "gql-tada check -c tsconfig.app.json",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "typecheck": "tsc --noEmit"
@@ -28,26 +29,28 @@
     "zod": "4.3.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.4",
+    "@eslint/js": "10.0.1",
+    "@rolldown/plugin-babel": "0.2.1",
     "@tailor-platform/app-shell-vite-plugin": "0.1.0",
     "@tailwindcss/vite": "4.2.1",
     "@types/node": "25.5.0",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "@vitejs/plugin-react": "5.2.0",
+    "@typescript-eslint/parser": "^8.57.0",
+    "@vitejs/plugin-react": "6.0.1",
     "babel-plugin-react-compiler": "1.0.0",
-    "eslint": "9.39.4",
+    "eslint": "10.0.3",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import-x": "4.16.2",
-    "eslint-plugin-react-dom": "2.13.0",
+    "eslint-plugin-react-dom": "3.0.0",
     "eslint-plugin-react-hooks": "7.0.1",
-    "eslint-plugin-react-x": "2.13.0",
+    "eslint-plugin-react-x": "3.0.0",
     "globals": "17.4.0",
-    "shadcn": "^3.8.4",
+    "shadcn": "^4.0.0",
     "tailwindcss": "4.2.1",
     "tw-animate-css": "1.4.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.57.0",
-    "vite": "7.3.1"
+    "vite": "8.0.0"
   }
 }

package/templates/scaffold/app/frontend/src/hooks/use-toast.ts

@@ -0,0 +1,30 @@
+// eslint-disable-next-line no-restricted-imports -- this is the wrapper itself
+import { useToast as useBaseToast } from "@tailor-platform/app-shell";
+import type { CombinedError } from "urql";
+
+// Extract a human-readable error message from a urql CombinedError.
+// Backend resolver errors are wrapped as "rpc error: code = ... desc = Error: <message>"
+// inside extensions.attr.error. This function extracts <message> when available.
+function getErrorMessage(error: CombinedError): string {
+  const gqlError = error.graphQLErrors[0];
+  const attrError = (gqlError?.extensions as Record<string, Record<string, string>> | undefined)
+    ?.attr?.error;
+  if (attrError) {
+    const match = /desc = Error: (.+?)(?:\n|$)/.exec(attrError);
+    if (match) return match[1];
+  }
+  return error.message;
+}
+
+// Wraps useToast so that toast.error() accepts a CombinedError directly
+// and automatically extracts the human-readable message.
+export function useToast() {
+  const toast = useBaseToast();
+  return {
+    ...toast,
+    error: (error: string | CombinedError) => {
+      const message = typeof error === "string" ? error : getErrorMessage(error);
+      toast.error(message);
+    },
+  };
+}

package/templates/scaffold/app/frontend/src/pages/user-management/user/create/components/create-user-form.tsx

@@ -1,9 +1,10 @@
-import { useNavigate, useToast } from "@tailor-platform/app-shell";
+import { useNavigate } from "@tailor-platform/app-shell";
 import { useMutation } from "urql";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import { graphql } from "@/graphql";
+import { useToast } from "@/hooks/use-toast";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import {
@@ -46,7 +47,7 @@ export const CreateUserForm = () => {
   const onSubmit = (values: FormValues) => {
     void createUser(values, { additionalTypenames: ["User"] }).then((result) => {
       if (result.error) {
-        toast.error(result.error.message);
+        toast.error(result.error);
         return;
       }
       toast.success("User created successfully");

package/templates/scaffold/app/frontend/vite.config.ts

@@ -1,16 +1,16 @@
 import path from "node:path";
 import tailwindcss from "@tailwindcss/vite";
-import react from "@vitejs/plugin-react";
+import react, { reactCompilerPreset } from "@vitejs/plugin-react";
+import babel from "@rolldown/plugin-babel";
 import { appShellRoutes } from "@tailor-platform/app-shell-vite-plugin";
 import { defineConfig } from "vite";
 
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [
-    react({
-      babel: {
-        plugins: [["babel-plugin-react-compiler"]],
-      },
+    react(),
+    babel({
+      presets: [reactCompilerPreset()],
     }),
     tailwindcss(),
     appShellRoutes(),

package/templates/scaffold/module/lib/types.ts

@@ -1,4 +1,9 @@
-import type { InferSchema, Selectable, Insertable, Updateable } from "../../../shared";
 import type { DB } from "../generated/kysely-tailordb";
+import type {
+  InferSchema,
+  Selectable,
+  Insertable,
+  Updateable,
+} from "@tailor-platform/erp-kit/module";
 
 export type Schema = InferSchema<DB>;

package/templates/scaffold/module/permissions.ts

@@ -1,3 +1,3 @@
-import { definePermissions } from "../../shared";
+import { definePermissions } from "@tailor-platform/erp-kit/module";
 
 export const { permissions, own, all } = definePermissions("template-module", [] as const);

package/src/commands/module/list.test.ts

@@ -1,57 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { listModules, formatModuleList } from "./list";
-
-describe("listModules", () => {
-  it("returns the built-in modules with counts", () => {
-    const modules = listModules();
-    expect(modules.length).toBeGreaterThan(0);
-
-    const primitives = modules.find((m) => m.name === "primitives");
-    expect(primitives).toBeDefined();
-    expect(primitives!.commands).toBeGreaterThan(0);
-    expect(primitives!.models).toBeGreaterThan(0);
-    expect(primitives!.features).toBeGreaterThan(0);
-  });
-
-  it("returns zero counts for stub modules", () => {
-    const modules = listModules();
-    const inventory = modules.find((m) => m.name === "inventory");
-    expect(inventory).toBeDefined();
-    expect(inventory!.commands).toBe(0);
-    expect(inventory!.models).toBe(0);
-    expect(inventory!.features).toBe(0);
-  });
-
-  it("excludes shared and testing directories", () => {
-    const modules = listModules();
-    const names = modules.map((m) => m.name);
-    expect(names).not.toContain("shared");
-    expect(names).not.toContain("testing");
-  });
-
-  it("returns modules in alphabetical order", () => {
-    const modules = listModules();
-    const names = modules.map((m) => m.name);
-    const sorted = [...names].sort();
-    expect(names).toEqual(sorted);
-  });
-});
-
-describe("formatModuleList", () => {
-  it("formats modules with counts", () => {
-    const output = formatModuleList([
-      { name: "primitives", commands: 14, models: 4, features: 4 },
-      { name: "inventory", commands: 0, models: 0, features: 0 },
-    ]);
-    expect(output).toContain("primitives");
-    expect(output).toContain("14 commands");
-    expect(output).toContain("4 models");
-    expect(output).toContain("4 features");
-    expect(output).toContain("inventory");
-    expect(output).toContain("2 modules");
-  });
-
-  it("handles empty list", () => {
-    expect(formatModuleList([])).toBe("No modules found.");
-  });
-});

package/src/commands/module/list.ts

@@ -1,64 +0,0 @@
-import { readdirSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import chalk from "chalk";
-import { PACKAGE_ROOT } from "../../util";
-
-const MODULES_DIR = join(PACKAGE_ROOT, "src", "modules");
-const EXCLUDED_DIRS = new Set(["shared", "testing"]);
-
-export interface ModuleInfo {
-  name: string;
-  commands: number;
-  models: number;
-  features: number;
-}
-
-function countFiles(dir: string, pattern: RegExp, exclusions: RegExp[]): number {
-  if (!existsSync(dir)) return 0;
-  return readdirSync(dir).filter((f) => pattern.test(f) && !exclusions.some((p) => p.test(f)))
-    .length;
-}
-
-export function listModules(): ModuleInfo[] {
-  if (!existsSync(MODULES_DIR)) return [];
-  return readdirSync(MODULES_DIR, { withFileTypes: true })
-    .filter((d) => d.isDirectory() && !EXCLUDED_DIRS.has(d.name))
-    .map((d) => {
-      const modDir = join(MODULES_DIR, d.name);
-      return {
-        name: d.name,
-        commands: countFiles(join(modDir, "command"), /\.ts$/, [/\.test\.ts$/]),
-        models: countFiles(join(modDir, "db"), /\.ts$/, [/\.test\.ts$/, /^index\.ts$/]),
-        features: countFiles(join(modDir, "docs", "features"), /\.md$/, []),
-      };
-    })
-    .sort((a, b) => a.name.localeCompare(b.name));
-}
-
-export function formatModuleList(modules: ModuleInfo[]): string {
-  if (modules.length === 0) return "No modules found.";
-
-  const lines: string[] = [];
-  lines.push(chalk.bold("Modules:\n"));
-
-  const nameWidth = Math.max(...modules.map((m) => m.name.length), 4);
-
-  for (const mod of modules) {
-    const counts = [
-      `${mod.commands} commands`,
-      `${mod.models} models`,
-      `${mod.features} features`,
-    ].join(", ");
-    lines.push(`  ${mod.name.padEnd(nameWidth)}  ${counts}`);
-  }
-
-  lines.push("");
-  lines.push(`${modules.length} modules`);
-  return lines.join("\n");
-}
-
-export function runModuleList(): number {
-  const modules = listModules();
-  console.log(formatModuleList(modules));
-  return 0;
-}

package/templates/scaffold/module/lib/errors.ts

@@ -1 +0,0 @@
-import { createDomainError } from "../../../shared";