implab/implabjs-core Commit - r65:0c74a0572161

fixed "singleton" activation type handling in container configuration...

cin -

r65:0c74a0572161 v1.2.13 default

parent child

Context file:

r65:0c74a0572161

Collapse all files

src/amd/js/Uri.js +1 -1

-            define(["./declare", "./log/trace!"], function (declare, trace) {
+            define(["dojo/_base/declare", "./log/trace!"], function (declare, trace) {
                 trace.warn("THIS MODULE IS DEPRECATED! use uri-js or similar alternatives.");
                 function parseURI(uri) {

src/amd/ts/di/ResolverHelper.ts +7 -5

             import { Uuid } from "../Uuid";
-            import { argumentNotEmptyString, getGlobal } from "../safe";
+            import { argumentNotEmptyString, getGlobal, isNullOrEmptyString } from "../safe";
             import { TraceSource, DebugLevel } from "../log/TraceSource";
             import m = require("module");
             define(sandboxId, ["require"], r => r);
             // tslint:disable-next-line:no-var-requires
-            const globalRequire = require(sandboxId);
+            const globalRequire = getGlobal().require as Require;
             const trace = TraceSource.get(m.id);
                 }
             }
-            export function makeResolver(moduleName: string, contextRequire: Require) {
+            export async function makeResolver(moduleName: string, contextRequire: Require) {
                 trace.debug(
                     "makeResolver moduleName={0}, contextRequire={1}",
                     moduleName || "<nil>",
                     contextRequire ? typeof (contextRequire) : "<nil>"
                 );
-                const base = moduleName && moduleName.split("/").slice(0, -1).join("/");
+                const nestedRequire = isNullOrEmptyString(moduleName) ? null : await createContextRequire(moduleName);
-                const resolver = new ModuleResolver(contextRequire, base);
+                // const base = moduleName && moduleName.split("/").slice(0, -1).join("/");
+                const resolver = new ModuleResolver(nestedRequire, null);
                 return (id: string) => resolver.resolve(id);
             }

src/amd/ts/log/trace.ts +5 -1

             import { Predicate } from "../interfaces";
             export = {
-                on(filter: any , cb: any) {
+                level: 0,
+                on(filter: any, cb: any) {
                     if (arguments.length === 1) {
                         cb = filter;
                         filter = undefined;
                     if (test) {
                         TraceSource.on(source => {
+                            source.level = this.level;
                             if (test(source.id))
                                 source.events.on(cb);
                         });
                     } else {
                         TraceSource.on(source => {
+                            source.level = this.level;
                             source.events.on(cb);
                         });
                     }

src/amd/ts/text/TemplateCompiler.ts +2 -2

-            import { format } from "./StringFormat";
+            import * as format from "./format";
             import { TraceSource, DebugLevel } from "../log/TraceSource";
             import { ITemplateParser, TokenType } from "./TemplateParser";
             import m = require("module");
                 }
                 visitTextFragment(parser: ITemplateParser) {
-                    const i = this._data.push(parser.value());
+                    const i = this._data.push(parser.value()) - 1;
                     this._code.push("$p.push($data[" + i + "]);");
                 }
             }

src/amd/ts/text/TemplateParser.ts +5 0

             import { argumentNotEmptyString } from "../safe";
             import { MapOf } from "../interfaces";
+            import { TraceSource, DebugLevel } from "../log/TraceSource";
+            import m = require("module");
+            const trace = TraceSource.get(m.id);
             const splitRx = /(<%=|\[%=|<%|\[%|%\]|%>)/;
                     if (this._pos < this._tokens.length) {
                         this._value = this._tokens[this._pos];
                         this._type = tokenMap[this._value] || TokenType.Text;
                         return true;
                     } else {
                         this._type = TokenType.None;

src/amd/ts/text/format-compile.ts +2 -1

             import * as module from "module";
             import { TraceSource } from "../log/TraceSource";
+            import { compile } from "./StringFormat";
             const logger = TraceSource.get(module.id);
             logger.warn("The module is deprecated, use StringFormat.compile() method directly");
-            export { compile } from "./StringFormat";
+            export = compile;

src/amd/ts/text/format.ts +25 -5

@@ -1,8 +1,8
1	import { format as dojoFormatNumber } from "dojo/number";	1	import { format as dojoFormatNumber } from "dojo/number";
2	import { format as dojoFormatDate } from "dojo/date/locale";	2	import { format as dojoFormatDate } from "dojo/date/locale";
3	import { Formatter } from "./StringFormat";	3	import { Formatter, compile as _compile } from "./StringFormat";
4		4
5	import { isNumber } from "../safe";	5	import { isNumber, isNull } from "../safe";
6		6
7	interface NumberFormatOptions {	7	interface NumberFormatOptions {
8	round?: number;	8	round?: number;
@@ -42,6 +42,26 function convertDate(value: any, pattern
42		42
43	const _formatter = new Formatter([convertNumber, convertDate]);	43	const _formatter = new Formatter([convertNumber, convertDate]);
44		44
45	~~export~~ = function format(msg: string, ...args: any[]) {	45	function format(msg: string, ...args: any[]) {
46	return _formatter.format.~~apply~~(msg, ...args);	46	return _formatter.format(msg, ...args);
47	};	47	}
		48
		49	function _convert(value: any, pattern: string) {
		50	return _formatter.convert(value, pattern);
		51	}
		52
		53	namespace format {
		54	export const convert = _convert;
		55	export function compile(text: string) {
		56	const template = _compile(text);
		57
		58	return (...data) => {
		59	return template((name, pattern) => {
		60	const value = data[name];
		61	return !isNull(value) ? convert(value, pattern) : "";
		62	});
		63	};
		64	}
		65	}
		66
		67	export = format;

src/main/ts/Uuid.ts +11 -8

                         return _rnds;
                     };
-                    if ("undefined" !== typeof console && console.warn) {
+                    // if ("undefined" !== typeof console && console.warn) {
-                        console.warn("[SECURITY] node-uuid: crypto not usable, falling back to insecure Math.random()");
+                    //    console.warn("[SECURITY] node-uuid: crypto not usable, falling back to insecure Math.random()");
+                    // }
                 }
             }
             }
             // **`parse()` - Parse a UUID into it's component bytes**
-            export function _parse(s, buf?, offset?): Array<string> {
+            function _parse(s, buf?, offset?): Array<string> {
                 const i = (buf && offset) || 0; let ii = 0;
                 buf = buf || [];
             let _lastMSecs = 0; let _lastNSecs = 0;
             // See https://github.com/broofa/node-uuid for API details
-            export function _v1(options?, buf?, offset?): string {
+            function _v1(options?, buf?, offset?): string {
                 let i = buf && offset || 0;
                 const b = buf || [];
             // **`v4()` - Generate random UUID**
             // See https://github.com/broofa/node-uuid for API details
-            export function _v4(options?, buf?, offset?): string {
+            function _v4(options?, buf?, offset?): string {
                 // Deprecated - 'format' argument, as supported in v1.2
                 const i = buf && offset || 0;
                 return buf || _unparse(rnds);
             }
-            export function Uuid() {
+            function _Uuid() {
                 return _v4();
             }
-            export namespace Uuid {
+            namespace _Uuid {
                 export const v4 = _v4;
                 export const v1 = _v1;
                 export const empty = "00000000-0000-0000-0000-000000000000";
                 export const parse = _parse;
+                export const Uuid = _v4;
             }
+            export = _Uuid;

src/main/ts/di/Configuration.ts +7 -28

             const trace = TraceSource.get("@implab/core/di/Configuration");
-            declare const define;
-            declare const require;
-            declare const module;
-            function hasAmdLoader() {
-                try {
-                    // es6 may throw the exception
-                    return (typeof define === "function" && define.amd);
-                } catch {
-                    return false;
-            function hasNodeJs() {
-                try {
-                    return (typeof module !== "undefined" && module.exports);
-                } catch {
-                    return false;
             async function mapAll(data: object | any[], map?: (v, k) => any): Promise<any> {
                 if (data instanceof Array) {
                     return Promise.all(map ? data.map(map) : data);
                     this._configName = moduleName;
-                    const r = makeResolver(null, contextRequire);
+                    const r = await makeResolver(null, contextRequire);
                     const config = await r(moduleName, ct);
                     await this._applyConfiguration(
                         config,
-                        makeResolver(moduleName, contextRequire),
+                        await makeResolver(moduleName, contextRequire),
                         ct
                     );
                 }
-                applyConfiguration(data: object, contextRequire?: any, ct = Cancellation.none) {
+                async applyConfiguration(data: object, contextRequire?: any, ct = Cancellation.none) {
                     argumentNotNull(data, "data");
-                    return this._applyConfiguration(data, makeResolver(void (0), contextRequire), ct);
+                    await this._applyConfiguration(data, await makeResolver(void (0), contextRequire), ct);
                 }
                 async _applyConfiguration(data: object, resolver?: ModuleResolver, ct = Cancellation.none) {
                         opts.services = this._visitRegistrations(data.services, "services");
                     if (data.inject) {
-                        this._path.push("inject");
+                        this._enter("inject");
                         opts.inject = mapAll(
                             data.inject instanceof Array ?
                                 data.inject :
                 }
                 async _visitFactoryRegistration(data: FactoryRegistration, name: _key) {
-                    argumentOfType(data.$factory, Function, "data.$type");
+                    argumentOfType(data.$factory, Function, "data.$factory");
                     this._enter(name);
                     const opts = this._makeServiceParams(data);
-                    opts.factory = opts.$factory;
+                    opts.factory = data.$factory;
                     const d = new FactoryServiceDescriptor(
                         await mapAll(opts)

src/main/ts/di/FactoryServiceDescriptor.ts +1 -1

                     argumentNotNull(opts && opts.factory, "opts.factory");
                     // bind to null
-                    this._factory = () => opts.factory();
+                    this._factory = (...args) => opts.factory.apply(null, args);
                     if (opts.activation === ActivationType.Singleton) {
                         this._cacheId = oid(opts.factory);

src/main/ts/di/ResolverHelper.d.ts +1 -1

@@ -1,3 +1,3
1	import { ModuleResolver } from "./Configuration";	1	import { ModuleResolver } from "./Configuration";
2		2
3	export declare function makeResolver(moduleName?: string, contextRequire?: any): ModuleResolver; No newline at end of file	3	export declare function makeResolver(moduleName?: string, contextRequire?: any): Promise<ModuleResolver>; No newline at end of file

src/main/ts/di/ServiceDescriptor.ts +4 -4

                     throw new Error("Method '" + method + "' not found");
                 if (args instanceof Array)
-                    return m.apply(target, context.parse(args, "." + method));
+                    return m.apply(target, _parse(args, context, "." + method));
                 else
-                    return m.call(target, context.parse(args, "." + method));
+                    return m.call(target, _parse(args, context, "." + method));
             }
             function makeClenupCallback(target, method: ((instance) => void) | string) {
                     this._owner = opts.owner;
-                    if (opts.activation)
+                    if ("activation" in opts)
                         this._activationType = opts.activation;
-                    if (opts.params)
+                    if ("params" in opts)
                         this._params = opts.params;
                     if (opts.inject)

src/main/ts/di/interfaces.ts +3 -3

             }
             export enum ActivationType {
-                Singleton,
+                Singleton = 1,
                 Container,
                 Hierarchy,
                 Context,
             }
             export function isTypeRegistration(x): x is TypeRegistration {
-                return (!isPrimitive(x)) && ("$type" in x || "$factory" in x);
+                return (!isPrimitive(x)) && ("$type" in x);
             }
             export function isFactoryRegistration(x): x is FactoryRegistration {
-                return (!isPrimitive(x)) && ("$type" in x || "$factory" in x);
+                return (!isPrimitive(x)) && ("$factory" in x);
             }
             export function isValueRegistration(x): x is ValueRegistration {

src/main/ts/log/TraceSource.ts +7 -1

             import { Observable } from "../Observable";
             import { Registry } from "./Registry";
-            import { format } from "../text/StringFormat";
+            import { format as _format } from "../text/StringFormat";
             export const DebugLevel = 400;
                 readonly arg: any;
             }
+            function format(msg) {
+                if (typeof(msg) !== "string" || arguments.length === 1)
+                    return msg;
+                return _format.apply(null, arguments);
+            }
             export class TraceSource {
                 readonly id: any;

src/main/ts/safe.ts +48 -2

@@ -3,6 +3,9 const _oid = typeof Symbol === "function
3	Symbol("__implab__oid__") :	3	Symbol("__implab__oid__") :
4	"__implab__oid__";	4	"__implab__oid__";
5		5
		6	declare const window: any;
		7	declare const global: any;
		8
6	export function oid(instance: object): string {	9	export function oid(instance: object): string {
7	if (isNull(instance))	10	if (isNull(instance))
8	return null;	11	return null;
@@ -55,7 +58,7 export function isString(val) {
55	}	58	}
56		59
57	export function isPromise(val): val is PromiseLike<any> {	60	export function isPromise(val): val is PromiseLike<any> {
58	return ~~"then"~~ in val && val.then ~~instanceof~~ Function;	61	return val && typeof val.then === "function";
59	}	62	}
60		63
61	export function isNullOrEmptyString(str) {	64	export function isNullOrEmptyString(str) {
@@ -68,8 +71,23 export function isNotEmptyArray(arg): ar
68	return (arg instanceof Array && arg.length > 0);	71	return (arg instanceof Array && arg.length > 0);
69	}	72	}
70		73
		74	function _isStrictMode() {
		75	return !this;
		76	}
		77
		78	function _getNonStrictGlobal() {
		79	return this;
		80	}
		81
71	export function getGlobal() {	82	export function getGlobal() {
72	return this;	83	// in es3 we can't use indirect call to eval, since it will
		84	// be executed in the current call context.
		85	if (!_isStrictMode()) {
		86	return _getNonStrictGlobal();
		87	} else {
		88	// tslint:disable-next-line:no-eval
		89	return eval.call(null, "this");
		90	}
73	}	91	}
74		92
75	export function get(member: string, context?: object) {	93	export function get(member: string, context?: object) {
@@ -135,6 +153,9 export function mixin<T, S>(dest: T, sou
135	argumentNotNull(dest, "to");	153	argumentNotNull(dest, "to");
136	const _res = dest as T & S;	154	const _res = dest as T & S;
137		155
		156	if (isPrimitive(source))
		157	return _res;
		158
138	if (template instanceof Array) {	159	if (template instanceof Array) {
139	for (const p of template) {	160	for (const p of template) {
140	if (p in source)	161	if (p in source)
@@ -268,6 +289,31 export function pmap(items, cb) {
268	return next();	289	return next();
269	}	290	}
270		291
		292	export function pfor(items, cb) {
		293	argumentNotNull(cb, "cb");
		294
		295	if (isPromise(items))
		296	return items.then(data => {
		297	return pmap(data, cb);
		298	});
		299
		300	if (isNull(items) \|\| !items.length)
		301	return items;
		302
		303	let i = 0;
		304
		305	function next() {
		306	while (i < items.length) {
		307	const r = cb(items[i], i);
		308	i++;
		309	if (isPromise(r))
		310	return r.then(next);
		311	}
		312	}
		313
		314	return next();
		315	}
		316
271	/**	317	/**
272	* Выбирает первый элемент из последовательности, или обещания, если в	318	* Выбирает первый элемент из последовательности, или обещания, если в
273	* качестве параметра используется обещание, оно должно вернуть массив.	319	* качестве параметра используется обещание, оно должно вернуть массив.

src/main/ts/text/StringFormat.ts +5 -1

                 } else if (value instanceof Date) {
                     return value.toISOString();
                 } else {
-                    return pattern ? value.toString(pattern) : value.toString();
+                    return value.toString();
                 }
             }
             export function format(msg: string, ...args: any[]) {
                 return _default.format(msg, ...args);
             }
+            export function convert(value: any, pattern: string) {
+                return _default.format(value, pattern);
+            }

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