@owlmeans/context 0.1.18-rc.6 → 0.1.18-rc.8

package/README.md

@@ -4,15 +4,15 @@ Lightweight dependency injection and service lifecycle management for fullstack
 
 ## Overview
 
-- Context holds services, modules, and resources; passed top-down through the app
+- Context holds services, entrypoints, and resources in three flat registries keyed by alias; passed top-down through the app
 - Services are registered by alias and retrieved via `context.service(alias)`
-- Supports layered contexts (System → Global → Service → Entity → User) for multi-tenant apps
-- Route constants (`ROOT`, `HOME`, `GUEST`, `BASE`) are used by the module system across all packages
+- One context is built per process by a single factory and extended with idempotent `append*` mixins
+- Route constants (`ROOT`, `HOME`, `GUEST`, `BASE`) are used by the entrypoint system across all packages
 
 ## Installation
 
 ```bash
-bun add @owlmeans/context
+bun add @owlmeans/context@^0.1.18-rc.7
 ```
 
 ## Usage
@@ -66,10 +66,31 @@ Asserts that a context is defined; throws if not.
 
 Creates a context from a config object. Rarely used directly — prefer the higher-level `makeContext` from `@owlmeans/server-app` or `@owlmeans/client-context`.
 
+A factory calls the factory of the layer below it, applies its own idempotent `append*` mixins, and returns that same context:
+
+```typescript
+export const makeContext = <C extends Config, T extends Context<C>>(cfg: C): T => {
+  const context = makeServerContext<C, T>(cfg)
+  appendMyService<C, T>(context)
+  return context
+}
+```
+
+Nothing is stored for re-creation — a service, a resource and an entrypoint each bind to exactly one context.
+
+### Registries
+
+Three flat maps keyed by alias. Registering the same alias twice replaces the earlier entry.
+
+```typescript
+context.registerService(service)          // context.service(alias), context.hasService(alias)
+context.registerResource(resource)        // context.resource(alias), context.hasResource(alias)
+context.registerEntrypoints(entrypoints)  // context.entrypoint(alias), context.entrypoints(), context.hasEntrypoint(alias)
+```
+
 ### Enums
 
 ```typescript
-enum Layer { System, Global, Service, Entity, User }
 enum AppType { Backend, Frontend }
 enum ContextStage { Configuration, Loading, Ready }
 ```
@@ -99,7 +120,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills
+npx @owlmeans/agent-skills@^0.1.18-rc.12
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/context",
-  "version": "0.1.18-rc.6",
-  "generatedAt": "2026-08-18T14:48:00.551Z",
+  "version": "0.1.18-rc.8",
+  "generatedAt": "2026-09-04T22:43:25.452Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/context/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: context
-description: How to use @owlmeans/context — base context (DI container) factory, registerService(), service<T>() lookups, entrypoint<ClientEntrypoint<T>>() resolution. Auto-invoked when importing context primitives or building a makeContext factory.
+description: How to use @owlmeans/context — the DI container behind every OwlMeans app, its service/resource/entrypoint registries, the configure/init lifecycle, createService and createLazyService, middlewares, and the shared route-alias constants. Auto-invoked when importing context primitives, registering a service, or building a makeContext factory.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,46 +8,156 @@ user-invocable: false
 # @owlmeans/context
 
 **Layer:** Core
