@c9up/ream 0.1.25 → 0.1.26

package/src/container/Container.ts

@@ -10,7 +10,6 @@
  */
 
 import 'reflect-metadata'
-import { createLazyProxy, getLazyParams } from '../decorators/Lazy.js'
 import { getInjectTokens, getServiceMetadata, getServiceRegistry } from '../decorators/Service.js'
 import { didYouMean } from '../errors/FuzzyMatcher.js'
 import { ReamError } from '../errors/ReamError.js'
@@ -34,6 +33,10 @@ export class Container {
    * pointing at the same object after the test ends.
    */
   #singletonBackup: Map<string, unknown> = new Map()
+  /** Alias key → the token it forwards to (AdonisJS `container.alias`). */
+  #aliases: Map<string, ServiceToken> = new Map()
+  /** token key → post-resolution callbacks (AdonisJS `container.resolving`). */
+  #resolvingHooks: Map<string, Array<(value: unknown) => void | Promise<void>>> = new Map()
   #resolutionStack: string[] = []
   #resolutionSet: Set<string> = new Set()
 
@@ -58,6 +61,33 @@ export class Container {
     this.#bindings.set(key, { token, factory: () => value, scope: 'singleton', dependencies: [] })
   }
 
+  /**
+   * Register an alias — resolving `alias` forwards to `target` (AdonisJS
+   * `container.alias('db', Database)`). The target may be a class, string, or
+   * symbol that itself resolves to a binding or an auto-constructable class.
+   */
+  alias(alias: ServiceToken, target: ServiceToken): void {
+    this.#aliases.set(this.#tokenToKey(alias), target)
+  }
+
+  /**
+   * Register a callback that runs each time `token` is constructed (AdonisJS
+   * `container.resolving`) — for lazy init (`db.connect()`) or decorating the
+   * resolved instance. Runs after construction of a binding/auto-constructed
+   * class; NOT for raw `bindValue` values or an already-cached singleton.
+   */
+  resolving(token: ServiceToken, callback: (value: unknown) => void | Promise<void>): void {
+    const key = this.#tokenToKey(token)
+    const hooks = this.#resolvingHooks.get(key)
+    if (hooks) hooks.push(callback)
+    else this.#resolvingHooks.set(key, [callback])
+  }
+
+  async #runResolvingHooks(key: string, value: unknown): Promise<void> {
+    const hooks = this.#resolvingHooks.get(key)
+    if (hooks) for (const hook of hooks) await hook(value)
+  }
+
   // ─── Testing ──────────────────────────────────────────────
 
   /**
@@ -115,18 +145,27 @@ export class Container {
    * 4. Auto-construct if class has @inject() or @Service()
    * 5. Auto-construct any class (plain `new Class()`) as fallback
    */
