@flaredev/cli 0.3.0 → 0.4.0

package/templates/app/lib/dashboard.ts

@@ -1,138 +1,165 @@
-import { headers } from "next/headers";
-import { notFound, redirect } from "next/navigation";
-import { allowedActions, can, type Policy, type PolicyAction, type Resource } from "@flaredev/core";
-import { and, count, gte, lt } from "drizzle-orm";
-import type { SQLiteTable } from "drizzle-orm/sqlite-core";
-import { createResourceStore, type ResourceStore } from "@flaredev/core/server";
-import { getDb } from "@/db";
-import { policies } from "@/policies";
-import { resourceTables } from "@/resources/server";
-import { auth } from "./auth";
-import { cached, resourceTag, revalidateResource, TTL } from "./cache";
-
-/**
- * Roles that always reach the dashboard, whatever the policies say. Other roles get in when a
- * policy grants them read access to at least one resource.
- * Register roles with `flare role:add`, assign with `flare user:role`.
- */
-export const ADMIN_ROLES = ["admin", "staff"];
-
-export function policyFor(resourceName: string): Policy | undefined {
-  return (policies as Record<string, Policy | undefined>)[resourceName];
-}
-
-export async function dashboardSession() {
-  const session = await auth.api.getSession({ headers: await headers() });
-  if (!session) return { session: null, role: null, allowed: false } as const;
-  const role = (session.user as { role?: string | null }).role ?? null;
-  const readable = allResources().some((resource) => can(policyFor(resource.name), role, "read"));
-  return { session, role, allowed: (role !== null && ADMIN_ROLES.includes(role)) || readable } as const;
-}
-
-/** For admin pages: redirects signed-out visitors to sign-in and users without access to the home page. */
-export async function requireDashboard(returnTo = "/dashboard") {
-  const { session, role, allowed } = await dashboardSession();
-  if (!session) redirect(`/sign-in?next=${encodeURIComponent(returnTo)}`);
-  if (!allowed) redirect("/?error=forbidden");
-  return { session, role };
-}
-
-/**
- * For resource pages: also requires the policy to allow `action` on this resource.
- * Sends the user somewhere they can actually go — the list when they may read it,
- * the dashboard when they may not.
- */
-export async function requireAccess(resource: Resource, action: PolicyAction) {
-  const { session, role } = await requireDashboard(resourcePath(resource));
-  const policy = policyFor(resource.name);
-  if (!can(policy, role, action)) {
-    redirect(action !== "read" && can(policy, role, "read") ? resourcePath(resource) : "/dashboard?error=forbidden");
-  }
-  return { session, role };
-}
-
-/** What the current user may do with a resource, for hiding actions they can't use. */
-export async function adminPermissions(resourceName: string) {
-  const { role } = await dashboardSession();
-  return allowedActions(policyFor(resourceName), role);
-}
-
-const stores = new Map<string, ResourceStore>();
-
-/** CRUD store for a resource by name (404 for unknown names). */
-export function dashboardStore(name: string): ResourceStore {
-  const entry = (resourceTables as unknown as Record<string, { resource: Resource; table: SQLiteTable } | undefined>)[name];
-  if (!entry) notFound();
-  let store = stores.get(name);
-  if (!store) {
-    store = createResourceStore({ resource: entry.resource, table: entry.table, getDb, onChange: revalidateResource });
-    stores.set(name, store);
-  }
-  return store;
-}
-
-/**
- * How many records a resource has. Cached in the data cache under the resource's tag,
- * so the dashboard does not count every table on every visit, and a write through the
- * admin or the API drops the count on its way out.
- */
-export function recordCount(name: string): Promise<number> {
-  const count = cached(
-    async (resourceName: string) => {
-      const result = await dashboardStore(resourceName).list(new URLSearchParams({ perPage: "1" }));
-      return result.ok ? result.data.meta.total : 0;
-    },
-    ["flare", "record-count"],
-    { tags: [resourceTag(name)], revalidate: TTL.short },
-  );
-  return count(name);
-}
-
-/**
- * How many records a resource gained in the last `days` days, and in the `days` before
- * that, so a stat can show which way it's going. Cached like the totals.
- */
-export function recentCounts(name: string, days = 7): Promise<{ current: number; previous: number }> {
-  const counts = cached(
-    async (resourceName: string, windowDays: number) => {
-      const entry = (resourceTables as unknown as Record<string, { table: SQLiteTable } | undefined>)[resourceName];
-      const createdAt = entry ? (entry.table as unknown as Record<string, unknown>).createdAt : undefined;
-      // A resource whose table has no createdAt (a custom one) simply has no trend.
-      if (!entry || !createdAt) return { current: 0, previous: 0 };
-      const window = windowDays * 86_400_000;
-      const since = new Date(Date.now() - window);
-      const before = new Date(Date.now() - window * 2);
-      const column = createdAt as never;
-      const [current] = await getDb().select({ total: count() }).from(entry.table).where(gte(column, since));
-      const [previous] = await getDb()
-        .select({ total: count() })
-        .from(entry.table)
-        .where(and(gte(column, before), lt(column, since)));
-      return { current: current?.total ?? 0, previous: previous?.total ?? 0 };
-    },
-    ["flare", "recent-count"],
-    { tags: [resourceTag(name)], revalidate: TTL.short },
-  );
-  return counts(name, days);
-}
-
-/** Percentage change between two periods, or undefined when there's nothing to compare. */
-export function trend(current: number, previous: number): number | undefined {
-  if (previous === 0) return current === 0 ? undefined : 100;
-  return ((current - previous) / previous) * 100;
-}
-
-/** Every resource descriptor (unfiltered): navigation uses `visibleResources()` instead. */
-export function allResources(): Resource[] {
-  return Object.values(resourceTables as unknown as Record<string, { resource: Resource }>).map((entry) => entry.resource);
-}
-
-/** Resources the current user may read, for the sidebar and dashboard. */
-export async function visibleResources(): Promise<Resource[]> {
-  const { role } = await dashboardSession();
-  return allResources().filter((resource) => can(policyFor(resource.name), role, "read"));
-}
-
-export function resourcePath(resource: Resource, ...parts: string[]) {
-  return ["/dashboard", resource.slug, ...parts].join("/");
-}
+import { headers } from "next/headers";
+import { notFound, redirect } from "next/navigation";
+import { allowedActions, can, type Policy, type PolicyAction, type Resource } from "@flaredev/core";
+import { and, count, gte, lt } from "drizzle-orm";
+import type { SQLiteTable } from "drizzle-orm/sqlite-core";
+import { createResourceStore, type ResourceStore } from "@flaredev/core/server";
+import { getDb } from "@/db";
+import { policies } from "@/policies";
+import { resourceTables } from "@/resources/server";
+import { currentUser } from "./api";
+import { auth } from "./auth";
+import { cached, resourceTag, revalidateResource, TTL } from "./cache";
+
+/**
+ * Roles that always reach the dashboard, whatever the policies say. Other roles get in when a
+ * policy grants them read access to at least one resource.
+ * Register roles with `flare role:add`, assign with `flare user:role`.
+ */
+export const ADMIN_ROLES = ["admin", "staff"];
+
+export function policyFor(resourceName: string): Policy | undefined {
+  return (policies as Record<string, Policy | undefined>)[resourceName];
+}
+
+export async function dashboardSession() {
+  const session = await auth.api.getSession({ headers: await headers() });
+  if (!session) return { session: null, role: null, allowed: false } as const;
+  const role = (session.user as { role?: string | null }).role ?? null;
+  const readable = allResources().some((resource) => can(policyFor(resource.name), role, "read"));
+  return { session, role, allowed: (role !== null && ADMIN_ROLES.includes(role)) || readable } as const;
+}
+
+/** For admin pages: redirects signed-out visitors to sign-in and users without access to the home page. */
+export async function requireDashboard(returnTo = "/dashboard") {
+  const { session, role, allowed } = await dashboardSession();
+  if (!session) redirect(`/sign-in?next=${encodeURIComponent(returnTo)}`);
+  if (!allowed) redirect("/?error=forbidden");
+  return { session, role };
+}
+
+/**
+ * For resource pages: also requires the policy to allow `action` on this resource.
+ * Sends the user somewhere they can actually go — the list when they may read it,
+ * the dashboard when they may not.
+ */
+export async function requireAccess(resource: Resource, action: PolicyAction) {
+  const { session, role } = await requireDashboard(resourcePath(resource));
+  const policy = policyFor(resource.name);
+  if (!can(policy, role, action)) {
+    redirect(action !== "read" && can(policy, role, "read") ? resourcePath(resource) : "/dashboard?error=forbidden");
+  }
+  return { session, role };
+}
+
+/** What the current user may do with a resource, for hiding actions they can't use. */
+export async function adminPermissions(resourceName: string) {
+  const { role } = await dashboardSession();
+  return allowedActions(policyFor(resourceName), role);
+}
+
+const stores = new Map<string, ResourceStore>();
+
+/** CRUD store for a resource by name (404 for unknown names). */
+export function dashboardStore(name: string): ResourceStore {
+  const entry = (resourceTables as unknown as Record<string, { resource: Resource; table: SQLiteTable } | undefined>)[name];
+  if (!entry) notFound();
+  let store = stores.get(name);
+  if (!store) {
+    store = createResourceStore({ resource: entry.resource, table: entry.table, getDb, onChange: revalidateResource, currentUser });
+    stores.set(name, store);
+  }
+  return store;
+}
+
+/**
+ * How many records a resource has. Cached in the data cache under the resource's tag,
+ * so the dashboard does not count every table on every visit, and a write through the
+ * admin or the API drops the count on its way out.
+ */
+export function recordCount(name: string): Promise<number> {
+  const counted = cached(
+    async (resourceName: string) => {
+      // Counted straight off the table, not through the store: a list stops counting at
+      // 10,000 so that paging stays quick, and a stat wants the real number.
+      const entry = (resourceTables as unknown as Record<string, { table: SQLiteTable } | undefined>)[resourceName];
+      if (!entry) return 0;
+      const [row] = await getDb().select({ total: count() }).from(entry.table);
+      return row?.total ?? 0;
+    },
+    ["flare", "record-count"],
+    { tags: [resourceTag(name)], revalidate: TTL.short },
+  );
+  return counted(name);
+}
+
+/**
+ * How many records hold each value of a field, in one grouped query rather than one
+ * count per option. Used by the stats above a resource's table.
+ */
+export function valueCounts(name: string, field: string): Promise<Record<string, number>> {
+  const counted = cached(
+    async (resourceName: string, key: string) => {
+      const entry = (resourceTables as unknown as Record<string, { table: SQLiteTable } | undefined>)[resourceName];
+      const column = entry ? (entry.table as unknown as Record<string, unknown>)[key] : undefined;
+      if (!entry || !column) return {};
+      const rows = (await getDb()
+        .select({ value: column as never, total: count() })
+        .from(entry.table)
+        .groupBy(column as never)) as { value: unknown; total: number }[];
+      return Object.fromEntries(rows.map((row) => [String(row.value ?? ""), row.total]));
+    },
+    ["flare", "value-counts"],
+    { tags: [resourceTag(name)], revalidate: TTL.short },
+  );
+  return counted(name, field);
+}
+
+/**
+ * How many records a resource gained in the last `days` days, and in the `days` before
+ * that, so a stat can show which way it's going. Cached like the totals.
+ */
+export function recentCounts(name: string, days = 7): Promise<{ current: number; previous: number }> {
+  const counts = cached(
+    async (resourceName: string, windowDays: number) => {
+      const entry = (resourceTables as unknown as Record<string, { table: SQLiteTable } | undefined>)[resourceName];
+      const createdAt = entry ? (entry.table as unknown as Record<string, unknown>).createdAt : undefined;
+      // A resource whose table has no createdAt (a custom one) simply has no trend.
+      if (!entry || !createdAt) return { current: 0, previous: 0 };
+      const window = windowDays * 86_400_000;
+      const since = new Date(Date.now() - window);
+      const before = new Date(Date.now() - window * 2);
+      const column = createdAt as never;
+      const [current] = await getDb().select({ total: count() }).from(entry.table).where(gte(column, since));
+      const [previous] = await getDb()
+        .select({ total: count() })
+        .from(entry.table)
+        .where(and(gte(column, before), lt(column, since)));
+      return { current: current?.total ?? 0, previous: previous?.total ?? 0 };
+    },
+    ["flare", "recent-count"],
+    { tags: [resourceTag(name)], revalidate: TTL.short },
+  );
+  return counts(name, days);
+}
+
+/** Percentage change between two periods, or undefined when there's nothing to compare. */
+export function trend(current: number, previous: number): number | undefined {
+  if (previous === 0) return current === 0 ? undefined : 100;
+  return ((current - previous) / previous) * 100;
+}
+
+/** Every resource descriptor (unfiltered): navigation uses `visibleResources()` instead. */
+export function allResources(): Resource[] {
+  return Object.values(resourceTables as unknown as Record<string, { resource: Resource }>).map((entry) => entry.resource);
+}
+
+/** Resources the current user may read, for the sidebar and dashboard. */
+export async function visibleResources(): Promise<Resource[]> {
+  const { role } = await dashboardSession();
+  return allResources().filter((resource) => can(policyFor(resource.name), role, "read"));
+}
+
+export function resourcePath(resource: Resource, ...parts: string[]) {
+  return ["/dashboard", resource.slug, ...parts].join("/");
+}

