@stacksjs/ts-cloud 0.2.11 → 0.2.13

package/dist/generators/infrastructure.d.ts

@@ -25,6 +25,9 @@ export declare class InfrastructureGenerator {
      */
     private shouldDeploy;
     private resolveApiOriginPort;
+    private normalizeMountPath;
+    private storageBucketLogicalId;
+    private pathMountRewriteFunctionCode;
     /**
      * Generate complete infrastructure
      * Auto-detects what to generate based on configuration

package/dist/index.js

@@ -62098,6 +62098,19 @@ class InfrastructureGenerator {
     const port = Number(configuredPort || 3008);
     return Number.isFinite(port) && port > 0 ? port : 3008;
   }
+  normalizeMountPath(config6) {
+    const rawPath = config6?.mountPath || config6?.path;
+    if (!rawPath || rawPath === "/")
+      return;
+    const normalized = `/${rawPath}`.replace(/\/+/g, "/").replace(/\/$/, "");
+    return normalized === "/" ? undefined : normalized;
+  }
+  storageBucketLogicalId(slug, env, name) {
+    return `${slug}-${env}-s3-${name}`.split(/[^a-zA-Z0-9]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
+  }
+  pathMountRewriteFunctionCode(mountPath) {
+    return `function handler(event) { var request = event.request; var prefix = ${JSON.stringify(mountPath)}; var uri = request.uri; if (uri === prefix) { uri = '/'; } else if (uri.indexOf(prefix + '/') === 0) { uri = uri.substring(prefix.length); } if (uri === '' || uri === '/') { request.uri = '/index.html'; return request; } if (uri.endsWith('/')) { request.uri = uri + 'index.html'; return request; } var lastSegment = uri.substring(uri.lastIndexOf('/') + 1); if (lastSegment.indexOf('.') === -1) { request.uri = uri + '/index.html'; return request; } request.uri = uri; return request; }`;
+  }
   generate() {
     const slug = this.mergedConfig.project.slug;
     const env = this.environment;
@@ -62952,9 +62965,6 @@ class InfrastructureGenerator {
         }
         return d;
       });
-      if (this.mergedConfig.infrastructure?.storage?.docs && !subdomains.includes("docs")) {
-        subdomains.push("docs");
-      }
       const { certificate, logicalId: certLogicalId } = Security.createCertificate({
         domain: primaryDomain,
         subdomains,
@@ -62984,6 +62994,12 @@ class InfrastructureGenerator {
           }
         });
       }
+      const pathMountedWebsiteBuckets = Object.entries(this.mergedConfig.infrastructure.storage).map(([bucketName, bucketConfig]) => ({
+        name: bucketName,
+        config: bucketConfig,
+        mountPath: this.normalizeMountPath(bucketConfig),
+        logicalId: this.storageBucketLogicalId(slug, env, bucketName)
+      })).filter((bucket) => bucket.name !== "public" && bucket.config.website && bucket.mountPath);
       for (const [name, storageConfig] of Object.entries(this.mergedConfig.infrastructure.storage)) {
         const serveViaCloudFront = !!(storageConfig.website && sharedOacLogicalId);
         const { bucket, logicalId } = Storage.createBucket({
@@ -63009,7 +63025,8 @@ class InfrastructureGenerator {
           const enhanced = Storage.enableWebsiteHosting(bucket, websiteConfig.indexDocument || "index.html", websiteConfig.errorDocument);
           this.builder.addResource(logicalId, enhanced);
         }
-        if (serveViaCloudFront && sharedOacLogicalId && domain) {
+        const mountPath = this.normalizeMountPath(storageConfig);
+        if (serveViaCloudFront && sharedOacLogicalId && domain && !(mountPath && name !== "public")) {
           const distLogicalId = `${slug}${env}${name}CDN`.replace(/[^a-zA-Z0-9]/g, "");
           const aliases = [];
           if (storageConfig.aliases && storageConfig.aliases.length > 0) {
@@ -63111,6 +63128,47 @@ else if (!uri.includes('.')) { request.uri += '.html'; } return request; }`
                 OriginRequestPolicyId: "b689b0a8-53d0-40ab-baf2-68738e2966ac"
               });
             }
+            for (const mountedBucket of pathMountedWebsiteBuckets) {
+              const mountedOriginId = `S3-${slug}-${env}-${mountedBucket.name}`;
+              const mountedFunctionLogicalId = `${slug}${env}${mountedBucket.name}PathMountRewrite`.replace(/[^a-zA-Z0-9]/g, "");
+              this.builder.addResource(mountedFunctionLogicalId, {
+                Type: "AWS::CloudFront::Function",
+                Properties: {
+                  Name: `${slug}-${env}-${mountedBucket.name}-path-mount-rewrite`,
+                  AutoPublish: true,
+                  FunctionConfig: {
+                    Comment: `Path mount rewrite for ${slug} ${env} ${mountedBucket.name} at ${mountedBucket.mountPath}`,
+                    Runtime: "cloudfront-js-2.0"
+                  },
+                  FunctionCode: this.pathMountRewriteFunctionCode(mountedBucket.mountPath)
+                }
+              });
+              origins.push({
+                Id: mountedOriginId,
+                DomainName: { "Fn::Sub": `\${${mountedBucket.logicalId}}.s3.${region}.amazonaws.com` },
+                OriginPath: "",
+                S3OriginConfig: {
+                  OriginAccessIdentity: ""
+                },
+                OriginAccessControlId: { Ref: sharedOacLogicalId }
+              });
+              extraDependsOn.push(mountedBucket.logicalId, mountedFunctionLogicalId);
+              for (const pathPattern of [mountedBucket.mountPath, `${mountedBucket.mountPath}/*`]) {
+                cacheBehaviors.push({
+                  PathPattern: pathPattern,
+                  TargetOriginId: mountedOriginId,
+                  ViewerProtocolPolicy: "redirect-to-https",
+                  AllowedMethods: ["GET", "HEAD", "OPTIONS"],
+                  CachedMethods: ["GET", "HEAD", "OPTIONS"],
+                  Compress: true,
+                  CachePolicyId: "658327ea-f89d-4fab-a63d-7e88639e58f6",
+                  FunctionAssociations: [{
+                    EventType: "viewer-request",
+                    FunctionARN: { "Fn::GetAtt": [mountedFunctionLogicalId, "FunctionARN"] }
+                  }]
+                });
+              }
+            }
           }
           const distribution = {
             Type: "AWS::CloudFront::Distribution",
@@ -63174,6 +63232,35 @@ else if (!uri.includes('.')) { request.uri += '.html'; } return request; }`
               }
             }
           });
+          if (name === "public") {
+            for (const mountedBucket of pathMountedWebsiteBuckets) {
+              const mountedPolicyLogicalId = `${mountedBucket.logicalId}CloudFrontPolicy`;
+              this.builder.addResource(mountedPolicyLogicalId, {
+                Type: "AWS::S3::BucketPolicy",
+                DependsOn: [mountedBucket.logicalId, distLogicalId],
+                Properties: {
+                  Bucket: { Ref: mountedBucket.logicalId },
+                  PolicyDocument: {
+                    Version: "2012-10-17",
+                    Statement: [{
+                      Sid: "AllowCloudFrontServicePrincipal",
+                      Effect: "Allow",
+                      Principal: {
+                        Service: "cloudfront.amazonaws.com"
+                      },
+                      Action: "s3:GetObject",
+                      Resource: { "Fn::Sub": `arn:aws:s3:::\${${mountedBucket.logicalId}}/*` },
+                      Condition: {
+                        StringEquals: {
+                          "AWS:SourceArn": { "Fn::Sub": `arn:aws:cloudfront::\${AWS::AccountId}:distribution/\${${distLogicalId}}` }
+                        }
+                      }
+                    }]
+                  }
+                }
+              });
+            }
+          }
           if (aliases.length > 0) {
             websiteBucketDistributions.push({
               name,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/ts-cloud",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "A lightweight, performant infrastructure-as-code library and CLI for deploying both server-based (EC2) and serverless applications.",
   "author": "Chris Breuer <chris@stacksjs.com>",
   "license": "MIT",
@@ -85,8 +85,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.2.11",
-    "@ts-cloud/core": "0.2.11",
+    "@ts-cloud/aws-types": "0.2.13",
+    "@ts-cloud/core": "0.2.13",
     "@stacksjs/ts-xml": "^0.1.0"
   },
   "devDependencies": {