-**Install:** `"@owlmeans/context": "^0.1.18-rc.6"` in `dependencies`
+**Install:** `"@owlmeans/context": "^0.1.18-rc.8"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `Context<C>` types | Generic context interface (typed by Config) |
-| `makeBasicContext` | Low-level factory — usually you extend a layer-specific factory instead |
-| `registerService` (method) | Add a service to the DI container |
-| `service<T>(alias)` (method) | Resolve a service by alias |
-| `entrypoint<ClientEntrypoint<T>>(alias)` (method) | Resolve an entrypoint to call cross-service |
-| `Service` types | Service interface and lifecycle |
-| Constants | Built-in service/entrypoint aliases |
+| `makeBasicContext(cfg)` | Low-level factory — extend a layer-specific factory instead |
+| `BasicContext<C>` | The container interface, typed by its config |
+| `BasicConfig` | `{ ready, service, alias?, type, services?, records?, debug? }` — what every config extends |
+| `makeBasicConfig(type, service, cfg?)` | Build the base config object a layer factory then fills in |
+| `createService(alias, impl, init?)` | Build a service initialized during `context.init()` |
+| `createLazyService(alias, impl, init?)` | Build a service initialized on first `context.service()` |
+| `appendContextual(alias, obj)` | Give any object `alias` / `registerContext` / `assertCtx` |
+| `assertContext(ctx, location?)` | Return the context or throw `SyntaxError` when it is absent |
+| `Service` / `InitializedService` / `LazyService` | The three service shapes |
+| `BasicResource` / `BasicEntrypoint` / `Contextual` | The other registrable shapes |
+| `Middleware`, `MiddlewareType`, `MiddlewareStage` | Hooks that run inside `configure()` / `init()` |
+| `AppType` | `Backend` / `Frontend` |
+| `ContextStage` | `Configuration` → `Loading` → `Ready` |
+| `CONFIG_RECORD` (`'records'`), `ConfigRecord` | The config-record array key, and a record in it |
+| `ROOT`, `HOME`, `GUEST`, `BASE`, `CRASH` | Route-alias idioms every layer reuses |
 
-## Usage
+## One context per process
 
-Always extend a layer-specific factory (`@owlmeans/server-context`, `@owlmeans/web-panel`, etc.) rather than calling the basic factory directly. Always reassign `context.makeContext` so child contexts inherit the typed factory:
+A context is created ONCE by ONE factory. Extend a layer-specific factory
+(`@owlmeans/server-context`, `@owlmeans/web-panel`, …) rather than calling the basic factory
+directly: your factory calls the factory below it, applies its own idempotent `append*(context)`
+mixins and service registrations, and returns that same context. There are no layered or child
+contexts and nothing is stored for re-creation — a service, a resource and an entrypoint each bind
+to exactly one context, the first that registers them.
 
 ```typescript
-import { makeBackendContext } from '@owlmeans/server-context'
+import { makeServerContext } from '@owlmeans/server-context'
 
 export const makeContext = <C extends Config, T extends Context<C>>(cfg: C): T => {
-  const context = makeBackendContext<C, T>(cfg)
+  const context = makeServerContext<C, T>(cfg)
   context.registerService(makeMyService())
-  context.makeContext = makeContext as typeof context.makeContext
   return context
 }
 ```
 
-Resolve services and call cross-service entrypoints from a handler:
+## Registries
+
+Three flat maps keyed by alias. Registering the same alias twice **replaces** the earlier entry —
+entrypoint lists are routinely spread together and the later declaration is the one the app means.
+
+```typescript
+context.registerService(service)            // service(alias), hasService(alias)
+context.registerResource(resource)          // resource(alias), hasResource(alias)
+context.registerEntrypoints(entrypoints)    // entrypoint(alias), entrypoints(), hasEntrypoint(alias)
+```
+
+Every lookup throws `SyntaxError` when the alias is unknown. Resolve a service and call another
+service's entrypoint from a handler:
 
 ```typescript
 const someService = ctx.service<MyService>(MY_SERVICE_ALIAS)
 
