@quadnix/octo-aws-cdk 0.2.0 → 0.2.1

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.js

@@ -4,9 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { Action, DiffAction, Factory, MatchingResource, hasNodeName, } from '@quadnix/octo';
-import { CloudFrontDistribution } from '../../../../../../resources/cloudfront-distribution/index.js';
-import { CloudFrontInvalidation } from '../../../../../../resources/cloudfront-invalidation/index.js';
+import { Action, DiffAction, Factory, hasNodeName, } from '@quadnix/octo';
 import { S3Website } from '../../../../../../resources/s3-website/index.js';
 import { AwsS3StaticWebsiteService } from '../aws-s3-static-website-service.model.js';
 /**
@@ -28,7 +26,6 @@ let AddAwsS3StaticWebsiteServiceModelAction = class AddAwsS3StaticWebsiteService
     async handle(diff, actionInputs, actionOutputs) {
         const { bucketName } = diff.node;
         const { awsAccountId, awsRegionId } = actionInputs.metadata;
-        const { cloudFront } = actionInputs.inputs;
         const errorDocument = 'error.html';
         const indexDocument = 'index.html';
         const sanitizedBucketName = bucketName.replace(/[^\w-]/g, '-');
@@ -37,89 +34,10 @@ let AddAwsS3StaticWebsiteServiceModelAction = class AddAwsS3StaticWebsiteService
             awsAccountId,
             awsRegionId,
             Bucket: bucketName,
-            // Filled in by the grant below, which is also what closes the bucket.
-            distributionResourceIds: [],
             ErrorDocument: errorDocument,
             IndexDocument: indexDocument,
         });
         actionOutputs[s3Website.resourceId] = s3Website;
-        if (!cloudFront) {
-            return actionOutputs;
-        }
-        const originId = `${sanitizedBucketName}-origin`;
-        // Create CloudFront Distribution. This is one website-shaped setup out of what the resource can
-        // express: a single private bucket, everything cached the same way, and misses answered
-        // according to whether the site routes on the client or on the server.
-        const cloudFrontDistribution = new CloudFrontDistribution(`cloudfront-${sanitizedBucketName}`, {
-            aliases: [...(cloudFront.aliases || [])],
-            awsAccountId,
-            behaviors: [
-                {
-                    allowedMethods: ['GET', 'HEAD'],
-                    cachedMethods: ['GET', 'HEAD'],
-                    cachePolicy: { kind: 'managed', name: 'Managed-CachingOptimized' },
-                    compress: true,
-                    functionAssociations: [],
-                    originRequestPolicy: null,
-                    pathPattern: null,
-                    responseHeadersPolicy: null,
-                    targetOriginId: originId,
-                    viewerProtocolPolicy: 'redirect-to-https',
-                },
-            ],
-            cachePolicies: [],
-            comment: cloudFront.aliases?.[0] || bucketName,
-            customErrorResponses: [403, 404].map((errorCode) => cloudFront.notFoundBehavior === 'single-page-app'
-                ? {
-                    // A short TTL, because what is missing today is the app's next route tomorrow.
-                    errorCachingMinTtl: 10,
-                    errorCode,
-                    responseCode: 200,
-                    responsePagePath: `/${indexDocument}`,
-                }
-                : { errorCachingMinTtl: 10, errorCode, responseCode: 404, responsePagePath: `/${errorDocument}` }),
-            defaultRootObject: indexDocument,
-            distributionName: sanitizedBucketName,
-            enabled: true,
-            geoRestriction: { kind: 'none' },
-            httpVersion: 'http2and3',
-            isIpv6Enabled: true,
-            logging: null,
-            originGroups: [],
-            originRequestPolicies: [],
-            origins: [
-                {
-                    connectionAttempts: 3,
-                    connectionTimeout: 10,
-                    customHeaders: {},
-                    kind: { bucketName, bucketRegion: awsRegionId, kind: 's3' },
-                    originId,
-                    originPath: '',
-                },
-            ],
-            priceClass: cloudFront.priceClass || 'PriceClass_All',
-            responseHeadersPolicies: [],
-            viewerCertificate: cloudFront.certificateArn
-                ? {
-                    certificateArn: cloudFront.certificateArn,
-                    kind: 'acm',
-                    // eslint-disable-next-line spellcheck/spell-checker
-                    minimumProtocolVersion: 'TLSv1.2_2021',
-                }
-                : { kind: 'default' },
-            webAclArn: cloudFront.webAclArn || null,
-        });
-        actionOutputs[cloudFrontDistribution.resourceId] = cloudFrontDistribution;
-        // Admit the distribution to the bucket. The grant lives on the bucket, in the one policy the
-        // bucket owns, so a second distribution in front of the same bucket would add a statement rather
-        // than overwrite this one. It also closes the bucket: a bucket with a distribution in front of it
-        // publishes nothing of its own.
-        const matchingCloudFrontDistribution = new MatchingResource(cloudFrontDistribution);
-        s3Website.addCloudFrontAccess(matchingCloudFrontDistribution);
-        // Drop what the edges are holding whenever the published files change. The version is a
-        // placeholder until the source paths are read, which happens in the same transaction.
-        const cloudFrontInvalidation = new CloudFrontInvalidation(`cloudfront-invalidation-${sanitizedBucketName}`, { awsAccountId, contentVersion: 'initial', paths: ['/*'] }, [matchingCloudFrontDistribution]);
-        actionOutputs[cloudFrontInvalidation.resourceId] = cloudFrontInvalidation;
         return actionOutputs;
     }
 };

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-aws-s3-static-website-service.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-aws-s3-static-website-service.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/add-aws-s3-static-website-service.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAE5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEtF;;GAEG;AAEI,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAClD;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG;YAC9B,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,WAAW,CAC3B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAqC,EACrC,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEjC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC;QAE5D,MAAM,aAAa,GAAG,YAAY,CAAC;QACnC,MAAM,aAAa,GAAG,YAAY,CAAC;QACnC,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE/D,qBAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,UAAU,mBAAmB,EAAE,EAAE;YAC/D,YAAY;YACZ,WAAW;YACX,MAAM,EAAE,UAAU;YAClB,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;SAC7B,CAAC,CAAC;QAEH,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AA1CY,uCAAuC;IADnD,MAAM,CAAC,yBAAyB,CAAC;GACrB,uCAAuC,CA0CnD;;AAED;;GAEG;AAEI,IAAM,8CAA8C,GAApD,MAAM,8CAA8C;IAGzD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,uCAAuC,EAAE,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,8CAA8C;IAD1D,OAAO,CAA0C,uCAAuC,CAAC;GAC7E,8CAA8C,CAY1D"}

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.d.ts

@@ -1,6 +1,7 @@
 import { type ActionOutputs, type Diff, type EnhancedModuleSchema, type IModelAction } from '@quadnix/octo';
+import type { IManifest } from '../../../../../../utilities/s3-file-source/s3-file-source.utility.js';
 import type { AwsS3StaticWebsiteServiceModule } from '../../../aws-s3-static-website-service.module.js';
-import { AwsS3StaticWebsiteService, type IManifest } from '../aws-s3-static-website-service.model.js';
+import { AwsS3StaticWebsiteService } from '../aws-s3-static-website-service.model.js';
 /**
  * @internal
  */

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.js

