implab/implabjs-core Commit - r49:1a91da7b15f7

0

src/amd/tsconfig.json created 644 +11 0

@@ -0,0 +1,11
	1	{
	2	"extends": "../tsconfig.json",
	3	"compilerOptions": {
	4	"types": [
	5	"@types/requirejs"
	6	]
	7	},
	8	"include": [
	9	"ts/*/.ts"
	10	]
	11	} No newline at end of file

0

src/main/tsconfig.json created 644 +6 0

@@ -0,0 +1,6
	1	{
	2	"extends": "../tsconfig.json",
	3	"include": [
	4	"ts/*/.ts"
	5	]
	6	} No newline at end of file

0

build.gradle +5 -6

             }
             task _legacyJs(type:Copy) {
-                from 'src/js/'
+                from 'src/main/js/'
                 into distDir
             }
             task _buildTs(dependsOn: _npmInstall, type:Exec) {
-                inputs.dir('src/ts')
+                inputs.dir('src/main/ts')
                 inputs.file('src/tsconfig.json')
+                inputs.file('src/main/tsconfig.json')
                 outputs.dir(distDir)
                 commandLine 'node_modules/.bin/tsc',
-                    '-p', 'src/tsconfig.json',
+                    '-p', 'src/main/tsconfig.json',
-                    '--outDir', distDir,
+                    '--outDir', distDir
-                    '--listFiles',
-                    '--traceResolution'
             }
             task _packageMeta(type: Copy) {

0

package-lock.json +13 -7

                   "integrity": "sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==",
                   "dev": true
                 },
