@owlmeans/context 0.1.18-rc.1 → 0.1.18-rc.10

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"}

package/build/types.d.ts

@@ -1,11 +1,9 @@
-import type { AppType, ContextStage, Layer, MiddlewareStage, MiddlewareType, CONFIG_RECORD } from './consts.js';
+import type { AppType, ContextStage, MiddlewareStage, MiddlewareType, CONFIG_RECORD } from './consts.js';
 export interface BasicConfig {
     ready: boolean;
     service: string;
     alias?: string;
-    layer: Layer;
     type: AppType;
-    layerId?: string;
     services?: Record<string, Object>;
     [CONFIG_RECORD]?: ConfigRecord[];
     debug?: {
@@ -23,12 +21,10 @@ interface ConfigRecordItem extends Record<string, MaybeArray<ConfigRecordItem |
 export interface Contextual {
     ctx?: BasicContext<any>;
     alias: string;
-    reinitializeContext?: <T extends Contextual>(context: BasicContext<any>) => T;
     registerContext: <T extends Contextual, C extends BasicConfig>(context: BasicContext<C>) => T;
     assertCtx: <C extends BasicConfig, T extends BasicContext<C>>(location?: string) => T;
 }
 export interface Service extends Contextual {
-    layers?: Layer[];
     initialized: boolean;
     init?: () => Promise<void>;
     lazyInit?: () => Promise<void>;
@@ -44,14 +40,19 @@ export interface LazyService extends Service {
 }
 export interface BasicEntrypoint extends Contextual {
     _entrypoint: true;
-    _module: true;
 }
-/** @deprecated use BasicEntrypoint */
-export interface BasicModule extends Contextual {
-    _module: true;
+/**
+ * A stable reference to an entrypoint registered in a context.
+ *
+ * Contract packages use this instead of exporting raw alias strings.  The optional type member is
+ * deliberately phantom: it lets `context.entrypoint(protocol)` infer the context-bound module
+ * without changing the wire alias or adding registry-wide declaration merging.
+ */
+export interface EntrypointReference<T extends BasicEntrypoint = BasicEntrypoint> {
+    readonly alias: string;
+    readonly entrypointType?: T;
 }
 export interface BasicResource extends Contextual {
-    layers?: Layer[];
     init?: () => Promise<void>;
 }
 export interface Middleware {
@@ -59,6 +60,12 @@ export interface Middleware {
     stage: MiddlewareStage;
     apply: <C extends BasicConfig, T extends BasicContext<C>>(context: T, args?: Record<string, string | undefined>) => Promise<void>;
 }
+/**
+ * The DI container. One context is built per process by one factory: a layer specific
+ * factory composes the layer below it and then `append*` mixins register what the
+ * application needs. There is no child context and nothing is stored for re-creation —
+ * a service, a resource and an entrypoint each bind to exactly one context.
+ */
 export interface BasicContext<C extends BasicConfig> {
     cfg: C;
     stage: ContextStage;
@@ -66,7 +73,6 @@ export interface BasicContext<C extends BasicConfig> {
     waitForInitialized: () => Promise<boolean>;
     configure: <T extends BasicContext<C>>() => T;
     init: <T extends BasicContext<C>>() => Promise<T>;
-    updateContext: <T extends BasicContext<C>>(id?: string, to?: Layer) => Promise<T>;
     registerService: <T extends BasicContext<C>>(service: Service) => T;
     registerEntrypoint: <T extends BasicContext<C>>(entrypoint: BasicEntrypoint) => T;
     registerEntrypoints: <T extends BasicContext<C>>(entrypoints: BasicEntrypoint[]) => T;
@@ -74,23 +80,15 @@ export interface BasicContext<C extends BasicConfig> {
     registerMiddleware: <T extends BasicContext<C>>(middleware: Middleware) => T;
     get config(): Promise<C>;
     service: <T extends Service>(alias: string) => T;
-    entrypoint: <T extends BasicEntrypoint>(alias: string) => T;
+    entrypoint: {
+        <T extends BasicEntrypoint>(reference: EntrypointReference<T>): T;
+        <T extends BasicEntrypoint>(reference: EntrypointReference | string): T;
+    };
     resource: <T extends BasicResource>(alias: string) => T;
     hasResource: (alias: string) => boolean;
     hasService: (alias: string) => boolean;
     hasEntrypoint: (alias: string) => boolean;
     entrypoints: <T extends BasicEntrypoint>() => T[];
-    /** @deprecated use registerEntrypoint */
-    registerModule: <T extends BasicContext<C>>(module: BasicModule) => T;
-    /** @deprecated use registerEntrypoints */
-    registerModules: <T extends BasicContext<C>>(modules: BasicModule[]) => T;
-    /** @deprecated use entrypoint */
-    module: <T extends BasicModule>(alias: string) => T;
-    /** @deprecated use hasEntrypoint */
-    hasModule: (alias: string) => boolean;
-    /** @deprecated use entrypoints */
-    modules: <T extends BasicModule>() => T[];
-    makeContext?: <T extends BasicContext<C>>(cfg: C) => T;
 }
 export {};
 //# sourceMappingURL=types.d.ts.map

package/build/types.d.ts.map

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

package/build/utils/context.d.ts

@@ -1,11 +1,6 @@
-import { Layer, MiddlewareStage, MiddlewareType } from '../consts.js';
-import type { BasicConfig, BasicContext, Middleware, BasicResource, Service } from '../types.js';
-import type { InLayer } from './layer.js';
+import type { MiddlewareStage, MiddlewareType } from '../consts.js';
+import type { BasicConfig, BasicContext, Middleware } from '../types.js';
 export declare const getMiddlerwareKey: (middleware: Middleware) => string;
 export declare const createMiddlewareKey: (type: MiddlewareType, stage: MiddlewareStage) => string;
-export declare const isLayerIherited: (current: Layer, parent: Layer) => boolean;
-export declare const isResourceAvailable: (resource: BasicResource, layer: Layer) => boolean;
-export declare const layersOrder: Layer[];
-export declare const getAllServices: (services: InLayer<Record<string, Service>>, layer: Layer, id: string) => Service[];
 export declare const applyMiddlewares: <C extends BasicConfig, T extends BasicContext<C>>(context: T, middlewares: Record<string, Middleware[]>, type: MiddlewareType, stage: MiddlewareStage, args?: Record<string, string | undefined>) => Promise<void[]>;
 //# sourceMappingURL=context.d.ts.map

package/build/utils/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAChG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,eAAO,MAAM,iBAAiB,eAAgB,UAAU,WAA2D,CAAA;AAEnH,eAAO,MAAM,mBAAmB,SAAU,cAAc,SAAS,eAAe,WAAuB,CAAA;AAEvG,eAAO,MAAM,eAAe,YAAa,KAAK,UAAU,KAAK,KAAG,OACsB,CAAA;AAEtF,eAAO,MAAM,mBAAmB,aAAc,aAAa,SAAS,KAAK,YACkB,CAAA;AAE3F,eAAO,MAAM,WAAW,SAMvB,CAAA;AAED,eAAO,MAAM,cAAc,aAAc,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,SAAS,KAAK,MAAM,MAAM,cACxB,CAAA;AAE3E,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WACtE,CAAC,eACG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,QACnC,cAAc,SACb,eAAe,SACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,oBAG1C,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExE,eAAO,MAAM,iBAAiB,eAAgB,UAAU,WAA2D,CAAA;AAEnH,eAAO,MAAM,mBAAmB,SAAU,cAAc,SAAS,eAAe,WAAuB,CAAA;AAEvG,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WACtE,CAAC,eACG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,QACnC,cAAc,SACb,eAAe,SACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,oBAG1C,CAAA"}

package/build/utils/context.js

@@ -1,15 +1,4 @@
-import { Layer } from '../consts.js';
 export const getMiddlerwareKey = (middleware) => createMiddlewareKey(middleware.type, middleware.stage);
 export const createMiddlewareKey = (type, stage) => `${type}:${stage}`;
-export const isLayerIherited = (current, parent) => (current === parent) || (layersOrder.indexOf(parent) > layersOrder.indexOf(current));
-export const isResourceAvailable = (resource, layer) => resource.layers == null || resource.layers.some(_layer => isLayerIherited(_layer, layer));
-export const layersOrder = [
-    Layer.System,
-    Layer.Global,
-    Layer.Service,
-    Layer.Entity,
-    Layer.User
-];
-export const getAllServices = (services, layer, id) => services?.[layer]?.[id] != null ? Object.values(services[layer][id]) : [];
 export const applyMiddlewares = (context, middlewares, type, stage, args) => Promise.all(middlewares[createMiddlewareKey(type, stage)]?.map(async (middleware) => middleware.apply(context, args)) ?? []);
 //# sourceMappingURL=context.js.map

package/build/utils/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAmC,MAAM,cAAc,CAAA;AAIrE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,UAAsB,EAAE,EAAE,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,CAAA;AAEnH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAoB,EAAE,KAAsB,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAA;AAEvG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAc,EAAE,MAAa,EAAW,EAAE,CACxE,CAAC,OAAO,KAAK,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAEtF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAuB,EAAE,KAAY,EAAE,EAAE,CAC3E,QAAQ,CAAC,MAAM,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;AAE3F,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,KAAK,CAAC,MAAM;IACZ,KAAK,CAAC,MAAM;IACZ,KAAK,CAAC,OAAO;IACb,KAAK,CAAC,MAAM;IACZ,KAAK,CAAC,IAAI;CACX,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAA0C,EAAE,KAAY,EAAE,EAAU,EAAE,EAAE,CACrG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAE3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,OAAU,EACV,WAAyC,EACzC,IAAoB,EACpB,KAAsB,EACtB,IAAyC,EACzC,EAAE,CAAC,OAAO,CAAC,GAAG,CACd,WAAW,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAO,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CACpH,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,UAAsB,EAAE,EAAE,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,CAAA;AAEnH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAoB,EAAE,KAAsB,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAA;AAEvG,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,OAAU,EACV,WAAyC,EACzC,IAAoB,EACpB,KAAsB,EACtB,IAAyC,EACzC,EAAE,CAAC,OAAO,CAAC,GAAG,CACd,WAAW,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAO,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CACpH,CAAA"}

package/build/utils/index.d.ts

@@ -1,3 +1,2 @@
 export * from './context.js';
-export * from './layer.js';
 //# sourceMappingURL=index.d.ts.map

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA"}

package/build/utils/index.js

@@ -1,3 +1,2 @@
 export * from './context.js';
-export * from './layer.js';
 //# sourceMappingURL=index.js.map

package/build/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/context",
-  "version": "0.1.18-rc.1",
+  "version": "0.1.18-rc.10",
   "license": "MIT",
   "type": "module",
   "scripts": {

package/src/config.ts

@@ -1,11 +1,10 @@
-import { AppType, Layer } from './consts.js'
+import { AppType } from './consts.js'
 import type { BasicConfig } from './types.js'
 
 export const makeBasicConfig = <C extends BasicConfig>(type: AppType, service: string, cfg?: Partial<C>): C => {
   const config = {
     ready: false,
     service,
-    layer: type === AppType.Frontend ? Layer.Service : Layer.System,
     type,
     debug: {},
     services: {},

package/src/consts.ts

@@ -1,12 +1,4 @@
 
-export enum Layer {
-  System = 'system',
-  Global = 'global',
-  Service = 'service',
-  Entity = 'entity',
-  User = 'user'
-}
-
 export enum AppType {
   Backend = 'backend',
   Frontend = 'frontend',
@@ -26,8 +18,7 @@ export enum ContextStage {
 export enum MiddlewareStage {
   Configuration = 'configuration',
   Loading = 'loading',
-  Ready = 'ready',
-  Switching = 'switching'
+  Ready = 'ready'
 }
 
 export const CONFIG_RECORD = 'records'

package/src/context.ts

@@ -1,19 +1,21 @@
-import { ContextStage, Layer, MiddlewareStage, MiddlewareType } from './consts.js'
-import type { BasicConfig, BasicContext, Middleware, BasicEntrypoint, BasicModule, BasicResource, Service } from './types.js'
-// import { applyMiddlewares, getAllServices, getMiddlerwareKey, isResourceAvailable, layersOrder } from './utils/context.js'
-import { applyMiddlewares, getAllServices, getMiddlerwareKey, isResourceAvailable } from './utils/context.js'
-import { DEFAULT, InLayer, initializeLayer } from './utils/layer.js'
+import { ContextStage, MiddlewareStage, MiddlewareType } from './consts.js'
+import type {
+  BasicConfig, BasicContext, Middleware, BasicEntrypoint, BasicResource, EntrypointReference, Service
+} from './types.js'
+import { applyMiddlewares, getMiddlerwareKey } from './utils/context.js'
 
 type Entrypoint = BasicEntrypoint
 
 export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C> => {
-  const services = {} as InLayer<Record<string, Service>>
-  const entrypoints = {} as InLayer<Record<string, Entrypoint>>
-  const resources = {} as InLayer<Record<string, BasicResource>>
+  /**
+   * 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: Record<string, Service> = {}
+  const entrypoints: Record<string, Entrypoint> = {}
+  const resources: Record<string, BasicResource> = {}
   const middlewares: Record<string, Middleware[]> = {}
-  const allServices: Record<string, Service> = {}
-  const allEntrypoints: Record<string, Entrypoint> = {}
-  const allResources: Record<string, BasicResource> = {}
 
   let configure: (res: boolean) => void
   let initialize: (resv: boolean) => void
@@ -21,8 +23,6 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
   const configured = new Promise<boolean>(resolve => { configure = resolve })
   const initialized = new Promise<boolean>(resolve => { initialize = resolve })
 
-  // const contexts: Record<string, BasicContext<C>> = {}
-
   const inLazyInit = new Set<Service>()
 
   const context: BasicContext<C> = {
@@ -59,7 +59,7 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
 
       await applyMiddlewares<C, BasicContext<C>>(context, middlewares, MiddlewareType.Context, MiddlewareStage.Configuration)
 
-      await getAllServices(services, context.cfg.layer, context.cfg.layerId ?? DEFAULT).reduce(
+      await Object.values(services).reduce(
         async (previous, service) => {
           await previous
           if (!service.initialized) {
@@ -75,12 +75,9 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
 
       await applyMiddlewares<C, BasicContext<C>>(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<C, BasicContext<C>>(context, middlewares, MiddlewareType.Context, MiddlewareStage.Loading)
@@ -95,24 +92,13 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
     },
 
     registerService: <T>(service: 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 as T
     },
 
     registerEntrypoint: <T>(entrypoint: 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 as T
     },
@@ -122,19 +108,8 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
       return context as T
     },
 
-    /** @deprecated use registerEntrypoint */
-    registerModule: <T>(module: BasicModule) => context.registerEntrypoint(module as unknown as Entrypoint) as T,
-
-    /** @deprecated use registerEntrypoints */
-    registerModules: <T>(mods: BasicModule[]) => context.registerEntrypoints(mods as unknown as Entrypoint[]) as T,
-
     registerResource: <T>(resource: BasicResource) => {
-      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 as T
     },
@@ -154,15 +129,9 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
     },
 
     service: <T>(alias: string) => {
-      const id = initializeLayer(services, context.cfg.layer, context.cfg.layerId)
-
-      let _service: 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) {
@@ -179,99 +148,28 @@ export const makeBasicContext = <C extends BasicConfig>(cfg: C): BasicContext<C>
       return _service as T
     },
 
-    entrypoint: <T extends Entrypoint>(alias: string) => {
-      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] as T
+    entrypoint: <T extends Entrypoint>(reference: EntrypointReference<T> | string) => {
+      const alias = typeof reference === 'string' ? reference : reference.alias
+      if (entrypoints[alias] != null) {
+        return entrypoints[alias] as T
       }
       throw new SyntaxError(`Entrypoint ${alias} not found`)
     },
 
-    /** @deprecated use entrypoint */
-    module: <T>(alias: string) => context.entrypoint<any>(alias) as T,
-
     resource: <T extends BasicResource>(alias: string) => {
-      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] as T
-
-        return resource
+      if (resources[alias] != null) {
+        return resources[alias] as T
       }
       throw new SyntaxError(`Resource ${alias} not found`)
     },
 
-    entrypoints: <T extends Entrypoint>() => {
-      const id = initializeLayer(entrypoints, context.cfg.layer, context.cfg.layerId)
-      return Object.values(entrypoints[context.cfg.layer][id]) as T[]
-    },
-
-    /** @deprecated use entrypoints */
-    modules: <T>() => context.entrypoints<any>() as T[],
-
-    /**
-     * @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 <T>(_id?: string, _layer?: Layer) => {
-      return context as T
-
-      // 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,
+    entrypoints: <T extends Entrypoint>() => Object.values(entrypoints) as T[],
 
-    hasService: alias => allServices[alias] != null,
+    hasResource: alias => resources[alias] != null,
 
-    hasEntrypoint: alias => allEntrypoints[alias] != null,
+    hasService: alias => services[alias] != null,
 
-    /** @deprecated use hasEntrypoint */
-    hasModule: alias => context.hasEntrypoint(alias),
+    hasEntrypoint: alias => entrypoints[alias] != null,
   }
 
   return context

package/src/helper.ts

@@ -1,21 +1,14 @@
-import { Layer } from './consts.js'
 import type { Contextual, BasicContext, BasicConfig } from './types.js'
 
 export const appendContextual = <T extends Contextual>(alias: string, contextual: Partial<T>): T => {
   contextual.alias = alias
   contextual.registerContext = <T, C extends BasicConfig>(context: BasicContext<C>) => {
-    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 as T
+    return contextual as T
   }
 
   contextual.assertCtx = (
@@ -25,10 +18,6 @@ export const appendContextual = <T extends Contextual>(alias: string, contextual
   return contextual as T
 }
 
-// export type UpdContextType<C extends Config, T extends Context<C>, ExtraType> = T & ExtraType
-
-// export type UpdConfigType<T extends Config, ExtraType> = T & ExtraType
-
 /**
  * @throws {SyntaxError}
  */
@@ -38,6 +27,3 @@ export const assertContext = <C extends BasicConfig, T extends BasicContext<C>>(
   }
   return ctx as T
 }
-
-export const isContextWithoutIds = <C extends BasicConfig, T extends BasicContext<C>>(context: T): boolean =>
-  [Layer.System, Layer.Global, Layer.Service].includes(context.cfg.layer)

package/src/types.ts

@@ -1,13 +1,11 @@
-import type { AppType, ContextStage, Layer, MiddlewareStage, MiddlewareType, CONFIG_RECORD } from './consts.js'
+import type { AppType, ContextStage, MiddlewareStage, MiddlewareType, CONFIG_RECORD } from './consts.js'
 
 export interface BasicConfig {
   ready: boolean
   service: string
   // Is used as username of the service (e.g. for looking up for autehntication keys)
   alias?: string
-  layer: Layer
   type: AppType
-  layerId?: string
   services?: Record<string, Object>
   [CONFIG_RECORD]?: ConfigRecord[]
   debug?: {
@@ -31,13 +29,11 @@ interface ConfigRecordItem extends Record<
 export interface Contextual {
   ctx?: BasicContext<any>
   alias: string
-  reinitializeContext?: <T extends Contextual>(context: BasicContext<any>) => T // This method is a fix to replace context inside closed scope
   registerContext: <T extends Contextual, C extends BasicConfig>(context: BasicContext<C>) => T
   assertCtx: <C extends BasicConfig, T extends BasicContext<C>>(location?: string) => T
 }
 
 export interface Service extends Contextual {
-  layers?: Layer[]
   initialized: boolean
   init?: () => Promise<void>
   lazyInit?: () => Promise<void>
@@ -56,17 +52,22 @@ export interface LazyService extends Service {
 
 export interface BasicEntrypoint extends Contextual {
   _entrypoint: true
-  _module: true
 }
 
-/** @deprecated use BasicEntrypoint */
-export interface BasicModule extends Contextual {
-  _module: true
+/**
+ * A stable reference to an entrypoint registered in a context.
+ *
+ * Contract packages use this instead of exporting raw alias strings.  The optional type member is
+ * deliberately phantom: it lets `context.entrypoint(protocol)` infer the context-bound module
+ * without changing the wire alias or adding registry-wide declaration merging.
+ */
+export interface EntrypointReference<T extends BasicEntrypoint = BasicEntrypoint> {
+  readonly alias: string
+  readonly entrypointType?: T
 }
 
 export interface BasicResource extends Contextual {
-  layers?: Layer[]
-  init?: () => Promise<void> // After context switch the resource should be able to reinitialize
+  init?: () => Promise<void>
 }
 
 export interface Middleware {
@@ -75,6 +76,12 @@ export interface Middleware {
   apply: <C extends BasicConfig, T extends BasicContext<C>>(context: T, args?: Record<string, string | undefined>) => Promise<void>
 }
 
+/**
+ * The DI container. One context is built per process by one factory: a layer specific
+ * factory composes the layer below it and then `append*` mixins register what the
+ * application needs. There is no child context and nothing is stored for re-creation —
+ * a service, a resource and an entrypoint each bind to exactly one context.
+ */
 export interface BasicContext<C extends BasicConfig> {
   cfg: C
   stage: ContextStage
@@ -82,7 +89,6 @@ export interface BasicContext<C extends BasicConfig> {
   waitForInitialized: () => Promise<boolean>
   configure: <T extends BasicContext<C>>() => T
   init: <T extends BasicContext<C>>() => Promise<T>
-  updateContext: <T extends BasicContext<C>>(id?: string, to?: Layer) => Promise<T>
   registerService: <T extends BasicContext<C>>(service: Service) => T
   registerEntrypoint: <T extends BasicContext<C>>(entrypoint: BasicEntrypoint) => T
   registerEntrypoints: <T extends BasicContext<C>>(entrypoints: BasicEntrypoint[]) => T
@@ -91,24 +97,14 @@ export interface BasicContext<C extends BasicConfig> {
 
   get config(): Promise<C>
   service: <T extends Service>(alias: string) => T
-  entrypoint: <T extends BasicEntrypoint>(alias: string) => T
+  entrypoint: {
+    <T extends BasicEntrypoint>(reference: EntrypointReference<T>): T
+    <T extends BasicEntrypoint>(reference: EntrypointReference | string): T
+  }
   resource: <T extends BasicResource>(alias: string) => T
   hasResource: (alias: string) => boolean
   hasService: (alias: string) => boolean
   hasEntrypoint: (alias: string) => boolean
 
   entrypoints: <T extends BasicEntrypoint>() => T[]
-
-  /** @deprecated use registerEntrypoint */
-  registerModule: <T extends BasicContext<C>>(module: BasicModule) => T
-  /** @deprecated use registerEntrypoints */
-  registerModules: <T extends BasicContext<C>>(modules: BasicModule[]) => T
-  /** @deprecated use entrypoint */
-  module: <T extends BasicModule>(alias: string) => T
-  /** @deprecated use hasEntrypoint */
-  hasModule: (alias: string) => boolean
-  /** @deprecated use entrypoints */
-  modules: <T extends BasicModule>() => T[]
-
-  makeContext?: <T extends BasicContext<C>>(cfg: C) => T
 }