@stacksjs/orm 0.75.233 → 0.75.237

package/dist/models/Error.ts

@@ -52,6 +52,16 @@ export default defineModel({
       factory: faker => faker.system.filePath(),
     },
 
+    /**
+     * The HTTP status the error carried, and only that.
+     *
+     * It used to mean two things: the factory seeds an HTTP status while
+     * `resolveGroup` wrote 1 and `ignoreGroup` wrote 2 into the same column
+     * to mean resolved and ignored. So resolving an error destroyed its
+     * status, and a seeded error could never read as resolved because no
+     * factory row is ever 1 (stacksjs/stacks#2923). Triage now lives in
+     * `resolution`.
+     */
     status: {
       fillable: true,
       validation: {
@@ -63,6 +73,17 @@ export default defineModel({
       factory: faker => faker.number.int({ min: 400, max: 500 }),
     },
 
+    /** Where this error sits in triage. Separate from `status`, see above. */
+    resolution: {
+      required: true,
+      fillable: true,
+      default: 'unresolved',
+      validation: {
+        rule: schema.enum(['unresolved', 'resolved', 'ignored']),
+      },
+      factory: () => 'unresolved',
+    },
+
     additional_info: {
       fillable: true,
       validation: {

package/dist/traits/commentable.d.ts

@@ -1,4 +1,15 @@
-export declare function createCommentableMethods(tableName: string): boolean;
+export declare function createCommentableMethods(tableName: string): {
+  comments: (id: number) => Promise<any[]>;
+  commentCount: (id: number) => Promise<number>;
+  addComment: (id: number, comment: NewComment, options?: AddCommentOptions) => Promise<any>;
+  approvedComments: (id: number) => Promise<any[]>;
+  pendingComments: (id: number) => Promise<any[]>;
+  rejectedComments: (id: number) => Promise<any[]>;
+  upvoteComment: (commentId: number, userId: number) => Promise<any>;
+  removeCommentUpvote: (commentId: number, userId: number) => Promise<void>;
+  commentUpvoteCount: (commentId: number) => Promise<number>;
+  hasUpvotedComment: (commentId: number, userId: number) => Promise<boolean>
+};
 /** The fields a caller may set on a new comment. */
 export declare interface NewComment {
   body: string

package/dist/traits/commentable.js

@@ -1 +1 @@
-import{db as _db,sql,sqlDateTime}from"@stacksjs/database/runtime";function assertId(id,method){if(typeof id!=="number"||!Number.isFinite(id)||id<=0)throw Error(`[orm/commentable] ${method} requires a positive numeric id (received ${String(id)})`)}const UPVOTES_TABLE="commentable_upvotes",COMMENT_UPVOTE_TYPE="commentables";function isDuplicateError(err){const e=err;return e.code==="SQLITE_CONSTRAINT_UNIQUE"||e.code==="SQLITE_CONSTRAINT"||e.code==="23505"||e.errno===1062||/unique|duplicate/i.test(e.message??"")}const COMMENT_STATUSES_ON_CREATE=["pending","approved"];export function createCommentableMethods(tableName){const db=_db;return{async comments(id){assertId(id,"comments");return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).selectAll().orderBy("id","asc").execute()},async commentCount(id){const result=await db.selectFrom("commentables").select(sql`count(*) as count`).where("commentables_id","=",id).where("commentables_type","=",tableName).executeTakeFirst();return Number(result?.count)||0},async addComment(id,comment,options={}){assertId(id,"addComment");if(!comment||typeof comment.body!=="string"||comment.body.trim().length===0)throw Error("[orm/commentable] addComment requires a non-empty comment.body");if(comment.title!=null&&typeof comment.title!=="string")throw Error("[orm/commentable] addComment requires comment.title to be a string when given");const status=options.status??"pending";if(!COMMENT_STATUSES_ON_CREATE.includes(status))throw Error(`[orm/commentable] addComment status must be one of ${COMMENT_STATUSES_ON_CREATE.join(", ")} (received ${String(status)})`);const values={title:comment.title?.trim()??"",body:comment.body,commentables_id:id,commentables_type:tableName,status,approved_at:status==="approved"?Date.now():null,created_at:sqlDateTime(),updated_at:sqlDateTime()};for(const key of["author_name","author_email","user_id"])if(comment[key]!=null)values[key]=comment[key];const written=await db.insertInto("commentables").values(values).returningAll().executeTakeFirst();if(written&&typeof written==="object"&&"id"in written)return written;const insertedId=written?.lastInsertRowid;if(insertedId==null)return written;return await db.selectFrom("commentables").where("id","=",Number(insertedId)).selectAll().executeTakeFirst()},async approvedComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","approved").selectAll().orderBy("id","asc").execute()},async pendingComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","pending").selectAll().orderBy("id","asc").execute()},async rejectedComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","rejected").selectAll().orderBy("id","asc").execute()},async upvoteComment(commentId,userId){assertId(commentId,"upvoteComment");assertId(userId,"upvoteComment");const existing=()=>db.selectFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).selectAll().executeTakeFirst(),already=await existing();if(already)return already;try{await db.insertInto(UPVOTES_TABLE).values({upvoteable_id:commentId,upvoteable_type:COMMENT_UPVOTE_TYPE,user_id:userId,created_at:sqlDateTime()}).execute()}catch(err){if(!isDuplicateError(err))throw err}return await existing()},async removeCommentUpvote(commentId,userId){assertId(commentId,"removeCommentUpvote");assertId(userId,"removeCommentUpvote");await db.deleteFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).execute()},async commentUpvoteCount(commentId){assertId(commentId,"commentUpvoteCount");const result=await db.selectFrom(UPVOTES_TABLE).select("count(*) as count").where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).executeTakeFirst();return Number(result?.count)||0},async hasUpvotedComment(commentId,userId){assertId(commentId,"hasUpvotedComment");assertId(userId,"hasUpvotedComment");return!!await db.selectFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).selectAll().executeTakeFirst()}}}
+import{db as _db,sql,sqlDateTime}from"@stacksjs/database/runtime";function assertId(id,method){if(typeof id!=="number"||!Number.isFinite(id)||id<=0)throw Error(`[orm/commentable] ${method} requires a positive numeric id (received ${String(id)})`)}const UPVOTES_TABLE="commentable_upvotes",COMMENT_UPVOTE_TYPE="commentables";function isDuplicateError(err){const e=err;return e.code==="SQLITE_CONSTRAINT_UNIQUE"||e.code==="SQLITE_CONSTRAINT"||e.code==="23505"||e.errno===1062||/unique|duplicate/i.test(e.message??"")}const COMMENT_STATUSES_ON_CREATE=["pending","approved"];export function createCommentableMethods(tableName){const db=_db;return{async comments(id){assertId(id,"comments");return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).selectAll().orderBy("id","asc").execute()},async commentCount(id){const result=await db.selectFrom("commentables").select(sql`count(*) as count`).where("commentables_id","=",id).where("commentables_type","=",tableName).executeTakeFirst();return Number(result?.count)||0},async addComment(id,comment,options={}){assertId(id,"addComment");if(!comment||typeof comment.body!=="string"||comment.body.trim().length===0)throw Error("[orm/commentable] addComment requires a non-empty comment.body");if(comment.title!=null&&typeof comment.title!=="string")throw Error("[orm/commentable] addComment requires comment.title to be a string when given");const status=options.status??"pending";if(!COMMENT_STATUSES_ON_CREATE.includes(status))throw Error(`[orm/commentable] addComment status must be one of ${COMMENT_STATUSES_ON_CREATE.join(", ")} (received ${String(status)})`);const values={title:comment.title?.trim()??"",body:comment.body,commentables_id:id,commentables_type:tableName,status,approved_at:status==="approved"?Date.now():null,created_at:sqlDateTime(),updated_at:sqlDateTime()};for(const key of["author_name","author_email","user_id"])if(comment[key]!=null)values[key]=comment[key];const written=await db.insertInto("commentables").values(values).returningAll().executeTakeFirst();if(written&&typeof written==="object"&&"id"in written)return written;const insertedId=written?.lastInsertRowid;if(insertedId==null)return written;return await db.selectFrom("commentables").where("id","=",Number(insertedId)).selectAll().executeTakeFirst()},async approvedComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","approved").selectAll().orderBy("id","asc").execute()},async pendingComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","pending").selectAll().orderBy("id","asc").execute()},async rejectedComments(id){return await db.selectFrom("commentables").where("commentables_id","=",id).where("commentables_type","=",tableName).where("status","=","rejected").selectAll().orderBy("id","asc").execute()},async upvoteComment(commentId,userId){assertId(commentId,"upvoteComment");assertId(userId,"upvoteComment");const existing=()=>db.selectFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).selectAll().executeTakeFirst(),already=await existing();if(already)return already;try{await db.insertInto(UPVOTES_TABLE).values({upvoteable_id:commentId,upvoteable_type:COMMENT_UPVOTE_TYPE,user_id:userId,created_at:sqlDateTime()}).execute()}catch(err){if(!isDuplicateError(err))throw err}return await existing()},async removeCommentUpvote(commentId,userId){assertId(commentId,"removeCommentUpvote");assertId(userId,"removeCommentUpvote");await db.deleteFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).execute()},async commentUpvoteCount(commentId){assertId(commentId,"commentUpvoteCount");return await db.selectFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).count()},async hasUpvotedComment(commentId,userId){assertId(commentId,"hasUpvotedComment");assertId(userId,"hasUpvotedComment");return!!await db.selectFrom(UPVOTES_TABLE).where("upvoteable_id","=",commentId).where("upvoteable_type","=",COMMENT_UPVOTE_TYPE).where("user_id","=",userId).selectAll().executeTakeFirst()}}}

