implab/implabjs-core Commit - r71:600f0201c4ba

Minor fixes and improvements...

cin -

r71:600f0201c4ba v1.2.16 default

parent child

Context file:

r71:600f0201c4ba

Collapse all files

history.md +8 0

             HISTORY
             =======
+.2.16
+            ------
+            Minor fixes and improvements
+            - added `isCancellable` type predicate function to `safe` module
+            - `isString, isNumber, isInteger, isPrimitive` are now type predicates
 .2.0
             -----

package-lock.json +6 -6

                 },
                 "duplexer": {
                   "version": "0.1.1",
-                  "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                   "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                   "dev": true
                 },
                   "dependencies": {
                     "tape": {
                       "version": "2.3.3",
-                      "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
+                      "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                       "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                       "dev": true,
                       "requires": {
                 },
                 "minimist": {
                   "version": "0.0.5",
-                  "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
                   "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=",
                   "dev": true
                 },
                 },
                 "readable-stream": {
                   "version": "1.1.14",
-                  "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                   "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "dev": true,
                   "requires": {
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                   "dev": true
                 },
                 },
                 "through2": {
                   "version": "0.2.3",
-                  "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {

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

@@ -1,6 +1,6
1	import { Uuid } from "../Uuid";	1	import { Uuid } from "../Uuid";
2	import { argumentNotEmptyString, getGlobal, isNullOrEmptyString } from "../safe";	2	import { argumentNotEmptyString, getGlobal, isNullOrEmptyString } from "../safe";
3	import { TraceSource, ~~DebugLevel~~ } from "../log/TraceSource";	3	import { TraceSource } from "../log/TraceSource";
4	import m = require("module");	4	import m = require("module");
5		5
6	const sandboxId = Uuid();	6	const sandboxId = Uuid();
@@ -11,38 +11,13 const globalRequire = getGlobal().requir
11		11
12	const trace = TraceSource.get(m.id);	12	const trace = TraceSource.get(m.id);
13		13
14	export async function createContextRequire(moduleName: string): Promise<Require> {
15	argumentNotEmptyString(moduleName, "moduleName");
16
17	const parts = moduleName.split("/");
18	if (parts[0] === ".")
19	throw new Error("An absolute module path is required");
20
21	if (parts.length > 1)
22	parts.splice(-1, 1, Uuid());
23	else
24	parts.push(Uuid());
25
26	const shim = parts.join("/");
27
28	trace.debug(`define shim ${shim}`);
29
30	return new Promise<Require>(cb => {
31	define(shim, ["require"], r => {
32	trace.debug("shim resolved");
33	return r;
34	});
35	require([shim], cb);
36	});
37	}
38
39	class ModuleResolver {	14	class ModuleResolver {
40	_base: string;	15	_base: string;
41	_require: Require;	16	_require: Require;
42		17
43	constructor(req: Require, base?: string) {	18	constructor(req: Require, base?: string) {
44	this._base = base;	19	this._base = base;
45	this._require = req \|\| ~~globalRequire~~;	20	this._require = req;
46	}	21	}
47		22
48	resolve(moduleName: string) {	23	resolve(moduleName: string) {
@@ -58,17 +33,9 class ModuleResolver {
58	}	33	}
59	}	34	}
60		35
61	export ~~async~~ function makeResolver(moduleName: string, contextRequire: Require) {	36	export function makeResolver(moduleName: string, contextRequire: Require) {
62	trace.debug(	37	const base = moduleName && moduleName.split("/").slice(0, -1).join("/");
63	"makeResolver moduleName={0}, contextRequire={1}",
64	moduleName \|\| "<nil>",
65	contextRequire ? typeof (contextRequire) : "<nil>"
66	);
67		38
68	const nestedRequire = isNullOrEmptyString(moduleName) ? null : await createContextRequire(moduleName);	39	const resolver = new ModuleResolver(contextRequire, base);
69
70	// const base = moduleName && moduleName.split("/").slice(0, -1).join("/");
71
72	const resolver = new ModuleResolver(nestedRequire, null);
73	return (id: string) => resolver.resolve(id);	40	return (id: string) => resolver.resolve(id);
74	}	41	}

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

                     trace.debug("<{0}", name);
                 }
-                _visit(data, name: string): Promise<any> {
+                async _visit(data, name: string) {
                     if (isPrimitive(data) || isDescriptor(data))
                         return data;

src/main/ts/safe.ts +10 -4

+            import { ICancellable } from "./interfaces";
             let _nextOid = 0;
             const _oid = typeof Symbol === "function" ?
                 Symbol("__implab__oid__") :
                 return (arg === null || arg === undefined);
             }
-            export function isPrimitive(arg) {
+            export function isPrimitive(arg): arg is string | number | boolean | undefined | null {
                 return (arg === null || arg === undefined || typeof (arg) === "string" ||
                     typeof (arg) === "number" || typeof (arg) === "boolean");
             }
-            export function isInteger(arg) {
+            export function isInteger(arg): arg is number {
                 return parseInt(arg, 10) === arg;
             }
-            export function isNumber(arg) {
+            export function isNumber(arg): arg is number {
                 return parseFloat(arg) === arg;
             }
-            export function isString(val) {
+            export function isString(val): val is string {
                 return typeof (val) === "string" || val instanceof String;
             }
                 return val && typeof val.then === "function";
             }
+            export function isCancellable(val): val is ICancellable {
+                return val && typeof val.cancel === "function";
+            }
             export function isNullOrEmptyString(str) {
                 if (str === null || str === undefined ||
                     ((typeof (str) === "string" || str instanceof String) && str.length === 0))

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