-  make<T>(token: ServiceToken): T {
-    return this.resolve<T>(token)
+  make<T>(token: ServiceToken, runtimeValues?: unknown[]): Promise<T> {
+    return this.resolve<T>(token, runtimeValues)
   }
 
-  /** Alias for make() — backward compatible. */
-  resolve<T>(token: ServiceToken): T {
+  /**
+   * Resolve/construct a class or binding (AdonisJS `container.make` — async, so
+   * factories, providers and `resolving` hooks may be async). `runtimeValues`
+   * fill the resolved class's constructor slots by index (`make(Class, [req,
+   * res])`); only the `undefined` slots are container-resolved, top-level only.
+   */
+  async resolve<T>(token: ServiceToken, runtimeValues?: unknown[]): Promise<T> {
+    // Dereference an alias to its target before anything else.
+    const aliasTarget = this.#aliases.get(this.#tokenToKey(token))
+    if (aliasTarget !== undefined) return this.resolve<T>(aliasTarget, runtimeValues)
+
     const key = this.#tokenToKey(token)
 
     if (this.#resolutionSet.has(key)) {
       const cycle = [...this.#resolutionStack, key].join(' → ')
       throw new ReamError('CIRCULAR_DEPENDENCY', `Circular dependency detected: ${cycle}`, {
-        hint: 'Use @Lazy() on one of the constructor parameters to break the cycle.',
+        hint: 'Break the cycle by resolving one dependency lazily inside a method (`await container.make(Dep)`) instead of injecting it in the constructor.',
         context: { chain: cycle },
       })
     }
@@ -134,7 +173,7 @@ export class Container {
     this.#resolutionSet.add(key)
 
     try {
-      return this.#resolveInner<T>(key, token)
+      return await this.#resolveInner<T>(key, token, runtimeValues)
     } finally {
       this.#resolutionStack.pop()
       this.#resolutionSet.delete(key)
@@ -159,13 +198,17 @@ export class Container {
       Reflect.getMetadata('design:paramtypes', target.prototype, method) ?? []
 
     const len = Math.max(paramTypes.length, runtimeValues?.length ?? 0)
-    const args = Array.from({ length: len }, (_, index) => {
-      // Runtime values take precedence (and fill slots beyond paramTypes)
-      if (runtimeValues && index < runtimeValues.length) return runtimeValues[index]
+    // Sequential resolution keeps the shared cycle-detection stack consistent.
+    const args: unknown[] = []
+    for (let index = 0; index < len; index += 1) {
+      // Runtime values take precedence (and fill slots beyond paramTypes).
+      if (runtimeValues && index < runtimeValues.length) {
+        args.push(runtimeValues[index])
+        continue
+      }
       const type = paramTypes[index]
-      if (isClassConstructor(type)) return this.resolve(type)
-      return undefined
-    })
+      args.push(isInjectableClass(type) ? await this.resolve(type) : undefined)
+    }
 
     const member: unknown = instance[method]
     if (!isCallable(member)) {
@@ -183,10 +226,16 @@ export class Container {
       this.#bindings.has(key) ||
       this.#overrides.has(key) ||
       this.#singletons.has(key) ||
+      this.#aliases.has(key) ||
       (typeof token === 'function' && getServiceMetadata(token) !== undefined)
     )
   }
 
+  /** True only when EVERY token is registered/resolvable (AdonisJS `hasAllBindings`). */
+  hasAllBindings(tokens: ServiceToken[]): boolean {
+    return tokens.every((token) => this.has(token))
+  }
+
   get size(): number {
     return this.#bindings.size
   }
@@ -209,34 +258,35 @@ export class Container {
 
   // ─── Internal resolution ──────────────────────────────────
 
-  #resolveInner<T>(key: string, token: ServiceToken): T {
-    // 1. Check swaps (test overrides)
+  async #resolveInner<T>(key: string, token: ServiceToken, runtimeValues?: unknown[]): Promise<T> {
+    // 1. Check swaps (test overrides) — a swap factory may be async.
     if (this.#overrides.has(key)) {
-      // biome-ignore lint/suspicious/noExplicitAny: IoC container factory returns unknown; caller brands via T
-      return this.#overrides.get(key)?.() as any as T
+      const swapped = await this.#overrides.get(key)?.()
+      return swapped as T
     }
 
     // 2. Check cached singletons
     if (this.#singletons.has(key)) {
-      // biome-ignore lint/suspicious/noExplicitAny: IoC singleton stored as unknown; caller brands via T
-      return this.#singletons.get(key) as any as T
+      return this.#singletons.get(key) as T
     }
 
-    // 3. Check explicit bindings
+    // 3. Check explicit bindings — the factory may be async.
     const binding = this.#bindings.get(key)
     if (binding) {
-      const instance = binding.factory ? binding.factory() : undefined
+      const instance = binding.factory ? await binding.factory() : undefined
       if (binding.scope === 'singleton') {
         this.#singletons.set(key, instance)
       }
-      // biome-ignore lint/suspicious/noExplicitAny: IoC binding factory returns unknown; caller brands via T
-      return instance as any as T
+      await this.#runResolvingHooks(key, instance)
+      // Boundary cast from `unknown` — the caller brands the resolved type via T.
+      return instance as T
     }
 
     // 4. Auto-construct if it's a class
     if (typeof token === 'function') {
-      // biome-ignore lint/suspicious/noExplicitAny: IoC auto-construct returns unknown; caller brands via T
-      return this.#autoConstruct(token) as any as T
+      const instance = (await this.#autoConstruct(token, runtimeValues)) as T
+      await this.#runResolvingHooks(key, instance)
+      return instance
     }
 
     // 5. Not found
@@ -259,7 +309,10 @@ export class Container {
    * 2. Reflect.getMetadata('design:paramtypes') — decorator metadata (requires SWC/tsc)
    * 3. No params → plain `new Class()`
    */
-  #autoConstruct(target: new (...args: unknown[]) => unknown): unknown {
+  async #autoConstruct(
+    target: new (...args: unknown[]) => unknown,
+    runtimeValues?: unknown[],
+  ): Promise<unknown> {
     const metadata = getServiceMetadata(target)
     const scope = metadata?.scope ?? 'transient'
     const key = metadata?.as ?? target.name
@@ -268,10 +321,12 @@ export class Container {
       return this.#singletons.get(key)
     }
 
+    // A runtime value at this index (from `make(Class, [req, res])`) wins over
+    // container resolution for that constructor slot.
+    const runtimeAt = (index: number): unknown => runtimeValues?.[index]
+
     // 1. Check static containerInjections (AdonisJS Fold-compatible, works
-    // without emitDecoratorMetadata). The `in` operator narrows the optional
-    // field to `unknown`, then `readContainerInjectionDeps` validates the
-    // shape at runtime — no type-level cast required.
+    // without emitDecoratorMetadata).
     const explicitDeps = readContainerInjectionDeps(target)
 
     // 2. Fallback to reflect-metadata
@@ -279,7 +334,6 @@ export class Container {
       explicitDeps ?? Reflect.getMetadata('design:paramtypes', target) ?? []
 
     const injectTokens = getInjectTokens(target)
-    const lazyIndices = getLazyParams(target)
 
     // No `design:paramtypes` (a dev transpiler may not emit decorator metadata —
     // esbuild / tsx don't). Recover what we can, and NEVER construct with
@@ -287,22 +341,34 @@ export class Container {
     if (paramTypes.length === 0) {
       // (a) `@Inject(token)` records its tokens INDEPENDENTLY of decorator
       //     metadata, so even without `design:paramtypes` we can resolve the
-      //     constructor from that map alone.
+      //     constructor from that map alone. Deps resolve SEQUENTIALLY so the
+      //     shared cycle-detection stack stays consistent.
       if (injectTokens.size > 0) {
-        const maxIndex = Math.max(...injectTokens.keys())
-        const deps = Array.from({ length: maxIndex + 1 }, (_value, index) => {
-          const depToken = injectTokens.get(index)
-          if (!depToken) return undefined
-          if (lazyIndices.includes(index)) {
-            return createLazyProxy(() => this.resolve<object>(depToken))
+        const maxIndex = Math.max(...injectTokens.keys(), (runtimeValues?.length ?? 0) - 1)
+        const deps: unknown[] = []
+        for (let index = 0; index <= maxIndex; index += 1) {
+          const rt = runtimeAt(index)
+          if (rt !== undefined) {
+            deps.push(rt)
+            continue
           }
-          return this.resolve(depToken)
-        })
+          const depToken = injectTokens.get(index)
+          deps.push(depToken ? await this.resolve(depToken) : undefined)
+        }
+        const instance = new target(...deps)
+        if (scope === 'singleton') this.#singletons.set(key, instance)
+        return instance
+      }
+      // (b) No @Inject/metadata, but the caller supplied runtime values — build
+      //     from those (the `make(Controller, [req, res])` pattern with a plain
+      //     constructor). Slots beyond the runtime values stay undefined.
+      if (target.length > 0 && (runtimeValues?.length ?? 0) > 0) {
+        const deps = Array.from({ length: target.length }, (_value, index) => runtimeAt(index))
         const instance = new target(...deps)
         if (scope === 'singleton') this.#singletons.set(key, instance)
         return instance
       }
-      // (b) The constructor declares parameters but we have no way to resolve
+      // (c) The constructor declares parameters but we have no way to resolve
       //     them (no metadata, no @Inject, no containerInjections). Fail LOUDLY
       //     instead of `new target()` with undefined deps.
       if (target.length > 0) {
@@ -314,29 +380,29 @@ export class Container {
           },
         )
       }
-      // (c) Genuine zero-argument class.
+      // (d) Genuine zero-argument class.
       const instance = new target()
       if (scope === 'singleton') this.#singletons.set(key, instance)
       return instance
     }
 
-    const deps = paramTypes.map((type, index) => {
+    // Resolve constructor deps SEQUENTIALLY (the cycle-detection stack is
+    // instance-shared, so parallel Promise.all would interleave and corrupt it).
+    const deps: unknown[] = []
+    for (let index = 0; index < paramTypes.length; index += 1) {
+      const rt = runtimeAt(index)
+      if (rt !== undefined) {
+        deps.push(rt)
+        continue
+      }
       const namedToken = injectTokens.get(index)
-      // After the typeof check, type is a constructor function and valid as ServiceToken
+      const type = paramTypes[index]
+      // A native primitive constructor (String/Number/Boolean/…) is NOT
+      // injectable — leave the slot undefined so a constructor default can fill it.
       const depToken: ServiceToken | undefined =
-        namedToken ??
-        // biome-ignore lint/suspicious/noExplicitAny: reflect-metadata returns unknown; constructor functions are valid ServiceTokens
-        (typeof type === 'function' && type !== Object ? (type as any as ServiceToken) : undefined)
-
-      if (!depToken) return undefined
-
-      if (lazyIndices.includes(index)) {
-        // biome-ignore lint/suspicious/noExplicitAny: lazy proxy target must be object; IoC resolution returns unknown
-        return createLazyProxy(() => this.resolve(depToken) as any as object)
-      }
-
-      return this.resolve(depToken)
-    })
+        namedToken ?? (isInjectableClass(type) ? type : undefined)
+      deps.push(depToken ? await this.resolve(depToken) : undefined)
+    }
 
     const instance = new target(...deps)
     if (scope === 'singleton') this.#singletons.set(key, instance)
@@ -378,11 +444,29 @@ export class Container {
   }
 }
 
-// `design:paramtypes` returns `unknown[]` per our annotation; we narrow each
-// entry before treating it as a class token. `Object` slips through because
-// emitDecoratorMetadata uses it for `any`/`unknown` parameters.
-function isClassConstructor(value: unknown): value is new (...args: unknown[]) => unknown {
-  return typeof value === 'function' && value !== Object
+/**
+ * Native constructors emitDecoratorMetadata uses for primitive / `any` /
+ * `unknown` parameters. They are NOT injectable — resolving them would try to
+ * auto-construct `String`/`Number`/… (or silently inject `undefined`), so we
+ * skip them and let a constructor default fill the slot instead.
+ */
+const NON_INJECTABLE_CONSTRUCTORS = new Set<unknown>([
+  Object,
+  String,
+  Number,
+  Boolean,
+  Array,
+  Function,
+  Symbol,
+  Date,
+  RegExp,
+  Promise,
+  Error,
+])
+
+/** True for a real, injectable class token (excludes native primitive constructors). */
+function isInjectableClass(value: unknown): value is new (...args: unknown[]) => unknown {
+  return typeof value === 'function' && !NON_INJECTABLE_CONSTRUCTORS.has(value)
 }
 
 function isCallable(value: unknown): value is (...args: unknown[]) => unknown {

package/src/env/Env.ts

@@ -1,3 +1,9 @@
+import {
+  defineIdentifier,
+  defineIdentifierIfMissing,
+  type IdentifierResolver,
+  removeIdentifier,
+} from './interpolate.js'
 import { loadEnvFiles } from './loadEnvFiles.js'
 import { type SchemaNode, schema } from './schema.js'
 
@@ -45,6 +51,21 @@ export class Env<Values extends Record<string, unknown>> {
   /** The validation schema surface — `Env.schema.string()`, `.number()`, … */
   static readonly schema = schema
 
+  /** Register an interpolation identifier (AdonisJS `Env.defineIdentifier`). */
+  static defineIdentifier(name: string, resolver: IdentifierResolver): void {
+    defineIdentifier(name, resolver)
+  }
+
+  /** Register an identifier only if the name is free (AdonisJS `defineIdentifierIfMissing`). */
+  static defineIdentifierIfMissing(name: string, resolver: IdentifierResolver): void {
+    defineIdentifierIfMissing(name, resolver)
+  }
+
+  /** Remove a registered interpolation identifier (AdonisJS `Env.removeIdentifier`). */
+  static removeIdentifier(name: string): void {
+    removeIdentifier(name)
+  }
+
   readonly #values: Values
 
   private constructor(values: Values) {
@@ -80,12 +101,35 @@ export class Env<Values extends Record<string, unknown>> {
     return new Env(collected as EnvRecord<S>)
   }
 
-  /** Read a validated variable. Required keys are always present; optional keys may be `undefined`. */
+  /**
+   * Read a variable. Validated keys are typed; for any other key the raw
+   * `process.env` value is returned as a fallback (AdonisJS `env.get`
+   * semantics). Required keys are always present; optional keys may be
+   * `undefined`. The second argument is the default when nothing is found.
+   */
   get<K extends keyof Values>(key: K): Values[K]
   get<K extends keyof Values>(key: K, fallback: Values[K]): Values[K]
-  get<K extends keyof Values>(key: K, fallback?: Values[K]): Values[K] {
-    const value = this.#values[key]
-    if (value === undefined && fallback !== undefined) return fallback
-    return value
+  get(key: string): string | undefined
+  get(key: string, fallback: string): string
+  get(key: string, fallback?: unknown): unknown {
+    const cached = this.#values[key]
+    if (cached !== undefined) return cached
+    // Fallback to raw process.env for keys outside the validated schema.
+    const fromEnv = process.env[key]
+    if (fromEnv !== undefined && fromEnv !== '') return fromEnv
+    return fallback
+  }
+
+  /**
+   * Set/override a variable at runtime (AdonisJS `env.set`). Updates the cache
+   * AND `process.env`. The value is NOT re-validated — pass the correct type.
+   */
+  set<K extends keyof Values>(key: K, value: Values[K]): void
+  set(key: string, value: string): void
+  set(key: string, value: unknown): void {
+    // Reflect.set writes to the generic-typed cache without a cast (a direct
+    // `this.#values[key] = value` is rejected: a generic type is read-only-indexed).
+    Reflect.set(this.#values, key, value)
+    process.env[key] = String(value)
   }
 }

package/src/env/Secret.ts

@@ -0,0 +1,41 @@
+/**
+ * Secret — wraps a sensitive value so it never leaks through logs, JSON, or
+ * `util.inspect`. Mirrors `@poppinss/utils`'s `Secret` (zero-dep here). Read the
+ * underlying value explicitly with {@link release}.
+ *
+ *   const key = env.get('APP_KEY')   // Secret<string> when declared via schema.secret
+ *   key.toString()   // '[redacted]'
+ *   JSON.stringify({ key })          // '{"key":"[redacted]"}'
+ *   key.release()    // the real value — only when you deliberately need it
+ */
+const REDACTED = '[redacted]'
+
+export class Secret<T> {
+  readonly #value: T
+  readonly #keyword: string
+
+  constructor(value: T, redactedKeyword: string = REDACTED) {
+    this.#value = value
+    this.#keyword = redactedKeyword
+  }
+
+  /** Redacted placeholder (so `JSON.stringify` never emits the secret). */
+  toJSON(): string {
+    return this.#keyword
+  }
+
+  /** Redacted placeholder for string coercion + template literals. */
+  toString(): string {
+    return this.#keyword
+  }
+
+  /** Redacted placeholder for `console.log` / `util.inspect`. */
+  [Symbol.for('nodejs.util.inspect.custom')](): string {
+    return this.#keyword
+  }
+
+  /** Release the underlying value — the one deliberate way to read the secret. */
+  release(): T {
+    return this.#value
+  }
+}

package/src/env/interpolate.ts

@@ -0,0 +1,54 @@
+/**
+ * Env value interpolation — AdonisJS-style variable substitution + identifiers,
+ * applied by {@link loadEnvFiles} as each `.env` value is loaded.
+ *
+ * - `$VAR` / `${VAR}` are replaced with the value of `VAR` (looked up against
+ *   the values already loaded + `process.env`). A missing reference expands to
+ *   an empty string. `\$` is a literal dollar sign (escape).
+ * - `identifier:rest` — when `identifier` was registered via
+ *   {@link defineIdentifier}, the registered callback transforms `rest`
+ *   (e.g. a `base64:` decoder). Unregistered prefixes (like `postgres://…`)
+ *   are left untouched.
+ */
+
+/** Transform the remainder of an `identifier:rest` value into its final form. */
+export type IdentifierResolver = (value: string) => string
+
+const identifiers = new Map<string, IdentifierResolver>()
+
+/** Register an identifier resolver (AdonisJS `Env.defineIdentifier`). */
+export function defineIdentifier(name: string, resolver: IdentifierResolver): void {
+  identifiers.set(name, resolver)
+}
+
+/** Register an identifier resolver only if the name is free (AdonisJS `defineIdentifierIfMissing`). */
+export function defineIdentifierIfMissing(name: string, resolver: IdentifierResolver): void {
+  if (!identifiers.has(name)) identifiers.set(name, resolver)
+}
+
+/** Remove a registered identifier (AdonisJS `Env.removeIdentifier`). */
+export function removeIdentifier(name: string): void {
+  identifiers.delete(name)
+}
+
+const REFERENCE = /(\\)?\$(?:\{([^}]+)\}|([A-Za-z_][A-Za-z0-9_]*))/g
+
+/**
+ * Expand `$VAR` / `${VAR}` references and apply an identifier prefix. `lookup`
+ * resolves a referenced variable name to its current value (or undefined).
+ */
+export function interpolate(value: string, lookup: (name: string) => string | undefined): string {
+  const substituted = value.replace(REFERENCE, (full, escaped, braced, bare) => {
+    // `\$FOO` → literal `$FOO` (drop only the escaping backslash).
+    if (escaped) return full.slice(1)
+    const name = braced ?? bare
+    return lookup(name) ?? ''
+  })
+
+  const prefixed = /^([A-Za-z_][A-Za-z0-9_]*):([\s\S]*)$/.exec(substituted)
+  if (prefixed) {
+    const resolver = identifiers.get(prefixed[1])
+    if (resolver) return resolver(prefixed[2])
+  }
+  return substituted
+}

package/src/env/loadEnvFiles.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { parseEnv } from 'node:util'
+import { interpolate } from './interpolate.js'
 
 /**
  * Load `.env` files into `process.env` — the shared primitive behind both the
@@ -31,10 +32,17 @@ export function loadEnvFiles(appRoot: URL, options: { skipEnvLocal?: boolean } =
     } catch {
       continue // file absent — nothing to load
     }
-    for (const [key, value] of Object.entries(parseEnv(contents))) {
-      if (typeof value === 'string' && process.env[key] === undefined) {
-        process.env[key] = value
-      }
+    const parsed = parseEnv(contents)
+    for (const [key, value] of Object.entries(parsed)) {
+      if (typeof value !== 'string' || process.env[key] !== undefined) continue
+      // Interpolate `$VAR`/`${VAR}` against process.env then this file's own
+      // (already-loaded) values, and apply any `identifier:` resolver.
+      process.env[key] = interpolate(value, (name) => {
+        const fromProcess = process.env[name]
+        if (fromProcess !== undefined) return fromProcess
+        const fromFile = parsed[name]
+        return typeof fromFile === 'string' ? fromFile : undefined
+      })
     }
   }
 }