@stacksjs/cms 0.74.33 → 0.74.35

package/dist/taggables/fetch.d.ts

@@ -1,4 +1,18 @@
 import type { TaggableTable } from '@stacksjs/orm';
+/**
+ * Which table the `taggable_models` pivot points at (stacksjs/stacks#2579).
+ *
+ * `tags`, not `taggables`. The four aggregates below joined `taggables`, and
+ * every writer of that pivot writes a `tags` id: the dashboard validates
+ * `tagIds` against `tags`, writes them in `syncPostRelations`, reads them back
+ * in `PostIndexAction`, and counts them in `TagIndexAction`. The migration's own
+ * comment says `taggables` and is wrong too.
+ *
+ * `taggables` is a real table, but a different mechanism - the `taggable` trait
+ * in `@stacksjs/orm` writes tag names straight into it with no pivot row at
+ * all. Joining the pivot to it produced a silent empty result set, or worse, a
+ * row whose id happened to collide.
+ */
 /**
  * Fetch a tag by its ID
  *

package/dist/taggables/fetch.js

@@ -1 +1 @@
-import{getDb}from"../database";import{findOrCreate}from"./store";export async function fetchTagById(id){const db=await getDb();try{const result=await db.selectFrom("taggables").where("id","=",id).selectAll().executeTakeFirst();if(!result)return;return result}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tag: ${error.message}`);throw error}}export async function fetchTags(){const db=await getDb();try{return await db.selectFrom("taggables").where("is_active","=",!0).selectAll().execute()}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tags: ${error.message}`);throw error}}export async function firstOrCreate(name,taggableType,description){try{return await findOrCreate({name,taggable_type:taggableType,description})}catch(error){if(error instanceof Error)throw TypeError(`Failed to find or create tag: ${error.message}`);throw error}}export async function countTaggedPosts(taggableType){const db=await getDb();try{const result=await db.selectFrom("taggable_models").where("taggable_type","=",taggableType).count();return Number(result)||0}catch(error){if(error instanceof Error)throw TypeError(`Failed to count tagged posts: ${error.message}`);throw error}}export async function countTotalTags(){const db=await getDb();try{const result=await db.selectFrom("taggables").count();return Number(result)||0}catch(error){if(error instanceof Error)throw TypeError(`Failed to count total tags: ${error.message}`);throw error}}export async function findMostUsedTag(taggableType){const db=await getDb();try{let query=db.selectFrom("taggable_models").innerJoin("taggables","taggables.id","=","taggable_models.tag_id").select(["taggables.name"]).groupBy("taggables.name");if(taggableType)query=query.where("taggable_models.taggable_type","=",taggableType);const result=await query.orderBy("taggables.name","asc").executeTakeFirst();if(!result)return null;return{name:result.name,count:Number(result.usage_count||0)}}catch(error){if(error instanceof Error)throw TypeError(`Failed to find most used tag: ${error.message}`);throw error}}export async function findLeastUsedTag(){const db=await getDb();try{const result=await db.selectFrom("taggable_models").innerJoin("taggables","taggables.id","=","taggable_models.tag_id").select(["taggables.name"]).groupBy("taggables.name").orderBy("taggables.name","asc").executeTakeFirst();if(!result)return null;return{name:result.name,count:Number(result.usage_count||0)}}catch(error){if(error instanceof Error)throw TypeError(`Failed to find least used tag: ${error.message}`);throw error}}export async function fetchTagsWithPostCounts(){const db=await getDb();try{return(await db.selectFrom("taggables").leftJoin("taggable_models","taggables.id","=","taggable_models.tag_id").select(["taggables.name"]).groupBy("taggables.name").orderBy("taggables.name","desc").limit(10).execute()).map((row)=>({name:row.name,postCount:Number(row.post_count||0)}))}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tags with post counts: ${error.message}`);throw error}}export async function fetchTagDistribution(){const db=await getDb();try{const typedResult=await db.selectFrom("taggables").leftJoin("taggable_models","taggables.id","=","taggable_models.tag_id").select(["taggables.name"]).groupBy("taggables.name").orderBy("taggables.name","desc").execute(),totalCount=typedResult.reduce((sum,row)=>sum+Number(row.count||0),0);return typedResult.map((row)=>({name:row.name,count:Number(row.count||0),percentage:totalCount>0?Number(row.count||0)/totalCount*100:0}))}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tag distribution: ${error.message}`);throw error}}
+import{sql}from"@stacksjs/database";import{getDb}from"../database";import{findOrCreate}from"./store";export async function fetchTagById(id){const db=await getDb();try{const result=await db.selectFrom("taggables").where("id","=",id).selectAll().executeTakeFirst();if(!result)return;return result}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tag: ${error.message}`);throw error}}export async function fetchTags(){const db=await getDb();try{return await db.selectFrom("taggables").where("is_active","=",!0).selectAll().execute()}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tags: ${error.message}`);throw error}}export async function firstOrCreate(name,taggableType,description){try{return await findOrCreate({name,taggable_type:taggableType,description})}catch(error){if(error instanceof Error)throw TypeError(`Failed to find or create tag: ${error.message}`);throw error}}export async function countTaggedPosts(taggableType){const db=await getDb();try{const result=await db.selectFrom("taggable_models").where("taggable_type","=",taggableType).count();return Number(result)||0}catch(error){if(error instanceof Error)throw TypeError(`Failed to count tagged posts: ${error.message}`);throw error}}export async function countTotalTags(){const db=await getDb();try{const result=await db.selectFrom("taggables").count();return Number(result)||0}catch(error){if(error instanceof Error)throw TypeError(`Failed to count total tags: ${error.message}`);throw error}}export async function findMostUsedTag(taggableType){const db=await getDb();try{let query=db.selectFrom("taggable_models").innerJoin("tags","tags.id","=","taggable_models.tag_id").select(["tags.name",sql`count(*)`.as("usage_count")]).groupBy("tags.name");if(taggableType)query=query.where("taggable_models.taggable_type","=",taggableType);const result=await query.orderBy("usage_count","desc").executeTakeFirst();if(!result)return null;return{name:result.name,count:Number(result.usage_count||0)}}catch(error){if(error instanceof Error)throw TypeError(`Failed to find most used tag: ${error.message}`);throw error}}export async function findLeastUsedTag(){const db=await getDb();try{const result=await db.selectFrom("taggable_models").innerJoin("tags","tags.id","=","taggable_models.tag_id").select(["tags.name",sql`count(*)`.as("usage_count")]).groupBy("tags.name").orderBy("usage_count","asc").executeTakeFirst();if(!result)return null;return{name:result.name,count:Number(result.usage_count||0)}}catch(error){if(error instanceof Error)throw TypeError(`Failed to find least used tag: ${error.message}`);throw error}}export async function fetchTagsWithPostCounts(){const db=await getDb();try{return(await db.selectFrom("tags").leftJoin("taggable_models","tags.id","=","taggable_models.tag_id").select(["tags.name",sql`count(taggable_models.id)`.as("post_count")]).groupBy("tags.name").orderBy("post_count","desc").limit(10).execute()).map((row)=>({name:row.name,postCount:Number(row.post_count||0)}))}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tags with post counts: ${error.message}`);throw error}}export async function fetchTagDistribution(){const db=await getDb();try{const typedResult=await db.selectFrom("tags").leftJoin("taggable_models","tags.id","=","taggable_models.tag_id").select(["tags.name",sql`count(taggable_models.id)`.as("count")]).groupBy("tags.name").orderBy("count","desc").execute(),totalCount=typedResult.reduce((sum,row)=>sum+Number(row.count||0),0);return typedResult.map((row)=>({name:row.name,count:Number(row.count||0),percentage:totalCount>0?Number(row.count||0)/totalCount*100:0}))}catch(error){if(error instanceof Error)throw TypeError(`Failed to fetch tag distribution: ${error.message}`);throw error}}

package/dist/taggables/index.d.ts

@@ -6,6 +6,28 @@ export {
   fetchTagById,
   fetchTags,
 } from './fetch';
+/**
+ * The tag analytics, which were written but never exported (stacksjs/stacks#2579).
+ *
+ * Unreachable through `@stacksjs/cms`, which is why two bugs sat in them: they
+ * joined the pivot to `taggables` instead of `tags`, and none of them selected
+ * the count they then read, so every count was 0 and "most used" was whichever
+ * tag sorted first by name. Exported now that they work, since a tag manager is
+ * the obvious consumer.
+ */
+export {
+  countTaggedPosts,
+  countTotalTags,
+  fetchTagDistribution,
+  fetchTagsWithPostCounts,
+  findLeastUsedTag,
+  findMostUsedTag,
+  firstOrCreate,
+} from './fetch';
+export {
+  findOrCreate,
+  findOrCreateMany,
+} from './store';
 export {
   store,
 } from './store';

