implab/implabjs-core Commit - r146:f3f5c56d3b3e

Added childContainer service to container services, ServiceContaier is destroyable, fixed browser Uuid version

cin -

r146:f3f5c56d3b3e v1.4.0-rc5 default

parent child

Context file:

r146:f3f5c56d3b3e

Collapse all files

build.gradle +1 -1

                     if(symbols != 'none') {
                         sourceMap = true
-                        sourceRoot = packageName
+                        sourceRoot = "pack:${packageName}"
                     }
                     if (flavour == 'node') {

src/main/ts/Uuid.ts +7 -3

             const _window: any = "undefined" !== typeof window ? window : null;
+            function noop(): never {
+                throw new Error();
+            }
             interface WritableArrayLike<T> {
                 length: number;
                 [n: number]: T;
             // detect to determine the best RNG source, normalizing to a function
             // that
             // returns 128-bits of randomness, since that's what's usually required
-            let _rng: () => WritableArrayLike<number> = () => [];
+            let _rng: () => WritableArrayLike<number> = noop;
             function setupBrowser() {
                 // Allow for MSIE11 msCrypto
                 const _crypto = _window.crypto || _window.msCrypto;
-                if (!_rng && _crypto && _crypto.getRandomValues) {
+                if (_rng === noop && _crypto && _crypto.getRandomValues) {
                     // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
                     //
                     // Moderately fast, high quality
                     } catch (e) { /**/ }
                 }
-                if (!_rng) {
+                if (_rng === noop) {
                     // Math.random()-based (RNG)
                     //
                     // If all else fails, use Math.random(). It's fast, but is of

src/main/ts/di/Container.ts +4 -3

             import { TraceSource } from "../log/TraceSource";
             import { Configuration, RegistrationMap } from "./Configuration";
             import { Cancellation } from "../Cancellation";
-            import { IDestroyable, ICancellation } from "../interfaces";
+            import { ICancellation } from "../interfaces";
             import { isDescriptor } from "./traits";
             import { LifetimeManager } from "./LifetimeManager";
             import { each, isString } from "../safe";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            export class Container<S extends object = any> implements ServiceContainer<S>, IDestroyable {
+            export class Container<S extends object = any> implements ServiceContainer<S> {
                 readonly _services: ContainerServiceMap<S>;
                 readonly _lifetimeManager: LifetimeManager;
                 constructor(parent?: Container<S>) {
                     this._parent = parent;
-                    this._services = parent ? Object.create(parent._services) : {};
+                    this._services = Object.create(parent ? parent._services : null);
                     this._cleanup = [];
                     this._root = parent ? parent.getRootContainer() : this;
                     this._services.container = new ValueDescriptor(this) as any;
+                    this._services.childContainer = { activate: () => this.createChildContainer() };
                     this._disposed = false;
                     this._lifetimeManager = new LifetimeManager();
                 }

src/main/ts/di/interfaces.ts +4 -1

+            import { IDestroyable } from "../interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { LifetimeManager } from "./LifetimeManager";
                 resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
             }
-            export interface ServiceContainer<S extends object> extends ServiceLocator<S> {
+            export interface ServiceContainer<S extends object> extends ServiceLocator<S>, IDestroyable {
                 getLifetimeManager(): LifetimeManager;
                 register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>): this;
                 register(services: PartialServiceMap<S>): this;
             export interface ContainerProvided<S extends object> {
                 container: ServiceLocator<S>;
+                childContainer: ServiceContainer<S>;
             }
             export type ContainerRegistered<S extends object> = /*{

src/test/ts/tests/TextTests.ts +9 0

             import { test } from "./TestTraits";
             import { MockConsole } from "../mock/MockConsole";
             import { ConsoleWriter } from "../log/ConsoleWriter";
+            import { Uuid } from "../Uuid";
             test("String builder", async t => {
                 const sb = new StringBuilder();
                 t.deepEqual(mockConsole.getBuffer()[0].data, ["25 or 6 to 4! Let's have some ", { product: "tee" }], "Should handle many text chunks and object at the end");
             });
+            test("Uuid test", (t, log) => {
+                const id = Uuid();
+                log.log("uuid = {0}", id);
+                t.assert(id, "Should generate uuid");
+                t.notEqual(id, Uuid(), "uuid should never match");
+            });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages