@timesplinter/pimple 1.1.1 → 2.1.0

package/README.md

@@ -9,13 +9,22 @@ and the original PHP Pimple container by Fabien Potencier.
 
 ## Usage
 
-```js
+```ts
 import Pimple from '@timesplinter/pimple';
 
-const container: Container = new Pimple({env: 'dev'});
+type ServiceMap = {
+   'foo': string, 
+   'bar': string,
+};
 
-container.set('foo', (container: Pimple) => {
-    return `bar (${container.get('env')})`;
+const container: Container = new Pimple<ServiceMap>({env: 'dev'});
+
+container.set('foo', () => {
+    return `baz (${container.get('env')})`;
+});
+
+container.set('bar', (container: Pimple<ServiceMap>) => {
+    return `bar: ${container.get('foo')}`;
 });
 
 console.log(container.get('foo')); // 'bar (dev)';

package/lib/cjs/container.d.ts

@@ -1,4 +1,5 @@
-export default interface Container {
-    get(service: string): any;
-    has(service: string): boolean;
+export type ServiceKey<T> = keyof T;
+export default interface Container<T> {
+    get<K extends ServiceKey<T>>(key: K): T[K];
+    has<K extends ServiceKey<T>>(key: K): boolean;
 }

package/lib/cjs/pimple.d.ts

@@ -1,8 +1,15 @@
-import Container from "./container";
+import Container, { ServiceKey } from "./container";
 import ServiceProvider from "./serviceProvider";
 /** Declaration types */
-declare type ServiceDeclaration = Function | Object;
-declare type ProviderDeclaration = Function | ServiceProvider;
+type ServiceProviderFunction<T> = (container: Pimple<T>) => void;
+type ProviderDeclaration<T> = ServiceProviderFunction<T> | ServiceProvider<T>;
+type LazyServiceDefinition<T, S> = (container: Pimple<T>) => S;
+type ProtectedServiceDefinition<T, S> = () => LazyServiceDefinition<T, S>;
+type PlainServiceDefinition<S> = S extends Function ? () => S : S;
+type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S>;
+type ServiceMap<T> = {
+    [key in ServiceKey<T>]: ServiceDefinition<T, T[ServiceKey<T>]>;
+};
 /**
  * Pimple dependency injection container
  *
@@ -10,58 +17,52 @@ declare type ProviderDeclaration = Function | ServiceProvider;
  * @copyright 2016 SerafimArts <nesk@xakep.ru>
  * @copyright 2021 TiMESPLiNTER <dev@timesplinter.ch>
  * @license LGPL
- * @version 3.0.0
+ * @version 2.1.0
  */
-export default class Pimple implements Container {
-    /**
-     * @type {string}
-     */
+export default class Pimple<T> implements Container<T> {
     static get VERSION(): string;
-    /**
-     * @type {{}}
-     * @private
-     */
     private _definitions;
+    private _raw;
+    private _resolved;
+    private _resolving;
+    constructor(services?: Partial<ServiceMap<T>>);
     /**
-     * @type {{}}
-     * @private
+     * Define a service (first-time registration only)
      */
-    private _raw;
-    constructor(services?: {
-        [key: string]: any;
-    });
+    set<K extends ServiceKey<T>>(name: K, service: ServiceDefinition<T, T[K]>): Pimple<T>;
     /**
-     * Define a service
+     * Replace an existing service definition before it has been resolved
      */
-    set(name: string, service: ServiceDeclaration): Pimple;
+    replace<K extends ServiceKey<T>>(name: K, service: ServiceDefinition<T, T[K]>): Pimple<T>;
+    private define;
     /**
      * Register a factory
      */
-    factory(name: string, callback: Function): Pimple;
+    factory<K extends ServiceKey<T>>(name: K, callback: ServiceDefinition<T, T[K]>): Pimple<T>;
     /**
      * Get a service instance
      */
-    get(name: string): any;
+    get<K extends ServiceKey<T>>(name: K): T[K];
     /**
      * Checks whether a service is registered or not
      */
-    has(service: string): boolean;
+    has<K extends ServiceKey<T>>(name: K): boolean;
     /**
      * Register a protected function
      */
-    protect(service: Function): Function;
+    protect<T extends Function>(func: T): () => T;
     /**
      * Extend a service
      */
-    extend(serviceName: string, service: Function): Function;
+    extend<K extends ServiceKey<T>>(serviceName: K, service: Function): Function;
     /**
      * Get a service raw definition
      */
-    raw(name: string): Function;
+    raw<K extends ServiceKey<T>>(name: K): ServiceDefinition<T, T[K]>;
     /**
      * Register a service provider
      */
-    register(provider: ProviderDeclaration): Pimple;
+    register(provider: ProviderDeclaration<T>): Pimple<T>;
     private instanceOfServiceProvider;
 }
 export {};

package/lib/cjs/pimple.js

@@ -15,32 +15,49 @@ const reservedProperties = [
  * @copyright 2016 SerafimArts <nesk@xakep.ru>
  * @copyright 2021 TiMESPLiNTER <dev@timesplinter.ch>
  * @license LGPL
- * @version 3.0.0
+ * @version 2.1.0
  */
 class Pimple {
+    static get VERSION() { return '2.1.0'; }
     constructor(services = {}) {
-        /**
-         * @type {{}}
-         * @private
-         */
         this._definitions = {};
-        /**
-         * @type {{}}
-         * @private
-         */
         this._raw = {};
+        this._resolved = new Map();
+        this._resolving = [];
         Object.keys(services).forEach((service) => {
-            this.set(service, services[service]);
+            const serviceKey = service;
+            this.set(serviceKey, services[serviceKey]);
         }, this);
     }
     /**
-     * @type {string}
+     * Define a service (first-time registration only)
      */
-    static get VERSION() { return '3.0.0'; }
+    set(name, service) {
+        if (this.has(name)) {
+            throw new Error(`Service "${name.toString()}" is already defined. Use replace() to overwrite it.`);
+        }
+        return this.define(name, service);
+    }
     /**
-     * Define a service
+     * Replace an existing service definition before it has been resolved
      */
-    set(name, service) {
+    replace(name, service) {
+        var _a;
+        if (!this.has(name)) {
+            throw new RangeError(`Service "${name.toString()}" is not defined in the container.`);
+        }
+        if (this._resolved.has(name)) {
+            const trace = [];
+            let current = name;
+            while (current !== null) {
+                trace.unshift(current.toString());
+                current = (_a = this._resolved.get(current)) !== null && _a !== void 0 ? _a : null;
+            }
+            throw new Error(`Service "${name.toString()}" has already been resolved and cannot be replaced. Resolution trace: ${trace.join(' → ')}`);
+        }
+        return this.define(name, service);
+    }
+    define(name, service) {
         this._raw[name] = service;
         this._definitions[name] = service instanceof Function ?
             (function () {
@@ -52,8 +69,9 @@ class Pimple {
                     return cached;
                 };
             }()) : service;
-        if (reservedProperties.indexOf(name) === -1) {
+        if (reservedProperties.indexOf(name.toString()) === -1) {
             Object.defineProperty(this, name, {
+                configurable: true,
                 get: () => {
                     return this.get(name);
                 }
@@ -67,8 +85,9 @@ class Pimple {
     factory(name, callback) {
         this._raw[name] = callback;
         this._definitions[name] = callback;
-        if (reservedProperties.indexOf(name) === -1) {
+        if (reservedProperties.indexOf(name.toString()) === -1) {
             Object.defineProperty(this, name, {
+                configurable: true,
                 get: () => {
                     return this.get(name);
                 }
@@ -81,32 +100,43 @@ class Pimple {
      */
     get(name) {
         if (this._definitions[name] instanceof Function) {
-            return this._definitions[name](this);
+            const firstResolution = !this._resolved.has(name);
+            if (firstResolution) {
+                const parent = this._resolving.length > 0 ? this._resolving[this._resolving.length - 1] : null;
+                this._resolved.set(name, parent);
+                this._resolving.push(name);
+            }
+            try {
+                return this._definitions[name](this);
+            }
+            finally {
+                if (firstResolution) {
+                    this._resolving.pop();
+                }
+            }
         }
         return this._definitions[name];
     }
     /**
      * Checks whether a service is registered or not
      */
-    has(service) {
-        return service in this._definitions;
+    has(name) {
+        return name in this._definitions;
     }
     /**
      * Register a protected function
      */
-    protect(service) {
-        return () => {
-            return service;
-        };
+    protect(func) {
+        return () => func;
     }
     /**
      * Extend a service
      */
     extend(serviceName, service) {
         if (!this._definitions[serviceName]) {
-            throw new RangeError(`Definition with "${serviceName}" not defined in container.`);
+            throw new RangeError(`Definition with "${serviceName.toString()}" not defined in container.`);
         }
-        var def = this._definitions[serviceName];
+        let def = this._definitions[serviceName];
         return this._definitions[serviceName] = (container) => {
             if (def instanceof Function) {
                 def = def(container);
@@ -126,11 +156,9 @@ class Pimple {
     register(provider) {
         if (this.instanceOfServiceProvider(provider) && provider.register instanceof Function) {
             provider.register(this);
-            return this;
         }
-        if (provider instanceof Function) {
+        else if (provider instanceof Function) {
             provider(this);
-            return this;
         }
         return this;
     }

package/lib/cjs/pimple.js.map

@@ -1 +1 @@
-{"version":3,"file":"pimple.js","sourceRoot":"","sources":["../../src/pimple.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AASb;;GAEG;AACH,MAAM,kBAAkB,GAAa;IACjC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK;IAC9B,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa;IAC7C,WAAW;CACd,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAqB,MAAM;IAmBvB,YAAY,WAAoC,EAAE;QAZlD;;;WAGG;QACK,iBAAY,GAA4B,EAAE,CAAC;QAEnD;;;WAGG;QACK,SAAI,GAA4B,EAAE,CAAC;QAGvC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACzC,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;IArBD;;OAEG;IACH,MAAM,KAAK,OAAO,KAAK,OAAO,OAAO,CAAC,CAAC,CAAC;IAoBxC;;OAEG;IACI,GAAG,CAAC,IAAY,EAAE,OAA2B;QAEhD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAE1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,YAAY,QAAQ,CAAC,CAAC;YACnD,CAAC;gBACG,IAAI,MAAW,CAAC;gBAChB,OAAO,CAAC,MAAc,EAAE,EAAE;oBACtB,IAAI,MAAM,KAAK,SAAS,EAAE;wBACtB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;qBAC5B;oBACD,OAAO,MAAM,CAAC;gBAClB,CAAC,CAAC;YACN,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAEnB,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;YACzC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE;gBAC9B,GAAG,EAAE,GAAG,EAAE;oBACN,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;aACJ,CAAC,CAAC;SACN;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,IAAY,EAAE,QAAkB;QAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAW,QAAQ,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAEnC,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;YACzC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE;gBAC9B,GAAG,EAAE,GAAG,EAAE;oBACN,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;aACJ,CAAC,CAAC;SACN;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,GAAG,CAAC,IAAY;QACnB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,QAAQ,EAAE;YAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACI,GAAG,CAAC,OAAe;QACtB,OAAO,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,OAAiB;QAC5B,OAAO,GAAG,EAAE;YACR,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,WAAmB,EAAE,OAAiB;QAChD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YACjC,MAAM,IAAI,UAAU,CAAC,oBAAoB,WAAW,6BAA6B,CAAC,CAAC;SACtF;QAED,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC1D,IAAI,GAAG,YAAY,QAAQ,EAAE;gBACzB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;aACxB;YACD,OAAO,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACnC,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACI,GAAG,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACI,QAAQ,CAAC,QAA6B;QACzC,IAAI,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,QAAQ,YAAY,QAAQ,EAAE;YACnF,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,QAAQ,YAAY,QAAQ,EAAE;YAC9B,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,yBAAyB,CAAC,MAAW;QACzC,OAAO,UAAU,IAAI,MAAM,CAAC;IAChC,CAAC;CACJ;AA/ID,yBA+IC"}
+{"version":3,"file":"pimple.js","sourceRoot":"","sources":["../../src/pimple.ts"],"names":[],"mappings":"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"}

package/lib/cjs/serviceProvider.d.ts

@@ -2,6 +2,6 @@ import Pimple from "./pimple";
 /**
  * Service provider class for service injecting in Pimple container
  */
-export default interface ServiceProvider {
-    register(container: Pimple): void;
+export default interface ServiceProvider<T> {
+    register(container: Pimple<T>): void;
 }

package/lib/esm/container.d.ts

@@ -1,4 +1,5 @@
-export default interface Container {
-    get(service: string): any;
-    has(service: string): boolean;
+export type ServiceKey<T> = keyof T;
+export default interface Container<T> {
+    get<K extends ServiceKey<T>>(key: K): T[K];
+    has<K extends ServiceKey<T>>(key: K): boolean;
 }

package/lib/esm/pimple.d.ts

@@ -1,8 +1,15 @@
-import Container from "./container";
+import Container, { ServiceKey } from "./container";
 import ServiceProvider from "./serviceProvider";
 /** Declaration types */
-declare type ServiceDeclaration = Function | Object;
-declare type ProviderDeclaration = Function | ServiceProvider;
+type ServiceProviderFunction<T> = (container: Pimple<T>) => void;
+type ProviderDeclaration<T> = ServiceProviderFunction<T> | ServiceProvider<T>;
+type LazyServiceDefinition<T, S> = (container: Pimple<T>) => S;
+type ProtectedServiceDefinition<T, S> = () => LazyServiceDefinition<T, S>;
+type PlainServiceDefinition<S> = S extends Function ? () => S : S;
+type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S>;
+type ServiceMap<T> = {
+    [key in ServiceKey<T>]: ServiceDefinition<T, T[ServiceKey<T>]>;
+};
 /**
  * Pimple dependency injection container
  *
@@ -10,58 +17,52 @@ declare type ProviderDeclaration = Function | ServiceProvider;
  * @copyright 2016 SerafimArts <nesk@xakep.ru>
  * @copyright 2021 TiMESPLiNTER <dev@timesplinter.ch>
  * @license LGPL
- * @version 3.0.0
+ * @version 2.1.0
  */
-export default class Pimple implements Container {
-    /**
-     * @type {string}
-     */
+export default class Pimple<T> implements Container<T> {
     static get VERSION(): string;
-    /**
-     * @type {{}}
-     * @private
-     */
     private _definitions;
+    private _raw;
+    private _resolved;
+    private _resolving;
+    constructor(services?: Partial<ServiceMap<T>>);
     /**
-     * @type {{}}
-     * @private
+     * Define a service (first-time registration only)
      */
-    private _raw;
-    constructor(services?: {
-        [key: string]: any;
-    });
+    set<K extends ServiceKey<T>>(name: K, service: ServiceDefinition<T, T[K]>): Pimple<T>;
     /**
-     * Define a service
+     * Replace an existing service definition before it has been resolved
      */
-    set(name: string, service: ServiceDeclaration): Pimple;
+    replace<K extends ServiceKey<T>>(name: K, service: ServiceDefinition<T, T[K]>): Pimple<T>;
+    private define;
     /**
      * Register a factory
      */
-    factory(name: string, callback: Function): Pimple;
+    factory<K extends ServiceKey<T>>(name: K, callback: ServiceDefinition<T, T[K]>): Pimple<T>;
     /**
      * Get a service instance
      */
-    get(name: string): any;
+    get<K extends ServiceKey<T>>(name: K): T[K];
     /**
      * Checks whether a service is registered or not
      */
-    has(service: string): boolean;
+    has<K extends ServiceKey<T>>(name: K): boolean;
     /**
      * Register a protected function
      */
-    protect(service: Function): Function;
+    protect<T extends Function>(func: T): () => T;
     /**
      * Extend a service
      */
-    extend(serviceName: string, service: Function): Function;
+    extend<K extends ServiceKey<T>>(serviceName: K, service: Function): Function;
     /**
      * Get a service raw definition
      */
-    raw(name: string): Function;
+    raw<K extends ServiceKey<T>>(name: K): ServiceDefinition<T, T[K]>;
     /**
      * Register a service provider
      */
-    register(provider: ProviderDeclaration): Pimple;
+    register(provider: ProviderDeclaration<T>): Pimple<T>;
     private instanceOfServiceProvider;
 }
 export {};

package/lib/esm/pimple.js

@@ -14,32 +14,49 @@ const reservedProperties = [
  * @copyright 2016 SerafimArts <nesk@xakep.ru>
  * @copyright 2021 TiMESPLiNTER <dev@timesplinter.ch>
  * @license LGPL
- * @version 3.0.0
+ * @version 2.1.0
  */
 export default class Pimple {
+    static get VERSION() { return '2.1.0'; }
     constructor(services = {}) {
-        /**
-         * @type {{}}
-         * @private
-         */
         this._definitions = {};
-        /**
-         * @type {{}}
-         * @private
-         */
         this._raw = {};
+        this._resolved = new Map();
+        this._resolving = [];
         Object.keys(services).forEach((service) => {
-            this.set(service, services[service]);
+            const serviceKey = service;
+            this.set(serviceKey, services[serviceKey]);
         }, this);
     }
     /**
-     * @type {string}
+     * Define a service (first-time registration only)
      */
-    static get VERSION() { return '3.0.0'; }
+    set(name, service) {
+        if (this.has(name)) {
+            throw new Error(`Service "${name.toString()}" is already defined. Use replace() to overwrite it.`);
+        }
+        return this.define(name, service);
+    }
     /**
-     * Define a service
+     * Replace an existing service definition before it has been resolved
      */
-    set(name, service) {
+    replace(name, service) {
+        var _a;
+        if (!this.has(name)) {
+            throw new RangeError(`Service "${name.toString()}" is not defined in the container.`);
+        }
+        if (this._resolved.has(name)) {
+            const trace = [];
+            let current = name;
+            while (current !== null) {
+                trace.unshift(current.toString());
+                current = (_a = this._resolved.get(current)) !== null && _a !== void 0 ? _a : null;
+            }
+            throw new Error(`Service "${name.toString()}" has already been resolved and cannot be replaced. Resolution trace: ${trace.join(' → ')}`);
+        }
+        return this.define(name, service);
+    }
+    define(name, service) {
         this._raw[name] = service;
         this._definitions[name] = service instanceof Function ?
             (function () {
@@ -51,8 +68,9 @@ export default class Pimple {
                     return cached;
                 };
             }()) : service;
-        if (reservedProperties.indexOf(name) === -1) {
+        if (reservedProperties.indexOf(name.toString()) === -1) {
             Object.defineProperty(this, name, {
+                configurable: true,
                 get: () => {
                     return this.get(name);
                 }
@@ -66,8 +84,9 @@ export default class Pimple {
     factory(name, callback) {
         this._raw[name] = callback;
         this._definitions[name] = callback;
-        if (reservedProperties.indexOf(name) === -1) {
+        if (reservedProperties.indexOf(name.toString()) === -1) {
             Object.defineProperty(this, name, {
+                configurable: true,
                 get: () => {
                     return this.get(name);
                 }
@@ -80,32 +99,43 @@ export default class Pimple {
      */
     get(name) {
         if (this._definitions[name] instanceof Function) {
-            return this._definitions[name](this);
+            const firstResolution = !this._resolved.has(name);
+            if (firstResolution) {
+                const parent = this._resolving.length > 0 ? this._resolving[this._resolving.length - 1] : null;
+                this._resolved.set(name, parent);
+                this._resolving.push(name);
+            }
+            try {
+                return this._definitions[name](this);
+            }
+            finally {
+                if (firstResolution) {
+                    this._resolving.pop();
+                }
+            }
         }
         return this._definitions[name];
     }
     /**
      * Checks whether a service is registered or not
      */
-    has(service) {
-        return service in this._definitions;
+    has(name) {
+        return name in this._definitions;
     }
     /**
      * Register a protected function
      */
-    protect(service) {
-        return () => {
-            return service;
-        };
+    protect(func) {
+        return () => func;
     }
     /**
      * Extend a service
      */
     extend(serviceName, service) {
         if (!this._definitions[serviceName]) {
-            throw new RangeError(`Definition with "${serviceName}" not defined in container.`);
+            throw new RangeError(`Definition with "${serviceName.toString()}" not defined in container.`);
         }
-        var def = this._definitions[serviceName];
+        let def = this._definitions[serviceName];
         return this._definitions[serviceName] = (container) => {
             if (def instanceof Function) {
                 def = def(container);
@@ -125,11 +155,9 @@ export default class Pimple {
     register(provider) {
         if (this.instanceOfServiceProvider(provider) && provider.register instanceof Function) {
             provider.register(this);
-            return this;
         }
-        if (provider instanceof Function) {
+        else if (provider instanceof Function) {
             provider(this);
-            return this;
         }
         return this;
     }

package/lib/esm/pimple.js.map

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

package/lib/esm/serviceProvider.d.ts

@@ -2,6 +2,6 @@ import Pimple from "./pimple";
 /**
  * Service provider class for service injecting in Pimple container
  */
-export default interface ServiceProvider {
-    register(container: Pimple): void;
+export default interface ServiceProvider<T> {
+    register(container: Pimple<T>): void;
 }

package/package.json

@@ -1,25 +1,34 @@
 {
   "name": "@timesplinter/pimple",
   "license": "LGPL-3.0-or-later",
-  "version": "1.1.1",
+  "version": "2.1.0",
   "module": "./lib/esm/index.js",
   "main": "./lib/cjs/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TiMESPLiNTER/pimple-js.git"
+  },
   "scripts": {
     "test": "jest",
-    "coverage": "jest --collect-coverage",
+    "test:cov": "jest --collect-coverage",
+    "typecheck": "tsc --noEmit -p tsconfig.json && tsc --noEmit -p tsconfig-cjs.json",
     "transpile": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
-    "prepublish": "npm run transpile"
+    "prepublishOnly": "npm run transpile"
   },
+  "files": [
+    "lib/"
+  ],
   "keywords": [],
   "author": "Pascal Münst <dev@timesplinter.ch>",
   "description": "A simple dependency-injection container written in TypeScript based on PHP's Pimple",
   "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/preset-env": "^7.14.4",
-    "@babel/preset-typescript": "^7.13.0",
-    "@types/jest": "^26.0.23",
-    "babel-jest": "^27.0.2",
-    "jest": "^27.0.4",
-    "typescript": "^4.3.2"
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-typescript": "^7.23.3",
+    "@types/jest": "^29.5.14",
+    "babel-jest": "^29.7.0",
+    "jest": "^29.7.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^4.9.5"
   }
 }

package/.babelrc

@@ -1,6 +0,0 @@
-{
-    "presets": [
-        ["@babel/preset-env", {"targets": {"node": "current"}}],
-        "@babel/preset-typescript"
-    ]
-}

package/.github/workflows/test.yml

@@ -1,13 +0,0 @@
-name: Tests
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Run Jest
-      uses: stefanoeb/jest-action@1.0.3

package/jest.config.json

@@ -1,11 +0,0 @@
-{
-    "coverageDirectory": "./build/coverage",
-    "coverageThreshold": {
-        "global": {
-            "branches": 80,
-            "functions": 88,
-            "lines": 93,
-            "statements": 93
-        }
-    }
-}

package/src/container.ts

@@ -1,8 +0,0 @@
-import ServiceProvider from './serviceProvider';
-
-export default interface Container 
-{
-    get(service: string): any;
-
-    has(service: string): boolean;
-}

package/src/index.ts

@@ -1,8 +0,0 @@
-import Container from './container'
-import Pimple from './pimple'
-import ServiceProvider from './serviceProvider'
-export {
-  Container,
-  Pimple,
-  ServiceProvider
-}

package/src/pimple.ts

@@ -1,171 +0,0 @@
-"use strict";
-
-import Container from "./container";
-import ServiceProvider from "./serviceProvider";
-
-/** Declaration types */
-type ServiceDeclaration  = Function|Object;
-type ProviderDeclaration = Function|ServiceProvider;
-
-/**
- * Reserved names of properties
- */
-const reservedProperties: string[] = [
-    'get', 'set', 'factory', 'raw',
-    'protect', 'share', 'toString', 'constructor',
-    'prototype'
-];
-
-/**
- * Pimple dependency injection container
- *
- * @copyright 2011 M.PARAISO <mparaiso@online.fr>
- * @copyright 2016 SerafimArts <nesk@xakep.ru>
- * @copyright 2021 TiMESPLiNTER <dev@timesplinter.ch>
- * @license LGPL
- * @version 3.0.0
- */
-export default class Pimple implements Container
-{
-    /**
-     * @type {string}
-     */
-    static get VERSION() { return '3.0.0'; }
-
-    /**
-     * @type {{}}
-     * @private
-     */
-    private _definitions: { [key: string]: any; } = {};
-
-    /**
-     * @type {{}}
-     * @private
-     */
-    private _raw: { [key: string]: any; } = {};
-
-    constructor(services: { [key: string]: any; } = {}) {
-        Object.keys(services).forEach((service) => {
-            this.set(service, services[service]);
-        }, this);
-    }
-
-    /**
-     * Define a service
-     */
-    public set(name: string, service: ServiceDeclaration): Pimple
-    {
-        this._raw[name] = service;
-
-        this._definitions[name] = service instanceof Function ?
-            (function () {
-                let cached: any;
-                return (pimple: Pimple) => {
-                    if (cached === undefined) {
-                        cached = service(pimple);
-                    }
-                    return cached;
-                };
-            }()) : service;
-
-        if (reservedProperties.indexOf(name) === -1) {
-            Object.defineProperty(this, name, {
-                get: () => {
-                    return this.get(name);
-                }
-            });
-        }
-
-        return this;
-    }
-
-    /**
-     * Register a factory
-     */
-    public factory(name: string, callback: Function): Pimple {
-        this._raw[name]         = callback;
-        this._definitions[name] = callback;
-
-        if (reservedProperties.indexOf(name) === -1) {
-            Object.defineProperty(this, name, {
-                get: () => {
-                    return this.get(name);
-                }
-            });
-        }
-
-        return this;
-    }
-
-    /**
-     * Get a service instance
-     */
-    public get(name: string): any {
-        if (this._definitions[name] instanceof Function) {
-            return this._definitions[name](this);
-        }
-        return this._definitions[name];
-    }
-
-    /**
-     * Checks whether a service is registered or not
-     */
-    public has(service: string): boolean {
-        return service in this._definitions;
-    }
-
-    /**
-     * Register a protected function
-     */
-    public protect(service: Function): Function {
-        return () => {
-            return service;
-        };
-    }
-
-    /**
-     * Extend a service
-     */
-    public extend(serviceName: string, service: Function): Function {
-        if (!this._definitions[serviceName]) {
-            throw new RangeError(`Definition with "${serviceName}" not defined in container.`);
-        }
-
-        var def = this._definitions[serviceName];
-
-        return this._definitions[serviceName] = (container: Pimple) => {
-            if (def instanceof Function) {
-                def = def(container);
-            }
-            return service(def, container);
-        };
-    }
-
-    /**
-     * Get a service raw definition
-     */
-    public raw(name: string): Function {
-        return this._raw[name];
-    }
-
-    /**
-     * Register a service provider
-     */
-    public register(provider: ProviderDeclaration): Pimple {
-        if (this.instanceOfServiceProvider(provider) && provider.register instanceof Function) {
-            provider.register(this);
-            return this;
-        }
-
-        if (provider instanceof Function) {
-            provider(this);
-            return this;
-        }
-
-        return this;
-    }
-
-    private instanceOfServiceProvider(object: any): object is ServiceProvider {
-        return 'register' in object;
-    }
-}

package/src/serviceProvider.ts

@@ -1,9 +0,0 @@
-import Pimple from "./pimple";
-
-/**
- * Service provider class for service injecting in Pimple container
- */
- export default interface ServiceProvider 
- {
-      register(container: Pimple): void;
- }

package/tests/pimple.spec.ts

@@ -1,138 +0,0 @@
-import Pimple from '../src/pimple';
-
-describe('pimple container', () => {
-    it('returns container verison', async () => {
-        expect(Pimple.VERSION).toBe('3.0.0');
-    });
-
-    it('stores values', async () => {
-        const container = new Pimple({baz: 42});
-
-        container.set('foo', 'bar');
-
-        expect(container.get('foo')).toBe('bar');
-        expect(container.get('baz')).toBe(42);
-    });
-
-    it('resolves function', async () => {
-        const container = new Pimple();
-
-        container.set('foo', () => {
-            return 'baz';
-        });
-
-        expect(container.get('foo')).toBe('baz');
-    });
-
-    it('resolves function only once', async () => {
-        const container = new Pimple();
-
-        container.set('foo', () => {
-            return Math.random();
-        });
-
-        expect(container.get('foo')).toBe(container.get('foo'));
-    });
-
-    it('returns true if service exists', async () => {
-        const container = new Pimple();
-
-        container.set('foo', () => {
-            return 42;
-        });
-
-        expect(container.has('foo')).toBe(true);
-    });
-
-    it('returns true if service exists', async () => {
-        const container = new Pimple();
-
-        expect(container.has('foo')).toBe(false);
-    });
-
-    it('protects function', async () => {
-        const container = new Pimple();
-
-        const protectedFunciton = () => {
-            return 'baz';
-        };
-
-        container.set('foo', container.protect(protectedFunciton));
-
-        expect(container.get('foo')).toBe(protectedFunciton);
-    });
-
-    it('returns original function', async () => {
-        const container = new Pimple();
-
-        const protectedFunciton = () => {
-            return 'baz';
-        };
-
-        container.set('foo', protectedFunciton);
-
-        expect(container.raw('foo')).toBe(protectedFunciton);
-    });
-
-    it('registers services defined in service provider', async () => {
-        const container = new Pimple();
-
-        const serviceProviderMock = {
-            register: (container: Pimple) => {
-                container.set('foo', () => {
-                    return 'baz'
-                });
-            },
-        };
-
-        container.register(serviceProviderMock);
-
-        expect(container.get('foo')).toBe('baz');
-    });
-
-    it('registers services defined in function', async () => {
-        const container = new Pimple();
-
-        const serviceProviderMock = (container: Pimple) => {
-            container.set('foo', () => {
-                return 'baz'
-            });
-        };
-
-        container.register(serviceProviderMock);
-
-        expect(container.get('foo')).toBe('baz');
-    });
-
-    it('returns new instance from factory', async () => {
-        const container = new Pimple();
-
-        container.factory('foo', () => {
-            return Math.random();
-        });
-
-        expect(container.get('foo')).not.toBe(container.get('foo'));
-    });
-
-    it('throws exception on extending an undefined service', () => {
-        const container = new Pimple();
-
-        expect(() => {
-            container.extend('foo', () => {});
-        }).toThrow('Definition with "foo" not defined in container.');
-    });
-
-    it('extends service', () => {
-        const container = new Pimple({
-            foo: () => {
-                return 'baz';
-            }
-        });
-
-        container.extend('foo', (initialService: string, container: Pimple) => {
-            return initialService + 'bar';
-        });
-
-        expect(container.get('foo')).toBe('bazbar');
-    });
-});

package/tsconfig-cjs.json

@@ -1,8 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "compilerOptions": {
-      "module": "CommonJS",
-      "outDir": "./lib/cjs"
-    },
-  }
-  

package/tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-      "target": "ES2015",
-      "module": "ES2020",
-      "strict": true,
-      "esModuleInterop": true,
-      "noImplicitAny": true,
-      "declaration": true,
-      "sourceMap": true,
-      "experimentalDecorators": true,
-      "forceConsistentCasingInFileNames": true,
-      "moduleResolution": "node",
-      "outDir": "./lib/esm",
-      "baseUrl": "."
-  },
-  "include": [
-      "src/"
-  ]
-}