@take-out/scripts 0.0.72 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.69"
+    "@take-out/helpers": "0.0.73"
   },
   "devDependencies": {
     "vxrn": "1.4.10-1770207233041"

package/src/env-update.ts

@@ -137,9 +137,21 @@ function updateDockerCompose() {
     return
   }
 
-  const indent = '      '
+  // detect indent from the marker line
+  const markerMatch = dockerCompose.match(new RegExp(`^(\\s*)${yamlStartMarker}`, 'm'))
+  const indent = markerMatch?.[1] || '      '
+
+  // detect format: if markers are under an x- anchor block, use map syntax (KEY: val)
+  // otherwise use list syntax (- KEY=val)
+  const beforeMarker = dockerCompose.slice(0, dockerCompose.indexOf(yamlStartMarker))
+  const isMap = /x-[\w-]+:.*&[\w-]+/s.test(beforeMarker)
+
   const envLines = Object.keys(envVars)
-    .map((key) => `${indent}- ${key}=\${${key}:-}`)
+    .map((key) =>
+      isMap
+        ? `${indent}${key}: \${${key}:-}`
+        : `${indent}- ${key}=\${${key}:-}`
+    )
     .join('\n')
 
   const newDockerCompose = replaceYamlSection(dockerCompose, envLines, { indent })

package/src/release.ts

@@ -317,7 +317,9 @@ async function syncOnZeroIn() {
     return
   }
 
-  const newCommits = commits.slice(0, lastSyncIdx).filter((c) => !c.match(/^v\d+\.\d+\.\d+/))
+  const newCommits = commits
+    .slice(0, lastSyncIdx)
+    .filter((c) => !c.match(/^v\d+\.\d+\.\d+/))
   if (!newCommits.length) {
     console.info('  ← on-zero: no new github commits to sync in')
     return
@@ -331,7 +333,9 @@ async function syncOnZeroIn() {
     return
   }
 
-  await fs.copy(join(onZeroGithub, 'src'), join(onZeroTakeout, 'src'), { overwrite: true })
+  await fs.copy(join(onZeroGithub, 'src'), join(onZeroTakeout, 'src'), {
+    overwrite: true,
+  })
 
   const status = (await $`git status --porcelain`.text()).trim()
   if (status) {
@@ -342,7 +346,6 @@ async function syncOnZeroIn() {
 
 async function syncOnZeroOut(version: string) {
   if (!(await fs.pathExists(onZeroGithub))) return
-  console.info('  → on-zero: syncing out to github')
 
   // copy src files from takeout to github
   await fs.copy(join(onZeroTakeout, 'src'), join(onZeroGithub, 'src'), {
@@ -375,10 +378,12 @@ async function syncOnZeroOut(version: string) {
     { spaces: 2 }
   )
 
-  // commit and push
+  // only commit if there are actual changes
   const status = (await $`git -C ${onZeroGithub} status --porcelain`.text()).trim()
   if (!status) return
 
+  console.info('  → on-zero: syncing out to github')
+
   if (dryRun) {
     console.info(`    [dry-run] would push: sync: from takeout v${version}`)
     await $`git -C ${onZeroGithub} checkout -- .`