implab/implabjs-core Commit - r154:8e623248bc9d

minor fixed, improved typings

cin -

r154:8e623248bc9d v1.4.0-rc12 default

parent child

Context file:

r154:8e623248bc9d

Collapse all files

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

                      return this._lifetimeManager;
                  }
-                 resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K> {
+                 resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
+                 resolve<K extends ContainerKeys<S>>(name: K, def: undefined): TypeOfService<S, K> | undefined;
+                 resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K> | undefined {
                      trace.debug("resolve {0}", name);
                      const d = this._services[name];
                      if (d === undefined) {
-                         if (def !== undefined)
+                         if (arguments.length > 1)
                              return def;
                          else
                              throw new Error("Service '" + name + "' isn't found");
                   * @deprecated use resolve() method
                   */
                  getService<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>) {
-                     return this.resolve(name, def);
+                     return arguments.length === 1 ? this.resolve(name) : this.resolve(name, def);
                  }
                  register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>): this;
                      this._disposed = true;
                      for (const f of this._cleanup)
                          f();
+                     this._lifetimeManager.destroy();
                  }
                  /**

src/main/ts/di/LifetimeManager.ts +3 -1

              import { IDestroyable, MapOf } from "../interfaces";
-             import { argumentNotNull, isDestroyable, argumentNotEmptyString } from "../safe";
+             import { argumentNotNull, isDestroyable, argumentNotEmptyString, isRemovable } from "../safe";
              import { ILifetime, ServiceContainer } from "./interfaces";
              import { ActivationContext } from "./ActivationContext";
                                  self._cleanup.push(() => cleanup(item));
                              } else if (isDestroyable(item)) {
                                  self._cleanup.push(() => item.destroy());
+                             } else if (isRemovable(item)) {
+                                 self._cleanup.push(() => item.remove());
                              }
                          }
                      };

src/main/ts/di/interfaces.ts +1 0

              export interface ServiceLocator<S extends object> {
                  resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
+                 resolve<K extends ContainerKeys<S>>(name: K, def?: undefined): TypeOfService<S, K> | undefined;
              }
              export interface ServiceContainer<S extends object> extends ServiceLocator<S>, IDestroyable {

src/main/ts/safe.ts +15 -13

-             import { ICancellable, Constructor, IDestroyable, ICancellation } from "./interfaces";
+             import { ICancellable, Constructor, IDestroyable, ICancellation, IRemovable } from "./interfaces";
              let _nextOid = 0;
              const _oid = typeof Symbol === "function" ?
                      throw new Error("The argument '" + name + "' type doesn't match");
              }
-             export function isObject(val: any): val is object {
-                 return typeof val === "object";
+             }
              export function isNull(val: any): val is null | undefined {
                  return (val === null || val === undefined);
              }
                      typeof (val) === "number" || typeof (val) === "boolean");
              }
+             export function isObject<T>(value: T): value is Exclude<T & object, primitive> {
+                 return !!(value && typeof value === "object");
+             }
              export function isInteger(val: any): val is number {
                  return parseInt(val, 10) === val;
              }
              }
              export function isString(val: any): val is string {
-                 return typeof (val) === "string" || val instanceof String;
+                 return typeof (val) === "string";
              }
              export function isPromise<T = any>(val: any): val is PromiseLike<T> {
-                 return val && typeof val.then === "function";
+                 return !!(val && typeof val.then === "function");
              }
              export function isCancellable(val: any): val is ICancellable {
-                 return val && typeof val.cancel === "function";
+                 return !!(val && typeof val.cancel === "function");
              }
              export function isNullOrEmptyString(val: any): val is ("" | null | undefined) {
               * assigned later and are required to be not null.
               */
              export function notImplemented(): never {
-                 throw new Error("Not implemeted");
+                 throw new Error("Not implemented");
              }
              /**
               * Iterates over the specified array of items and calls the callback `cb`, if
              }
              export function isDestroyable(d: any): d is IDestroyable {
-                 if (d && "destroy" in d && typeof (destroy) === "function")
-                     return true;
-                 return false;
+                 return !!(d && typeof d.destroy === "function");
+             }
+             export function isRemovable(value: any): value is IRemovable {
+                 return !!(value && typeof value.remove === "function");
              }
              export function destroy(d: any) {
-                 if (d && "destroy" in d)
+                 if (isDestroyable(d))
                      d.destroy();
              }

src/tsconfig.json +1 -1

                      "experimentalDecorators": true,
                      "noEmitOnError": true,
                      "listFiles": true,
-                     //"strict": true,
+                     "strict": true,
                      "types": [],
                      "target": "ES5",
                      "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]

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