+                "@types/requirejs": {
+                  "version": "2.1.31",
+                  "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.31.tgz",
+                  "integrity": "sha512-b2soeyuU76rMbcRJ4e0hEl0tbMhFwZeTC0VZnfuWlfGlk6BwWNsev6kFu/twKABPX29wkX84wU2o+cEJoXsiTw==",
+                  "dev": true
+                },
                 "@types/tape": {
                   "version": "4.2.32",
                   "resolved": "http://registry.npmjs.org/@types/tape/-/tape-4.2.32.tgz",
                 },
                 "duplexer": {
                   "version": "0.1.1",
-                  "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+                  "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                   "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                   "dev": true
                 },
                   "dependencies": {
                     "tape": {
                       "version": "2.3.3",
-                      "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
+                      "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                       "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                       "dev": true,
                       "requires": {
                 },
                 "path-is-absolute": {
                   "version": "1.0.1",
-                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+                  "resolved": "http://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": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                  "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                   "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "dev": true,
                   "requires": {
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                   "dev": true
                 },
                 },
                 "through": {
                   "version": "2.3.8",
-                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+                  "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
                   "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
                   "dev": true
                 },
                 "through2": {
                   "version": "0.2.3",
-                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+                  "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {

0

package.json +1 0

                 "typescript": "latest",
                 "tape": "latest",
                 "@types/tape": "latest",
+                "@types/requirejs": "latest",
                 "requirejs": "latest",
                 "faucet": "latest",
                 "dojo": "^1.10.0"

0

src/amd/ts/di/RequireJsHelper.ts +2 -13

             import { argumentNotEmptyString } from "../safe";
             import { TraceSource } from "../log/TraceSource";
-            export interface RequireFn {
-                (module: string): any;
-                (modules: string[], cb?: (...args: any[]) => any): void;
-            declare const require: RequireFn;
             export const rjs = require;
             declare function define(name: string, modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
             declare function define(modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
-            interface RequireJsResolverParams {
-                contextRequire: RequireFn;
             const trace = TraceSource.get("@implab/core/di/RequireJsHelper");
-            export async function createContextRequire(moduleName: string): Promise<RequireFn> {
+            export async function createContextRequire(moduleName: string): Promise<Require> {
                 argumentNotEmptyString(moduleName, "moduleName");
                 const parts = moduleName.split("/");
                 trace.debug(`define shim ${shim}`);
-                return new Promise<RequireFn>(fulfill => {
+                return new Promise<Require>(fulfill => {
                     define(shim, ["require"], r => {
                         trace.debug("shim resolved");
                         return r;

0

src/main/js/Uri.js ~~src/js/Uri.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/Uri.js to src/main/js/Uri.js

0

src/main/js/data/DataContext.js ~~src/js/data/DataContext.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/DataContext.js to src/main/js/data/DataContext.js			NO CONTENT: file renamed from src/js/data/DataContext.js to src/main/js/data/DataContext.js

1

NO CONTENT: file renamed from src/js/data/DataContext.js to src/main/js/data/DataContext.js

0

src/main/js/data/MapSchema.js ~~src/js/data/MapSchema.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/MapSchema.js to src/main/js/data/MapSchema.js			NO CONTENT: file renamed from src/js/data/MapSchema.js to src/main/js/data/MapSchema.js

1

NO CONTENT: file renamed from src/js/data/MapSchema.js to src/main/js/data/MapSchema.js

0

src/main/js/data/ObjectStore.js ~~src/js/data/ObjectStore.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/ObjectStore.js to src/main/js/data/ObjectStore.js			NO CONTENT: file renamed from src/js/data/ObjectStore.js to src/main/js/data/ObjectStore.js

1

NO CONTENT: file renamed from src/js/data/ObjectStore.js to src/main/js/data/ObjectStore.js

0

src/main/js/data/RestStore.js ~~src/js/data/RestStore.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/RestStore.js to src/main/js/data/RestStore.js			NO CONTENT: file renamed from src/js/data/RestStore.js to src/main/js/data/RestStore.js

1

NO CONTENT: file renamed from src/js/data/RestStore.js to src/main/js/data/RestStore.js

0

src/main/js/data/StatefullStoreAdapter.js ~~src/js/data/StatefullStoreAdapter.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/StatefullStoreAdapter.js to src/main/js/data/StatefullStoreAdapter.js			NO CONTENT: file renamed from src/js/data/StatefullStoreAdapter.js to src/main/js/data/StatefullStoreAdapter.js

1

NO CONTENT: file renamed from src/js/data/StatefullStoreAdapter.js to src/main/js/data/StatefullStoreAdapter.js

0

src/main/js/data/StoreAdapter.js ~~src/js/data/StoreAdapter.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/StoreAdapter.js to src/main/js/data/StoreAdapter.js			NO CONTENT: file renamed from src/js/data/StoreAdapter.js to src/main/js/data/StoreAdapter.js

1

NO CONTENT: file renamed from src/js/data/StoreAdapter.js to src/main/js/data/StoreAdapter.js

0

src/main/js/data/_ModelBase.js ~~src/js/data/_ModelBase.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/_ModelBase.js to src/main/js/data/_ModelBase.js			NO CONTENT: file renamed from src/js/data/_ModelBase.js to src/main/js/data/_ModelBase.js

1

NO CONTENT: file renamed from src/js/data/_ModelBase.js to src/main/js/data/_ModelBase.js

0

src/main/js/data/_StatefulModelMixin.js ~~src/js/data/_StatefulModelMixin.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/_StatefulModelMixin.js to src/main/js/data/_StatefulModelMixin.js			NO CONTENT: file renamed from src/js/data/_StatefulModelMixin.js to src/main/js/data/_StatefulModelMixin.js

1

NO CONTENT: file renamed from src/js/data/_StatefulModelMixin.js to src/main/js/data/_StatefulModelMixin.js

0

src/main/js/data/declare-model.js ~~src/js/data/declare-model.js~~ renamed 0 0

	1	NO CONTENT: file renamed from src/js/data/declare-model.js to src/main/js/data/declare-model.js			NO CONTENT: file renamed from src/js/data/declare-model.js to src/main/js/data/declare-model.js

1

NO CONTENT: file renamed from src/js/data/declare-model.js to src/main/js/data/declare-model.js

0

src/main/js/declare/_load.js ~~src/js/declare/_load.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/declare/_load.js to src/main/js/declare/_load.js

0

src/main/js/declare/override.js ~~src/js/declare/override.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/declare/override.js to src/main/js/declare/override.js

0

src/main/js/log/trace.js ~~src/js/log/trace.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/log/trace.js to src/main/js/log/trace.js

0

src/main/js/messaging/Client.js ~~src/js/messaging/Client.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/messaging/Client.js to src/main/js/messaging/Client.js

0

src/main/js/messaging/Destination.js ~~src/js/messaging/Destination.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/messaging/Destination.js to src/main/js/messaging/Destination.js

0

src/main/js/messaging/Listener.js ~~src/js/messaging/Listener.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/messaging/Listener.js to src/main/js/messaging/Listener.js

0

src/main/js/messaging/Session.js ~~src/js/messaging/Session.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/messaging/Session.js to src/main/js/messaging/Session.js

0

src/main/js/text/format-compile.js ~~src/js/text/format-compile.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/text/format-compile.js to src/main/js/text/format-compile.js

0

src/main/js/text/format.js ~~src/js/text/format.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/text/format.js to src/main/js/text/format.js

0

src/main/js/text/template-compile.js ~~src/js/text/template-compile.js~~ renamed 0 0

1

NO CONTENT: file renamed from src/js/text/template-compile.js to src/main/js/text/template-compile.js

0

src/main/ts/Cancellation.ts ~~src/ts/Cancellation.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/Cancellation.ts to src/main/ts/Cancellation.ts

0

src/main/ts/Observable.ts ~~src/ts/Observable.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/Observable.ts to src/main/ts/Observable.ts

0

src/main/ts/Uuid.ts ~~src/ts/Uuid.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/Uuid.ts to src/main/ts/Uuid.ts

0

src/main/ts/components/ActivatableMixin.ts ~~src/ts/components/ActivatableMixin.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/components/ActivatableMixin.ts to src/main/ts/components/ActivatableMixin.ts

0

src/main/ts/components/AsyncComponent.ts ~~src/ts/components/AsyncComponent.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/components/AsyncComponent.ts to src/main/ts/components/AsyncComponent.ts

0

src/main/ts/di.ts ~~src/ts/di.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di.ts to src/main/ts/di.ts

0

src/main/ts/di/ActivationContext.ts ~~src/ts/di/ActivationContext.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ActivationContext.ts to src/main/ts/di/ActivationContext.ts

0

src/main/ts/di/ActivationError.ts ~~src/ts/di/ActivationError.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ActivationError.ts to src/main/ts/di/ActivationError.ts

0

src/main/ts/di/AggregateDescriptor.ts ~~src/ts/di/AggregateDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/AggregateDescriptor.ts to src/main/ts/di/AggregateDescriptor.ts

0

src/main/ts/di/ConfigError.ts ~~src/ts/di/ConfigError.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ConfigError.ts to src/main/ts/di/ConfigError.ts

0

src/main/ts/di/Configuration.ts ~~src/ts/di/Configuration.ts~~ renamed +2 -2

             import { ReferenceDescriptor } from "./ReferenceDescriptor";
             import { TypeServiceDescriptor } from "./TypeServiceDescriptor";
             import { FactoryServiceDescriptor } from "./FactoryServiceDescriptor";
-            import { rjs, createContextRequire, RequireFn } from "../../amd/ts/RequireJsHelper";
+            import { rjs, createContextRequire } from "./RequireJsHelper";
             import { TraceSource } from "../log/TraceSource";
             import { ConfigError } from "./ConfigError";
             import { Cancellation } from "../Cancellation";
                     this._container.register(services);
                 }
-                async applyConfiguration(data: object, contextRequire?: RequireFn, ct = Cancellation.none) {
+                async applyConfiguration(data: object, contextRequire?: Require, ct = Cancellation.none) {
                     argumentNotNull(data, "data");
                     trace.log("applyConfiguration");

0

src/main/ts/di/Container.ts ~~src/ts/di/Container.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/Container.ts to src/main/ts/di/Container.ts

0

src/main/ts/di/FactoryServiceDescriptor.ts ~~src/ts/di/FactoryServiceDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/FactoryServiceDescriptor.ts to src/main/ts/di/FactoryServiceDescriptor.ts

0

src/main/ts/di/ReferenceDescriptor.ts ~~src/ts/di/ReferenceDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ReferenceDescriptor.ts to src/main/ts/di/ReferenceDescriptor.ts

0

src/main/ts/di/ServiceDescriptor.ts ~~src/ts/di/ServiceDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ServiceDescriptor.ts to src/main/ts/di/ServiceDescriptor.ts

0

src/main/ts/di/TypeServiceDescriptor.ts ~~src/ts/di/TypeServiceDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/TypeServiceDescriptor.ts to src/main/ts/di/TypeServiceDescriptor.ts

0

src/main/ts/di/ValueDescriptor.ts ~~src/ts/di/ValueDescriptor.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/ValueDescriptor.ts to src/main/ts/di/ValueDescriptor.ts

0

src/main/ts/di/interfaces.ts ~~src/ts/di/interfaces.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/di/interfaces.ts to src/main/ts/di/interfaces.ts

0

src/main/ts/interfaces.ts ~~src/ts/interfaces.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/interfaces.ts to src/main/ts/interfaces.ts

0

src/main/ts/log/TraceSource.ts ~~src/ts/log/TraceSource.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/log/TraceSource.ts to src/main/ts/log/TraceSource.ts

0

src/main/ts/log/writers/ConsoleWriter.ts ~~src/ts/log/writers/ConsoleWriter.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/log/writers/ConsoleWriter.ts to src/main/ts/log/writers/ConsoleWriter.ts

0

src/main/ts/main.ts ~~src/ts/main.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/main.ts to src/main/ts/main.ts

0

src/main/ts/safe.ts ~~src/ts/safe.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/safe.ts to src/main/ts/safe.ts

0

src/main/ts/text/format.d.ts ~~src/ts/text/format.d.ts~~ renamed 0 0

1

NO CONTENT: file renamed from src/ts/text/format.d.ts to src/main/ts/text/format.d.ts

0

src/tsconfig.json +4 -5

                     "module": "amd",
                     "sourceMap": true,
                     "declaration": true,
+                    "moduleResolution": "node",
+                    "listFiles": true,
                     "lib": [
                         "es5",
                         "es2015.promise",
                         "dom"
                     ],
                     "rootDirs": [
-                        "ts",
+                        "main/ts",
                         "amd/ts"
                     ],
                     "types": []
-                },
-                "include" : [
-                    "ts/**/*.ts", "amd/ts/**/*.ts"
             }

	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