@crossdelta/infrastructure 0.1.41 → 0.2.2

package/README.md

@@ -21,7 +21,6 @@ npm install @crossdelta/infrastructure
 ```
 
 ## Quick Start
-
 ### 1. Create a service config
 
 ```typescript
@@ -42,7 +41,6 @@ export default config
 
 ```typescript
 // infra/index.ts
-import { join } from 'node:path'
 import {
   buildServices,
   buildIngressRules,
@@ -52,7 +50,7 @@ import {
 } from '@crossdelta/infrastructure'
 import { App } from '@pulumi/digitalocean'
 
-const serviceConfigs = discoverServices(join(__dirname, 'services'))
+const serviceConfigs = discoverServices('services')
 
 const app = new App('my-app', {
   spec: {
@@ -104,7 +102,7 @@ const config: ServiceConfig = {
 
 ## CLI: generate-env
 
-Generate `.env.local` for local development from your Pulumi config and service definitions.
+Generate `.env.local` and service-specific `env.ts` files for local development.
 
 ### Setup
 
@@ -113,16 +111,12 @@ Add a script to your workspace `package.json`:
 ```json
 {
   "scripts": {
-    "generate-env": "npx tsx node_modules/@crossdelta/infrastructure/cli/commands/generate-env.ts"
+    "generate-env": "turbo run generate-env --ui=stream"
   }
 }
 ```
 
-Then run:
-
-```bash
-npm run generate-env
-```
+Or use `pf dev` which runs `generate-env` automatically before starting services.
 
 ### What it does
 
@@ -130,7 +124,8 @@ npm run generate-env
 2. Discovers services from `infra/services/*.ts`
 3. Generates `SERVICE_URL` and `SERVICE_PORT` env vars for localhost
 4. Writes `.env.local` to your workspace root
-5. Generates a `ServiceName` TypeScript type
+5. Generates `infra/env.ts` with type-safe `ServiceName` union type
+6. Generates `services/*/src/env.ts` for each service (Docker-compatible)
 
 ### Example output
 
@@ -145,17 +140,51 @@ API_GATEWAY_PORT=4000
 STOREFRONT_PORT=3000
 ```
 
+`services/orders/src/env.ts`:
+```typescript
+import { getServicePort, getServiceUrl } from '@crossdelta/infrastructure/env'
+
+export const SERVICE_NAME = 'orders' as const
+export const getServicePort = (defaultPort = 8080) => _getServicePort(SERVICE_NAME, defaultPort)
+export const getServiceUrl = () => _getServiceUrl(SERVICE_NAME)
+```
+
+## Runtime Helpers
+
+Use `@crossdelta/infrastructure/env` in your services to read environment configuration:
+
+```typescript
+import { getServicePort, getServiceUrl } from '@crossdelta/infrastructure/env'
+
+// Get port from ORDERS_PORT env var (fallback: 8080)
+const port = getServicePort('orders', 8080)
+
+// Get URL from ORDERS_URL env var
+const url = getServiceUrl('orders')
+```
+
+These helpers work both locally (via `.env.local`) and in production (via DO App Platform env injection).
+
 ## API
 
+### Main Export (`@crossdelta/infrastructure`)
+
 | Function | Description |
 |----------|-------------|
-| `discoverServices(dir)` | Auto-discover service configs from directory |
+| `discoverServices(dir)` | Auto-discover service configs (relative to cwd or absolute) |
 | `buildServices(options)` | Build App Platform service specs |
 | `buildIngressRules(configs)` | Generate ingress rules |
 | `buildServiceUrlEnvs(configs)` | Create SERVICE_NAME_URL env vars |
 | `buildServicePortEnvs(configs)` | Create SERVICE_NAME_PORT env vars |
 | `buildLocalUrls(configs)` | Generate localhost URLs for local dev |
 
+### Env Export (`@crossdelta/infrastructure/env`)
+
+| Function | Description |
+|----------|-------------|
+| `getServicePort(name, default)` | Read SERVICE_NAME_PORT from env |
+| `getServiceUrl(name)` | Read SERVICE_NAME_URL from env |
+
 ## License
 
 MIT

package/dist/env.d.ts

@@ -6,4 +6,3 @@
  * import { getServicePort, getServiceUrl } from '@crossdelta/infrastructure/env'
  */
 export * from './helpers/service-runtime';
-export type { ServiceName } from './types/service-names';

package/dist/helpers/discover-services.d.ts

