@crossdelta/infrastructure 0.8.3 → 0.8.5

package/bin/env-parsing.ts

@@ -0,0 +1,51 @@
+export const resolveStringVariable = (variableName: string, fileContent: string): string | undefined => {
+  const pattern = new RegExp(
+    `(?:const|let|var)\\s+${variableName}\\s*=\\s*['"]([^'"]+)['"]`,
+  )
+  return fileContent.match(pattern)?.[1]
+}
+
+export const resolveArrayJoin = (variableName: string, separator: string, fileContent: string): string | undefined => {
+  const arrayPattern = new RegExp(
+    `(?:const|let|var)\\s+${variableName}\\s*=\\s*\\[([^\\]]*)]`,
+    's',
+  )
+  const arrayMatch = fileContent.match(arrayPattern)
+  if (!arrayMatch?.[1]) return undefined
+
+  const elements = arrayMatch[1]
+    .split(',')
+    .map((element) => element.trim().replace(/^['"]|['"]$/g, ''))
+    .filter(Boolean)
+
+  return elements.length > 0 ? elements.join(separator) : undefined
+}
+
+export const extractEnvLiterals = (content: string): Record<string, string> | undefined => {
+  const envBlockMatch = content.match(/(?<!\w)env:\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/)
+  if (!envBlockMatch?.[1]) return undefined
+
+  const literals: Record<string, string> = {}
+  const literalPattern = /^\s*(\w+):\s*['"]([^'"]+)['"]/gm
+  for (const [, key, value] of envBlockMatch[1].matchAll(literalPattern)) {
+    if (key && value) literals[key] = value
+  }
+
+  const joinPattern = /^\s*(\w+):\s*(\w+)\.join\(\s*['"]([^'"]*)['"]\s*\)/gm
+  for (const [, key, variableName, separator] of envBlockMatch[1].matchAll(joinPattern)) {
+    if (key && variableName) {
+      const resolved = resolveArrayJoin(variableName, separator ?? ',', content)
+      if (resolved) literals[key] = resolved
+    }
+  }
+
+  const variablePattern = /^\s*(\w+):\s*(\w+)\s*,?$/gm
+  for (const [, key, variableName] of envBlockMatch[1].matchAll(variablePattern)) {
+    if (key && variableName && !(key in literals)) {
+      const resolved = resolveStringVariable(variableName, content)
+      if (resolved) literals[key] = resolved
+    }
+  }
+
+  return Object.keys(literals).length > 0 ? literals : undefined
+}

package/bin/generate-env.mjs

@@ -4,6 +4,50 @@
 import { execSync } from "node:child_process";
 import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+
+// bin/env-parsing.ts
+var resolveStringVariable = (variableName, fileContent) => {
+  const pattern = new RegExp(`(?:const|let|var)\\s+${variableName}\\s*=\\s*['"]([^'"]+)['"]`);
+  return fileContent.match(pattern)?.[1];
+};
+var resolveArrayJoin = (variableName, separator, fileContent) => {
+  const arrayPattern = new RegExp(`(?:const|let|var)\\s+${variableName}\\s*=\\s*\\[([^\\]]*)]`, "s");
+  const arrayMatch = fileContent.match(arrayPattern);
+  if (!arrayMatch?.[1])
+    return;
+  const elements = arrayMatch[1].split(",").map((element) => element.trim().replace(/^['"]|['"]$/g, "")).filter(Boolean);
+  return elements.length > 0 ? elements.join(separator) : undefined;
+};
+var extractEnvLiterals = (content) => {
+  const envBlockMatch = content.match(/(?<!\w)env:\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/);
+  if (!envBlockMatch?.[1])
+    return;
+  const literals = {};
+  const literalPattern = /^\s*(\w+):\s*['"]([^'"]+)['"]/gm;
+  for (const [, key, value] of envBlockMatch[1].matchAll(literalPattern)) {
+    if (key && value)
+      literals[key] = value;
+  }
+  const joinPattern = /^\s*(\w+):\s*(\w+)\.join\(\s*['"]([^'"]*)['"]\s*\)/gm;
+  for (const [, key, variableName, separator] of envBlockMatch[1].matchAll(joinPattern)) {
+    if (key && variableName) {
+      const resolved = resolveArrayJoin(variableName, separator ?? ",", content);
+      if (resolved)
+        literals[key] = resolved;
+    }
+  }
+  const variablePattern = /^\s*(\w+):\s*(\w+)\s*,?$/gm;
+  for (const [, key, variableName] of envBlockMatch[1].matchAll(variablePattern)) {
+    if (key && variableName && !(key in literals)) {
+      const resolved = resolveStringVariable(variableName, content);
+      if (resolved)
+        literals[key] = resolved;
+    }
+  }
+  return Object.keys(literals).length > 0 ? literals : undefined;
+};
+
+// bin/generate-env.ts
 var LOCK_FILES = ["bun.lock", "bun.lockb", "package-lock.json", "yarn.lock", "pnpm-lock.yaml"];
 var toEnvKey = (name) => name.toUpperCase().replace(/-/g, "_");
 var resolveNumber = (value, fileContent) => {
@@ -27,18 +71,6 @@ var extract = {
     return numbers.length > 0 ? numbers : undefined;
   }
 };
-var extractEnvLiterals = (content) => {
-  const envBlockMatch = content.match(/(?<!\w)env:\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/);
-  if (!envBlockMatch?.[1])
-    return;
-  const literals = {};
-  const literalPattern = /^\s*(\w+):\s*['"]([^'"]+)['"]/gm;
-  for (const [, key, value] of envBlockMatch[1].matchAll(literalPattern)) {
-    if (key && value)
-      literals[key] = value;
-  }
-  return Object.keys(literals).length > 0 ? literals : undefined;
-};
 var getServicePort = (config) => {
   if (config.primaryPort)
     return config.primaryPort;

package/bin/generate-env.ts

@@ -13,6 +13,7 @@
 import { execSync } from 'node:child_process'
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
+import { extractEnvLiterals } from './env-parsing'
 
 type PulumiConfigEntry = {
   value?: string
@@ -62,18 +63,6 @@ const extract = {
   },
 }
 
-const extractEnvLiterals = (content: string): Record<string, string> | undefined => {
-  const envBlockMatch = content.match(/(?<!\w)env:\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/)
-  if (!envBlockMatch?.[1]) return undefined
-
-  const literals: Record<string, string> = {}
-  const literalPattern = /^\s*(\w+):\s*['"]([^'"]+)['"]/gm
-  for (const [, key, value] of envBlockMatch[1].matchAll(literalPattern)) {
-    if (key && value) literals[key] = value
-  }
-  return Object.keys(literals).length > 0 ? literals : undefined
-}
-
 const getServicePort = (config: MinimalServiceConfig): number | undefined => {
   if (config.primaryPort) return config.primaryPort
   if (config.containerPort) return config.containerPort

package/dist/index.cjs

@@ -1015,7 +1015,7 @@ var generateSetupScript = (streams) => {
     `echo "⏳ Waiting for NATS to become available..."`,
     `RETRIES=0`,
     `MAX_RETRIES=30`,
-    `until nats $NATS_OPTS server ping --count 1 > /dev/null 2>&1; do`,
+    `until nats $NATS_OPTS rtt > /dev/null 2>&1; do`,
     `  RETRIES=$((RETRIES + 1))`,
     `  if [ "$RETRIES" -ge "$MAX_RETRIES" ]; then`,
     `    echo "❌ NATS not available after $MAX_RETRIES attempts"`,

package/dist/index.js

@@ -921,7 +921,7 @@ var generateSetupScript = (streams) => {
     `echo "⏳ Waiting for NATS to become available..."`,
     `RETRIES=0`,
     `MAX_RETRIES=30`,
-    `until nats $NATS_OPTS server ping --count 1 > /dev/null 2>&1; do`,
+    `until nats $NATS_OPTS rtt > /dev/null 2>&1; do`,
     `  RETRIES=$((RETRIES + 1))`,
     `  if [ "$RETRIES" -ge "$MAX_RETRIES" ]; then`,
     `    echo "❌ NATS not available after $MAX_RETRIES attempts"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
@@ -35,7 +35,7 @@
     }
   },
   "dependencies": {
-    "@crossdelta/cloudevents": "^0.7.18"
+    "@crossdelta/cloudevents": "^0.7.19"
   },
   "peerDependencies": {
     "@pulumi/digitalocean": "^4.0.0",