@tachyon-gg/railway-deploy 0.1.0 → 0.2.1

package/README.md

@@ -158,7 +158,6 @@ domains:
   - app.example.com                # Simple domain
   - domain: api.example.com        # Domain with target port
     target_port: 8080
-domain: simple.example.com         # Shorthand for a single domain
 
 # Railway-provided domain
 railway_domain: true               # Generate a .up.railway.app domain
@@ -166,8 +165,7 @@ railway_domain:                    # ...with a specific target port
   target_port: 3000
 
 # TCP proxies (for non-HTTP services like databases)
-tcp_proxy: 5432                    # Single port
-tcp_proxies: [5432, 6379]          # Multiple ports
+tcp_proxies: [5432, 6379]          # One or more ports
 
 # Outbound networking
 ipv6_egress: true                  # Enable IPv6 outbound traffic
@@ -232,7 +230,8 @@ variables:
   APP_VERSION: "%{tag}"
   DATABASE_URL: ${{Postgres.DATABASE_URL}}
 
-domain: "%{tag}.example.com"
+domains:
+  - "%{tag}.example.com"
 
 healthcheck:
   path: /health
@@ -309,7 +308,7 @@ services:
     volume:
       mount: /var/lib/postgresql/data
       name: pg-data
-    tcp_proxy: 5432
+    tcp_proxies: [5432]
     variables:
       POSTGRES_DB: myapp
 
@@ -319,7 +318,7 @@ services:
     volume:
       mount: /data
       name: redis-data
-    tcp_proxy: 6379
+    tcp_proxies: [6379]
 
   worker:
     template: ../services/worker.yaml