package/dist/taggables/index.js

@@ -1 +1 @@
-export{bulkDestroy,destroy}from"./destroy";export{fetchTagById,fetchTags}from"./fetch";export{store}from"./store";export{update}from"./update";
+export{bulkDestroy,destroy}from"./destroy";export{fetchTagById,fetchTags}from"./fetch";export{countTaggedPosts,countTotalTags,fetchTagDistribution,fetchTagsWithPostCounts,findLeastUsedTag,findMostUsedTag,firstOrCreate}from"./fetch";export{findOrCreate,findOrCreateMany}from"./store";export{store}from"./store";export{update}from"./update";

package/dist/tests/setup.js

@@ -27,6 +27,18 @@ import{existsSync,unlinkSync}from"node:fs";import{tmpdir}from"node:os";import{jo
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP
   )
+`).execute();await db.unsafe(`
+  CREATE TABLE IF NOT EXISTS tags (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name VARCHAR(255),
+    slug VARCHAR(255),
+    description TEXT,
+    post_count INTEGER DEFAULT 0,
+    color VARCHAR(255),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP,
+    uuid VARCHAR(255)
+  )
 `).execute();await db.unsafe(`
   CREATE TABLE IF NOT EXISTS pages (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -97,4 +109,4 @@ import{existsSync,unlinkSync}from"node:fs";import{tmpdir}from"node:os";import{jo
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP
   )
-`).execute();const tableNames=["categorizables","categorizable_models","taggable_models","pages","page_revisions","redirects","menus","menu_items"];export async function refreshDatabase(){await forceConfig();for(const table of tableNames)await db.unsafe(`DELETE FROM ${table}`).execute()}process.on("exit",()=>{for(const suffix of["","-wal","-shm"])try{if(existsSync(`${DB_PATH}${suffix}`))unlinkSync(`${DB_PATH}${suffix}`)}catch{}});
+`).execute();const tableNames=["categorizables","categorizable_models","taggable_models","tags","pages","page_revisions","redirects","menus","menu_items"];export async function refreshDatabase(){await forceConfig();for(const table of tableNames)await db.unsafe(`DELETE FROM ${table}`).execute()}process.on("exit",()=>{for(const suffix of["","-wal","-shm"])try{if(existsSync(`${DB_PATH}${suffix}`))unlinkSync(`${DB_PATH}${suffix}`)}catch{}});

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/cms",
   "type": "module",
   "sideEffects": false,
-  "version": "0.74.33",
+  "version": "0.74.35",
   "description": "Stacks cms utilities.",
   "author": "Chris Breuer",
   "contributors": [
@@ -58,14 +58,14 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/database": "0.74.33",
-    "@stacksjs/error-handling": "0.74.33",
-    "@stacksjs/orm": "0.74.33",
-    "@stacksjs/path": "0.74.33",
-    "@stacksjs/sites": "0.74.33",
-    "@stacksjs/slug": "0.74.33",
+    "@stacksjs/database": "0.74.35",
+    "@stacksjs/error-handling": "0.74.35",
+    "@stacksjs/orm": "0.74.35",
+    "@stacksjs/path": "0.74.35",
+    "@stacksjs/sites": "0.74.35",
+    "@stacksjs/slug": "0.74.35",
     "@stacksjs/stx": "^0.2.274",
-    "@stacksjs/validation": "0.74.33",
+    "@stacksjs/validation": "0.74.35",
     "ts-slug": "^0.1.0",
     "ts-spreadsheets": "^0.2.0"
   },