@nextsparkjs/core 0.1.0-beta.192 → 0.1.0-beta.193

package/dist/lib/theme/ThemeProvider.js

@@ -9,9 +9,9 @@ function getCurrentClientTheme() {
 }
 const ThemeContext = createContext(null);
 function ThemeProvider({ children }) {
-  const [currentTheme, setCurrentTheme] = useState(null);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState();
+  const [currentTheme, setCurrentTheme] = useState(() => getCurrentClientTheme() ?? null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(() => getCurrentClientTheme() ? void 0 : "Project theme was not generated");
   const loadTheme = React.useCallback(() => {
     var _a;
     try {
@@ -45,8 +45,10 @@ function ThemeProvider({ children }) {
     });
   }, [currentTheme, loadTheme]);
   useEffect(() => {
-    loadTheme();
-  }, [loadTheme]);
+    var _a;
+    if (!currentTheme) console.error("[ThemeProvider] Project theme was not generated");
+    else if ((_a = currentTheme.styles) == null ? void 0 : _a.globals) applyThemeStyles(currentTheme);
+  }, []);
   useEffect(() => {
     if (process.env.NODE_ENV === "development") {
       const handleHotReload = () => {

package/dist/routes/(auth)/accept-invite/[token]/page.js

@@ -8,7 +8,7 @@ import { Alert, AlertDescription, AlertTitle } from "@nextsparkjs/core/component
 import { Loader2, CheckCircle, XCircle, Users, LogIn, UserPlus } from "lucide-react";
 import { toast } from "sonner";
 import Link from "next/link";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/teams";
 import { withBasePath } from "@nextsparkjs/core/lib/base-path";
 function AcceptInvitePage() {
   const params = useParams();

package/dist/routes/(auth)/forgot-password/page.js

@@ -7,7 +7,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { AlertCircle, ArrowLeft, CheckCircle, Loader2, Mail } from "lucide-react";
 import Link from "next/link";
 import { useState, useCallback } from "react";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/auth";
 import { useTranslations } from "next-intl";
 import { useForm } from "react-hook-form";
 import { Button } from "@nextsparkjs/core/components/ui/button";

package/dist/routes/(auth)/reset-password/page.js

@@ -17,7 +17,7 @@ import { Label } from "@nextsparkjs/core/components/ui/label";
 import { PasswordInput } from "@nextsparkjs/core/components/ui/password-input";
 import { Alert, AlertDescription } from "@nextsparkjs/core/components/ui/alert";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@nextsparkjs/core/components/ui/card";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/auth";
 function ResetPasswordContent() {
   const searchParams = useSearchParams();
   const token = searchParams.get("token") || "";

package/dist/routes/(auth)/signup/page.cc.d.ts

@@ -2,8 +2,8 @@
  * Signup page for a host with `cacheComponents` on (variant of ./page).
  *
  * Same page and metadata; `dynamic = 'force-dynamic'` is left out because Next.js fails a build that
- * has it under Cache Components. The page reads the database and calls redirect() inside its own
- * <Suspense> boundary, which under Cache Components streams per request, after the static shell.
+ * has it under Cache Components. The page reads the database and calls redirect(); under Cache Components
+ * the group or root layout puts it behind Suspense, so the redirect streams per request, after the static shell.
  */
 export { default, metadata } from './page';
 //# sourceMappingURL=page.cc.d.ts.map

package/dist/routes/(auth)/signup/page.d.ts

@@ -1,6 +1,6 @@
 import type { Metadata } from 'next';
 export declare const dynamic = "force-dynamic";
 export declare const metadata: Metadata;
-declare function SignupPage(): import("react/jsx-runtime").JSX.Element;
+declare function SignupPage(): Promise<import("react/jsx-runtime").JSX.Element>;
 export default SignupPage;
 //# sourceMappingURL=page.d.ts.map

package/dist/routes/(auth)/signup/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/routes/(auth)/signup/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AASpC,eAAO,MAAM,OAAO,kBAAkB,CAAA;AAOtC,eAAO,MAAM,QAAQ,EAAE,QAA0B,CAAA;AAgCjD,iBAAS,UAAU,4CAMlB;AAGD,eAAe,UAAU,CAAA"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/routes/(auth)/signup/page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AASpC,eAAO,MAAM,OAAO,kBAAkB,CAAA;AAOtC,eAAO,MAAM,QAAQ,EAAE,QAA0B,CAAA;AAKjD,iBAAe,UAAU,qDA4BxB;AAED,eAAe,UAAU,CAAA"}

package/dist/routes/(auth)/signup/page.js

@@ -1,5 +1,4 @@
 import { jsx } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { redirect } from "next/navigation";
 import { SignupForm } from "@nextsparkjs/core/components/auth/forms/SignupForm";
 import { AUTH_CONFIG } from "@nextsparkjs/core/lib/config";
@@ -11,7 +10,7 @@ const defaultMetadata = {
   description: "Create your account to start using our platform"
 };
 export const metadata = defaultMetadata;
-async function SignupPageContent() {
+async function SignupPage() {
   var _a, _b;
   const registrationMode = ((_b = (_a = AUTH_CONFIG) == null ? void 0 : _a.registration) == null ? void 0 : _b.mode) ?? "open";
   if (!resolveAuthMethods(AUTH_CONFIG).includes("email-password")) {
@@ -28,7 +27,4 @@ async function SignupPageContent() {
   }
   return /* @__PURE__ */ jsx(SignupForm, {});
 }
-function SignupPage() {
-  return /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(SignupPageContent, {}) });
-}
 export default SignupPage;

package/dist/routes/(auth)/verify-email/page.js

@@ -5,7 +5,7 @@ import { useSearchParams, useRouter } from "next/navigation";
 import { Suspense, useEffect, useState } from "react";
 import { Button } from "@nextsparkjs/core/components/ui/button";
 import { Alert, AlertDescription } from "@nextsparkjs/core/components/ui/alert";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/auth";
 import { withBasePath } from "@nextsparkjs/core/lib/base-path";
 function VerifyEmailContent() {
   const searchParams = useSearchParams();

package/dist/routes/(public)/docs/[section]/[page]/page.cc.js

@@ -5,7 +5,7 @@ import { DOCS_REGISTRY } from "@nextsparkjs/registries/docs-registry";
 import { parseMarkdownFile } from "@nextsparkjs/core/lib/docs/parser";
 import { DocsBreadcrumbs } from "@nextsparkjs/core/components/docs/docs-breadcrumbs";
 import { DocsContent } from "@nextsparkjs/core/components/docs/docs-content";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/public";
 import { getTranslations } from "next-intl/server";
 import path from "path";
 export async function generateStaticParams() {

package/dist/routes/(public)/docs/[section]/[page]/page.js

@@ -4,7 +4,7 @@ import { DOCS_REGISTRY } from "@nextsparkjs/registries/docs-registry";
 import { parseMarkdownFile } from "@nextsparkjs/core/lib/docs/parser";
 import { DocsBreadcrumbs } from "@nextsparkjs/core/components/docs/docs-breadcrumbs";
 import { DocsContent } from "@nextsparkjs/core/components/docs/docs-content";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/public";
 import { getTranslations } from "next-intl/server";
 import path from "path";
 export const dynamicParams = false;

package/dist/routes/(public)/docs/layout.js

@@ -3,7 +3,7 @@ import { Suspense } from "react";
 import { DocsLayout } from "@nextsparkjs/core/components/docs/docs-layout";
 import { DocsSidebar } from "@nextsparkjs/core/components/docs/docs-sidebar";
 import { DOCS_REGISTRY } from "@nextsparkjs/registries/docs-registry";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/public";
 export default function DocsLayoutPage({
   children
 }) {

package/dist/routes/(public)/docs/page.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@nextsparkjs/core/components/ui/card";
 import { DOCS_REGISTRY } from "@nextsparkjs/registries/docs-registry";
-import { sel } from "@nextsparkjs/core/lib/selectors";
+import { sel } from "@nextsparkjs/core/selectors/public";
 import { BookOpen, Folder, FileText, ArrowRight } from "lucide-react";
 import Link from "next/link";
 export const metadata = {

package/dist/routes/_internal/default-public-layout.d.ts

@@ -1,6 +1,11 @@
 /**
  * Core's default public layout. A module of its own: the composition module (./public-layout) and the metadata a
  * project override keeps are imported without it, so an override's route ships none of its client components.
+ *
+ * `children` is not behind a Suspense boundary: one makes a `notFound()` thrown by a public page (the `[slug]` of the
+ * pages entity) arrive in the stream after the head went out, so an unknown URL answers 200 instead of 404 in the
+ * legacy host. The Cache Components wrapper (group-layouts.cc) puts its own boundary around the page, which that
+ * mode needs.
  */
 export declare function DefaultPublicLayout({ children }: {
     children: React.ReactNode;

package/dist/routes/_internal/default-public-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-public-layout.d.ts","sourceRoot":"","sources":["../../../src/routes/_internal/default-public-layout.tsx"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACT,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,2CAiBA"}
+{"version":3,"file":"default-public-layout.d.ts","sourceRoot":"","sources":["../../../src/routes/_internal/default-public-layout.tsx"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACT,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,2CAeA"}

package/dist/routes/_internal/default-public-layout.js

@@ -1,5 +1,4 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { PublicNavbar } from "@nextsparkjs/core/components/app/layouts/PublicNavbar";
 import { PublicFooter } from "@nextsparkjs/core/components/app/layouts/PublicFooter";
 export function DefaultPublicLayout({
@@ -7,7 +6,7 @@ export function DefaultPublicLayout({
 }) {
   return /* @__PURE__ */ jsxs("div", { className: "min-h-screen bg-background flex flex-col", children: [
     /* @__PURE__ */ jsx(PublicNavbar, {}),
-    /* @__PURE__ */ jsx("main", { className: "flex-1", children: /* @__PURE__ */ jsx(Suspense, { fallback: null, children }) }),
+    /* @__PURE__ */ jsx("main", { className: "flex-1", children }),
     /* @__PURE__ */ jsx(PublicFooter, {})
   ] });
 }

package/dist/routes/devtools/blocks/[slug]/page.d.ts

@@ -11,7 +11,10 @@ interface BlockDetailPageProps {
  */
 export default function BlockDetailPage({ params }: BlockDetailPageProps): Promise<import("react/jsx-runtime").JSX.Element>;
 /**
- * Generate static params for all blocks
+ * Generate static params for all blocks.
+ *
+ * Cache Components needs at least one result. A project with no blocks (the productivity template) returns a
+ * placeholder no block matches, so the page answers notFound() instead of failing the build.
  */
 export declare function generateStaticParams(): Promise<{
     slug: string;

package/dist/routes/devtools/blocks/[slug]/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/routes/devtools/blocks/[slug]/page.tsx"],"names":[],"mappings":"AAIA,UAAU,oBAAoB;IAC5B,MAAM,EAAE,OAAO,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;CACJ;AAED;;;;;GAKG;AACH,wBAA8B,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,oBAAoB,oDAa7E;AAED;;GAEG;AACH,wBAAsB,oBAAoB;;KAIzC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/routes/devtools/blocks/[slug]/page.tsx"],"names":[],"mappings":"AAIA,UAAU,oBAAoB;IAC5B,MAAM,EAAE,OAAO,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;CACJ;AAED;;;;;GAKG;AACH,wBAA8B,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,oBAAoB,oDAa7E;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB;;KAKzC"}

package/dist/routes/devtools/blocks/[slug]/page.js

@@ -10,7 +10,8 @@ export default async function BlockDetailPage({ params }) {
   return /* @__PURE__ */ jsx("div", { className: "space-y-6", "data-cy": `devtools-block-detail-${slug}`, children: /* @__PURE__ */ jsx(BlockDetailViewer, { slug }) });
 }
 export async function generateStaticParams() {
-  return Object.keys(BLOCK_REGISTRY).map((slug) => ({
+  const slugs = Object.keys(BLOCK_REGISTRY);
+  return (slugs.length > 0 ? slugs : ["_none"]).map((slug) => ({
     slug
   }));
 }

package/dist/templates/features/blog/blocks/post-content/component.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { cn } from '@nextsparkjs/core/lib/utils'
 import { buildSectionClasses } from '@nextsparkjs/core/types/blocks'
 import { sanitizeBlockHtml } from '@nextsparkjs/core/lib/blocks/sanitize-html'
-import { sel } from '../../lib/selectors'
+import { sel } from '../../lib/block-selectors'
 import type { PostContentBlockProps } from './schema'
 import { withBasePathIfInApp } from '@nextsparkjs/core/lib/base-path'
 

package/dist/templates/features/blog/entities/posts/posts.config.ts

@@ -65,17 +65,6 @@ export const postsEntityConfig: EntityConfig = {
   // Permissions are now centralized in permissions.config.ts
   // See: config/permissions.config.ts -> entities.posts
 
-  // ==========================================
-  // 5. INTERNATIONALIZATION
-  // ==========================================
-  i18n: {
-    fallbackLocale: 'en',
-    loaders: {
-      en: () => import('./messages/en.json'),
-      es: () => import('./messages/es.json'),
-    },
-  },
-
   // ==========================================
   // 6. BUILDER CONFIGURATION
   // ==========================================

package/dist/templates/features/pages/blocks/hero/component.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { Button } from '@nextsparkjs/core/components/ui/button'
 import { cn } from '@nextsparkjs/core/lib/utils'
 import { buildSectionClasses, resolveMediaUrl } from '@nextsparkjs/core/types/blocks'
-import { sel } from '../../lib/selectors'
+import { sel } from '../../lib/block-selectors'
 import type { HeroBlockProps } from './schema'
 import { withBasePathIfInApp } from '@nextsparkjs/core/lib/base-path'
 

package/dist/templates/features/pages/entities/pages/pages.config.ts

@@ -65,17 +65,6 @@ export const pagesEntityConfig: EntityConfig = {
   // Permissions are now centralized in permissions.config.ts
   // See: config/permissions.config.ts -> entities.pages
 
-  // ==========================================
-  // 5. INTERNATIONALIZATION
-  // ==========================================
-  i18n: {
-    fallbackLocale: 'en',
-    loaders: {
-      en: () => import('./messages/en.json'),
-      es: () => import('./messages/es.json'),
-    },
-  },
-
   // ==========================================
   // 6. BUILDER CONFIGURATION
   // ==========================================

package/dist/templates/projects/blog/lib/block-selectors.ts

@@ -0,0 +1,29 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the blog theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  // Blocks the pages and blog content features copy into the project (blocks/hero, blocks/post-content)
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/dist/templates/projects/blog/lib/selectors.ts

@@ -10,20 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the blog theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // Blog theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/dist/templates/projects/blog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nextsparkjs/theme-blog",
   "version": "0.1.0-beta.192",
-  "private": false,
+  "private": true,
   "type": "module",
   "main": "./config/theme.config.ts",
   "requiredPlugins": [],
@@ -23,8 +23,5 @@
   "nextspark": {
     "type": "theme",
     "name": "blog"
-  },
-  "devDependencies": {
-    "@types/dompurify": "^3.2.0"
   }
 }

package/dist/templates/projects/crm/lib/block-selectors.ts

@@ -0,0 +1,29 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the CRM theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  // Blocks the pages and blog content features copy into the project (blocks/hero, blocks/post-content)
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/dist/templates/projects/crm/lib/selectors.ts

@@ -10,20 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the CRM theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // CRM theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/dist/templates/projects/crm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nextsparkjs/theme-crm",
   "version": "0.1.0-beta.192",
-  "private": false,
+  "private": true,
   "type": "module",
   "main": "./config/theme.config.ts",
   "requiredPlugins": [],

package/dist/templates/projects/crm/templates/dashboard/(main)/layout.tsx

@@ -5,28 +5,13 @@
 
 'use client'
 
-import { useState, createContext, useContext, ReactNode, useEffect } from 'react'
+import { useState, ReactNode, useEffect } from 'react'
 import { CRMSidebar } from '@/templates/shared/CRMSidebar'
 import { CRMTopBar } from '@/templates/shared/CRMTopBar'
 import { CRMMobileNav } from '@/templates/shared/CRMMobileNav'
+import { SidebarContext } from '@/templates/shared/CRMSidebarContext'
 import { cn } from '@nextsparkjs/core/lib/utils'
 
-// Context for sidebar state
-interface SidebarContextValue {
-  expanded: boolean
-  setExpanded: (value: boolean) => void
-}
-
-const SidebarContext = createContext<SidebarContextValue | undefined>(undefined)
-
-export function useCRMSidebar() {
-  const context = useContext(SidebarContext)
-  if (!context) {
-    return { expanded: false, setExpanded: () => {} }
-  }
-  return context
-}
-
 interface CRMDashboardLayoutProps {
   children: ReactNode
 }

package/dist/templates/projects/crm/templates/shared/CRMSidebarContext.tsx

@@ -0,0 +1,23 @@
+/**
+ * CRM sidebar state, shared by the dashboard layout (provider) and any component that reads it.
+ * Lives outside the layout: Next only allows a layout to export its default component.
+ */
+
+'use client'
+
+import { createContext, useContext } from 'react'
+
+export interface SidebarContextValue {
+  expanded: boolean
+  setExpanded: (value: boolean) => void
+}
+
+export const SidebarContext = createContext<SidebarContextValue | undefined>(undefined)
+
+export function useCRMSidebar() {
+  const context = useContext(SidebarContext)
+  if (!context) {
+    return { expanded: false, setExpanded: () => {} }
+  }
+  return context
+}

package/dist/templates/projects/productivity/entities/boards/boards.service.ts

@@ -82,9 +82,9 @@ export class BoardsService {
    */
   static async getById(id: string, userId: string): Promise<Board | null> {
     const result = await queryOneWithRLS<DbBoard>(
-      userId,
       `SELECT * FROM boards WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbBoard(result) : null
@@ -121,9 +121,9 @@ export class BoardsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM boards ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -135,9 +135,9 @@ export class BoardsService {
 
     params.push(limit, offset)
     const boards = await queryWithRLS<DbBoard>(
-      userId,
       `SELECT * FROM boards ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -173,13 +173,13 @@ export class BoardsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `INSERT INTO boards (name, description, color, is_archived, position, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6, $7)
        RETURNING *`,
-      [name, description, color, isArchived, position, userId, teamId]
-    )
+      [name, description, color, isArchived, position, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create board')
@@ -228,11 +228,11 @@ export class BoardsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `UPDATE boards SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Board not found or access denied')
@@ -245,11 +245,11 @@ export class BoardsService {
    * Delete a board with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `DELETE FROM boards WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }

package/dist/templates/projects/productivity/entities/cards/cards.service.ts

@@ -105,9 +105,9 @@ export class CardsService {
    */
   static async getById(id: string, userId: string): Promise<Card | null> {
     const result = await queryOneWithRLS<DbCard>(
-      userId,
       `SELECT * FROM cards WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbCard(result) : null
@@ -162,9 +162,9 @@ export class CardsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM cards ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -176,9 +176,9 @@ export class CardsService {
 
     params.push(limit, offset)
     const cards = await queryWithRLS<DbCard>(
-      userId,
       `SELECT * FROM cards ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -218,13 +218,13 @@ export class CardsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `INSERT INTO cards (title, description, list_id, board_id, position, due_date, assignee_id, labels, is_archived, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
        RETURNING *`,
-      [title, description, listId, boardId, position, dueDate, assigneeId, JSON.stringify(labels), isArchived, userId, teamId]
-    )
+      [title, description, listId, boardId, position, dueDate, assigneeId, JSON.stringify(labels), isArchived, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create card')
@@ -293,11 +293,11 @@ export class CardsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `UPDATE cards SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Card not found or access denied')
@@ -325,11 +325,11 @@ export class CardsService {
    * Delete a card with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `DELETE FROM cards WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }