implab/implabjs-core Commit - r152:8bee6a6d5f46

fixed bug in applying a lifetime while processing the json configuration...

cin -

r152:8bee6a6d5f46 v1.4.0-rc10 default

parent child

Context file:

r152:8bee6a6d5f46

Collapse all files

src/amd/ts/text/TemplateParser.ts +1 -1

                 }
                 value() {
-                    if (!this._value)
+                    if (this._value === undefined)
                         throw new Error("The current token doesn't have a value");
                     return this._value;
                 }

src/amd/ts/text/template-compile.ts +11 -4

@@ -38,10 +38,17 compile.load = (id: string, require: Req
38	trace.debug("{0}: compiled", url);	38	trace.debug("{0}: compiled", url);
39	callback(cache[url] = tc);	39	callback(cache[url] = tc);
40	}, (err: any) => {	40	}, (err: any) => {
41	callback.error({	41	if (callback.error)
42	~~inner~~: ~~err~~,	42	callback.error({
43	src: "@implab/core/text/template-compile"	43	inner: err,
44	});	44	from: "@implab/core/text/template-compile"
		45	});
		46	else
		47	trace.error({
		48	message: `Failed to load: ${url}`,
		49	error: err,
		50	from: "@implab/core/text/template-compile"
		51	});
45	});	52	});
46	}	53	}
47	};	54	};

src/main/ts/di/ConfigError.ts +4 -2

-            export class ConfigError extends Error {
+            export class ConfigError {
                 inner?: {};
+                message: string;
                 path?: string;
                 configName?: string;
                 constructor(message: string, inner?: {}) {
-                    super(message);
+                    this.message = message;
                     this.inner = inner;
                 }
             }

src/main/ts/di/Configuration.ts +14 -5

                 ILifetime, ServiceContainer
             } from "./interfaces";
-            import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get, primitive } from "../safe";
+            import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get, primitive, oid, mixin } from "../safe";
             import { AggregateDescriptor } from "./AggregateDescriptor";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { ReferenceDescriptor } from "./ReferenceDescriptor";
             import { isDescriptor } from "./traits";
             import { LazyReferenceDescriptor } from "./LazyReferenceDescriptor";
             import { LifetimeManager } from "./LifetimeManager";
+            import { ServiceDescriptorParams } from "./ServiceDescriptor";
             export interface RegistrationScope<S extends object> {
                 }
                 _makeServiceParams(data: ServiceRegistration<any, S>) {
-                    const opts: any = {
+                    const opts: any = {};
-                    };
                     if (data.services)
                         opts.services = this._visitRegistrations(data.services, "services");
                             this._visit(data.params, "params");
                     if (data.activation) {
-                        opts.activation = this._getLifetimeManager(data.activation, data.typeId);
+                        opts.lifetime = this._getLifetimeManager(data.activation, data.typeId);
                     }
                     if (data.cleanup)
                     argumentNotNull(data.$type, "data.$type");
                     this._enter(name);
-                    const opts = this._makeServiceParams(data);
+                    const opts = {} as any;
                     if (data.$type instanceof Function) {
                         opts.type = data.$type;
                     } else {
                         });
                     }
+                    if (!data.typeId && data.activation === "singleton")
+                        data.typeId = oid(opts.type);
+                    mixin(opts, this._makeServiceParams(data));
                     const d = new TypeServiceDescriptor<S, any, any[]>(
                         await mapAll(opts)
                     );
                     argumentOfType(data.$factory, Function, "data.$factory");
                     this._enter(name);
+                    if (!data.typeId && data.activation === "singleton")
+                        data.typeId = oid(data.$factory);
                     const opts = this._makeServiceParams(data);
                     opts.factory = data.$factory;

src/main/ts/safe.ts +1 -1

              *                <c>this</c> в <c>cb</c>.
              * @returns {void}
              */
-            export function each<T>(obj: T, cb: <X extends keyof T>(v: NonNullable<T[X]>, k: X) => void): void;
+            export function each<T>(obj: T, cb: <X extends Extract<keyof T, string>>(v: NonNullable<T[X]>, k: X) => void): void;
             export function each<T>(array: T[], cb: (v: T, i: number) => void): void;
             export function each(obj: any, cb: any, thisArg?: any): any;
             export function each(obj: any, cb: any, thisArg?: any) {

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