package/dist/index.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -10704,9 +10722,9 @@ var require_instanceOf = __commonJS((exports) => {
   exports.instanceOf = undefined;
   var _inspect = require_inspect();
   var isProduction = globalThis.process && false;
-  var instanceOf = isProduction ? function instanceOf(value, constructor) {
+  var instanceOf = isProduction ? function instanceOf2(value, constructor) {
     return value instanceof constructor;
-  } : function instanceOf(value, constructor) {
+  } : function instanceOf2(value, constructor) {
     if (value instanceof constructor) {
       return true;
     }
@@ -23727,6 +23745,48 @@ var require_graphql2 = __commonJS((exports) => {
   var _index6 = require_utilities();
 });
 
+// node_modules/fast-deep-equal/index.js
+var require_fast_deep_equal = __commonJS((exports, module) => {
+  module.exports = function equal(a, b) {
+    if (a === b)
+      return true;
+    if (a && b && typeof a == "object" && typeof b == "object") {
+      if (a.constructor !== b.constructor)
+        return false;
+      var length, i, keys;
+      if (Array.isArray(a)) {
+        length = a.length;
+        if (length != b.length)
+          return false;
+        for (i = length;i-- !== 0; )
+          if (!equal(a[i], b[i]))
+            return false;
+        return true;
+      }
+      if (a.constructor === RegExp)
+        return a.source === b.source && a.flags === b.flags;
+      if (a.valueOf !== Object.prototype.valueOf)
+        return a.valueOf() === b.valueOf();
+      if (a.toString !== Object.prototype.toString)
+        return a.toString() === b.toString();
+      keys = Object.keys(a);
+      length = keys.length;
+      if (length !== Object.keys(b).length)
+        return false;
+      for (i = length;i-- !== 0; )
+        if (!Object.prototype.hasOwnProperty.call(b, keys[i]))
+          return false;
+      for (i = length;i-- !== 0; ) {
+        var key = keys[i];
+        if (!equal(a[key], b[key]))
+          return false;
+      }
+      return true;
+    }
+    return a !== a && b !== b;
+  };
+});
+
 // node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -37437,7 +37497,6 @@ var ServiceTemplateSchema = exports_external.object({
   params: exports_external.record(exports_external.string(), ParamDefSchema).optional(),
   source: SourceConfigSchema.optional(),
   variables: exports_external.record(exports_external.string(), exports_external.string().nullable()).optional(),
-  domain: DomainEntrySchema.optional(),
   domains: exports_external.array(DomainEntrySchema).optional(),
   region: RegionConfigSchema.optional(),
   restart_policy: RestartPolicySchema.optional(),
@@ -37460,7 +37519,6 @@ var ServiceTemplateSchema = exports_external.object({
   check_suites: exports_external.boolean().optional(),
   registry_credentials: RegistryCredentialsSchema.optional(),
   railway_domain: RailwayDomainSchema,
-  tcp_proxy: exports_external.number().int().positive().optional(),
   tcp_proxies: exports_external.array(exports_external.number().int().positive()).optional(),
   limits: LimitsConfigSchema,
   railway_config_file: exports_external.string().optional(),
@@ -37471,7 +37529,6 @@ var ServiceEntrySchema = exports_external.object({
   params: exports_external.record(exports_external.string(), exports_external.string()).optional(),
   variables: exports_external.record(exports_external.string(), exports_external.string().nullable()).optional(),
   source: SourceConfigSchema.optional(),
-  domain: DomainEntrySchema.optional(),
   domains: exports_external.array(DomainEntrySchema).optional(),
   volume: VolumeConfigSchema.optional(),
   region: RegionConfigSchema.optional(),
@@ -37494,7 +37551,6 @@ var ServiceEntrySchema = exports_external.object({
   check_suites: exports_external.boolean().optional(),
   registry_credentials: RegistryCredentialsSchema.optional(),
   railway_domain: RailwayDomainSchema,
-  tcp_proxy: exports_external.number().int().positive().optional(),
   tcp_proxies: exports_external.array(exports_external.number().int().positive()).optional(),
   limits: LimitsConfigSchema,
   railway_config_file: exports_external.string().optional(),
@@ -37535,19 +37591,21 @@ ${issues}`);
 // src/config/variables.ts
 var import_dotenv = __toESM(require_main(), 1);
 import { readFileSync } from "fs";
-function resolveEnvVars(variables, env = process.env) {
+function resolveEnvVars(variables, env = process.env, lenient = false) {
   const resolved = {};
   for (const [key, value] of Object.entries(variables)) {
     if (value === null)
       continue;
-    resolved[key] = resolveEnvVarString(value, env);
+    resolved[key] = resolveEnvVarString(value, env, lenient);
   }
   return resolved;
 }
-function resolveEnvVarString(input, env = process.env) {
-  return input.replace(/\$\{(?!\{)([^}]+)\}/g, (_match, name) => {
+function resolveEnvVarString(input, env = process.env, lenient = false) {
+  return input.replace(/\$\{(?!\{)([^}]+)\}/g, (match, name) => {
     const value = env[name];
     if (value === undefined) {
+      if (lenient)
+        return match;
       throw new Error(`Environment variable "${name}" is not set (referenced as \${${name}})`);
     }
     return value;
@@ -37571,19 +37629,12 @@ function normalizeDomainEntry(entry) {
     ...entry.target_port !== undefined ? { targetPort: entry.target_port } : {}
   };
 }
-function normalizeDomains(domain2, domains) {
-  const result = [];
-  if (domains)
-    result.push(...domains.map(normalizeDomainEntry));
-  if (domain2) {
-    const normalized = normalizeDomainEntry(domain2);
-    if (!result.some((d) => d.domain === normalized.domain)) {
-      result.push(normalized);
-    }
-  }
-  return result;
+function normalizeDomains(domains) {
+  if (!domains)
+    return [];
+  return domains.map(normalizeDomainEntry);
 }
-function loadEnvironmentConfig(envFilePath) {
+function loadEnvironmentConfig(envFilePath, options) {
   const absPath = resolve(envFilePath);
   if (!existsSync(absPath)) {
     throw new Error(`Config file not found: ${absPath}`);
@@ -37605,14 +37656,15 @@ function loadEnvironmentConfig(envFilePath) {
   const config2 = parsed;
   const services = {};
   const deletedVars = {};
+  const lenient = options?.lenient ?? false;
   for (const [name, entry] of Object.entries(config2.services)) {
-    const { service, deleted } = resolveService(name, entry, envDir);
+    const { service, deleted } = resolveService(name, entry, envDir, lenient);
     services[name] = service;
     if (deleted.length > 0) {
       deletedVars[name] = deleted;
     }
   }
-  const resolvedSharedVars = config2.shared_variables ? resolveEnvVars(config2.shared_variables) : {};
+  const resolvedSharedVars = config2.shared_variables ? resolveEnvVars(config2.shared_variables, process.env, lenient) : {};
   const deletedSharedVars = config2.shared_variables ? getDeletedVariables(config2.shared_variables) : [];
   const buckets = {};
   if (config2.buckets) {
@@ -37634,7 +37686,7 @@ function loadEnvironmentConfig(envFilePath) {
     environmentName: config2.environment
   };
 }
-function resolveService(name, entry, envDir) {
+function resolveService(name, entry, envDir, lenient = false) {
   let template;
   if (entry.template) {
     const templatePath = resolve(envDir, entry.template);
@@ -37682,18 +37734,16 @@ function resolveService(name, entry, envDir) {
   const checkSuites = template?.check_suites ?? entry.check_suites;
   const registryCredentials = template?.registry_credentials ?? entry.registry_credentials;
   const railwayDomain = template?.railway_domain ?? entry.railway_domain;
-  const tcpProxy = template?.tcp_proxy ?? entry.tcp_proxy;
   const tcpProxies = template?.tcp_proxies ?? entry.tcp_proxies;
   const limits = template?.limits ?? entry.limits;
   const railwayConfigFile = template?.railway_config_file ? expandParamsDeep(template.railway_config_file, params) : entry.railway_config_file;
   const staticOutboundIps = template?.static_outbound_ips ?? entry.static_outbound_ips;
   let templateDomains = [];
   if (template) {
-    const tplDomain = template.domain ? expandParamsDeep(template.domain, params) : undefined;
     const tplDomains = template.domains ? expandParamsDeep(template.domains, params) : undefined;
-    templateDomains = normalizeDomains(tplDomain, tplDomains);
+    templateDomains = normalizeDomains(tplDomains);
   }
-  const entryDomains = normalizeDomains(entry.domain, entry.domains);
+  const entryDomains = normalizeDomains(entry.domains);
   if (entry.source)
     source = entry.source;
   const domains = entryDomains.length > 0 ? entryDomains : templateDomains;
@@ -37703,9 +37753,9 @@ function resolveService(name, entry, envDir) {
     ...entry.variables || {}
   };
   const deleted = getDeletedVariables(mergedVars);
-  const resolvedVars = resolveEnvVars(mergedVars);
+  const resolvedVars = resolveEnvVars(mergedVars, process.env, lenient);
   const resolvedDomainsRaw = domains.map((d) => ({
-    domain: resolveEnvVarString(d.domain),
+    domain: resolveEnvVarString(d.domain, process.env, lenient),
     ...d.targetPort !== undefined ? { targetPort: d.targetPort } : {}
   }));
   const seenDomains = new Set;
@@ -37771,8 +37821,8 @@ function resolveService(name, entry, envDir) {
     service.checkSuites = checkSuites;
   if (registryCredentials) {
     service.registryCredentials = {
-      username: resolveEnvVarString(registryCredentials.username),
-      password: resolveEnvVarString(registryCredentials.password)
+      username: resolveEnvVarString(registryCredentials.username, process.env, lenient),
+      password: resolveEnvVarString(registryCredentials.password, process.env, lenient)
     };
   }
   if (railwayDomain !== undefined) {
@@ -37782,13 +37832,8 @@ function resolveService(name, entry, envDir) {
       service.railwayDomain = { targetPort: railwayDomain.target_port };
     }
   }
-  const allTcpPorts = [];
-  if (tcpProxies)
-    allTcpPorts.push(...tcpProxies);
-  if (tcpProxy !== undefined && !allTcpPorts.includes(tcpProxy))
-    allTcpPorts.push(tcpProxy);
-  if (allTcpPorts.length > 0)
-    service.tcpProxies = allTcpPorts;
+  if (tcpProxies && tcpProxies.length > 0)
+    service.tcpProxies = tcpProxies;
   if (limits) {
     service.limits = {
       ...limits.memory_gb !== undefined ? { memoryGB: limits.memory_gb } : {},
@@ -39381,8 +39426,9 @@ async function applyChange(client, change, projectId, environmentId, createdServ
 }
 
 // src/util.ts
+var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
 function deepEqual(a, b) {
-  return Bun.deepEquals(a, b);
+  return import_fast_deep_equal.default(a, b);
 }
 
 // src/reconcile/diff.ts
@@ -39868,7 +39914,7 @@ async function run(configPath, opts) {
     const raw = readFileSync3(absPath, "utf-8");
     const parsed = $parse(raw);
     validateEnvironmentConfig(parsed);
-    loadEnvironmentConfig(configPath);
+    loadEnvironmentConfig(configPath, { lenient: true });
     console.log("Config is valid.");
     process.exit(0);
   }

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@tachyon-gg/railway-deploy",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tachyon-gg/railway-deploy"
+  },
   "main": "./dist/index.js",
   "exports": {
     ".": "./dist/index.js"
@@ -31,6 +35,7 @@
     "@graphql-typed-document-node/core": "^3.2.0",
     "commander": "^14.0.3",
     "dotenv": "^17.3.1",
+    "fast-deep-equal": "^3.1.3",
     "graphql": "^16.10.0",
     "graphql-request": "^7.1.2",
     "yaml": "^2.7.0",