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

package/templates/projects/productivity/entities/lists/lists.service.ts

@@ -78,9 +78,9 @@ export class ListsService {
    */
   static async getById(id: string, userId: string): Promise<List | null> {
     const result = await queryOneWithRLS<DbList>(
-      userId,
       `SELECT * FROM lists WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbList(result) : null
@@ -123,9 +123,9 @@ export class ListsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM lists ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -137,9 +137,9 @@ export class ListsService {
 
     params.push(limit, offset)
     const lists = await queryWithRLS<DbList>(
-      userId,
       `SELECT * FROM lists ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -174,13 +174,13 @@ export class ListsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `INSERT INTO lists (name, board_id, position, is_archived, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6)
        RETURNING *`,
-      [name, boardId, position, isArchived, userId, teamId]
-    )
+      [name, boardId, position, isArchived, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create list')
@@ -224,11 +224,11 @@ export class ListsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `UPDATE lists SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('List not found or access denied')
@@ -241,11 +241,11 @@ export class ListsService {
    * Delete a list with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `DELETE FROM lists WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }

package/templates/projects/productivity/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 productivity 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/templates/projects/productivity/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 productivity theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // Productivity theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/templates/projects/productivity/package.json

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

package/templates/projects/starter/lib/block-selectors.ts

@@ -0,0 +1,28 @@
+/**
+ * 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 starter theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  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/templates/projects/starter/lib/selectors.ts

@@ -10,22 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the starter theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  hero: {
-    container: 'block-hero',
-    cta: 'hero-cta',
-  },
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // THEME SELECTORS (CORE + BLOCKS)