di-sacala 0.1.1 → 0.1.3

package/README.md

@@ -9,7 +9,7 @@
 - **Full Type Safety**: Get autocompletion and type checks for all your injected services.
 - **Fluent API**: Chainable service registration makes it easy to compose your container.
 - **Container Composition**: Merge multiple containers together to share dependencies across different parts of your application.
-- **Lazy Construction**: Services are instantiated only on demand (when first accessed).
+- **Lazy & Singleton**: Services are instantiated only on demand (when first accessed) and reused for subsequent accesses.
 - **Zero Runtime Dependencies**: Extremely lightweight.
 
 ## Installation
@@ -22,13 +22,13 @@ npm install di-sacala
 
 ### 1. Defining a Service
 
-A service is a class that implements the `DiService` interface. It must implement a `getName()` method which will be used as the key in the container. Use `as const` to ensure the name is treated as a literal type.
+A service is a class that implements the `DiService` interface. It must implement a `getServiceName()` method which will be used as the key in the container. Use `as const` to ensure the name is treated as a literal type.
 
 ```typescript
 import { DiService } from 'di-sacala';
 
 export class LoggerService implements DiService<"logger"> {
-    getName() {
+    getServiceName() {
         return "logger" as const;
     }
     
@@ -55,14 +55,14 @@ container.logger.log("Service is ready!");
 
 ### 3. Services with Dependencies
 
-To inject dependencies into a service, define its constructor to accept the container. You can use the `Di` type helper to specify which services are required.
+To inject dependencies into a service, define its constructor to accept the container. You can use the `Di<T>` type helper to specify which services are required. It supports both a single service type or a tuple of multiple services.
 
 ```typescript
 import { Di, DiService } from 'di-sacala';
 import { LoggerService } from './LoggerService';
 
 export class UserService implements DiService<"user"> {
-    getName() {
+    getServiceName() {
         return "user" as const;
     }
     
@@ -96,9 +96,9 @@ const appContainer = new DiContainer()
     .inject(MainApp);
 ```
 
-### 5. Lazy Construction
+### 5. Lazy & Singleton
 
-Services registered via `inject` are only instantiated when they are first accessed. This allows for efficient container initialization and avoids unnecessary work for services that might not be used in certain execution paths.
+Services registered via `inject` are only instantiated when they are first accessed. Once created, the same instance is returned for all subsequent calls. This ensures efficiency and consistent state within the container.
 
 ```typescript
 const container = new DiContainer()
@@ -128,6 +128,27 @@ const container = new DiContainer()
 container.inject(AnotherLoggerService); 
 ```
 
+### 7. Reserved Field Names
+
+Since `DiContainer` uses a fluent API, certain names are reserved for its internal methods and cannot be used as service names:
+
+- `inject`
+- `injectContainer`
+
+Similar to duplicate names, attempting to use a reserved name will trigger both a **Type-level Check** and a **Runtime Check**.
+
+```typescript
+class InjectService implements DiService<"inject"> {
+    getServiceName() { return "inject" as const; }
+}
+
+const container = new DiContainer();
+
+// TypeScript Error: Type '"Reserved field name: inject"' ...
+// Runtime Error: Reserved field name: inject
+container.inject(InjectService);
+```
+
 ## Development
 
 ### Installation

package/dist/di-sacala.d.ts

@@ -9,7 +9,7 @@ export interface DiService<Name extends string> {
      *
      * The method is called without an instance context, so it can be used as a static property.
      */
-    getName(this: null): Name;
+    getServiceName(this: null): Name;
 }
 /**
  * A recursive type transformation that converts a Service (or tuple of Services)
@@ -21,9 +21,10 @@ export interface DiService<Name extends string> {
 export type Di<S> = S extends [infer S1, ...infer Tail] ? Di<S1> & Di<Tail> : S extends [] ? unknown : S extends DiService<infer Name> ? {
     [Key in Name]: S;
 } : never;
-type Append<Container, Service extends DiService<string>> = Service extends DiService<infer Name> ? Container extends {
+type CheckReservedField<Name, T> = Name extends keyof DiContainer ? `Reserved field name: ${Name}` : T;
+type Append<Container, Service extends DiService<string>> = Service extends DiService<infer Name> ? CheckReservedField<Name, Container extends {
     [Key in Name]: unknown;
-} ? `Duplicate service name: ${Name}` : Container & Di<Service> : never;
+} ? `Duplicate service name: ${Name}` : Container & Di<Service>> : never;
 type Merge<DI1, DI2> = Exclude<keyof DI1, "inject" | "injectContainer"> & Exclude<keyof DI2, "inject" | "injectContainer"> extends never ? DI1 & DI2 : `Containers have duplicated keys: ${(Exclude<keyof DI1, "inject" | "injectContainer"> & Exclude<keyof DI2, "inject" | "injectContainer">) & string}`;
 /**
  * DiContainer manages service instantiation and dependency resolution.

package/dist/di-sacala.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di-sacala.d.ts","sourceRoot":"","sources":["../src/di-sacala.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,SAAS,CAAC,IAAI,SAAS,MAAM;IAC1C;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CAC7B;AAED;;;;;;GAMG;AACH,MAAM,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,GACjD,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GACjB,CAAC,SAAS,EAAE,GACV,OAAO,GACP,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,GAC7B;KAAG,GAAG,IAAI,IAAI,GAAG,CAAC;CAAE,GACpB,KAAK,CAAC;AAEhB,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,SAAS,SAAS,CAAC,MAAM,CAAC,IACpD,OAAO,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,GAC/B,SAAS,SAAS;KAAG,GAAG,IAAI,IAAI,GAAG,OAAO;CAAE,GACxC,2BAA2B,IAAI,EAAE,GACjC,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,GAC3B,KAAK,CAAC;AAEhB,KAAK,KAAK,CAAC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,GACnE,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,SAAS,KAAK,GAC5D,GAAG,GAAG,GAAG,GACT,oCAAoC,CAAC,OAAO,CACxC,MAAM,GAAG,EACT,QAAQ,GAAG,iBAAiB,CAC/B,GACG,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,CAAC,GACjD,MAAM,EAAE,CAAC;AAKnB;;;;GAIG;AACH,qBAAa,WAAW;;IAGpB;;;;;;;;OAQG;IACH,MAAM,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC9B,UAAU,EAAE,KAAK,YAAY,EAAE,IAAI,KAAK,CAAC,GAC1C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAoBlB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,SAAS,WAAW,EAAE,KAAK,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;CAoBtE"}
+{"version":3,"file":"di-sacala.d.ts","sourceRoot":"","sources":["../src/di-sacala.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,SAAS,CAAC,IAAI,SAAS,MAAM;IAC1C;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACpC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,GACjD,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GACjB,CAAC,SAAS,EAAE,GACV,OAAO,GACP,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,GAC7B;KAAG,GAAG,IAAI,IAAI,GAAG,CAAC;CAAE,GACpB,KAAK,CAAC;AAIhB,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,SAAS,MAAM,WAAW,GAC3D,wBAAwB,IAAI,EAAE,GAC9B,CAAC,CAAC;AAER,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,SAAS,SAAS,CAAC,MAAM,CAAC,IACpD,OAAO,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,GAC/B,kBAAkB,CACd,IAAI,EACJ,SAAS,SAAS;KAAG,GAAG,IAAI,IAAI,GAAG,OAAO;CAAE,GACtC,2BAA2B,IAAI,EAAE,GACjC,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,CAChC,GACD,KAAK,CAAC;AAEhB,KAAK,KAAK,CAAC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,GACnE,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,SAAS,KAAK,GAC5D,GAAG,GAAG,GAAG,GACT,oCAAoC,CAAC,OAAO,CACxC,MAAM,GAAG,EACT,QAAQ,GAAG,iBAAiB,CAC/B,GACG,OAAO,CAAC,MAAM,GAAG,EAAE,QAAQ,GAAG,iBAAiB,CAAC,CAAC,GACjD,MAAM,EAAE,CAAC;AAiBnB;;;;GAIG;AACH,qBAAa,WAAW;;IAGpB;;;;;;;;OAQG;IACH,MAAM,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC9B,UAAU,EAAE,KAAK,YAAY,EAAE,IAAI,KAAK,CAAC,GAC1C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAwBlB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,SAAS,WAAW,EAAE,KAAK,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;CAetE"}

package/dist/index.js

@@ -1,49 +1,27 @@
-const r = (n, t) => Object.prototype.hasOwnProperty.call(n, t);
-class s {
+const s =  new Set(["inject", "injectContainer"]), i = (n, t) => Object.prototype.hasOwnProperty.call(n, t);
+function c(n, t) {
+  for (const e in n) i(n, e) && t(e);
+}
+const r = (n) => {
+  throw new Error(n);
+};
+class a {
   constructor() {
   }
-  /**
-   * Registers a new service by instantiating it with the current container instance.
-   * The service is then attached to the container using its `name` property.
-   *
-   * @template S - The type of service being injected.
-   * @param dependency - A constructor for the service, which receives the container as its only argument.
-   * @returns The container instance, typed with the newly added service.
-   * @throws {Error} If a service with the same name is already registered.
-   */
   inject(t) {
-    const e = t.prototype.getName();
-    if (r(this, e))
-      throw new Error(`Duplicate service name: ${e}`);
-    let i;
-    return Object.defineProperty(this, e, {
-      enumerable: !0,
-      configurable: !1,
-      get: () => i ?? (i = new t(this))
-    }), this;
+    const e = t.prototype.getServiceName.call(null);
+    s.has(e) && r(`Reserved field name: ${e}`), i(this, e) && r(`Duplicate service name: ${e}`);
+    let o;
+    return Object.defineProperty(this, e, { enumerable: !0, get: () => o ?? (o = new t(this)) }), this;
   }
-  /**
-   * Copies all service properties from another container into this one.
-   * Useful for composing containers or providing shared dependencies.
-   *
-   * @template DC - The type of the other DiContainer.
-   * @param other - The source container to copy services from.
-   * @returns The current container instance, typed with the merged services.
-   * @throws {Error} If any service name from the other container already exists in this container.
-   */
   injectContainer(t) {
-    for (const e in t)
-      if (r(t, e) && r(this, e))
-        throw new Error(`Containers have duplicated keys: ${e}`);
-    for (const e in t)
-      r(t, e) && Object.defineProperty(this, e, {
-        enumerable: !0,
-        configurable: !1,
-        get: () => t[e]
-      });
-    return this;
+    return c(t, (e) => {
+      i(this, e) && r(`Containers have duplicated keys: ${String(e)}`);
+    }), c(t, (e) => {
+      Object.defineProperty(this, e, { enumerable: !0, get: () => t[e] });
+    }), this;
   }
 }
 export {
-  s as DiContainer
+  a as DiContainer
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(i,n){typeof exports=="object"&&typeof module<"u"?n(exports):typeof define=="function"&&define.amd?define(["exports"],n):(i=typeof globalThis<"u"?globalThis:i||self,n(i.DiSacala={}))})(this,(function(i){"use strict";const n=(r,t)=>Object.prototype.hasOwnProperty.call(r,t);class s{constructor(){}inject(t){const e=t.prototype.getName();if(n(this,e))throw new Error(`Duplicate service name: ${e}`);let o;return Object.defineProperty(this,e,{enumerable:!0,configurable:!1,get:()=>o??(o=new t(this))}),this}injectContainer(t){for(const e in t)if(n(t,e)&&n(this,e))throw new Error(`Containers have duplicated keys: ${e}`);for(const e in t)n(t,e)&&Object.defineProperty(this,e,{enumerable:!0,configurable:!1,get:()=>t[e]});return this}}i.DiContainer=s,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})}));
+(function(o,i){typeof exports=="object"&&typeof module<"u"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(o=typeof globalThis<"u"?globalThis:o||self,i(o.DiSacala={}))})(this,(function(o){"use strict";const i=new Set(["inject","injectContainer"]),r=(n,t)=>Object.prototype.hasOwnProperty.call(n,t);function c(n,t){for(const e in n)r(n,e)&&t(e)}const s=n=>{throw new Error(n)};class l{constructor(){}inject(t){const e=t.prototype.getServiceName.call(null);i.has(e)&&s(`Reserved field name: ${e}`),r(this,e)&&s(`Duplicate service name: ${e}`);let a;return Object.defineProperty(this,e,{enumerable:!0,get:()=>a??(a=new t(this))}),this}injectContainer(t){return c(t,e=>{r(this,e)&&s(`Containers have duplicated keys: ${String(e)}`)}),c(t,e=>{Object.defineProperty(this,e,{enumerable:!0,get:()=>t[e]})}),this}}o.DiContainer=l,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "di-sacala",
-    "version": "0.1.1",
+    "version": "0.1.3",
     "description": "Small type-safe dependency injection lib",
     "type": "module",
     "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
+    "types": "./dist/di-sacala.d.ts",
     "files": [
         "dist"
     ],