@@ -2,6 +2,17 @@ import type { ServiceConfig } from '../types';
 /**
  * Auto-discovers all service configurations from a directory.
  * Each .ts file (except index.ts) should export a ServiceConfig as default.
+ *
+ * @param servicesDir - Path to services directory (relative to cwd or absolute)
  * @throws Error if duplicate ports are detected
+ *
+ * @example
+ * ```typescript
+ * // Relative path (resolved from process.cwd())
+ * const configs = discoverServices('infra/services')
+ *
+ * // Absolute path
+ * const configs = discoverServices('/absolute/path/to/services')
+ * ```
  */
 export declare function discoverServices(servicesDir: string): ServiceConfig[];

package/dist/helpers/service-runtime.d.ts

@@ -3,37 +3,20 @@
  * These functions read from environment variables set by generate-env (local)
  * or injected by DO App Platform (production).
  */
-import type { ServiceName } from '../types';
 /**
  * Get the port for a service from environment variables.
- * Reads from <SERVICE_NAME>_PORT (e.g., ORDERS_PORT, API_GATEWAY_PORT)
+ * Reads from SERVICE_NAME_PORT (e.g., ORDERS_PORT, API_GATEWAY_PORT)
  *
  * @param serviceName - The service name (e.g., 'orders', 'api-gateway')
  * @param defaultPort - Fallback port if env var is not set (default: 8080)
  * @returns The configured port number
- *
- * @example
- * ```typescript
- * import { getServicePort } from '@crossdelta/infrastructure/env'
- *
- * const port = getServicePort('orders', 3001)
- * // Reads process.env.ORDERS_PORT, falls back to 3001
- * ```
  */
-export declare function getServicePort(serviceName: ServiceName, defaultPort?: number): number;
+export declare function getServicePort(serviceName: string, defaultPort?: number): number;
 /**
  * Get the URL for a service from environment variables.
- * Reads from <SERVICE_NAME>_URL (e.g., ORDERS_URL, API_GATEWAY_URL)
+ * Reads from SERVICE_NAME_URL (e.g., ORDERS_URL, API_GATEWAY_URL)
  *
  * @param serviceName - The service name (e.g., 'orders', 'api-gateway')
  * @returns The service URL or undefined if not set
- *
- * @example
- * ```typescript
- * import { getServiceUrl } from '@crossdelta/infrastructure/env'
- *
- * const ordersUrl = getServiceUrl('orders')
- * // Returns process.env.ORDERS_URL
- * ```
  */
-export declare function getServiceUrl(serviceName: ServiceName): string | undefined;
+export declare function getServiceUrl(serviceName: string): string | undefined;

package/dist/index.cjs

@@ -105,9 +105,10 @@ ${conflicts.join(`
   }
 }
 function discoverServices(servicesDir) {
-  const files = import_node_fs.readdirSync(servicesDir).filter((file) => file.endsWith(".ts") && file !== "index.ts");
+  const resolvedDir = import_node_path.isAbsolute(servicesDir) ? servicesDir : import_node_path.resolve(process.cwd(), servicesDir);
+  const files = import_node_fs.readdirSync(resolvedDir).filter((file) => file.endsWith(".ts") && file !== "index.ts");
   const configs = files.map((file) => {
-    const module2 = require(import_node_path.join(servicesDir, file));
+    const module2 = require(import_node_path.join(resolvedDir, file));
     return module2.default;
   });
   validateNoDuplicatePorts(configs);

package/dist/index.js

@@ -32,7 +32,7 @@ var defaultHealthCheck = {
 };
 // lib/helpers/discover-services.ts
 import { readdirSync } from "node:fs";
-import { join } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 function getServicePort(config) {
   if (config.httpPort)
     return config.httpPort;
@@ -57,9 +57,10 @@ ${conflicts.join(`
   }
 }
 function discoverServices(servicesDir) {
-  const files = readdirSync(servicesDir).filter((file) => file.endsWith(".ts") && file !== "index.ts");
+  const resolvedDir = isAbsolute(servicesDir) ? servicesDir : resolve(process.cwd(), servicesDir);
+  const files = readdirSync(resolvedDir).filter((file) => file.endsWith(".ts") && file !== "index.ts");
   const configs = files.map((file) => {
-    const module = __require(join(servicesDir, file));
+    const module = __require(join(resolvedDir, file));
     return module.default;
   });
   validateNoDuplicatePorts(configs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.1.41",
+  "version": "0.2.2",
   "type": "module",
   "license": "MIT",
   "publishConfig": {