package/templates/app/lib/views.ts

@@ -0,0 +1,29 @@
+import { and, asc, eq } from "drizzle-orm";
+import { getDb } from "@/db";
+import { savedView } from "@/db/flare-schema";
+import { dashboardSession } from "./dashboard";
+
+export interface SavedView {
+  id: string;
+  resource: string;
+  name: string;
+  query: string;
+}
+
+/** How many views one person may keep per resource, so the sidebar stays a sidebar. */
+export const MAX_VIEWS = 12;
+
+/** This person's saved views, oldest first so the sidebar doesn't reshuffle. */
+export async function listViews(resource?: string): Promise<SavedView[]> {
+  const { session } = await dashboardSession();
+  if (!session) return [];
+  const where = resource
+    ? and(eq(savedView.userId, session.user.id), eq(savedView.resource, resource))
+    : eq(savedView.userId, session.user.id);
+  const rows = await getDb()
+    .select({ id: savedView.id, resource: savedView.resource, name: savedView.name, query: savedView.query })
+    .from(savedView)
+    .where(where)
+    .orderBy(asc(savedView.createdAt));
+  return rows;
+}

package/templates/app/migrations/0000_init.sql

@@ -107,3 +107,14 @@ CREATE TABLE `role` (
 	`label` text NOT NULL,
 	`created_at` integer DEFAULT (cast(unixepoch('subsecond') * 1000 as integer)) NOT NULL
 );
