@jaypie/constructs 1.1.51 → 1.1.52

package/dist/esm/JaypieGitHubDeployRole.d.ts

@@ -7,7 +7,7 @@ export interface JaypieGitHubDeployRoleProps {
 }
 export declare class JaypieGitHubDeployRole extends Construct {
     private readonly _role;
-    constructor(scope: Construct, id: string, props?: JaypieGitHubDeployRoleProps);
+    constructor(scope: Construct, id?: string, props?: JaypieGitHubDeployRoleProps);
     get role(): Role;
     get roleArn(): string;
     get roleName(): string;

package/dist/esm/JaypieHostedZone.d.ts

@@ -15,6 +15,11 @@ export interface JaypieHostedZoneRecordProps extends Omit<JaypieDnsRecordProps,
     id?: string;
 }
 interface JaypieHostedZoneProps {
+    /**
+     * Optional construct ID
+     * @default `${zoneName}-HostedZone`
+     */
+    id?: string;
     /**
      * The domain name for the hosted zone
      */
@@ -49,6 +54,6 @@ export declare class JaypieHostedZone extends Construct {
     /**
      * Create a new hosted zone with query logging and optional DNS records
      */
-    constructor(scope: Construct, id: string, props: JaypieHostedZoneProps);
+    constructor(scope: Construct, idOrProps: string | JaypieHostedZoneProps, propsOrRecords?: JaypieHostedZoneProps | JaypieHostedZoneRecordProps[]);
 }
 export {};

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { CDK as CDK$2, ConfigurationError, mergeDomain, isValidSubdomain, isValidHostname } from '@jaypie/cdk';
+import { CDK as CDK$2, ConfigurationError, mergeDomain, isValidSubdomain, isValidHostname as isValidHostname$1 } from '@jaypie/cdk';
 export { CDK } from '@jaypie/cdk';
 import { Construct } from 'constructs';
 import * as cdk from 'aws-cdk-lib';
@@ -1321,7 +1321,7 @@ class JaypieDnsRecord extends Construct {
 }
 
 class JaypieGitHubDeployRole extends Construct {
-    constructor(scope, id, props = {}) {
+    constructor(scope, id = "GitHubDeployRole", props = {}) {
         super(scope, id);
         const { oidcProviderArn = Fn.importValue(CDK$2.IMPORT.OIDC_PROVIDER), output = true, repoRestriction: propsRepoRestriction, } = props;
         // Extract account ID from the scope
@@ -1415,11 +1415,54 @@ class JaypieExpressLambda extends JaypieLambda {
 const SERVICE = {
     ROUTE53: "route53.amazonaws.com",
 };
+/**
+ * Check if a string is a valid hostname
+ */
+function isValidHostname(str) {
+    // Check if it contains a dot and matches hostname pattern
+    if (!str.includes("."))
+        return false;
+    // Basic hostname validation: alphanumeric, hyphens, dots
+    // Each label must start and end with alphanumeric
+    const hostnameRegex = /^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}$/i;
+    return hostnameRegex.test(str);
+}
 class JaypieHostedZone extends Construct {
     /**
      * Create a new hosted zone with query logging and optional DNS records
      */
-    constructor(scope, id, props) {
+    constructor(scope, idOrProps, propsOrRecords) {
+        // Handle overloaded constructor signatures
+        let props;
+        let id;
+        if (typeof idOrProps === "string") {
+            // If it's a valid hostname, treat it as zoneName
+            if (isValidHostname(idOrProps)) {
+                // Third param can be props object or records array
+                if (Array.isArray(propsOrRecords)) {
+                    props = { zoneName: idOrProps, records: propsOrRecords };
+                }
+                else {
+                    props = propsOrRecords || { zoneName: idOrProps };
+                    // Set zoneName if not already set
+                    if (!props.zoneName) {
+                        props = { ...props, zoneName: idOrProps };
+                    }
+                }
+                // Use id from props if provided, otherwise derive from zoneName
+                id = props.id || `${idOrProps}-HostedZone`;
+            }
+            else {
+                // Otherwise treat it as an explicit id
+                props = propsOrRecords;
+                id = idOrProps;
+            }
+        }
+        else {
+            // idOrProps is props
+            props = idOrProps;
+            id = props.id || `${props.zoneName}-HostedZone`;
+        }
         super(scope, id);
         const { zoneName, project } = props;
         const destination = props.destination ?? true;
@@ -1891,11 +1934,11 @@ class JaypieWebDeploymentBucket extends Construct {
             throw new ConfigurationError("CDK_ENV_WEB_SUBDOMAIN is not a valid subdomain");
         }
         if (process.env.CDK_ENV_WEB_HOSTED_ZONE &&
-            !isValidHostname(process.env.CDK_ENV_WEB_HOSTED_ZONE)) {
+            !isValidHostname$1(process.env.CDK_ENV_WEB_HOSTED_ZONE)) {
             throw new ConfigurationError("CDK_ENV_WEB_HOSTED_ZONE is not a valid hostname");
         }
         if (process.env.CDK_ENV_HOSTED_ZONE &&
-            !isValidHostname(process.env.CDK_ENV_HOSTED_ZONE)) {
+            !isValidHostname$1(process.env.CDK_ENV_HOSTED_ZONE)) {
             throw new ConfigurationError("CDK_ENV_HOSTED_ZONE is not a valid hostname");
         }
         // Determine host from props or environment
@@ -1912,7 +1955,7 @@ class JaypieWebDeploymentBucket extends Construct {
                 host = undefined;
             }
         }
-        if (host && !isValidHostname(host)) {
+        if (host && !isValidHostname$1(host)) {
             throw new ConfigurationError("Host is not a valid hostname");
         }
         // Determine zone from props or environment