-const [response] = await ctx.entrypoint<ClientEntrypoint<ResponseType>>(
+const response = await ctx.entrypoint<ClientEntrypoint<ResponseType>>(
   externalService.action.alias
-).call({ body: { ... } })
+).call({ body: { ... } })   // call() resolves to the value; invoke() gives { value, outcome }
+```
+
+## Lifecycle
+
+`configure()` runs the `Config` + `Configuration` middlewares and moves the context to `Loading`;
+`init()` awaits that, then initializes every service, then the resources, then flips to `Ready` and
+sets `cfg.ready`. `waitForConfigured()` and `waitForInitialized()` resolve at those two points, and
+`await ctx.config` yields the config once configuration is done. Both calls are safe to repeat — a
+context already past the stage returns itself unchanged.
+
+`configure()` is **not** async: it returns the context straight away and its middlewares run
+detached, so the stage flips to `Loading` only when they settle. Anything that must see a configured
+context awaits `waitForConfigured()` or `init()`, never the return of `configure()`.
+
+## Services
+
+`createService` and `createLazyService` differ only in **when** the init function runs.
+
+- `createService` — `init()` is awaited during `context.init()`, in registration order. Asking for
+  an uninitialized one throws `SyntaxError`.
+- `createLazyService` — `lazyInit()` fires on the first `context.service(alias)` and the service is
+  returned immediately, before that promise settles. Choose lazy when the service must be reachable
+  while the context is still `Loading` — from an app's `makeContext`, or from another package's
+  `append*` helper — **not** because it has no async work; most lazy services do plenty of it.
+
+```typescript
+import { createService } from '@owlmeans/context'
+
+export const makeMyService = (alias = MY_SERVICE) => createService<MyService>(alias, {
+  doWork: async () => { /* ... */ }
+}, service => async () => {
+  await connect()
+  service.initialized = true
+})
+```
+
+The init function is a factory: it receives the service and returns the actual initializer, which
+must set `service.initialized = true`. Omit it and the service is simply marked initialized. Inside
+any method use `service.assertCtx<Config, Context>()` to reach the context it was registered on.
+
+### `ready()`
+
+Both factories give the service a `ready(): Promise<boolean>` that resolves once its init function
+has finished, and both `InitializedService` and `LazyService` declare it. It is how you wait for a
+lazy service: the container hands the service back before `lazyInit()` settles, so anything the init
+prepared — a database client, a loaded config, a socket — is only safe to touch after `ready()`.
+
+```typescript
+const mongo = ctx.service<MongoService>(MONGO_ALIAS)   // this call is what triggers lazyInit
+await mongo.ready()
+```
+
+A lazy service's init runs only when someone resolves it through `context.service(alias)`, so
+`ready()` on a reference obtained any other way never settles.
+
+## Middlewares
+
+A middleware declares a `type` (`Config` or `Context`) and a `stage` (`Configuration`, `Loading` or
+`Ready`), and that pair — not the stage alone — decides where it runs. Exactly five pairs are ever
+applied, in this order:
+
+| Type + stage | Where it runs |
+|--------------|---------------|
+| `Config` + `Configuration` | inside `configure()`, before the stage becomes `Loading` — the only hook that sees `cfg` before anything else does |
+| `Context` + `Configuration` | first thing inside `init()` |
+| `Config` + `Loading` | inside `init()`, **after every service has been initialized** and before the resources |
+| `Context` + `Loading` | inside `init()`, after the resources |
+| `Context` + `Ready` | after the stage flips to `Ready`; started but **not awaited**, so `init()` resolves without waiting for it |
+
+`Config` + `Ready` is never applied at all — a middleware registered under that pair silently never
+runs. All middlewares sharing a pair are applied with `Promise.all`, so they run concurrently and
+registration order does not sequence them.
+
+Pick the pair by what the work needs. `Config` + `Configuration` is for config that stands on its
+own — mounted secrets, hosts read from the environment. `Config` + `Loading` is for config that has
+to be resolved *through a running service*, because services are already initialized by then; that
+is the stage a cluster- or vault-backed value resolver registers at, and it can `await
+service.ready()` on the service it depends on. `Context` middlewares register or adjust what the
+container holds.
+
+```typescript
+context.registerMiddleware({
+  type: MiddlewareType.Config,
+  stage: MiddlewareStage.Loading,   // services are up — resolve cfg values through one of them
+  apply: async ctx => { /* mutate ctx.cfg */ }
+})
 ```
 
 ## Depends On
 
-- `@owlmeans/config` — context is parameterized by a Config
-- `@owlmeans/entrypoint` — `ClientEntrypoint<T>` type for cross-service calls
+- Nothing. This is the root package — `@owlmeans/config` layers the application config on top of
+  `BasicConfig`, and `@owlmeans/entrypoint` layers URL units on top of `BasicEntrypoint`.

package/build/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,WAAW,QAAQ,OAAO,WAAW,MAAM,QAAQ,OAAO,CAAC,CAAC,CAAC,KAAG,CAazG,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,WAAW,QAAQ,OAAO,WAAW,MAAM,QAAQ,OAAO,CAAC,CAAC,CAAC,KAAG,CAYzG,CAAA"}

package/build/config.js

@@ -1,9 +1,7 @@
-import { AppType, Layer } from './consts.js';
 export const makeBasicConfig = (type, service, cfg) => {
     const config = {
         ready: false,
         service,
-        layer: type === AppType.Frontend ? Layer.Service : Layer.System,
         type,
         debug: {},
         services: {},

package/build/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAG5C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAwB,IAAa,EAAE,OAAe,EAAE,GAAgB,EAAK,EAAE;IAC5G,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,KAAK;QACZ,OAAO;QACP,KAAK,EAAE,IAAI,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;QAC/D,IAAI;QACJ,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,GAAG,GAAG;KACF,CAAA;IAEN,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAwB,IAAa,EAAE,OAAe,EAAE,GAAgB,EAAK,EAAE;IAC5G,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,KAAK;QACZ,OAAO;QACP,IAAI;QACJ,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,GAAG,GAAG;KACF,CAAA;IAEN,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}

package/build/consts.d.ts

@@ -1,10 +1,3 @@
-export declare enum Layer {
-    System = "system",
-    Global = "global",
-    Service = "service",
-    Entity = "entity",
-    User = "user"
-}
 export declare enum AppType {
     Backend = "backend",
     Frontend = "frontend"
@@ -21,8 +14,7 @@ export declare enum ContextStage {
 export declare enum MiddlewareStage {
     Configuration = "configuration",
     Loading = "loading",
-    Ready = "ready",
-    Switching = "switching"
+    Ready = "ready"
 }
 export declare const CONFIG_RECORD = "records";
 export declare const EMPTY_ENTITY = "[UNDEFINED_ENTITY]";

package/build/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,oBAAY,KAAK;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,oBAAY,OAAO;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;CACtB;AAED,oBAAY,cAAc;IACxB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,oBAAY,YAAY;IACtB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,eAAe;IACzB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,SAAS,cAAc;CACxB;AAED,eAAO,MAAM,aAAa,YAAY,CAAA;AAEtC,eAAO,MAAM,YAAY,uBAAuB,CAAA;AAChD,eAAO,MAAM,aAAa,wBAAwB,CAAA;AAGlD;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,KAAK,UAAU,CAAA;AAC5B;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,KAAK,UAAU,CAAA"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,oBAAY,OAAO;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;CACtB;AAED,oBAAY,cAAc;IACxB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,oBAAY,YAAY;IACtB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,eAAe;IACzB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,eAAO,MAAM,aAAa,YAAY,CAAA;AAEtC,eAAO,MAAM,YAAY,uBAAuB,CAAA;AAChD,eAAO,MAAM,aAAa,wBAAwB,CAAA;AAGlD;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,KAAK,UAAU,CAAA;AAC5B;;GAEG;AACH,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B;;GAEG;AACH,eAAO,MAAM,KAAK,UAAU,CAAA"}

package/build/consts.js

@@ -1,11 +1,3 @@
-export var Layer;
-(function (Layer) {
-    Layer["System"] = "system";
-    Layer["Global"] = "global";
-    Layer["Service"] = "service";
-    Layer["Entity"] = "entity";
-    Layer["User"] = "user";
-})(Layer || (Layer = {}));
 export var AppType;
 (function (AppType) {
     AppType["Backend"] = "backend";
@@ -27,7 +19,6 @@ export var MiddlewareStage;
     MiddlewareStage["Configuration"] = "configuration";
     MiddlewareStage["Loading"] = "loading";
     MiddlewareStage["Ready"] = "ready";
-    MiddlewareStage["Switching"] = "switching";
 })(MiddlewareStage || (MiddlewareStage = {}));
 export const CONFIG_RECORD = 'records';
 export const EMPTY_ENTITY = '[UNDEFINED_ENTITY]';

package/build/consts.js.map

@@ -1 +1 @@
-{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAN,IAAY,KAMX;AAND,WAAY,KAAK;IACf,0BAAiB,CAAA;IACjB,0BAAiB,CAAA;IACjB,4BAAmB,CAAA;IACnB,0BAAiB,CAAA;IACjB,sBAAa,CAAA;AACf,CAAC,EANW,KAAK,KAAL,KAAK,QAMhB;AAED,MAAM,CAAN,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAHW,OAAO,KAAP,OAAO,QAGlB;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,qCAAmB,CAAA;AACrB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,+CAA+B,CAAA;IAC/B,mCAAmB,CAAA;IACnB,+BAAe,CAAA;AACjB,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAED,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,kDAA+B,CAAA;IAC/B,sCAAmB,CAAA;IACnB,kCAAe,CAAA;IACf,0CAAuB,CAAA;AACzB,CAAC,EALW,eAAe,KAAf,eAAe,QAK1B;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAA;AAEtC,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAAA;AAChD,MAAM,CAAC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAElD,wBAAwB;AACxB;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAA;AAC5B;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAA"}
+{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AACA,MAAM,CAAN,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAHW,OAAO,KAAP,OAAO,QAGlB;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,qCAAmB,CAAA;AACrB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,+CAA+B,CAAA;IAC/B,mCAAmB,CAAA;IACnB,+BAAe,CAAA;AACjB,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,kDAA+B,CAAA;IAC/B,sCAAmB,CAAA;IACnB,kCAAe,CAAA;AACjB,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAA;AAEtC,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAAA;AAChD,MAAM,CAAC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAElD,wBAAwB;AACxB;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAA;AAC5B;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAA"}

package/build/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAoE,MAAM,YAAY,CAAA;AAO7H,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,OAAO,CAAC,KAAG,YAAY,CAAC,CAAC,CA6Q9E,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAuD,MAAM,YAAY,CAAA;AAKhH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,OAAO,CAAC,KAAG,YAAY,CAAC,CAAC,CAsK9E,CAAA"}

package/build/context.js

@@ -1,20 +1,19 @@
-import { ContextStage, Layer, MiddlewareStage, MiddlewareType } from './consts.js';
-// import { applyMiddlewares, getAllServices, getMiddlerwareKey, isResourceAvailable, layersOrder } from './utils/context.js'
-import { applyMiddlewares, getAllServices, getMiddlerwareKey, isResourceAvailable } from './utils/context.js';
-import { DEFAULT, initializeLayer } from './utils/layer.js';
+import { ContextStage, MiddlewareStage, MiddlewareType } from './consts.js';
+import { applyMiddlewares, getMiddlerwareKey } from './utils/context.js';
 export const makeBasicContext = (cfg) => {
+    /**
+     * One flat registry per kind, keyed by alias. Registering an alias twice replaces the
+     * earlier entry — application entrypoint lists are routinely spread together and the
+     * later declaration is the one the app means.
+     */
     const services = {};
     const entrypoints = {};
     const resources = {};
     const middlewares = {};
-    const allServices = {};
-    const allEntrypoints = {};
-    const allResources = {};
     let configure;
     let initialize;
     const configured = new Promise(resolve => { configure = resolve; });
     const initialized = new Promise(resolve => { initialize = resolve; });
-    // const contexts: Record<string, BasicContext<C>> = {}
     const inLazyInit = new Set();
     const context = {
         cfg,
@@ -39,7 +38,7 @@ export const makeBasicContext = (cfg) => {
                 return context;
             }
             await applyMiddlewares(context, middlewares, MiddlewareType.Context, MiddlewareStage.Configuration);
-            await getAllServices(services, context.cfg.layer, context.cfg.layerId ?? DEFAULT).reduce(async (previous, service) => {
+            await Object.values(services).reduce(async (previous, service) => {
                 await previous;
                 if (!service.initialized) {
                     if (service.init != null) {
@@ -51,12 +50,9 @@ export const makeBasicContext = (cfg) => {
                 }
             }, Promise.resolve());
             await applyMiddlewares(context, middlewares, MiddlewareType.Config, MiddlewareStage.Loading);
-            const id = initializeLayer(resources, context.cfg.layer, context.cfg.layerId ?? DEFAULT);
-            await Object.values(resources[context.cfg.layer][id]).reduce(async (previous, resource) => {
+            await Object.values(resources).reduce(async (previous, resource) => {
                 await previous;
-                if (isResourceAvailable(resource, context.cfg.layer)) {
-                    await resource.init?.();
-                }
+                await resource.init?.();
             }, Promise.resolve());
             await applyMiddlewares(context, middlewares, MiddlewareType.Context, MiddlewareStage.Loading);
             context.stage = ContextStage.Ready;
@@ -66,38 +62,19 @@ export const makeBasicContext = (cfg) => {
             return context;
         },
         registerService: (service) => {
-            const id = initializeLayer(services, context.cfg.layer, context.cfg.layerId);
-            service = service.registerContext(context);
-            if (allServices[service.alias] == null) {
-                allServices[service.alias] = service;
-            }
-            services[context.cfg.layer][id][service.alias] = service;
+            services[service.alias] = service.registerContext(context);
             return context;
         },
         registerEntrypoint: (entrypoint) => {
-            const id = initializeLayer(entrypoints, context.cfg.layer, context.cfg.layerId);
-            entrypoint = entrypoint.registerContext(context);
-            if (allEntrypoints[entrypoint.alias] == null) {
-                allEntrypoints[entrypoint.alias] = entrypoint;
-            }
-            entrypoints[context.cfg.layer][id][entrypoint.alias] = entrypoint;
+            entrypoints[entrypoint.alias] = entrypoint.registerContext(context);
             return context;
         },
         registerEntrypoints: (eps) => {
             eps.forEach(ep => context.registerEntrypoint(ep));
             return context;
         },
-        /** @deprecated use registerEntrypoint */
-        registerModule: (module) => context.registerEntrypoint(module),
-        /** @deprecated use registerEntrypoints */
-        registerModules: (mods) => context.registerEntrypoints(mods),
         registerResource: (resource) => {
-            const id = initializeLayer(resources, context.cfg.layer, context.cfg.layerId);
-            resource = resource.registerContext(context);
-            if (allResources[resource.alias] == null) {
-                allResources[resource.alias] = resource;
-            }
-            resources[context.cfg.layer][id][resource.alias] = resource;
+            resources[resource.alias] = resource.registerContext(context);
             return context;
         },
         registerMiddleware: (middleware) => {
@@ -112,16 +89,9 @@ export const makeBasicContext = (cfg) => {
             return configured.then(() => context.cfg);
         },
         service: (alias) => {
-            const id = initializeLayer(services, context.cfg.layer, context.cfg.layerId);
-            let _service;
-            if (services[context.cfg.layer]?.[id]?.[alias] != null) {
-                _service = services[context.cfg.layer][id][alias];
-            }
-            else if (services[Layer.Global]?.[id]?.[alias] != null) {
-                _service = services[context.cfg.layer][id][alias];
-            }
-            else {
-                throw new SyntaxError(`Service ${alias} not found in layer ${context.cfg.layer}`);
+            const _service = services[alias];
+            if (_service == null) {
+                throw new SyntaxError(`Service ${alias} not found`);
             }
             if (!_service.initialized) {
                 if (_service.lazyInit != null) {
@@ -139,75 +109,21 @@ export const makeBasicContext = (cfg) => {
             return _service;
         },
         entrypoint: (alias) => {
-            const id = initializeLayer(entrypoints, context.cfg.layer, context.cfg.layerId);
-            if (entrypoints[context.cfg.layer][id][alias] != null) {
-                return entrypoints[context.cfg.layer][id][alias];
+            if (entrypoints[alias] != null) {
+                return entrypoints[alias];
             }
             throw new SyntaxError(`Entrypoint ${alias} not found`);
         },
-        /** @deprecated use entrypoint */
-        module: (alias) => context.entrypoint(alias),
         resource: (alias) => {
-            const id = initializeLayer(resources, context.cfg.layer, context.cfg.layerId);
-            if (resources[context.cfg.layer][id][alias] != null) {
-                const resource = resources[context.cfg.layer][id][alias];
-                return resource;
+            if (resources[alias] != null) {
+                return resources[alias];
             }
             throw new SyntaxError(`Resource ${alias} not found`);
         },
-        entrypoints: () => {
-            const id = initializeLayer(entrypoints, context.cfg.layer, context.cfg.layerId);
-            return Object.values(entrypoints[context.cfg.layer][id]);
-        },
-        /** @deprecated use entrypoints */
-        modules: () => context.entrypoints(),
-        /**
-         * @TODO Unfortunatly module cloning between contexts is quite unstable.
-         * And it looks like in some cases it relies on modules that aren't really clonned.
-         * The problem is that the not cloned modules are changing their context accross all context
-         * layers and we can't rely on such behaviour.
-         * So we disabled context update as a whole and all functionality that relies on it
-         * cause in curent release mixed tenancy is not in use in any project and it looks like
-         * there is no short term plans to use it some way.
-         */
-        updateContext: async (_id, _layer) => {
-            return context;
-            // const index = layersOrder.indexOf(context.cfg.layer)
-            // layer = layer ?? (layersOrder[index + 1] != null ? layersOrder[index + 1] : undefined)
-            // if (layer == null) {
-            //   throw new SyntaxError("There is no next layer to switch to")
-            // }
-            // if ([Layer.Entity, Layer.User].includes(layer) && id == null) {
-            //   throw new SyntaxError(`Cannot switch to layer ${layer} without id`)
-            // }
-            // id = initializeLayer(resources, layer, id)
-            // // Cache initalized context layers
-            // const key = `${layer}:${id}`
-            // if (key in contexts) {
-            //   return contexts[key] as T
-            // }
-            // const _config: C = JSON.parse(JSON.stringify(context.cfg))
-            // _config.layer = layer
-            // _config.ready = false
-            // _config.layerId = id
-            // // @TODO we need to make a rule to store all makeContext methods after they are applied
-            // const _context = context.makeContext != null ? context.makeContext(_config) : makeBasicContext(_config)
-            // Object.values(middlewares).flatMap(middlewares => middlewares)
-            //   .forEach(middleware => _context.registerMiddleware(middleware))
-            // await applyMiddlewares<C, BasicContext<C>>(_context, middlewares, MiddlewareType.Config, MiddlewareStage.Switching, { layer, id })
-            // Object.values(allServices).forEach(service => _context.registerService(service))
-            // Object.values(allEntrypoints).forEach(ep => _context.registerEntrypoint(ep))
-            // Object.values(allResources).forEach(resource => _context.registerResource(resource))
-            // await applyMiddlewares<C, BasicContext<C>>(_context, middlewares, MiddlewareType.Context, MiddlewareStage.Switching, { layer, id })
-            // _context.stage = ContextStage.Loading
-            // await _context.configure().init()
-            // return (contexts[key] = _context) as T
-        },
-        hasResource: alias => allResources[alias] != null,
-        hasService: alias => allServices[alias] != null,
-        hasEntrypoint: alias => allEntrypoints[alias] != null,
-        /** @deprecated use hasEntrypoint */
-        hasModule: alias => context.hasEntrypoint(alias),
+        entrypoints: () => Object.values(entrypoints),
+        hasResource: alias => resources[alias] != null,
+        hasService: alias => services[alias] != null,
+        hasEntrypoint: alias => entrypoints[alias] != null,
     };
     return context;
 };

package/build/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}

package/build/helper.d.ts

@@ -4,5 +4,4 @@ export declare const appendContextual: <T extends Contextual>(alias: string, con
  * @throws {SyntaxError}
  */
 export declare const assertContext: <C extends BasicConfig, T extends BasicContext<C>>(ctx: T | BasicContext<BasicConfig> | undefined, location?: string) => T;
-export declare const isContextWithoutIds: <C extends BasicConfig, T extends BasicContext<C>>(context: T) => boolean;
 //# sourceMappingURL=helper.d.ts.map

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAEvE,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,UAAU,SAAS,MAAM,cAAc,OAAO,CAAC,CAAC,CAAC,KAAG,CAsB9F,CAAA;AAMD;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,SAAS,aAAa,MAAM,KAAG,CAKnJ,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,KAAG,OAC1B,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAEvE,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,UAAU,SAAS,MAAM,cAAc,OAAO,CAAC,CAAC,CAAC,KAAG,CAgB9F,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,SAAS,aAAa,MAAM,KAAG,CAKnJ,CAAA"}

package/build/helper.js

@@ -1,23 +1,15 @@
-import { Layer } from './consts.js';
 export const appendContextual = (alias, contextual) => {
     contextual.alias = alias;
     contextual.registerContext = (context) => {
-        const _contextual = contextual.ctx == null
-            ? contextual
-            : contextual.reinitializeContext != null
-                ? contextual.reinitializeContext(context) : contextual;
-        // We do NOT update context when it's the same contextual with already set context
-        // Actuall we just do not need to switch context in many on the level of context consumer
-        if (_contextual.ctx == null) {
-            _contextual.ctx = context;
+        // A contextual binds to exactly one context — the first one that registers it.
+        if (contextual.ctx == null) {
+            contextual.ctx = context;
         }
-        return _contextual;
+        return contextual;
     };
     contextual.assertCtx = (location => assertContext(contextual.ctx, location ?? contextual.alias));
     return contextual;
 };
-// export type UpdContextType<C extends Config, T extends Context<C>, ExtraType> = T & ExtraType
-// export type UpdConfigType<T extends Config, ExtraType> = T & ExtraType
 /**
  * @throws {SyntaxError}
  */
@@ -27,5 +19,4 @@ export const assertContext = (ctx, location) => {
     }
     return ctx;
 };
-export const isContextWithoutIds = (context) => [Layer.System, Layer.Global, Layer.Service].includes(context.cfg.layer);
 //# sourceMappingURL=helper.js.map

package/build/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAuB,KAAa,EAAE,UAAsB,EAAK,EAAE;IACjG,UAAU,CAAC,KAAK,GAAG,KAAK,CAAA;IACxB,UAAU,CAAC,eAAe,GAAG,CAA2B,OAAwB,EAAE,EAAE;QAClF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,IAAI,IAAI;YACxC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,UAAU,CAAC,mBAAmB,IAAI,IAAI;gBACtC,CAAC,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;QAE1D,kFAAkF;QAClF,yFAAyF;QACzF,IAAI,WAAW,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,WAAW,CAAC,GAAG,GAAG,OAAO,CAAA;QAC3B,CAAC;QAED,OAAO,WAAgB,CAAA;IACzB,CAAC,CAAA;IAED,UAAU,CAAC,SAAS,GAAG,CACrB,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,CACzC,CAAA;IAEhC,OAAO,UAAe,CAAA;AACxB,CAAC,CAAA;AAED,gGAAgG;AAEhG,yEAAyE;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAmD,GAA8C,EAAE,QAAiB,EAAK,EAAE;IACtJ,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,WAAW,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAA;IAC3D,CAAC;IACD,OAAO,GAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAmD,OAAU,EAAW,EAAE,CAC3G,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAuB,KAAa,EAAE,UAAsB,EAAK,EAAE;IACjG,UAAU,CAAC,KAAK,GAAG,KAAK,CAAA;IACxB,UAAU,CAAC,eAAe,GAAG,CAA2B,OAAwB,EAAE,EAAE;QAClF,+EAA+E;QAC/E,IAAI,UAAU,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,GAAG,OAAO,CAAA;QAC1B,CAAC;QAED,OAAO,UAAe,CAAA;IACxB,CAAC,CAAA;IAED,UAAU,CAAC,SAAS,GAAG,CACrB,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,CACzC,CAAA;IAEhC,OAAO,UAAe,CAAA;AACxB,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAmD,GAA8C,EAAE,QAAiB,EAAK,EAAE;IACtJ,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,WAAW,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAA;IAC3D,CAAC;IACD,OAAO,GAAQ,CAAA;AACjB,CAAC,CAAA"}