# HG changeset patch
# User cin
# Date 2018-12-13 23:37:28
# Node ID 1a91da7b15f790fd35fa7c9717d2a0373ae580ce
# Parent  2ef1241803eee273132474727644b8816682f159

changed the project structure

diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -44,20 +44,19 @@ task _npmInstall() {
 }
 
 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',
-        '--outDir', distDir,
-        '--listFiles',
-        '--traceResolution'
+        '-p', 'src/main/tsconfig.json',
+        '--outDir', distDir
 }
 
 task _packageMeta(type: Copy) {
diff --git a/package-lock.json b/package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,12 @@
       "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",
@@ -84,7 +90,7 @@
     },
     "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
     },
@@ -129,7 +135,7 @@
       "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": {
@@ -289,7 +295,7 @@
     },
     "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
     },
@@ -301,7 +307,7 @@
     },
     "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": {
@@ -354,7 +360,7 @@
     },
     "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
     },
@@ -411,13 +417,13 @@
     },
     "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": {
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "typescript": "latest",
     "tape": "latest",
     "@types/tape": "latest",
+    "@types/requirejs": "latest",
     "requirejs": "latest",
     "faucet": "latest",
     "dojo": "^1.10.0"
diff --git a/src/amd/ts/di/RequireJsHelper.ts b/src/amd/ts/di/RequireJsHelper.ts
--- a/src/amd/ts/di/RequireJsHelper.ts
+++ b/src/amd/ts/di/RequireJsHelper.ts
@@ -2,25 +2,14 @@ import { Uuid } from "../Uuid";
 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("/");
@@ -36,7 +25,7 @@ export async function createContextRequi
 
     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;
diff --git a/src/amd/tsconfig.json b/src/amd/tsconfig.json
new file mode 100644
--- /dev/null
+++ b/src/amd/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "extends": "../tsconfig.json",
+    "compilerOptions": {
+        "types": [
+            "@types/requirejs"
+        ]
+    },
+    "include": [
+        "ts/**/*.ts"
+    ]
+}
\ No newline at end of file
diff --git a/src/js/Uri.js b/src/main/js/Uri.js
rename from src/js/Uri.js
rename to src/main/js/Uri.js
diff --git a/src/js/data/DataContext.js b/src/main/js/data/DataContext.js
rename from src/js/data/DataContext.js
rename to src/main/js/data/DataContext.js
diff --git a/src/js/data/MapSchema.js b/src/main/js/data/MapSchema.js
rename from src/js/data/MapSchema.js
rename to src/main/js/data/MapSchema.js
diff --git a/src/js/data/ObjectStore.js b/src/main/js/data/ObjectStore.js
rename from src/js/data/ObjectStore.js
rename to src/main/js/data/ObjectStore.js
diff --git a/src/js/data/RestStore.js b/src/main/js/data/RestStore.js
rename from src/js/data/RestStore.js
rename to src/main/js/data/RestStore.js
diff --git a/src/js/data/StatefullStoreAdapter.js b/src/main/js/data/StatefullStoreAdapter.js
rename from src/js/data/StatefullStoreAdapter.js
rename to src/main/js/data/StatefullStoreAdapter.js
diff --git a/src/js/data/StoreAdapter.js b/src/main/js/data/StoreAdapter.js
rename from src/js/data/StoreAdapter.js
rename to src/main/js/data/StoreAdapter.js
diff --git a/src/js/data/_ModelBase.js b/src/main/js/data/_ModelBase.js
rename from src/js/data/_ModelBase.js
rename to src/main/js/data/_ModelBase.js
diff --git a/src/js/data/_StatefulModelMixin.js b/src/main/js/data/_StatefulModelMixin.js
rename from src/js/data/_StatefulModelMixin.js
rename to src/main/js/data/_StatefulModelMixin.js
diff --git a/src/js/data/declare-model.js b/src/main/js/data/declare-model.js
rename from src/js/data/declare-model.js
rename to src/main/js/data/declare-model.js
diff --git a/src/js/declare/_load.js b/src/main/js/declare/_load.js
rename from src/js/declare/_load.js
rename to src/main/js/declare/_load.js
diff --git a/src/js/declare/override.js b/src/main/js/declare/override.js
rename from src/js/declare/override.js
rename to src/main/js/declare/override.js
diff --git a/src/js/log/trace.js b/src/main/js/log/trace.js
rename from src/js/log/trace.js
rename to src/main/js/log/trace.js
diff --git a/src/js/messaging/Client.js b/src/main/js/messaging/Client.js
rename from src/js/messaging/Client.js
rename to src/main/js/messaging/Client.js
diff --git a/src/js/messaging/Destination.js b/src/main/js/messaging/Destination.js
rename from src/js/messaging/Destination.js
rename to src/main/js/messaging/Destination.js
diff --git a/src/js/messaging/Listener.js b/src/main/js/messaging/Listener.js
rename from src/js/messaging/Listener.js
rename to src/main/js/messaging/Listener.js
diff --git a/src/js/messaging/Session.js b/src/main/js/messaging/Session.js
rename from src/js/messaging/Session.js
rename to src/main/js/messaging/Session.js
diff --git a/src/js/text/format-compile.js b/src/main/js/text/format-compile.js
rename from src/js/text/format-compile.js
rename to src/main/js/text/format-compile.js
diff --git a/src/js/text/format.js b/src/main/js/text/format.js
rename from src/js/text/format.js
rename to src/main/js/text/format.js
diff --git a/src/js/text/template-compile.js b/src/main/js/text/template-compile.js
rename from src/js/text/template-compile.js
rename to src/main/js/text/template-compile.js
diff --git a/src/ts/Cancellation.ts b/src/main/ts/Cancellation.ts
rename from src/ts/Cancellation.ts
rename to src/main/ts/Cancellation.ts
diff --git a/src/ts/Observable.ts b/src/main/ts/Observable.ts
rename from src/ts/Observable.ts
rename to src/main/ts/Observable.ts
diff --git a/src/ts/Uuid.ts b/src/main/ts/Uuid.ts
rename from src/ts/Uuid.ts
rename to src/main/ts/Uuid.ts
diff --git a/src/ts/components/ActivatableMixin.ts b/src/main/ts/components/ActivatableMixin.ts
rename from src/ts/components/ActivatableMixin.ts
rename to src/main/ts/components/ActivatableMixin.ts
diff --git a/src/ts/components/AsyncComponent.ts b/src/main/ts/components/AsyncComponent.ts
rename from src/ts/components/AsyncComponent.ts
rename to src/main/ts/components/AsyncComponent.ts
diff --git a/src/ts/di.ts b/src/main/ts/di.ts
rename from src/ts/di.ts
rename to src/main/ts/di.ts
diff --git a/src/ts/di/ActivationContext.ts b/src/main/ts/di/ActivationContext.ts
rename from src/ts/di/ActivationContext.ts
rename to src/main/ts/di/ActivationContext.ts
diff --git a/src/ts/di/ActivationError.ts b/src/main/ts/di/ActivationError.ts
rename from src/ts/di/ActivationError.ts
rename to src/main/ts/di/ActivationError.ts
diff --git a/src/ts/di/AggregateDescriptor.ts b/src/main/ts/di/AggregateDescriptor.ts
rename from src/ts/di/AggregateDescriptor.ts
rename to src/main/ts/di/AggregateDescriptor.ts
diff --git a/src/ts/di/ConfigError.ts b/src/main/ts/di/ConfigError.ts
rename from src/ts/di/ConfigError.ts
rename to src/main/ts/di/ConfigError.ts
diff --git a/src/ts/di/Configuration.ts b/src/main/ts/di/Configuration.ts
rename from src/ts/di/Configuration.ts
rename to src/main/ts/di/Configuration.ts
--- a/src/ts/di/Configuration.ts
+++ b/src/main/ts/di/Configuration.ts
@@ -20,7 +20,7 @@ import { Container } from "./Container";
 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";
