@take-out/scripts 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.1.3",
+    "@take-out/helpers": "workspace:*",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {

package/src/env-update.ts

@@ -3,6 +3,7 @@
 import fs from 'node:fs'
 
 import { cmd } from './cmd'
+import { resolveDepVersion } from './helpers/resolve-dep-version'
 
 await cmd`sync environment variables from package.json to CI and server configs`.run(
   async () => {
@@ -43,8 +44,14 @@ await cmd`sync environment variables from package.json to CI and server configs`
       }
 
       const indent = `          `
-      const envSection = Object.keys(envVars)
-        .map((key) => `${indent}${key}: \${{ secrets.${key} }}`)
+      const envSection = Object.entries(envVars)
+        .map(([key, value]) => {
+          const resolved = resolveDepVersion(value, packageJson.dependencies)
+          if (resolved) {
+            return `${indent}${key}: \${{ secrets.${key} || '${resolved}' }}`
+          }
+          return `${indent}${key}: \${{ secrets.${key} }}`
+        })
         .join('\n')
 
       const newDeployYml = replaceYamlSection(deployYml, envSection, { indent })

package/src/generate-env.ts

@@ -3,6 +3,7 @@
 import fs from 'node:fs'
 
 import { cmd } from './cmd'
+import { resolveDepVersion } from './helpers/resolve-dep-version'
 
 await cmd`sync auto-generated env vars to local .env file`.run(async ({ path }) => {
   const ENV_PATH = path.join(process.cwd(), '.env')
@@ -26,15 +27,13 @@ await cmd`sync auto-generated env vars to local .env file`.run(async ({ path })
     const lines: string[] = [BEGIN_MARKER, `# Generated at: ${new Date().toISOString()}`]
 
     for (const [key, value] of Object.entries(envVars)) {
-      if (typeof value === 'string' && value.startsWith('$dep:')) {
-        // resolve version from dependency
-        const depName = value.slice('$dep:'.length)
-        const version = packageJson.dependencies?.[depName]?.replace(/^[\^~]/, '')
-        if (version) {
-          lines.push(`${key}=${version}`)
-        } else {
-          console.warn(`Could not resolve dependency version for ${depName}`)
-        }
+      const depVersion = resolveDepVersion(value, packageJson.dependencies)
+      if (depVersion) {
+        lines.push(`${key}=${depVersion}`)
+      } else if (typeof value === 'string' && value.startsWith('$dep:')) {
+        console.warn(
+          `Could not resolve dependency version for ${value.slice('$dep:'.length)}`
+        )
       } else if (typeof value === 'string' && value !== '') {
         // non-empty string default
         lines.push(`${key}=${value}`)

package/src/helpers/args.ts

@@ -61,10 +61,10 @@ export function args<const S extends string>(strings: TemplateStringsArray | S):
 
   // parse spec: "--port number --verbose boolean"
   const schema: Record<string, 'string' | 'number' | 'boolean'> = {}
-  const matches = spec.matchAll(/--?([a-z-]+)\s+(string|number|boolean)/gi)
+  const matches = spec.matchAll(/--?([a-z0-9-]+)\s+(string|number|boolean)/gi)
 
   for (const [, flag, type] of matches) {
-    const camel = flag!.replace(/-([a-z])/g, (_, c) => c.toUpperCase())
+    const camel = flag!.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase())
     schema[camel] = type as 'string' | 'number' | 'boolean'
   }
 
@@ -75,7 +75,7 @@ export function args<const S extends string>(strings: TemplateStringsArray | S):
     const arg = argv[i]!
 
     if (arg.startsWith('-')) {
-      const key = arg.replace(/^--?/, '').replace(/-([a-z])/g, (_, c) => c.toUpperCase())
+      const key = arg.replace(/^--?/, '').replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase())
       const type = schema[key]
 
       if (type === 'boolean') {

package/src/helpers/resolve-dep-version.ts

@@ -0,0 +1,11 @@
+/**
+ * resolves a `$dep:package-name` value to the installed version from dependencies
+ */
+export function resolveDepVersion(
+  value: string | boolean,
+  dependencies: Record<string, string> | undefined
+): string | undefined {
+  if (typeof value !== 'string' || !value.startsWith('$dep:')) return undefined
+  const depName = value.slice('$dep:'.length)
+  return dependencies?.[depName]?.replace(/^[\^~]/, '')
+}