package/dist/traits/likeable.js

@@ -1 +1 @@
-import{db as _db,sqlDateTime}from"@stacksjs/database/runtime";export function createLikeableMethods(tableName,options){const db=_db,likeTable=options?.table||`${tableName}_likes`,foreignKey=options?.foreignKey||`${tableName.replace(/s$/,"")}_id`;return{async likes(id){return await db.selectFrom(likeTable).where(foreignKey,"=",id).selectAll().execute()},async likeCount(id){const result=await db.selectFrom(likeTable).select("count(*) as count").where(foreignKey,"=",id).executeTakeFirst();return Number(result?.count)||0},async like(id,userId){if(typeof id!=="number"||!Number.isFinite(id)||id<=0)throw Error(`[orm/likeable] like requires a positive numeric id (received ${String(id)})`);if(typeof userId!=="number"||!Number.isFinite(userId)||userId<=0)throw Error(`[orm/likeable] like requires a positive numeric userId (received ${String(userId)})`);const now=sqlDateTime();try{return await db.insertInto(likeTable).values({[foreignKey]:id,user_id:userId,created_at:now,updated_at:now}).returningAll().executeTakeFirst()}catch(err){const e=err;if(!(e.code==="SQLITE_CONSTRAINT_UNIQUE"||e.code==="SQLITE_CONSTRAINT"||e.code==="23505"||e.errno===1062||/unique|duplicate/i.test(e.message??"")))throw err;const existing=await db.selectFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).selectAll().executeTakeFirst();if(existing)return existing;throw err}},async unlike(id,userId){await db.deleteFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).execute()},async isLiked(id,userId){return!!await db.selectFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).selectAll().executeTakeFirst()},async likedBy(userId){return(await db.selectFrom(likeTable).select([foreignKey]).where("user_id","=",userId).execute()).map((r)=>Number(r[foreignKey])).filter(Boolean)}}}
+import{db as _db,sqlDateTime}from"@stacksjs/database/runtime";export function createLikeableMethods(tableName,options){const db=_db,likeTable=options?.table||`${tableName}_likes`,foreignKey=options?.foreignKey||`${tableName.replace(/s$/,"")}_id`;return{async likes(id){return await db.selectFrom(likeTable).where(foreignKey,"=",id).selectAll().execute()},async likeCount(id){return await db.selectFrom(likeTable).where(foreignKey,"=",id).count()},async like(id,userId){if(typeof id!=="number"||!Number.isFinite(id)||id<=0)throw Error(`[orm/likeable] like requires a positive numeric id (received ${String(id)})`);if(typeof userId!=="number"||!Number.isFinite(userId)||userId<=0)throw Error(`[orm/likeable] like requires a positive numeric userId (received ${String(userId)})`);const now=sqlDateTime();try{return await db.insertInto(likeTable).values({[foreignKey]:id,user_id:userId,created_at:now,updated_at:now}).returningAll().executeTakeFirst()}catch(err){const e=err;if(!(e.code==="SQLITE_CONSTRAINT_UNIQUE"||e.code==="SQLITE_CONSTRAINT"||e.code==="23505"||e.errno===1062||/unique|duplicate/i.test(e.message??"")))throw err;const existing=await db.selectFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).selectAll().executeTakeFirst();if(existing)return existing;throw err}},async unlike(id,userId){await db.deleteFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).execute()},async isLiked(id,userId){return!!await db.selectFrom(likeTable).where(foreignKey,"=",id).where("user_id","=",userId).selectAll().executeTakeFirst()},async likedBy(userId){return(await db.selectFrom(likeTable).select([foreignKey]).where("user_id","=",userId).execute()).map((r)=>Number(r[foreignKey])).filter(Boolean)}}}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/orm",
   "type": "module",
   "sideEffects": false,
