@ez4/aws-bucket 0.22.0 → 0.24.0

package/dist/bucket/client.d.ts

@@ -1,6 +1,6 @@
 import type { Arn, ResourceTags } from '@ez4/aws-common';
+import type { Event } from '@aws-sdk/client-s3';
 import type { Bucket } from '@ez4/storage';
-import { Event } from '@aws-sdk/client-s3';
 export type CreateRequest = {
     bucketName: string;
 };

package/dist/bucket/function/types.d.ts

@@ -3,6 +3,7 @@ import type { ExtraSource } from '@ez4/project/library';
 export type BucketEventFunction = {
     functionName: string;
     sourceFile: string;
+    module?: string;
 };
 export type BucketEventEntryPoint = BucketEventFunction & {
     dependencies: string[];

package/dist/client.cjs

@@ -2,7 +2,7 @@
 typeof o=="object"||typeof o=="function")for(let e of C(o))!O.call(t,e)&&e!==s&&
 p(t,e,{get:()=>o[e],enumerable:!(n=B(o,e))||n.enumerable});return t};var T=(t,o,s)=>(s=t!=null?f(l(t)):{},g(o||!t||!t.__esModule?p(s,"default",{value:t,
 enumerable:!0}):s,t)),K=t=>g(p({},"__esModule",{value:!0}),t);var h={};S(h,{Client:()=>w});module.exports=K(h);var y=require("@aws-sdk/s3-request-presigner"),
-r=require("@aws-sdk/client-s3"),d=T(require("mime/lite.js"),1);var c=new r.S3Client({}),w;(o=>o.make=m(s=>new class{async exists(n){return!!await this.
+r=require("@aws-sdk/client-s3"),d=T(require("mime"),1);var c=new r.S3Client({}),w;(o=>o.make=m(s=>new class{async exists(n){return!!await this.
 getStats(n)}async write(n,e,i){let a=i?.contentType??d.default.getType(n);await c.
 send(new r.PutObjectCommand({Bucket:s,Key:n,Body:e,...a&&{ContentType:a}}))}async read(n){
 let i=await(await c.send(new r.GetObjectCommand({Bucket:s,Key:n}))).Body.transformToByteArray();

package/dist/client.mjs

@@ -1,6 +1,6 @@
 var d=Object.defineProperty;var c=(a,i)=>d(a,"name",{value:i,configurable:!0});import{getSignedUrl as p}from"@aws-sdk/s3-request-presigner";import{HeadObjectCommand as w,
 PutObjectCommand as y,GetObjectCommand as m,DeleteObjectCommand as u,NotFound as f,
-S3Client as B,NoSuchKey as C}from"@aws-sdk/client-s3";import l from"mime/lite.js";var s=new B({}),O;(i=>i.make=c(r=>new class{async exists(e){return!!await this.getStats(
+S3Client as B,NoSuchKey as C}from"@aws-sdk/client-s3";import l from"mime";var s=new B({}),O;(i=>i.make=c(r=>new class{async exists(e){return!!await this.getStats(
 e)}async write(e,t,n){let o=n?.contentType??l.getType(e);await s.send(new y({Bucket:r,
 Key:e,Body:t,...o&&{ContentType:o}}))}async read(e){let n=await(await s.send(new m(
 {Bucket:r,Key:e}))).Body.transformToByteArray();return Buffer.from(n)}async delete(e){

package/dist/main.cjs

@@ -126,22 +126,23 @@ e,s.name,r),vt=(0,et.createLogGroup)(t,{retention:i??O.LogRetention,groupName:ee
 tags:r.tags});return d=Q(t,n.role,vt,{functionName:ee,description:s.description,
 timeout:g??O.Timeout,memory:v??O.Memory,extras:e.extras,debug:r.debug,tags:r.tags,
 variables:{...r.variables,...e.variables,...E},handler:{dependencies:n.getDependencies(
-s.file),functionName:s.name,sourceFile:s.file},...c&&{listener:{functionName:c.name,
-sourceFile:c.file}}}),n.setServiceState(d,T,r),d},"prepareEvents"),rt=o((t,e,r,n)=>{
-if(!e.extras||!e.events)return;if(!n.role||!(0,Y.isRoleState)(n.role))throw new h;
-let{handler:s}=e.events,c=X(e,s.name),i=(0,L.getFunctionState)(n,c,r);(0,Ye.linkServiceExtras)(
-t,i.entryId,e.extras)},"connectEvents");var ot=require("node:fs/promises"),w=require("node:path"),nt=require("@ez4/aws-bucket");var st=o(async(t,e,r)=>{let n=process.cwd(),s=(0,w.join)(n,r),c=await(0,ot.readdir)(
+s.file),functionName:s.name,sourceFile:s.file,module:s.module},...c&&{listener:{
+functionName:c.name,sourceFile:c.file,module:c.module}}}),n.setServiceState(d,T,
+r),d},"prepareEvents"),rt=o((t,e,r,n)=>{if(!e.extras||!e.events)return;if(!n.role||
+!(0,Y.isRoleState)(n.role))throw new h;let{handler:s}=e.events,c=X(e,s.name),i=(0,L.getFunctionState)(
+n,c,r);(0,Ye.linkServiceExtras)(t,i.entryId,e.extras)},"connectEvents");var ot=require("node:fs/promises"),w=require("node:path"),nt=require("@ez4/aws-bucket");var st=o(async(t,e,r)=>{let n=process.cwd(),s=(0,w.join)(n,r),c=await(0,ot.readdir)(
 s,{withFileTypes:!0,recursive:!0});for(let i of c){if(!i.isFile())continue;let g=(0,w.join)(
 i.parentPath,i.name);(0,nt.createBucketObject)(t,e,{objectKey:(0,w.relative)(s,g),
 filePath:(0,w.relative)(n,g)})}},"prepareLocalContent");var ct=o((t,e,r)=>{let n=K(t,e.name,r);return{entryIds:[n.entryId],constructor:`\
 make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",module:"Client"}},
 "prepareLinkedClient");var at=o(t=>{let{service:e,options:r,context:n}=t;return(0,q.isBucketService)(e)?
 ct(n,e,r):null},"prepareLinkedServices"),it=o(async t=>{let{state:e,service:r,options:n,
-context:s}=t;if(!(0,q.isBucketService)(r))return;let{localPath:c,autoExpireDays:i,
+context:s}=t;if(!(0,q.isBucketService)(r))return!1;let{localPath:c,autoExpireDays:i,
 events:g,cors:v}=r,E=await Qe(r,n),T=tt(e,r,n,s),d=J(e,T,{eventsPath:g?.path,tags:n.
-tags,bucketName:E,autoExpireDays:i,localPath:c,cors:v});s.setServiceState(d,r,n),
-c&&await st(e,d,c)},"prepareBucketServices"),pt=o(t=>{let{state:e,service:r,options:n,
-context:s}=t;(0,q.isBucketService)(r)&&rt(e,r,n,s)},"connectBucketServices");var mt=require("@ez4/storage/library"),M=require("@ez4/aws-identity"),ut=require("@ez4/project/library");var lt=o(t=>{let{state:e,serviceType:r,options:n}=t;if(r!==mt.ServiceType)return null;
+tags,bucketName:E,autoExpireDays:i,localPath:c,cors:v});return s.setServiceState(
+d,r,n),c&&await st(e,d,c),!0},"prepareBucketServices"),pt=o(t=>{let{state:e,service:r,
+options:n,context:s}=t;(0,q.isBucketService)(r)&&rt(e,r,n,s)},"connectBucketServ\
+ices");var mt=require("@ez4/storage/library"),M=require("@ez4/aws-identity"),ut=require("@ez4/project/library");var lt=o(t=>{let{state:e,serviceType:r,options:n}=t;if(r!==mt.ServiceType)return null;
 let s=(0,ut.getServiceName)("",n),c=`${s}-bucket-policy`;return(0,M.tryGetPolicy)(
 e,c)??(0,M.createPolicy)(e,{tags:n.tags,policyDocument:Z(s),policyName:c})},"pre\
 pareExecutionPolicy");var yt=!1,Qt=o(()=>{yt||((0,ft.registerTriggers)(),(0,gt.registerTriggers)(),(0,dt.registerTriggers)(),

package/dist/main.mjs

@@ -66,8 +66,8 @@ eResource"),dt=o(async t=>{let e=t.result;e&&await se(e.bucketName)},"deleteReso
 urce");var ie=o(()=>{St(g,ce())},"registerPolicyProvider");import{registerProvider as At}from"@ez4/aws-common";import{stat as Rt}from"node:fs/promises";import{ReplaceResourceError as Ct}from"@ez4/aws-common";
 import{deepCompare as jt,deepEqual as ht}from"@ez4/utils";import{createReadStream as kt}from"node:fs";import{S3Client as bt,PutObjectCommand as xt,
 PutObjectTaggingCommand as Pt,DeleteObjectCommand as Bt,NoSuchBucket as wt}from"@aws-sdk/client-s3";
-import{getTagList as vt,Logger as j}from"@ez4/aws-common";import Et from"mime";var d="AWS:S3/Object",f="aws:s3.object";var io=o(t=>t.type===f,"isBucketObjectState"),R=o((t,e)=>`${t}/${e}`,"getBucketO\
-bjectPath"),po=o(t=>t.getDependencies(f).map(({result:r,parameters:n})=>({lastModified:r?.
+import{getTagList as vt,Logger as j}from"@ez4/aws-common";import Et from"mime";var d="AWS:S3/Object",f="aws:s3.object";var co=o(t=>t.type===f,"isBucketObjectState"),R=o((t,e)=>`${t}/${e}`,"getBucketO\
+bjectPath"),ao=o(t=>t.getDependencies(f).map(({result:r,parameters:n})=>({lastModified:r?.
 lastModified,objectKey:n.objectKey})),"getBucketObjectFiles");var h=new bt({}),O=o(async(t,e)=>{let{objectKey:r,filePath:n}=e;j.logCreate(d,R(
 t,r));let s=Et.getType(n);return await h.send(new xt({Bucket:t,Key:r,Body:kt(n),
 ...s&&{ContentType:s}})),{objectKey:r}},"putObject"),pe=o(async(t,e,r)=>{j.logTag(
@@ -116,33 +116,33 @@ e,s.name),l=Wt(n,B,r);if(l)return l;let A=Pe(e,s.name,r),ze=Jt(t,{retention:a??P
 LogRetention,groupName:A,tags:r.tags});return l=be(t,n.role,ze,{functionName:A,description:s.
 description,timeout:u??P.Timeout,memory:k??P.Memory,extras:e.extras,debug:r.debug,
 tags:r.tags,variables:{...r.variables,...e.variables,...b},handler:{dependencies:n.
-getDependencies(s.file),functionName:s.name,sourceFile:s.file},...c&&{listener:{
-functionName:c.name,sourceFile:c.file}}}),n.setServiceState(l,B,r),l},"prepareEv\
-ents"),ve=o((t,e,r,n)=>{if(!e.extras||!e.events)return;if(!n.role||!Be(n.role))throw new x;
-let{handler:s}=e.events,c=z(e,s.name),a=Vt(n,c,r);Zt(t,a.entryId,e.extras)},"con\
-nectEvents");import{readdir as Qt}from"node:fs/promises";import{join as Ee,relative as Re}from"node:path";
+getDependencies(s.file),functionName:s.name,sourceFile:s.file,module:s.module},...c&&
+{listener:{functionName:c.name,sourceFile:c.file,module:c.module}}}),n.setServiceState(
+l,B,r),l},"prepareEvents"),ve=o((t,e,r,n)=>{if(!e.extras||!e.events)return;if(!n.
+role||!Be(n.role))throw new x;let{handler:s}=e.events,c=z(e,s.name),a=Vt(n,c,r);
+Zt(t,a.entryId,e.extras)},"connectEvents");import{readdir as Qt}from"node:fs/promises";import{join as Ee,relative as Re}from"node:path";
 import{createBucketObject as Xt}from"@ez4/aws-bucket";var Ce=o(async(t,e,r)=>{let n=process.cwd(),s=Ee(n,r),c=await Qt(s,{withFileTypes:!0,
 recursive:!0});for(let a of c){if(!a.isFile())continue;let u=Ee(a.parentPath,a.name);
 Xt(t,e,{objectKey:Re(s,u),filePath:Re(n,u)})}},"prepareLocalContent");var je=o((t,e,r)=>{let n=te(t,e.name,r);return{entryIds:[n.entryId],constructor:`\
 make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",module:"Client"}},
 "prepareLinkedClient");var he=o(t=>{let{service:e,options:r,context:n}=t;return F(e)?je(n,e,r):null},"p\
 repareLinkedServices"),Oe=o(async t=>{let{state:e,service:r,options:n,context:s}=t;
-if(!F(r))return;let{localPath:c,autoExpireDays:a,events:u,cors:k}=r,b=await xe(r,
-n),B=we(e,r,n,s),l=Se(e,B,{eventsPath:u?.path,tags:n.tags,bucketName:b,autoExpireDays:a,
-localPath:c,cors:k});s.setServiceState(l,r,n),c&&await Ce(e,l,c)},"prepareBucket\
-Services"),Te=o(t=>{let{state:e,service:r,options:n,context:s}=t;F(r)&&ve(e,r,n,
-s)},"connectBucketServices");import{ServiceType as Yt}from"@ez4/storage/library";import{createPolicy as er,tryGetPolicy as tr}from"@ez4/aws-identity";
+if(!F(r))return!1;let{localPath:c,autoExpireDays:a,events:u,cors:k}=r,b=await xe(
+r,n),B=we(e,r,n,s),l=Se(e,B,{eventsPath:u?.path,tags:n.tags,bucketName:b,autoExpireDays:a,
+localPath:c,cors:k});return s.setServiceState(l,r,n),c&&await Ce(e,l,c),!0},"pre\
+pareBucketServices"),Te=o(t=>{let{state:e,service:r,options:n,context:s}=t;F(r)&&
+ve(e,r,n,s)},"connectBucketServices");import{ServiceType as Yt}from"@ez4/storage/library";import{createPolicy as er,tryGetPolicy as tr}from"@ez4/aws-identity";
 import{getServiceName as rr}from"@ez4/project/library";var Ne=o(t=>{let{state:e,serviceType:r,options:n}=t;if(r!==Yt)return null;let s=rr(
 "",n),c=`${s}-bucket-policy`;return tr(e,c)??er(e,{tags:n.tags,policyDocument:de(
-s),policyName:c})},"prepareExecutionPolicy");var De=!1,Qn=o(()=>{De||(or(),nr(),sr(),cr(),ar("@ez4/aws-bucket",{"deploy:prepa\
+s),policyName:c})},"prepareExecutionPolicy");var De=!1,Zn=o(()=>{De||(or(),nr(),sr(),cr(),ar("@ez4/aws-bucket",{"deploy:prepa\
 reExecutionPolicy":Ne,"deploy:prepareLinkedService":he,"deploy:prepareResources":Oe,
-"deploy:connectResources":Te}),Y(),ie(),fe(),De=!0)},"registerTriggers");import{getRegion as ir}from"@ez4/aws-identity";var ts=o(t=>/(.+)\.s3\.(.+)\.amazonaws\.com/i.test(t),"isBucketDomain"),rs=o(async t=>{
-let e=await ir();return`${t}.s3.${e}.amazonaws.com`},"getBucketDomain");import{attachEntry as pr}from"@ez4/stateful";import{hashData as mr}from"@ez4/utils";var is=o((t,e,r,n)=>{let s=mr(g,e.entryId,r.entryId);return pr(t,{type:g,entryId:s,
-dependencies:[e.entryId,r.entryId],parameters:n})},"createBucketPolicy");var ls=o(t=>t.type===g,"isBucketPolicyState");import{attachEntry as ur}from"@ez4/stateful";import{hashData as lr}from"@ez4/utils";var ks=o((t,e,r)=>{let n=r.objectKey,s=lr(f,e.entryId,n);return ur(t,{type:f,entryId:s,
+"deploy:connectResources":Te}),Y(),ie(),fe(),De=!0)},"registerTriggers");import{getRegion as ir}from"@ez4/aws-identity";var Yn=o(t=>/(.+)\.s3\.(.+)\.amazonaws\.com/i.test(t),"isBucketDomain"),es=o(async t=>{
+let e=await ir();return`${t}.s3.${e}.amazonaws.com`},"getBucketDomain");import{attachEntry as pr}from"@ez4/stateful";import{hashData as mr}from"@ez4/utils";var cs=o((t,e,r,n)=>{let s=mr(g,e.entryId,r.entryId);return pr(t,{type:g,entryId:s,
+dependencies:[e.entryId,r.entryId],parameters:n})},"createBucketPolicy");var ms=o(t=>t.type===g,"isBucketPolicyState");import{attachEntry as ur}from"@ez4/stateful";import{hashData as lr}from"@ez4/utils";var ds=o((t,e,r)=>{let n=r.objectKey,s=lr(f,e.entryId,n);return ur(t,{type:f,entryId:s,
 dependencies:[e.entryId],parameters:r})},"createBucketObject");export{i as BucketServiceName,y as BucketServiceType,d as ObjectServiceName,f as ObjectServiceType,
 S as PolicyServiceName,g as PolicyServiceType,ge as buildBucketArn,Se as createBucket,
-be as createBucketEventFunction,ks as createBucketObject,is as createBucketPolicy,
-ee as createBucketStateId,rs as getBucketDomain,E as getBucketName,po as getBucketObjectFiles,
-R as getBucketObjectPath,te as getBucketState,de as getPolicyDocument,ts as isBucketDomain,
-io as isBucketObjectState,ls as isBucketPolicyState,st as isBucketState,Qn as registerTriggers};
+be as createBucketEventFunction,ds as createBucketObject,cs as createBucketPolicy,
+ee as createBucketStateId,es as getBucketDomain,E as getBucketName,ao as getBucketObjectFiles,
+R as getBucketObjectPath,te as getBucketState,de as getPolicyDocument,Yn as isBucketDomain,
+co as isBucketObjectState,ms as isBucketPolicyState,st as isBucketState,Zn as registerTriggers};
 //# sourceMappingURL=main.mjs.map

package/dist/object/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EntryState, StepContext } from '@ez4/stateful';
-import { ObjectState } from './types.js';
+import type { ObjectState } from './types.js';
 export declare const isBucketObjectState: (resource: EntryState) => resource is ObjectState;
 export declare const getBucketObjectPath: (bucketName: string, objectKey: string) => string;
 export declare const getBucketObjectFiles: (context: StepContext) => {

package/dist/policy/service.d.ts

@@ -1,4 +1,4 @@
 import type { EntryState, EntryStates } from '@ez4/stateful';
+import type { BucketState } from '../bucket/types.js';
 import type { PolicyParameters, PolicyState } from './types.js';
-import { BucketState } from '../main.js';
 export declare const createBucketPolicy: <E extends EntryState>(state: EntryStates<E>, sourceState: EntryState, bucketState: BucketState, parameters: PolicyParameters) => PolicyState;

package/dist/triggers/content.d.ts

@@ -1,3 +1,3 @@
 import type { BucketState } from '@ez4/aws-bucket';
-import { EntryStates } from '@ez4/stateful';
+import type { EntryStates } from '@ez4/stateful';
 export declare const prepareLocalContent: (state: EntryStates, bucketState: BucketState, localPath: string) => Promise<void>;

package/dist/triggers/service.d.ts

@@ -1,4 +1,4 @@
 import type { ServiceEvent, ConnectResourceEvent, PrepareResourceEvent } from '@ez4/project/library';
 export declare const prepareLinkedServices: (event: ServiceEvent) => import("@ez4/project/library").ExtraSource | null;
-export declare const prepareBucketServices: (event: PrepareResourceEvent) => Promise<void>;
+export declare const prepareBucketServices: (event: PrepareResourceEvent) => Promise<boolean>;
 export declare const connectBucketServices: (event: ConnectResourceEvent) => void;

package/dist/triggers/utils.d.ts

@@ -1,5 +1,5 @@
+import type { BucketService } from '@ez4/storage/library';
 import type { DeployOptions } from '@ez4/project/library';
-import { BucketService } from '@ez4/storage/library';
 export declare const getBucketName: (service: BucketService, options: DeployOptions) => Promise<string>;
 export declare const getInternalName: (service: BucketService, suffixName: string) => string;
 export declare const getFunctionName: (service: BucketService, handlerName: string, options: DeployOptions) => string;

package/lib/event.ts

@@ -1,5 +1,4 @@
 import type { S3Event, Context } from 'aws-lambda';
-import type { Service } from '@ez4/common';
 import type { Bucket } from '@ez4/storage';
 
 import { ServiceEventType } from '@ez4/common';
@@ -7,14 +6,14 @@ import { BucketEventType } from '@ez4/storage';
 
 declare const __EZ4_CONTEXT: object;
 
-declare function dispatch(event: Service.Event<Bucket.Event>, context: object): Promise<void>;
+declare function dispatch(event: Bucket.ServiceEvent, context: object): Promise<void>;
 declare function handle(event: Bucket.Event, context: object): Promise<any>;
 
 /**
  * Entrypoint to handle S3 notifications.
  */
 export async function s3EntryPoint(event: S3Event, context: Context): Promise<void> {
-  let currentRequest: Bucket.Event | undefined;
+  let currentRequest: Bucket.Incoming | undefined;
 
   const request = {
     requestId: context.awsRequestId
@@ -59,7 +58,7 @@ const getKnownEventType = (eventName: string) => {
   throw new Error(`Event type ${eventName} isn't supported.`);
 };
 
-const onBegin = async (request: Partial<Bucket.Incoming>) => {
+const onBegin = async (request: Bucket.Request) => {
   return dispatch(
     {
       type: ServiceEventType.Begin,
@@ -69,7 +68,7 @@ const onBegin = async (request: Partial<Bucket.Incoming>) => {
   );
 };
 
-const onReady = async (request: Partial<Bucket.Incoming>) => {
+const onReady = async (request: Bucket.Incoming) => {
   return dispatch(
     {
       type: ServiceEventType.Ready,
@@ -79,7 +78,7 @@ const onReady = async (request: Partial<Bucket.Incoming>) => {
   );
 };
 
-const onError = async (error: Error, request: Partial<Bucket.Incoming>) => {
+const onError = async (error: Error, request: Bucket.Request | Bucket.Incoming) => {
   console.error(error);
 
   return dispatch(
@@ -92,7 +91,7 @@ const onError = async (error: Error, request: Partial<Bucket.Incoming>) => {
   );
 };
 
-const onEnd = async (request: Partial<Bucket.Incoming>) => {
+const onEnd = async (request: Bucket.Request) => {
   return dispatch(
     {
       type: ServiceEventType.End,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/aws-bucket",
   "description": "EZ4: Self-managed AWS S3 bucket provider",
-  "version": "0.22.0",
+  "version": "0.24.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -32,6 +32,7 @@
     "packages/*"
   ],
   "scripts": {
+    "lint": "eslint --cache",
     "clean": "rm -f *.tsbuildinfo && rm -rf dist/*",
     "build": "tsc -p tsconfig.json && node tools/bundler.mjs",
     "test": "npm run test:types && node --env-file ../../../local.env --test --import ../../../tools/tsnode.mjs test/*.spec.ts",
@@ -44,14 +45,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.758.0",
     "@aws-sdk/s3-request-presigner": "^3.758.0",
-    "@ez4/aws-common": "^0.22.0",
-    "@ez4/aws-function": "^0.22.0",
-    "@ez4/aws-identity": "^0.22.0",
-    "@ez4/aws-logs": "^0.22.0",
-    "@ez4/project": "^0.22.0",
-    "@ez4/stateful": "^0.22.0",
-    "@ez4/storage": "^0.22.0",
-    "@ez4/utils": "^0.22.0",
+    "@ez4/aws-common": "^0.24.0",
+    "@ez4/aws-function": "^0.24.0",
+    "@ez4/aws-identity": "^0.24.0",
+    "@ez4/aws-logs": "^0.24.0",
+    "@ez4/project": "^0.24.0",
+    "@ez4/stateful": "^0.24.0",
+    "@ez4/storage": "^0.24.0",
+    "@ez4/utils": "^0.24.0",
     "@types/aws-lambda": "^8.10.147",
     "@types/mime": "^3.0.0",
     "mime": "^3.0.0"