+--> statement-breakpoint
+CREATE TABLE `saved_view` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`resource` text NOT NULL,
+	`name` text NOT NULL,
+	`query` text NOT NULL,
+	`created_at` integer DEFAULT (cast(unixepoch('subsecond') * 1000 as integer)) NOT NULL
+);
+--> statement-breakpoint
+CREATE INDEX `saved_view_user_idx` ON `saved_view` (`user_id`,`resource`);

package/templates/app/migrations/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "b98aab68-42f4-4832-ac5d-de8a121d8eae",
+  "id": "06909070-5897-4787-87c1-4e86bf5f98d3",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "account": {
@@ -733,6 +733,68 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {},
       "checkConstraints": {}
+    },
+    "saved_view": {
+      "name": "saved_view",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resource": {
+          "name": "resource",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "query": {
+          "name": "query",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(cast(unixepoch('subsecond') * 1000 as integer))"
+        }
+      },
+      "indexes": {
+        "saved_view_user_idx": {
+          "name": "saved_view_user_idx",
+          "columns": [
+            "user_id",
+            "resource"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     }
   },
   "views": {},

package/templates/app/vite.config.ts

@@ -1,31 +1,41 @@
-import { defineConfig, loadEnv } from "vite";
-import vinext from "vinext";
-import { cloudflare } from "@cloudflare/vite-plugin";
-import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
-
-export default defineConfig(({ mode }) => ({
-  // FLARE_THEME (shell or .env) picks the theme for this build; see lib/theme.ts.
-  define: { __FLARE_THEME__: JSON.stringify(loadEnv(mode, process.cwd(), "FLARE_").FLARE_THEME ?? "") },
-  // `flare dev --tunnel` serves the dev server on a https://*.trycloudflare.com URL.
-  server: { allowedHosts: [".trycloudflare.com"] },
-  plugins: [
-    vinext({
-      cache: {
-        // Data cache (`cached()`, fetch, "use cache") in Workers KV, shared by every colo.
-        // Entries live a day unless a tag revalidates them first; a colo may reuse its own
-        // copy for a minute after a write elsewhere.
-        data: kvDataAdapter({ ttlSeconds: 86_400, entryCacheTtlSeconds: 60 }),
-        // No `cdn` adapter yet. vinext's Workers Cache adapter (cdnAdapter) is experimental
-        // in the 1.0 beta: behind it, any page that redirects fails with "Too many
-        // redirects", and nothing is cached without an experimental two-stage deploy.
-        // See "Caching" in the Flare docs before turning it on.
-      },
-    }),
-    cloudflare({
-      viteEnvironment: {
-        name: "rsc",
-        childEnvironments: ["ssr"],
-      },
-    }),
-  ],
-}));
+import { defineConfig, loadEnv } from "vite";
+import vinext from "vinext";
+import { cloudflare } from "@cloudflare/vite-plugin";
+import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
+
+export default defineConfig(({ mode }) => ({
+  // FLARE_THEME (shell or .env) picks the theme for this build; see lib/theme.ts.
+  define: { __FLARE_THEME__: JSON.stringify(loadEnv(mode, process.cwd(), "FLARE_").FLARE_THEME ?? "") },
+  // `flare dev --tunnel` serves the dev server on a https://*.trycloudflare.com URL.
+  server: { allowedHosts: [".trycloudflare.com"] },
+  optimizeDeps: {
+    /*
+     * Packages that ship their own "use client" components are left out of dependency
+     * pre-bundling. Bundled, the browser and the server each end up with their own copy
+     * of the same module, and a client-side navigation lands on the wrong one — which is
+     * the "Cannot read properties of null (reading 'useSyncExternalStore')" you get once
+     * and never again after a reload.
+     */
+    exclude: ["lucide-react", "vinext", "radix-ui", "@radix-ui/react-slot", "sonner", "cmdk", "react-day-picker", "@flaredev/core"],
+  },
+  plugins: [
+    vinext({
+      cache: {
+        // Data cache (`cached()`, fetch, "use cache") in Workers KV, shared by every colo.
+        // Entries live a day unless a tag revalidates them first; a colo may reuse its own
+        // copy for a minute after a write elsewhere.
+        data: kvDataAdapter({ ttlSeconds: 86_400, entryCacheTtlSeconds: 60 }),
+        // No `cdn` adapter yet. vinext's Workers Cache adapter (cdnAdapter) is experimental
+        // in the 1.0 beta: behind it, any page that redirects fails with "Too many
+        // redirects", and nothing is cached without an experimental two-stage deploy.
+        // See "Caching" in the Flare docs before turning it on.
+      },
+    }),
+    cloudflare({
+      viteEnvironment: {
+        name: "rsc",
+        childEnvironments: ["ssr"],
+      },
+    }),
+  ],
+}));

package/templates/locks/package-lock.json

@@ -6253,9 +6253,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.436",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.436.tgz",
-      "integrity": "sha512-iG79/xCF3iThADicbgbES2+liFYmTvelo7jWcEfg6lQ+Adrh7zShrXSg2ZdEDLbKjJ298kGAKMnnzVWobp0L+g==",
+      "version": "1.5.437",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.437.tgz",
+      "integrity": "sha512-1z60R0Nb+kYPnGUrQ6PvMjTVINDGMfqQZ/mI5FJIHvTotlA6noI+YJWakbjaFM+qhLXg9WnK3RUeYSO5ixSHJA==",
       "license": "ISC",
       "peer": true
     },