-  "version": "0.75.233",
+  "version": "0.75.237",
   "description": "The Stacks ORM integration",
   "author": "Chris Breuer",
   "contributors": [
@@ -63,31 +63,31 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/cache": "0.75.233",
-    "@stacksjs/cli": "0.75.233",
-    "@stacksjs/config": "0.75.233",
-    "@stacksjs/database": "0.75.233",
-    "@stacksjs/env": "0.75.233",
-    "@stacksjs/error-handling": "0.75.233",
-    "@stacksjs/events": "0.75.233",
-    "@stacksjs/logging": "0.75.233",
-    "@stacksjs/model-meta": "0.75.233",
-    "@stacksjs/pagination": "0.75.233",
-    "@stacksjs/path": "0.75.233",
-    "@stacksjs/query-builder": "0.75.233",
-    "@stacksjs/realtime": "0.75.233",
-    "@stacksjs/router": "0.75.233",
-    "@stacksjs/storage": "0.75.233",
-    "@stacksjs/strings": "0.75.233",
+    "@stacksjs/cache": "0.75.237",
+    "@stacksjs/cli": "0.75.237",
+    "@stacksjs/config": "0.75.237",
+    "@stacksjs/database": "0.75.237",
+    "@stacksjs/env": "0.75.237",
+    "@stacksjs/error-handling": "0.75.237",
+    "@stacksjs/events": "0.75.237",
+    "@stacksjs/logging": "0.75.237",
+    "@stacksjs/model-meta": "0.75.237",
+    "@stacksjs/pagination": "0.75.237",
+    "@stacksjs/path": "0.75.237",
+    "@stacksjs/query-builder": "0.75.237",
+    "@stacksjs/realtime": "0.75.237",
+    "@stacksjs/router": "0.75.237",
+    "@stacksjs/storage": "0.75.237",
+    "@stacksjs/strings": "0.75.237",
     "@stacksjs/ts-validation": "^0.5.6",
-    "@stacksjs/validation": "0.75.233",
+    "@stacksjs/validation": "0.75.237",
     "bun-query-builder": "^0.3.8"
   },
   "peerDependencies": {
-    "@stacksjs/auth": "0.75.233",
-    "@stacksjs/payments": "0.75.233",
-    "@stacksjs/queue": "0.75.233",
-    "@stacksjs/search-engine": "0.75.233",
+    "@stacksjs/auth": "0.75.237",
+    "@stacksjs/payments": "0.75.237",
+    "@stacksjs/queue": "0.75.237",
+    "@stacksjs/search-engine": "0.75.237",
     "stripe": "23.0.0"
   },
   "peerDependenciesMeta": {
@@ -108,7 +108,7 @@
     }
   },
   "devDependencies": {
-    "@stacksjs/types": "0.75.233",
+    "@stacksjs/types": "0.75.237",
     "better-dx": "^0.2.24",
     "stripe": "23.0.0"
   }