implab/implabjs-core Commit - r48:2ef1241803ee

working on multi-platform support

cin -

r48:2ef1241803ee di-typescript

parent child

Context file:

r48:2ef1241803ee

Collapse all files

src/amd/ts/di/RequireJsHelper.ts created 644 +46 0

@@ -0,0 +1,46
	1	import { Uuid } from "../Uuid";
	2	import { argumentNotEmptyString } from "../safe";
	3	import { TraceSource } from "../log/TraceSource";
	4
	5	export interface RequireFn {
	6	(module: string): any;
	7	(modules: string[], cb?: (...args: any[]) => any): void;
	8	}
	9
	10	declare const require: RequireFn;
	11
	12	export const rjs = require;
	13
	14	declare function define(name: string, modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
	15	declare function define(modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
	16
	17	interface RequireJsResolverParams {
	18	contextRequire: RequireFn;
	19	}
	20
	21	const trace = TraceSource.get("@implab/core/di/RequireJsHelper");
	22
	23	export async function createContextRequire(moduleName: string): Promise<RequireFn> {
	24	argumentNotEmptyString(moduleName, "moduleName");
	25
	26	const parts = moduleName.split("/");
	27	if (parts[0] === ".")
	28	throw new Error("An absolute module path is required");
	29
	30	if (parts.length > 1)
	31	parts.splice(-1, 1, Uuid());
	32	else
	33	parts.push(Uuid());
	34
	35	const shim = parts.join("/");
	36
	37	trace.debug(`define shim ${shim}`);
	38
	39	return new Promise<RequireFn>(fulfill => {
	40	define(shim, ["require"], r => {
	41	trace.debug("shim resolved");
	42	return r;
	43	});
	44	require([shim], fulfill);
	45	});
	46	}

build.gradle +8 -2

             def testDir = "$packageDir/$platform"
             task printVersion {
+                doLast {
                     println "version: $version"
                     println "packageName: $packageName"
                     println "platform: $platform"
                 }
+            }
             task clean {
             task _buildTs(dependsOn: _npmInstall, type:Exec) {
                 inputs.dir('src/ts')
-                inputs.file('tsconfig.json')
+                inputs.file('src/tsconfig.json')
                 outputs.dir(distDir)
-                commandLine 'node_modules/.bin/tsc', '-p', 'src/tsconfig.json', '--outDir', distDir
+                commandLine 'node_modules/.bin/tsc',
+                    '-p', 'src/tsconfig.json',
+                    '--outDir', distDir,
+                    '--listFiles',
+                    '--traceResolution'
             }
             task _packageMeta(type: Copy) {

package-lock.json +7 -7

                 },
                 "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": {
                 },
                 "path-is-absolute": {
                   "version": "1.0.1",
-                  "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                   "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
                   "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
                 },
                 },
                 "through": {
                   "version": "2.3.8",
-                  "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
                   "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
                   "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/ts/Uuid.ts +3 -1

             //     Copyright (c) 2010-2012 Robert Kieffer
             //     MIT License - http://opensource.org/licenses/mit-license.php
-            declare var window: any;
+            declare const window: any;
+            declare const require;
+            declare const Buffer;
             const _window: any = "undefined" !== typeof window ? window : null;

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

             import { ReferenceDescriptor } from "./ReferenceDescriptor";
             import { TypeServiceDescriptor } from "./TypeServiceDescriptor";
             import { FactoryServiceDescriptor } from "./FactoryServiceDescriptor";
-            import { rjs, createContextRequire, RequireFn } from "./RequireJsHelper";
+            import { rjs, createContextRequire, RequireFn } from "../../amd/ts/RequireJsHelper";
             import { TraceSource } from "../log/TraceSource";
             import { ConfigError } from "./ConfigError";
             import { Cancellation } from "../Cancellation";

src/tsconfig.json +9 -3

                     "lib": [
                         "es5",
                         "es2015.promise",
-                        "es2015.symbol"
+                        "es2015.symbol",
+                        "dom"
+                    ],
+                    "rootDirs": [
+                        "ts",
+                        "amd/ts"
+                    ],
+                    "types": []
                 },
                 "include" : [
-                    "ts/**/*.ts"
+                    "ts/**/*.ts", "amd/ts/**/*.ts"
                 ]
             }

src/ts/di/RequireJsHelper.ts removed 0 -46

NO CONTENT: file was removed

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