Merge pull request #102 from monk-io/add-custom-domains

nooga · web-flow · commit 2a6a0e612925 · 2025-09-11T19:39:00.000+01:00
[feature] add cloudflare entity, custom domains for vercel and netlify entities
diff --git a/dist/cloudflare/MANIFEST b/dist/cloudflare/MANIFEST
@@ -1,4 +1,4 @@
 REPO cloudflare
-VERSION_HASH e0206fa9d712
-LOAD cloudflare-dns-record.yaml cloudflare-base.yaml cloudflare-dns-zone.yaml
+VERSION_HASH 1f3d61bb7e51
+LOAD cloudflare-base.yaml cloudflare-dns-record.yaml cloudflare-dns-zone.yaml
 RESOURCES cloudflare-base.js cloudflare-dns-record-sync.js cloudflare-dns-zone-sync.js
diff --git a/dist/cloudflare/cloudflare-base.yaml b/dist/cloudflare/cloudflare-base.yaml
@@ -3,5 +3,5 @@ namespace: cloudflare
 cloudflare-base:
   defines: module
   metadata:
-    version-hash: e0206fa9d712
+    version-hash: 1f3d61bb7e51
   source: <<< cloudflare-base.js
diff --git a/dist/cloudflare/cloudflare-dns-record-sync.js b/dist/cloudflare/cloudflare-dns-record-sync.js
@@ -72,6 +72,7 @@ var _CloudflareDNSRecord = class _CloudflareDNSRecord extends (_a = CloudflareEn
       this.state.record_id = existing.id;
       this.state.zone_id = zoneId;
       this.state.existing = true;
+      this.state.applied_zone_name = this.definition.zone_name;
       return;
     }
     const payload = {
@@ -89,24 +90,22 @@ var _CloudflareDNSRecord = class _CloudflareDNSRecord extends (_a = CloudflareEn
       this.state.record_id = createdId;
       this.state.zone_id = zoneId;
       this.state.existing = false;
+      this.state.applied_zone_name = this.definition.zone_name;
     } else {
       const newRec = this.findRecord(zoneId, this.definition.record_type, this.definition.name);
       if (newRec) {
         this.state.record_id = newRec.id;
         this.state.zone_id = zoneId;
         this.state.existing = false;
+        this.state.applied_zone_name = this.definition.zone_name;
       }
     }
     return;
   }
   update() {
-    const zoneId = this.resolveZoneId();
-    if (!zoneId) return;
-    if (!this.state.record_id) {
-      const existing = this.findRecord(zoneId, this.definition.record_type, this.definition.name);
-      if (!existing) return void this.create();
-      this.state.record_id = existing.id;
-    }
+    const currentZoneId = this.state.zone_id;
+    const desiredZoneId = this.definition.zone_id ?? (this.definition.zone_name ? this.findZoneByName(this.definition.zone_name)?.id : currentZoneId);
+    if (!desiredZoneId) return;
     const payload = {
       type: this.definition.record_type,
       name: this.definition.name
@@ -116,7 +115,69 @@ var _CloudflareDNSRecord = class _CloudflareDNSRecord extends (_a = CloudflareEn
     if (typeof this.definition.proxied === "boolean") payload.proxied = this.definition.proxied;
     if (typeof this.definition.priority === "number") payload.priority = this.definition.priority;
     if (this.definition.data) payload.data = this.definition.data;
-    this.request("PUT", `/zones/${zoneId}/dns_records/${this.state.record_id}`, payload);
+    const nameChanged = this.definition.zone_name !== void 0 && this.state.applied_zone_name !== void 0 && this.definition.zone_name !== this.state.applied_zone_name;
+    const idChanged = Boolean(currentZoneId && currentZoneId !== desiredZoneId);
+    if (nameChanged || idChanged) {
+      const old = { zone: currentZoneId, id: this.state.record_id, owned: this.state.existing === false };
+      const existing = this.findRecord(desiredZoneId, this.definition.record_type, this.definition.name);
+      if (existing) {
+        this.state.record_id = existing.id;
+        this.state.zone_id = desiredZoneId;
+        this.state.existing = true;
+      } else {
+        const created = this.request("POST", `/zones/${desiredZoneId}/dns_records`, payload);
+        const newId = created?.result?.id;
+        if (newId) {
+          this.state.record_id = newId;
+          this.state.zone_id = desiredZoneId;
+          this.state.existing = false;
+        } else {
+          const newRec = this.findRecord(desiredZoneId, this.definition.record_type, this.definition.name);
+          if (newRec) {
+            this.state.record_id = newRec.id;
+            this.state.zone_id = desiredZoneId;
+            this.state.existing = true;
+          }
+        }
+      }
+      if (old.zone && old.id && old.owned) {
+        this.request("DELETE", `/zones/${old.zone}/dns_records/${old.id}`);
+      }
+      if (this.definition.zone_name !== void 0) {
+        this.state.applied_zone_name = this.definition.zone_name;
+      }
+      return;
+    }
+    if (!this.state.record_id) {
+      const existing = this.findRecord(desiredZoneId, this.definition.record_type, this.definition.name);
+      if (!existing) {
+        const created = this.request("POST", `/zones/${desiredZoneId}/dns_records`, payload);
+        const newId = created?.result?.id;
+        if (newId) {
+          this.state.record_id = newId;
+          this.state.zone_id = desiredZoneId;
+          this.state.existing = false;
+          if (this.definition.zone_name !== void 0) this.state.applied_zone_name = this.definition.zone_name;
+        } else {
+          const newRec = this.findRecord(desiredZoneId, this.definition.record_type, this.definition.name);
+          if (newRec) {
+            this.state.record_id = newRec.id;
+            this.state.zone_id = desiredZoneId;
+            this.state.existing = true;
+            if (this.definition.zone_name !== void 0) this.state.applied_zone_name = this.definition.zone_name;
+          }
+        }
+        return;
+      }
+      this.state.record_id = existing.id;
+      this.state.zone_id = desiredZoneId;
+      this.state.existing = true;
+    }
+    this.request("PUT", `/zones/${desiredZoneId}/dns_records/${this.state.record_id}`, payload);
+    this.state.zone_id = desiredZoneId;
+    if (this.definition.zone_name !== void 0) {
+      this.state.applied_zone_name = this.definition.zone_name;
+    }
   }
   delete() {
     if (!this.state.zone_id || !this.state.record_id) {
diff --git a/dist/cloudflare/cloudflare-dns-record.yaml b/dist/cloudflare/cloudflare-dns-record.yaml
@@ -3,7 +3,7 @@ cloudflare-dns-record:
   defines: entity
   metadata:
     name: CloudflareDNSRecord
-    version-hash: e0206fa9d712
+    version-hash: 1f3d61bb7e51
   schema:
     secret_ref:
       type: string
@@ -47,6 +47,9 @@ cloudflare-dns-record:
     zone_id:
       type: string
       description: Zone id resolved for this record
+    applied_zone_name:
+      type: string
+      description: Zone name applied on last successful operation (for change detection)
   lifecycle:
     sync: <<< cloudflare-dns-record-sync.js
     get-info: ''
diff --git a/dist/cloudflare/cloudflare-dns-zone.yaml b/dist/cloudflare/cloudflare-dns-zone.yaml
@@ -3,7 +3,7 @@ cloudflare-dns-zone:
   defines: entity
   metadata:
     name: CloudflareDNSZone
-    version-hash: e0206fa9d712
+    version-hash: 1f3d61bb7e51
   schema:
     secret_ref:
       type: string
diff --git a/dist/netlify/MANIFEST b/dist/netlify/MANIFEST
@@ -1,4 +1,4 @@
 REPO netlify
-VERSION_HASH c5366b9218cb
-LOAD account.yaml netlify-base.yaml form.yaml common.yaml site.yaml
-RESOURCES common.js account-sync.js form-sync.js netlify-base.js site-sync.js
+VERSION_HASH 7f6f1883a79e
+LOAD account.yaml common.yaml form.yaml netlify-base.yaml site.yaml
+RESOURCES account-sync.js form-sync.js netlify-base.js common.js site-sync.js
diff --git a/dist/netlify/account.yaml b/dist/netlify/account.yaml
@@ -3,7 +3,7 @@ account:
   defines: entity
   metadata:
     name: Account
-    version-hash: c5366b9218cb
+    version-hash: 7f6f1883a79e
   schema:
     secret_ref:
       type: string
diff --git a/dist/netlify/common.yaml b/dist/netlify/common.yaml
@@ -3,5 +3,5 @@ namespace: netlify
 common:
   defines: module
   metadata:
-    version-hash: c5366b9218cb
+    version-hash: 7f6f1883a79e
   source: <<< common.js
diff --git a/dist/netlify/form.yaml b/dist/netlify/form.yaml
@@ -3,7 +3,7 @@ form:
   defines: entity
   metadata:
     name: Form
-    version-hash: c5366b9218cb
+    version-hash: 7f6f1883a79e
   schema:
     secret_ref:
       type: string
diff --git a/dist/netlify/netlify-base.yaml b/dist/netlify/netlify-base.yaml
@@ -3,5 +3,5 @@ namespace: netlify
 netlify-base:
   defines: module
   metadata:
-    version-hash: c5366b9218cb
+    version-hash: 7f6f1883a79e
   source: <<< netlify-base.js
diff --git a/dist/netlify/site-sync.js b/dist/netlify/site-sync.js
@@ -85,6 +85,7 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
         url: existingSite.ssl_url || existingSite.url,
         admin_url: existingSite.admin_url,
         custom_domain: existingSite.custom_domain,
+        default_domain: existingSite.default_domain || existingSite.name + ".netlify.app",
         state: existingSite.state,
         created_at: existingSite.created_at,
         updated_at: existingSite.updated_at,
@@ -98,6 +99,18 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
       name: this.definition.name,
       created_via: "monk.io"
     };
+    if (this.definition.custom_domain) {
+      body.custom_domain = this.definition.custom_domain;
+    }
+    if (this.definition.password) {
+      body.password = this.definition.password;
+    }
+    if (this.definition.force_ssl !== void 0) {
+      body.force_ssl = this.definition.force_ssl;
+    }
+    if (Array.isArray(this.definition.domain_aliases) && this.definition.domain_aliases.length > 0) {
+      body.domain_aliases = this.definition.domain_aliases;
+    }
     let createObj;
     try {
       createObj = this.makeRequest("POST", `${urlPrefix}/sites`, body);
@@ -124,6 +137,7 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
                 url: site.ssl_url || site.url,
                 admin_url: site.admin_url,
                 custom_domain: site.custom_domain,
+                default_domain: site.default_domain || site.name + ".netlify.app",
                 state: site.state,
                 created_at: site.created_at,
                 updated_at: site.updated_at,
@@ -146,12 +160,42 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
       url: createObj.ssl_url || createObj.url,
       admin_url: createObj.admin_url,
       custom_domain: createObj.custom_domain,
+      default_domain: createObj.default_domain || createObj.name + ".netlify.app",
+      domain_aliases: createObj.domain_aliases,
       state: createObj.state,
       created_at: createObj.created_at,
       updated_at: createObj.updated_at,
       existing: false
     };
     cli.output(`\u2705 Created Netlify site: ${createObj.name} (${createObj.ssl_url})`);
+    try {
+      const needsFollowUpUpdate = Boolean(
+        this.definition.custom_domain || Array.isArray(this.definition.domain_aliases) && this.definition.domain_aliases.length > 0 || this.definition.force_ssl !== void 0 || this.definition.password
+      );
+      if (needsFollowUpUpdate) {
+        const urlPrefix2 = this.definition.team_slug ? `/${this.definition.team_slug}` : "";
+        const updateBody = { name: this.definition.name };
+        if (this.definition.custom_domain) updateBody.custom_domain = this.definition.custom_domain;
+        if (Array.isArray(this.definition.domain_aliases) && this.definition.domain_aliases.length > 0) {
+          updateBody.domain_aliases = this.definition.domain_aliases;
+        }
+        if (this.definition.force_ssl !== void 0) updateBody.force_ssl = this.definition.force_ssl;
+        if (this.definition.password) updateBody.password = this.definition.password;
+        const updatedSite = this.makeRequest("PUT", `${urlPrefix2}/sites/${this.state.id}`, updateBody);
+        this.state = {
+          ...this.state,
+          name: updatedSite.name,
+          url: updatedSite.ssl_url || updatedSite.url,
+          custom_domain: updatedSite.custom_domain,
+          default_domain: updatedSite.default_domain || updatedSite.name + ".netlify.app",
+          domain_aliases: updatedSite.domain_aliases,
+          updated_at: updatedSite.updated_at
+        };
+        cli.output(`\u{1F504} Applied post-create site settings (custom domain/aliases)`);
+      }
+    } catch (error) {
+      cli.output(`\u26A0\uFE0F  Post-create update failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+    }
   }
   update() {
     if (!this.state.id) {
@@ -168,6 +212,9 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
     if (this.definition.custom_domain) {
       body.custom_domain = this.definition.custom_domain;
     }
+    if (Array.isArray(this.definition.domain_aliases) && this.definition.domain_aliases.length > 0) {
+      body.domain_aliases = this.definition.domain_aliases;
+    }
     if (this.definition.password) {
       body.password = this.definition.password;
     }
@@ -180,6 +227,8 @@ var _Site = class _Site extends (_a = NetlifyEntity, _getSite_dec = [action("get
       name: updatedSite.name,
       url: updatedSite.ssl_url || updatedSite.url,
       custom_domain: updatedSite.custom_domain,
+      default_domain: updatedSite.default_domain || updatedSite.name + ".netlify.app",
+      domain_aliases: updatedSite.domain_aliases,
       updated_at: updatedSite.updated_at
     };
     cli.output(`\u2705 Updated Netlify site: ${updatedSite.name}`);
diff --git a/dist/netlify/site.yaml b/dist/netlify/site.yaml
@@ -3,7 +3,7 @@ site:
   defines: entity
   metadata:
     name: Site
-    version-hash: c5366b9218cb
+    version-hash: 7f6f1883a79e
   schema:
     secret_ref:
       type: string
@@ -22,6 +22,11 @@ site:
     custom_domain:
       type: string
       description: Custom domain for the site
+    domain_aliases:
+      type: array
+      items:
+        type: string
+      description: Additional custom domains that should resolve to this site
     password:
       type: string
       description: Password to protect the site
@@ -46,9 +51,17 @@ site:
     admin_url:
       type: string
       description: The admin URL for managing the site
+    default_domain:
+      type: string
+      description: 'The default Netlify-hosted domain (e.g., example-site.netlify.app)'
     custom_domain:
       type: string
       description: Custom domain configured for the site
+    domain_aliases:
+      type: array
+      items:
+        type: string
+      description: Additional custom domains configured for the site
     state:
       type: string
       description: Current state of the site
diff --git a/dist/vercel/MANIFEST b/dist/vercel/MANIFEST
@@ -1,4 +1,4 @@
 REPO vercel
-VERSION_HASH e52ddaa6cf33
-LOAD deployment.yaml vercel-base.yaml common.yaml project.yaml
-RESOURCES common.js vercel-base.js project-sync.js deployment-sync.js
+VERSION_HASH 3ace1cd1ed88
+LOAD common.yaml deployment.yaml project.yaml vercel-base.yaml
+RESOURCES common.js vercel-base.js deployment-sync.js project-sync.js
diff --git a/dist/vercel/common.yaml b/dist/vercel/common.yaml
@@ -3,5 +3,5 @@ namespace: vercel
 common:
   defines: module
   metadata:
-    version-hash: e52ddaa6cf33
+    version-hash: 3ace1cd1ed88
   source: <<< common.js
diff --git a/dist/vercel/deployment.yaml b/dist/vercel/deployment.yaml
@@ -3,7 +3,7 @@ deployment:
   defines: entity
   metadata:
     name: Deployment
-    version-hash: e52ddaa6cf33
+    version-hash: 3ace1cd1ed88
   schema:
     secret_ref:
       type: string
diff --git a/dist/vercel/project-sync.js b/dist/vercel/project-sync.js
diff --git a/dist/vercel/project.yaml b/dist/vercel/project.yaml
diff --git a/dist/vercel/vercel-base.yaml b/dist/vercel/vercel-base.yaml
diff --git a/src/cloudflare/dns-record.ts b/src/cloudflare/dns-record.ts
diff --git a/src/netlify/common.ts b/src/netlify/common.ts
diff --git a/src/netlify/site.ts b/src/netlify/site.ts
diff --git a/src/vercel/project.ts b/src/vercel/project.ts