package/templates/locks/pnpm-lock.yaml

@@ -2640,8 +2640,8 @@ packages:
       sqlite3:
         optional: true
 
-  electron-to-chromium@1.5.436:
-    resolution: {integrity: sha512-iG79/xCF3iThADicbgbES2+liFYmTvelo7jWcEfg6lQ+Adrh7zShrXSg2ZdEDLbKjJ298kGAKMnnzVWobp0L+g==}
+  electron-to-chromium@1.5.437:
+    resolution: {integrity: sha512-1z60R0Nb+kYPnGUrQ6PvMjTVINDGMfqQZ/mI5FJIHvTotlA6noI+YJWakbjaFM+qhLXg9WnK3RUeYSO5ixSHJA==}
 
   emoji-regex-xs@2.0.1:
     resolution: {integrity: sha512-1QFuh8l7LqUcKe24LsPUNzjrzJQ7pgRwp1QMcZ5MX6mFplk2zQ08NVCM84++1cveaUUYtcCYHmeFEuNg16sU4g==}
@@ -5388,7 +5388,7 @@ snapshots:
     dependencies:
       baseline-browser-mapping: 2.11.25
       caniuse-lite: 1.0.30001810
-      electron-to-chromium: 1.5.436
+      electron-to-chromium: 1.5.437
       node-releases: 2.0.56
       update-browserslist-db: 1.3.3(browserslist@4.29.0)
 
@@ -5459,7 +5459,7 @@ snapshots:
     optionalDependencies:
       kysely: 0.29.6
 
-  electron-to-chromium@1.5.436: {}
+  electron-to-chromium@1.5.437: {}
 
   emoji-regex-xs@2.0.1: {}