@@ -4,7 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { createHash } from 'crypto';
 import { Action, DiffAction, Factory, hasNodeName, } from '@quadnix/octo';
 import { AwsS3StaticWebsiteService } from '../aws-s3-static-website-service.model.js';
 /**
@@ -29,20 +28,6 @@ let UpdateAwsS3StaticWebsiteServiceSourcePathsModelAction = class UpdateAwsS3Sta
         const s3Website = actionInputs.resources[`bucket-${sanitizedBucketName}`];
         s3Website.updateManifest(diff.value);
         actionOutputs[s3Website.resourceId] = s3Website;
-        // What the distribution is serving has moved, so the edges have to be told. The version is a
-        // digest over the manifest rather than the manifest itself: it only ever has to differ from the
-        // last one, and an invalidation that named every file would be billed per path.
-        const cloudFrontInvalidation = actionInputs.resources[`cloudfront-invalidation-${sanitizedBucketName}`];
-        if (cloudFrontInvalidation) {
-            const manifestDigest = createHash('sha1')
-                .update(Object.keys(diff.value)
-                .sort()
-                .map((remotePath) => `${remotePath}:${diff.value[remotePath].digest}`)
-                .join('\n'))
-                .digest('hex');
-            cloudFrontInvalidation.properties.contentVersion = manifestDigest;
-            actionOutputs[cloudFrontInvalidation.resourceId] = cloudFrontInvalidation;
-        }
         return actionOutputs;
     }
 };

package/dist/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-aws-s3-static-website-service-source-paths.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,yBAAyB,EAAkB,MAAM,2CAA2C,CAAC;AAEtG;;GAEG;AAEI,IAAM,qDAAqD,GAA3D,MAAM,qDAAqD;IAGhE;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YACjC,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,aAAa,CAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAgD,EAChD,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE/D,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,mBAAmB,EAAE,CAAc,CAAC;QACvF,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,6FAA6F;QAC7F,gGAAgG;QAChG,gFAAgF;QAChF,MAAM,sBAAsB,GAAG,YAAY,CAAC,SAAS,CAAC,2BAA2B,mBAAmB,EAAE,CAEzF,CAAC;QACd,IAAI,sBAAsB,EAAE,CAAC;YAC3B,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;iBACtC,MAAM,CACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;iBACpB,IAAI,EAAE;iBACN,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;iBACrE,IAAI,CAAC,IAAI,CAAC,CACd;iBACA,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,sBAAsB,CAAC,UAAU,CAAC,cAAc,GAAG,cAAc,CAAC;YAElE,aAAa,CAAC,sBAAsB,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC;QAC5E,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AArDY,qDAAqD;IADjE,MAAM,CAAC,yBAAyB,CAAC;GACrB,qDAAqD,CAqDjE;;AAED;;GAEG;AAEI,IAAM,4DAA4D,GAAlE,MAAM,4DAA4D;IAGvE;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,qDAAqD,EAAE,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,4DAA4D;IADxE,OAAO,CAAwD,qDAAqD,CAAC;GACzG,4DAA4D,CAYxE"}
+{"version":3,"file":"update-aws-s3-static-website-service-source-paths.model.action.js","sourceRoot":"","sources":["../../../../../../../src/modules/service/aws-s3-static-website-service/models/service/actions/update-aws-s3-static-website-service-source-paths.model.action.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EAGN,UAAU,EAEV,OAAO,EAEP,WAAW,GACZ,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEtF;;GAEG;AAEI,IAAM,qDAAqD,GAA3D,MAAM,qDAAqD;IAGhE;;OAEG;IACH,MAAM,CAAC,IAAU;QACf,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YACjC,IAAI,CAAC,IAAI,YAAY,yBAAyB;YAC9C,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YACjC,IAAI,CAAC,KAAK,KAAK,aAAa,CAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACV,IAAgD,EAChD,YAAmE,EACnE,aAA4B;QAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE/D,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,mBAAmB,EAAE,CAAc,CAAC;QACvF,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AAjCY,qDAAqD;IADjE,MAAM,CAAC,yBAAyB,CAAC;GACrB,qDAAqD,CAiCjE;;AAED;;GAEG;AAEI,IAAM,4DAA4D,GAAlE,MAAM,4DAA4D;IAGvE;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,qDAAqD,EAAE,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,4DAA4D;IADxE,OAAO,CAAwD,qDAAqD,CAAC;GACzG,4DAA4D,CAYxE"}

package/dist/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.d.ts

@@ -1,35 +1,21 @@
-import { Diff, Service } from '@quadnix/octo';
+import { type AModel, Diff, type Region, Service } from '@quadnix/octo';
+import { type IS3FileExcludePath, type IS3FileSourcePath } from '../../../../../utilities/s3-file-source/s3-file-source.utility.js';
 import { AwsS3StaticWebsiteServiceSchema } from './aws-s3-static-website-service.schema.js';
-export type IManifest = {
-    [key: string]: {
-        algorithm: 'sha1';
-        digest: string | 'deleted';
-        filePath: string;
-    };
-};
 /**
  * @internal
  */
 export declare class AwsS3StaticWebsiteService extends Service {
     readonly bucketName: string;
-    readonly excludePaths: {
-        directoryPath: string;
-        subDirectoryOrFilePath: string;
-    }[];
-    readonly sourcePaths: {
-        directoryPath: string;
-        isDirectory: boolean;
-        remotePath: string;
-        subDirectoryOrFilePath: string;
-    }[];
+    readonly excludePaths: IS3FileExcludePath[];
+    readonly sourcePaths: IS3FileSourcePath[];
     /**
      * @internal
      */
-    constructor(bucketName: AwsS3StaticWebsiteServiceSchema['bucketName']);
+    constructor(bucketName: AwsS3StaticWebsiteServiceSchema['bucketName'], region: Region);
     /**
      * @internal
      */
-    static unSynth(service: AwsS3StaticWebsiteServiceSchema): Promise<AwsS3StaticWebsiteService>;
+    static unSynth(service: AwsS3StaticWebsiteServiceSchema, deReferenceContext: (context: string) => Promise<AModel<any, any>>): Promise<AwsS3StaticWebsiteService>;
     /**
      * @internal
      */
@@ -42,8 +28,4 @@ export declare class AwsS3StaticWebsiteService extends Service {
      * @internal
      */
     synth(): AwsS3StaticWebsiteServiceSchema;
-    /**
-     * @internal
-     */
-    private generateSourceManifest;
 }

package/dist/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.js

@@ -8,10 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var AwsS3StaticWebsiteService_1;
-import { lstat, readdir } from 'fs/promises';
-import { join, parse } from 'path';
-import { Diff, DiffAction, Model, ModelError, ProjectUtility, Service, Validate } from '@quadnix/octo';
-import { FileUtility } from '../../../../../utilities/file/file.utility.js';
+import { Diff, DiffAction, Model, ModelError, Service, ServiceType, Validate, } from '@quadnix/octo';
+import { S3FileSourceUtility, } from '../../../../../utilities/s3-file-source/s3-file-source.utility.js';
 import { AwsS3StaticWebsiteServiceSchema } from './aws-s3-static-website-service.schema.js';
 /**
  * @internal
@@ -20,8 +18,8 @@ let AwsS3StaticWebsiteService = AwsS3StaticWebsiteService_1 = class AwsS3StaticW
     /**
      * @internal
      */
-    constructor(bucketName) {
-        super(`${bucketName}-s3-static-website`);
+    constructor(bucketName, region) {
+        super(`${bucketName}-s3-static-website`, [region], ServiceType.STORAGE, 's3-static-website');
         this.excludePaths = [];
         this.sourcePaths = [];
         this.bucketName = bucketName;
@@ -29,67 +27,22 @@ let AwsS3StaticWebsiteService = AwsS3StaticWebsiteService_1 = class AwsS3StaticW
     /**
      * @internal
      */
-    static async unSynth(service) {
-        return new AwsS3StaticWebsiteService_1(service.bucketName);
+    static async unSynth(service, deReferenceContext) {
+        const region = (await deReferenceContext(service.parents[0].context));
+        return new AwsS3StaticWebsiteService_1(service.bucketName, region);
     }
     /**
      * @internal
      */
     async addSource(directoryPath, subDirectoryOrFilePath, filter, transform) {
-        // Against the project root rather than the working directory. A module composes the graph in
-        // every mode, including the `octo run-action` callback terraform makes mid-apply, and terraform
-        // makes that call from a terragrunt cache directory.
-        directoryPath = ProjectUtility.resolveFromProjectRoot(directoryPath);
-        if (!subDirectoryOrFilePath) {
-            subDirectoryOrFilePath = '';
-        }
-        // Remove leading slashes.
-        subDirectoryOrFilePath = subDirectoryOrFilePath.replace(/^\/+/g, '');
-        // Ensure subDirectoryOrFilePath exists, and is readable.
-        const relativeSubDirectoryOrFilePath = join(directoryPath, subDirectoryOrFilePath);
-        const stats = await lstat(relativeSubDirectoryOrFilePath);
-        if (stats.isFile()) {
-            if (!subDirectoryOrFilePath) {
-                const { base, dir } = parse(directoryPath);
-                directoryPath = dir;
-                subDirectoryOrFilePath = base;
-            }
-            const shouldInclude = filter ? filter(subDirectoryOrFilePath) : true;
-            if (shouldInclude) {
-                this.sourcePaths.push({
-                    directoryPath,
-                    isDirectory: false,
-                    remotePath: transform ? transform(subDirectoryOrFilePath) : subDirectoryOrFilePath,
-                    subDirectoryOrFilePath,
-                });
-            }
-        }
-        else {
-            this.sourcePaths.push({
-                directoryPath,
-                isDirectory: true,
-                remotePath: transform ? transform(subDirectoryOrFilePath) : subDirectoryOrFilePath,
-                subDirectoryOrFilePath,
-            });
-            const filePaths = await readdir(relativeSubDirectoryOrFilePath, { recursive: true });
-            for (let filePath of filePaths) {
-                filePath = join(subDirectoryOrFilePath, filePath);
-                const shouldInclude = filter ? filter(filePath) : true;
-                if (!shouldInclude) {
-                    this.excludePaths.push({
-                        directoryPath,
-                        subDirectoryOrFilePath: filePath,
-                    });
-                }
-            }
-        }
+        await S3FileSourceUtility.addSource(this.sourcePaths, this.excludePaths, directoryPath, subDirectoryOrFilePath, filter, transform);
     }
     /**
      * @internal
      */
     async diffProperties() {
         // Generate new manifest.
-        const newManifestData = await this.generateSourceManifest();
+        const newManifestData = await S3FileSourceUtility.generateManifest(this.sourcePaths, this.excludePaths);
         // Ensure index.html exists.
         if (this.sourcePaths.length > 0 && !(newManifestData['error.html'] || newManifestData['index.html'])) {
             throw new ModelError('error.html/index.html missing in root of website!', this);
@@ -111,41 +64,10 @@ let AwsS3StaticWebsiteService = AwsS3StaticWebsiteService_1 = class AwsS3StaticW
      */
     synth() {
         return {
+            ...super.synth(),
             bucketName: this.bucketName,
-            serviceId: this.serviceId,
         };
     }
-    /**
-     * @internal
-     */
-    async generateSourceManifest() {
-        const manifest = {};
-        const sourcePaths = [...this.sourcePaths];
-        for (const sourcePath of sourcePaths) {
-            if (!sourcePath.isDirectory) {
-                const filePath = join(sourcePath.directoryPath, sourcePath.subDirectoryOrFilePath);
-                const digest = await FileUtility.hash(filePath);
-                manifest[sourcePath.remotePath] = { algorithm: 'sha1', digest, filePath };
-            }
-            else {
-                const directoryPath = join(sourcePath.directoryPath, sourcePath.subDirectoryOrFilePath);
-                const directoryFilePaths = await readdir(directoryPath, { recursive: true });
-                for (const directoryFilePath of directoryFilePaths) {
-                    const filePath = join(directoryPath, directoryFilePath);
-                    const stats = await lstat(filePath);
-                    if (stats.isDirectory()) {
-                        continue;
-                    }
-                    if (this.excludePaths.findIndex((p) => join(p.directoryPath, p.subDirectoryOrFilePath) === filePath) === -1) {
-                        const remotePath = join(sourcePath.remotePath, directoryFilePath);
-                        const digest = await FileUtility.hash(filePath);
-                        manifest[remotePath] = { algorithm: 'sha1', digest, filePath };
-                    }
-                }
-            }
-        }
-        return manifest;
-    }
 };
 __decorate([
     Validate({ options: { maxLength: 128, minLength: 2, regex: /^[a-zA-Z0-9][\w.-]*[a-zA-Z0-9]$/ } }),
@@ -153,7 +75,7 @@ __decorate([
 ], AwsS3StaticWebsiteService.prototype, "bucketName", void 0);
 AwsS3StaticWebsiteService = AwsS3StaticWebsiteService_1 = __decorate([
     Model('@octo', 'service', AwsS3StaticWebsiteServiceSchema),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, Function])
 ], AwsS3StaticWebsiteService);
 export { AwsS3StaticWebsiteService };
 //# sourceMappingURL=aws-s3-static-website-service.model.js.map

package/dist/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-s3-static-website-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aws-s3-static-website-service.model.js","sourceRoot":"","sources":["../../../../../../src/modules/service/aws-s3-static-website-service/models/service/aws-s3-static-website-service.model.ts"],"names":[],"mappings":"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"}

package/dist/modules/service/aws-s3-storage-service/aws-s3-storage-service.module.d.ts

@@ -1,21 +1,31 @@
-import { AModule, type App } from '@quadnix/octo';
+import { AModule } from '@quadnix/octo';
 import { AwsS3StorageServiceModuleSchema } from './index.schema.js';
 import { AwsS3StorageService } from './models/service/index.js';
 /**
  * `AwsS3StorageServiceModule` is an S3-based AWS storage service module
  * that provides an implementation for the `Service` model.
- * This module creates S3 buckets for object storage with support for directory organization and remote file management.
- * It provides scalable, durable storage for applications with configurable directory structures.
+ * This module creates an S3 bucket for object storage, declares the key prefixes in it that other
+ * modules may be granted access to, and optionally uploads the files of a local directory into it.
+ *
+ * The bucket is closed to the public by default. To serve its files, pass it as an origin to
+ * `AwsCloudFrontServiceModule`, which grants its distribution access. For a bucket that serves a
+ * website on its own, use `AwsS3StaticWebsiteServiceModule`.
+ * The bucket lives in a region created by any of the AWS region modules.
  *
  * @example
  * TypeScript
  * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
  * import { AwsS3StorageServiceModule } from '@quadnix/octo-aws-cdk/modules/service/aws-s3-storage-service';
  *
  * octo.loadModule(AwsS3StorageServiceModule, 'my-storage-module', {
+ *   accessPrefixes: ['uploads', 'documents', 'images'],
  *   bucketName: 'my-app-storage',
- *   region: myRegion,
- *   remoteDirectoryPaths: ['uploads', 'documents', 'images']
+ *   corsRules: [{ allowHeaders: ['Range'], allowMethods: ['GET'], allowOrigins: ['https://app.example.com'] }],
+ *   directoryPath: 'website',
+ *   filter: (filePath) => !filePath.includes('.DS_Store'),
+ *   lifecycleRules: [{ expirationInDays: 1, tags: { upload: 'pending' } }],
+ *   region: stub<Region>('${{my-region-module.model.region}}')
  * });
  * ```
  *
@@ -29,14 +39,15 @@ import { AwsS3StorageService } from './models/service/index.js';
  */
 export declare class AwsS3StorageServiceModule extends AModule<AwsS3StorageServiceModuleSchema, AwsS3StorageService> {
     /**
-     * Creates the bucket service, and registers each directory in it along with who may read or write it.
+     * Creates the bucket service, registers the local files it uploads, and registers each access
+     * prefix in it that other modules may be granted access to.
      */
     onInit(inputs: AwsS3StorageServiceModuleSchema): Promise<AwsS3StorageService>;
     /**
-     * Resolves the app, account, and region this bucket is created in.
+     * Resolves the account and region this bucket is created in.
+     * The region may be networked or serverless; the bucket only needs its AWS region ID.
      */
     registerMetadata(inputs: AwsS3StorageServiceModuleSchema): Promise<{
-        app: App;
         awsAccountId: string;
         awsRegionId: string;
     }>;

package/dist/modules/service/aws-s3-storage-service/aws-s3-storage-service.module.js

@@ -4,26 +4,37 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { AModule, Module } from '@quadnix/octo';
+import { AModule, Module, ModuleError } from '@quadnix/octo';
 import { AwsRegionAnchorSchema } from '../../../anchors/aws-region/aws-region.anchor.schema.js';
+import { AwsServerlessRegionAnchorSchema } from '../../../anchors/aws-region/aws-serverless-region.anchor.schema.js';
 import { AwsS3StorageServiceAnchor } from '../../../anchors/aws-s3-storage-service/aws-s3-storage-service.anchor.js';
 import { AwsS3StorageServiceModuleSchema } from './index.schema.js';
 import { AwsS3StorageService } from './models/service/index.js';
 /**
  * `AwsS3StorageServiceModule` is an S3-based AWS storage service module
  * that provides an implementation for the `Service` model.
- * This module creates S3 buckets for object storage with support for directory organization and remote file management.
- * It provides scalable, durable storage for applications with configurable directory structures.
+ * This module creates an S3 bucket for object storage, declares the key prefixes in it that other
+ * modules may be granted access to, and optionally uploads the files of a local directory into it.
+ *
+ * The bucket is closed to the public by default. To serve its files, pass it as an origin to
+ * `AwsCloudFrontServiceModule`, which grants its distribution access. For a bucket that serves a
+ * website on its own, use `AwsS3StaticWebsiteServiceModule`.
+ * The bucket lives in a region created by any of the AWS region modules.
  *
  * @example
  * TypeScript
  * ```ts
+ * import { type Region, stub } from '@quadnix/octo';
  * import { AwsS3StorageServiceModule } from '@quadnix/octo-aws-cdk/modules/service/aws-s3-storage-service';
  *
  * octo.loadModule(AwsS3StorageServiceModule, 'my-storage-module', {
+ *   accessPrefixes: ['uploads', 'documents', 'images'],
  *   bucketName: 'my-app-storage',
- *   region: myRegion,
- *   remoteDirectoryPaths: ['uploads', 'documents', 'images']
+ *   corsRules: [{ allowHeaders: ['Range'], allowMethods: ['GET'], allowOrigins: ['https://app.example.com'] }],
+ *   directoryPath: 'website',
+ *   filter: (filePath) => !filePath.includes('.DS_Store'),
+ *   lifecycleRules: [{ expirationInDays: 1, tags: { upload: 'pending' } }],
+ *   region: stub<Region>('${{my-region-module.model.region}}')
  * });
  * ```
  *
@@ -37,35 +48,48 @@ import { AwsS3StorageService } from './models/service/index.js';
  */
 let AwsS3StorageServiceModule = class AwsS3StorageServiceModule extends AModule {
     /**
-     * Creates the bucket service, and registers each directory in it along with who may read or write it.
+     * Creates the bucket service, registers the local files it uploads, and registers each access
+     * prefix in it that other modules may be granted access to.
      */
     async onInit(inputs) {
-        const { app, awsAccountId, awsRegionId } = await this.registerMetadata(inputs);
-        // Create a new service service.
-        const s3StorageService = new AwsS3StorageService(inputs.bucketName);
-        app.addService(s3StorageService);
+        const { awsAccountId, awsRegionId } = await this.registerMetadata(inputs);
+        // Create a new s3-storage service.
+        const s3StorageService = new AwsS3StorageService(inputs.bucketName, inputs.region);
+        // Add source files.
+        if (inputs.directoryPath) {
+            await s3StorageService.addSource(inputs.directoryPath, inputs.subDirectoryOrFilePath || undefined, inputs.filter || undefined, inputs.transform || undefined);
+        }
         // Add anchors.
-        s3StorageService.addAnchor(new AwsS3StorageServiceAnchor('AwsS3StorageServiceAnchor', { awsAccountId, awsRegionId, bucketName: inputs.bucketName }, s3StorageService));
-        // Add S3 directories.
-        for (const remoteDirectoryPath of inputs.remoteDirectoryPaths || []) {
-            s3StorageService.addDirectory(remoteDirectoryPath);
+        s3StorageService.addAnchor(new AwsS3StorageServiceAnchor('AwsS3StorageServiceAnchor', {
+            awsAccountId,
+            awsRegionId,
+            bucketName: inputs.bucketName,
+            contentDigest: await s3StorageService.getContentDigest(),
+        }, s3StorageService));
+        // Add access prefixes.
+        for (const accessPrefix of inputs.accessPrefixes || []) {
+            s3StorageService.addAccessPrefix(accessPrefix);
         }
         return s3StorageService;
     }
     /**
-     * Resolves the app, account, and region this bucket is created in.
+     * Resolves the account and region this bucket is created in.
+     * The region may be networked or serverless; the bucket only needs its AWS region ID.
      */
     async registerMetadata(inputs) {
         const region = inputs.region;
         const account = region.getParents()['account'][0].to;
-        const app = account.getParents()['app'][0].to;
         // Get AWS Region ID.
-        const [matchingAnchor] = await region.getAnchorsMatchingSchema(AwsRegionAnchorSchema, [], {
-            searchBoundaryMembers: false,
-        });
+        const [[matchingRegionAnchor], [matchingServerlessRegionAnchor]] = await Promise.all([
+            region.getAnchorsMatchingSchema(AwsRegionAnchorSchema, [], { searchBoundaryMembers: false }),
+            region.getAnchorsMatchingSchema(AwsServerlessRegionAnchorSchema, [], { searchBoundaryMembers: false }),
+        ]);
+        const matchingAnchor = matchingRegionAnchor || matchingServerlessRegionAnchor;
+        if (!matchingAnchor) {
+            throw new ModuleError('Region is not an AWS region!', this.constructor.name);
+        }
         const awsRegionId = matchingAnchor.getSchemaInstance().properties.awsRegionId;
         return {
-            app,
             awsAccountId: account.accountId,
             awsRegionId,
         };

package/dist/modules/service/aws-s3-storage-service/aws-s3-storage-service.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-s3-storage-service.module.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-storage-service/aws-s3-storage-service.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,OAAO,EAA0B,MAAM,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0EAA0E,CAAC;AACrH,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,OAA6D;IAC1G;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAAuC;QAClD,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAE/E,gCAAgC;QAChC,MAAM,gBAAgB,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACpE,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAEjC,eAAe;QACf,gBAAgB,CAAC,SAAS,CACxB,IAAI,yBAAyB,CAC3B,2BAA2B,EAC3B,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EAC5D,gBAAgB,CACjB,CACF,CAAC;QACF,sBAAsB;QACtB,KAAK,MAAM,mBAAmB,IAAI,MAAM,CAAC,oBAAoB,IAAI,EAAE,EAAE,CAAC;YACpE,gBAAgB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,gBAAgB,CAC7B,MAAuC;QAEvC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAa,CAAC;QAChE,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAS,CAAC;QAErD,qBAAqB;QACrB,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,qBAAqB,EAAE,EAAE,EAAE;YACxF,qBAAqB,EAAE,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAE9E,OAAO;YACL,GAAG;YACH,YAAY,EAAE,OAAO,CAAC,SAAS;YAC/B,WAAW;SACZ,CAAC;IACJ,CAAC;CACF,CAAA;AAjDY,yBAAyB;IADrC,MAAM,CAA4B,OAAO,EAAE,+BAA+B,CAAC;GAC/D,yBAAyB,CAiDrC"}
+{"version":3,"file":"aws-s3-storage-service.module.js","sourceRoot":"","sources":["../../../../src/modules/service/aws-s3-storage-service/aws-s3-storage-service.module.ts"],"names":[],"mappings":"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"}