@@ -90,7 +90,7 @@ export class Configuration {
         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");
diff --git a/src/ts/di/Container.ts b/src/main/ts/di/Container.ts
rename from src/ts/di/Container.ts
rename to src/main/ts/di/Container.ts
diff --git a/src/ts/di/FactoryServiceDescriptor.ts b/src/main/ts/di/FactoryServiceDescriptor.ts
rename from src/ts/di/FactoryServiceDescriptor.ts
rename to src/main/ts/di/FactoryServiceDescriptor.ts
diff --git a/src/ts/di/ReferenceDescriptor.ts b/src/main/ts/di/ReferenceDescriptor.ts
rename from src/ts/di/ReferenceDescriptor.ts
rename to src/main/ts/di/ReferenceDescriptor.ts
diff --git a/src/ts/di/ServiceDescriptor.ts b/src/main/ts/di/ServiceDescriptor.ts
rename from src/ts/di/ServiceDescriptor.ts
rename to src/main/ts/di/ServiceDescriptor.ts
diff --git a/src/ts/di/TypeServiceDescriptor.ts b/src/main/ts/di/TypeServiceDescriptor.ts
rename from src/ts/di/TypeServiceDescriptor.ts
rename to src/main/ts/di/TypeServiceDescriptor.ts
diff --git a/src/ts/di/ValueDescriptor.ts b/src/main/ts/di/ValueDescriptor.ts
rename from src/ts/di/ValueDescriptor.ts
rename to src/main/ts/di/ValueDescriptor.ts
diff --git a/src/ts/di/interfaces.ts b/src/main/ts/di/interfaces.ts
rename from src/ts/di/interfaces.ts
rename to src/main/ts/di/interfaces.ts
diff --git a/src/ts/interfaces.ts b/src/main/ts/interfaces.ts
rename from src/ts/interfaces.ts
rename to src/main/ts/interfaces.ts
diff --git a/src/ts/log/TraceSource.ts b/src/main/ts/log/TraceSource.ts
rename from src/ts/log/TraceSource.ts
rename to src/main/ts/log/TraceSource.ts
diff --git a/src/ts/log/writers/ConsoleWriter.ts b/src/main/ts/log/writers/ConsoleWriter.ts
rename from src/ts/log/writers/ConsoleWriter.ts
rename to src/main/ts/log/writers/ConsoleWriter.ts
diff --git a/src/ts/main.ts b/src/main/ts/main.ts
rename from src/ts/main.ts
rename to src/main/ts/main.ts
diff --git a/src/ts/safe.ts b/src/main/ts/safe.ts
rename from src/ts/safe.ts
rename to src/main/ts/safe.ts
diff --git a/src/ts/text/format.d.ts b/src/main/ts/text/format.d.ts
rename from src/ts/text/format.d.ts
rename to src/main/ts/text/format.d.ts
diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
new file mode 100644
--- /dev/null
+++ b/src/main/tsconfig.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tsconfig.json",
+    "include": [
+        "ts/**/*.ts"
+    ]
+}
\ No newline at end of file
diff --git a/src/tsconfig.json b/src/tsconfig.json
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -4,6 +4,8 @@
         "module": "amd",
         "sourceMap": true,
         "declaration": true,
+        "moduleResolution": "node",
+        "listFiles": true,
         "lib": [
             "es5",
             "es2015.promise",
@@ -11,12 +13,9 @@
             "dom"
         ],
         "rootDirs": [
-            "ts",
+            "main/ts",
             "amd/ts"
         ],
         "types": []
-    },
-    "include" : [
-        "ts/**/*.ts", "amd/ts/**/*.ts"
-    ]
+    }
 }
\ No newline at end of file