@stacksjs/orm 0.75.347 → 0.75.349

package/dist/traits/actor.d.ts

@@ -19,6 +19,8 @@ export declare function currentTrailActor(): number | string | null;
  * to fail the write being described.
  */
 export declare function resolveTrailActorId(): Promise<number | string | null>;
+/** Resolve only the request identity, independently of CLI/job overrides. */
+export declare function resolveRequestTrailActorId(): Promise<number | string | null>;
 /**
  * The requesting IP, when there is a request to ask.
  *

package/dist/traits/actor.js

@@ -1 +1 @@
-import{log}from"@stacksjs/logging";const SENSITIVE_FIELD_PATTERNS=[/^password$/i,/^password_hash$/i,/^api_key$/i,/_token$/i,/_secret$/i,/^remember_token$/i];let explicitActorId=null;export function setTrailActor(id){explicitActorId=id}export function currentTrailActor(){return explicitActorId}export async function resolveTrailActorId(){if(explicitActorId!=null)return explicitActorId;try{const mod=await import("@stacksjs/router").catch(()=>null);if(!mod)return null;const getCurrentRequest=mod.getCurrentRequest;if(typeof getCurrentRequest!=="function")return null;const request=getCurrentRequest();return request?.user?.id??request?._user?.id??null}catch{return null}}export async function resolveTrailIp(){try{const getCurrentRequest=(await import("@stacksjs/router").catch(()=>null))?.getCurrentRequest;if(typeof getCurrentRequest!=="function")return null;const request=getCurrentRequest();return typeof request?.ip==="function"?request.ip()??null:null}catch{return null}}export function redactSensitive(attributes){if(!attributes||typeof attributes!=="object")return null;const safe={};for(const[key,value]of Object.entries(attributes)){if(SENSITIVE_FIELD_PATTERNS.some((pattern)=>pattern.test(key)))continue;safe[key]=value}return safe}export function reportTrailFailure(trail,subject,error){log.warn(`[orm] ${trail} row write failed for ${subject}: ${error?.message??String(error)}`)}
+import{log}from"@stacksjs/logging";const SENSITIVE_FIELD_PATTERNS=[/^password$/i,/^password_hash$/i,/^api_key$/i,/_token$/i,/_secret$/i,/^remember_token$/i];let explicitActorId=null;export function setTrailActor(id){explicitActorId=id}export function currentTrailActor(){return explicitActorId}export async function resolveTrailActorId(){if(explicitActorId!=null)return explicitActorId;return resolveRequestTrailActorId()}export async function resolveRequestTrailActorId(){try{const mod=await import("@stacksjs/router").catch(()=>null);if(!mod)return null;const getCurrentRequest=mod.getCurrentRequest;if(typeof getCurrentRequest!=="function")return null;const request=getCurrentRequest();return request?._authenticatedUser?.id??request?.user?.id??request?._user?.id??null}catch{return null}}export async function resolveTrailIp(){try{const getCurrentRequest=(await import("@stacksjs/router").catch(()=>null))?.getCurrentRequest;if(typeof getCurrentRequest!=="function")return null;const request=getCurrentRequest();return typeof request?.ip==="function"?request.ip()??null:null}catch{return null}}export function redactSensitive(attributes){if(!attributes||typeof attributes!=="object")return null;const safe={};for(const[key,value]of Object.entries(attributes)){if(SENSITIVE_FIELD_PATTERNS.some((pattern)=>pattern.test(key)))continue;safe[key]=value}return safe}export function reportTrailFailure(trail,subject,error){log.warn(`[orm] ${trail} row write failed for ${subject}: ${error?.message??String(error)}`)}

package/dist/traits/audit.js

@@ -1 +1 @@
-import{sqlDateTime}from"@stacksjs/database/runtime";import{log}from"@stacksjs/logging";const SENSITIVE_FIELD_PATTERNS=[/^password$/i,/^password_hash$/i,/^api_key$/i,/_token$/i,/_secret$/i,/^remember_token$/i],AUDITS_TABLE="model_audits";let _explicitAuditUserId=null;export function setAuditUser(id){_explicitAuditUserId=id}async function resolveAuditUserId(){if(_explicitAuditUserId!=null)return _explicitAuditUserId;try{const mod=await import("@stacksjs/router").catch(()=>null);if(!mod)return null;const getCurrentRequest=mod.getCurrentRequest;if(typeof getCurrentRequest!=="function")return null;const request=getCurrentRequest();if(!request)return null;return(request.user??request._user)?.id??null}catch{return null}}function redactSensitive(row){if(!row||typeof row!=="object")return null;const out={};for(const[k,v]of Object.entries(row)){if(SENSITIVE_FIELD_PATTERNS.some((rx)=>rx.test(k)))continue;out[k]=v}return out}function plainAttrs(value){if(!value||typeof value!=="object")return null;const v=value;if(v._attributes&&typeof v._attributes==="object")return{...v._attributes};return{...value}}function diffAttrs(before,after){if(!before||!after)return{old:before,next:after};const old={},next={},keys=new Set([...Object.keys(before),...Object.keys(after)]);for(const k of keys)if(before[k]!==after[k]){old[k]=before[k];next[k]=after[k]}return{old,next}}async function writeAuditRow(payload,transactional=!1){try{const{db}=await import("@stacksjs/database/runtime");await db.insertInto(AUDITS_TABLE).values({auditable_type:payload.auditable_type,auditable_id:payload.auditable_id,event:payload.event,old_values:payload.old_values?JSON.stringify(payload.old_values):null,new_values:payload.new_values?JSON.stringify(payload.new_values):null,user_id:payload.user_id,created_at:sqlDateTime()}).executeTakeFirst()}catch(err){log.warn(`[orm] audit row write failed for ${payload.auditable_type}#${String(payload.auditable_id)} (${payload.event})`,{error:err});if(transactional)throw err}}export function createAuditMethods(modelName){return{async audits(id){try{const{db}=await import("@stacksjs/database/runtime");return(await db.selectFrom(AUDITS_TABLE).selectAll().where("auditable_type","=",modelName).where("auditable_id","=",id).orderBy("created_at","desc").execute()??[]).map((r)=>({...r,old_values:typeof r.old_values==="string"?safeJsonParse(r.old_values):r.old_values,new_values:typeof r.new_values==="string"?safeJsonParse(r.new_values):r.new_values}))}catch(err){log.warn(`[orm] audits() lookup failed for ${modelName}#${String(id)}`,{error:err});return[]}}}}function safeJsonParse(value){try{return JSON.parse(value)}catch{return value}}export function resolveAuditOptions(useAudit){if(useAudit&&typeof useAudit==="object"&&"transactional"in useAudit)return{transactional:useAudit.transactional===!0};return{transactional:!1}}export function applyAudit(baseModel,modelName,primaryKey="id",opts={}){const transactional=opts.transactional===!0,model=baseModel;if(typeof baseModel.audits!=="function")baseModel.audits=createAuditMethods(modelName).audits;const runWithOptionalTx=async(fn)=>{if(!transactional)return await fn();const{db}=await import("@stacksjs/database/runtime");return await db.transaction(async()=>fn())},origCreate=baseModel.create;if(typeof origCreate==="function")baseModel.create=async function(...args){return await runWithOptionalTx(async()=>{const result=await origCreate.apply(this,args);try{const newAttrs=plainAttrs(result),id=newAttrs?.[primaryKey];if(id!=null){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"created",old_values:null,new_values:redactSensitive(newAttrs),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(create) failed for ${modelName}`,{error:err});if(transactional)throw err}return result})};const origCreateMany=baseModel.createMany;if(typeof origCreateMany==="function")baseModel.createMany=async function(...args){return await runWithOptionalTx(async()=>{const result=await origCreateMany.apply(this,args);try{const userId=Array.isArray(result)&&result.length?await resolveAuditUserId():null;for(const record of Array.isArray(result)?result:[]){const newAttrs=plainAttrs(record),id=newAttrs?.[primaryKey];if(id==null)continue;await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"created",old_values:null,new_values:redactSensitive(newAttrs),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(createMany) failed for ${modelName}`,{error:err});if(transactional)throw err}return result})};const origUpdate=baseModel.update;if(typeof origUpdate==="function")baseModel.update=async function(id,data){return await runWithOptionalTx(async()=>{const find=model.find,before=typeof find==="function"?plainAttrs(await find.call(model,id)):null,result=await origUpdate.call(this,id,data);try{const after=plainAttrs(result)??(typeof find==="function"?plainAttrs(await find.call(model,id)):null),{old,next}=diffAttrs(before,after);if(next&&Object.keys(next).length>0){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"updated",old_values:redactSensitive(old),new_values:redactSensitive(next),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(update) failed for ${modelName}#${String(id)}`,{error:err});if(transactional)throw err}return result})};const wrapDelete=(key)=>{const orig=baseModel[key];if(typeof orig!=="function")return;baseModel[key]=async function(id){return await runWithOptionalTx(async()=>{const find=model.find,before=typeof find==="function"?plainAttrs(await find.call(model,id)):null,result=await orig.call(this,id);try{if(result!==!1&&before){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"deleted",old_values:redactSensitive(before),new_values:null,user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(${key}) failed for ${modelName}#${String(id)}`,{error:err});if(transactional)throw err}return result})}};wrapDelete("delete");wrapDelete("softDelete")}
+import{sqlDateTime}from"@stacksjs/database/runtime";import{log}from"@stacksjs/logging";import{resolveRequestTrailActorId}from"./actor";const SENSITIVE_FIELD_PATTERNS=[/^password$/i,/^password_hash$/i,/^api_key$/i,/_token$/i,/_secret$/i,/^remember_token$/i],AUDITS_TABLE="model_audits";let _explicitAuditUserId=null;export function setAuditUser(id){_explicitAuditUserId=id}async function resolveAuditUserId(){if(_explicitAuditUserId!=null)return _explicitAuditUserId;return resolveRequestTrailActorId()}function redactSensitive(row){if(!row||typeof row!=="object")return null;const out={};for(const[k,v]of Object.entries(row)){if(SENSITIVE_FIELD_PATTERNS.some((rx)=>rx.test(k)))continue;out[k]=v}return out}function plainAttrs(value){if(!value||typeof value!=="object")return null;const v=value;if(v._attributes&&typeof v._attributes==="object")return{...v._attributes};return{...value}}function diffAttrs(before,after){if(!before||!after)return{old:before,next:after};const old={},next={},keys=new Set([...Object.keys(before),...Object.keys(after)]);for(const k of keys)if(before[k]!==after[k]){old[k]=before[k];next[k]=after[k]}return{old,next}}async function writeAuditRow(payload,transactional=!1){try{const{db}=await import("@stacksjs/database/runtime");await db.insertInto(AUDITS_TABLE).values({auditable_type:payload.auditable_type,auditable_id:payload.auditable_id,event:payload.event,old_values:payload.old_values?JSON.stringify(payload.old_values):null,new_values:payload.new_values?JSON.stringify(payload.new_values):null,user_id:payload.user_id,created_at:sqlDateTime()}).executeTakeFirst()}catch(err){log.warn(`[orm] audit row write failed for ${payload.auditable_type}#${String(payload.auditable_id)} (${payload.event})`,{error:err});if(transactional)throw err}}export function createAuditMethods(modelName){return{async audits(id){try{const{db}=await import("@stacksjs/database/runtime");return(await db.selectFrom(AUDITS_TABLE).selectAll().where("auditable_type","=",modelName).where("auditable_id","=",id).orderBy("created_at","desc").execute()??[]).map((r)=>({...r,old_values:typeof r.old_values==="string"?safeJsonParse(r.old_values):r.old_values,new_values:typeof r.new_values==="string"?safeJsonParse(r.new_values):r.new_values}))}catch(err){log.warn(`[orm] audits() lookup failed for ${modelName}#${String(id)}`,{error:err});return[]}}}}function safeJsonParse(value){try{return JSON.parse(value)}catch{return value}}export function resolveAuditOptions(useAudit){if(useAudit&&typeof useAudit==="object"&&"transactional"in useAudit)return{transactional:useAudit.transactional===!0};return{transactional:!1}}export function applyAudit(baseModel,modelName,primaryKey="id",opts={}){const transactional=opts.transactional===!0,model=baseModel;if(typeof baseModel.audits!=="function")baseModel.audits=createAuditMethods(modelName).audits;const runWithOptionalTx=async(fn)=>{if(!transactional)return await fn();const{db}=await import("@stacksjs/database/runtime");return await db.transaction(async()=>fn())},origCreate=baseModel.create;if(typeof origCreate==="function")baseModel.create=async function(...args){return await runWithOptionalTx(async()=>{const result=await origCreate.apply(this,args);try{const newAttrs=plainAttrs(result),id=newAttrs?.[primaryKey];if(id!=null){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"created",old_values:null,new_values:redactSensitive(newAttrs),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(create) failed for ${modelName}`,{error:err});if(transactional)throw err}return result})};const origCreateMany=baseModel.createMany;if(typeof origCreateMany==="function")baseModel.createMany=async function(...args){return await runWithOptionalTx(async()=>{const result=await origCreateMany.apply(this,args);try{const userId=Array.isArray(result)&&result.length?await resolveAuditUserId():null;for(const record of Array.isArray(result)?result:[]){const newAttrs=plainAttrs(record),id=newAttrs?.[primaryKey];if(id==null)continue;await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"created",old_values:null,new_values:redactSensitive(newAttrs),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(createMany) failed for ${modelName}`,{error:err});if(transactional)throw err}return result})};const origUpdate=baseModel.update;if(typeof origUpdate==="function")baseModel.update=async function(id,data){return await runWithOptionalTx(async()=>{const find=model.find,before=typeof find==="function"?plainAttrs(await find.call(model,id)):null,result=await origUpdate.call(this,id,data);try{const after=plainAttrs(result)??(typeof find==="function"?plainAttrs(await find.call(model,id)):null),{old,next}=diffAttrs(before,after);if(next&&Object.keys(next).length>0){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"updated",old_values:redactSensitive(old),new_values:redactSensitive(next),user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(update) failed for ${modelName}#${String(id)}`,{error:err});if(transactional)throw err}return result})};const wrapDelete=(key)=>{const orig=baseModel[key];if(typeof orig!=="function")return;baseModel[key]=async function(id){return await runWithOptionalTx(async()=>{const find=model.find,before=typeof find==="function"?plainAttrs(await find.call(model,id)):null,result=await orig.call(this,id);try{if(result!==!1&&before){const userId=await resolveAuditUserId();await writeAuditRow({auditable_type:modelName,auditable_id:id,event:"deleted",old_values:redactSensitive(before),new_values:null,user_id:userId},transactional)}}catch(err){log.warn(`[orm] audit(${key}) failed for ${modelName}#${String(id)}`,{error:err});if(transactional)throw err}return result})}};wrapDelete("delete");wrapDelete("softDelete")}

package/package.json

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