| @@ -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,0 +1,6 | |||
|
|
1 | { | |
|
|
2 | "extends": "../tsconfig.json", | |
|
|
3 | "include": [ | |
|
|
4 | "ts/**/*.ts" | |
|
|
5 | ] | |
|
|
6 | } No newline at end of file | |
| @@ -1,111 +1,110 | |||
|
|
1 | 1 | if (release != 'rtm') { |
|
|
2 | 2 | version += "-$release" |
|
|
3 | 3 | } |
|
|
4 | 4 | |
|
|
5 | 5 | if(!npmName) |
|
|
6 | 6 | npmName = name; |
|
|
7 | 7 | |
|
|
8 | 8 | ext.packageName="$npmScope/$npmName"; |
|
|
9 | 9 | |
|
|
10 | 10 | def packageDir = "$buildDir/dist" |
|
|
11 | 11 | def distDir = "$packageDir/$platform" |
|
|
12 | 12 | def testDir = "$packageDir/$platform" |
|
|
13 | 13 | |
|
|
14 | 14 | task printVersion { |
|
|
15 | 15 | doLast { |
|
|
16 | 16 | println "version: $version" |
|
|
17 | 17 | println "packageName: $packageName" |
|
|
18 | 18 | println "platform: $platform" |
|
|
19 | 19 | } |
|
|
20 | 20 | } |
|
|
21 | 21 | |
|
|
22 | 22 | |
|
|
23 | 23 | task clean { |
|
|
24 | 24 | doLast { |
|
|
25 | 25 | delete buildDir |
|
|
26 | 26 | delete "node_modules/$packageName" |
|
|
27 | 27 | } |
|
|
28 | 28 | } |
|
|
29 | 29 | |
|
|
30 | 30 | task cleanNpm { |
|
|
31 | 31 | doLast { |
|
|
32 | 32 | delete 'node_modules' |
|
|
33 | 33 | } |
|
|
34 | 34 | } |
|
|
35 | 35 | |
|
|
36 | 36 | task _npmInstall() { |
|
|
37 | 37 | inputs.file("package.json") |
|
|
38 | 38 | outputs.dir("node_modules") |
|
|
39 | 39 | doLast { |
|
|
40 | 40 | exec { |
|
|
41 | 41 | commandLine 'npm', 'install' |
|
|
42 | 42 | } |
|
|
43 | 43 | } |
|
|
44 | 44 | } |
|
|
45 | 45 | |
|
|
46 | 46 | task _legacyJs(type:Copy) { |
|
|
47 | from 'src/js/' | |
|
|
47 | from 'src/main/js/' | |
|
|
48 | 48 | into distDir |
|
|
49 | 49 | } |
|
|
50 | 50 | |
|
|
51 | 51 | task _buildTs(dependsOn: _npmInstall, type:Exec) { |
|
|
52 | inputs.dir('src/ts') | |
|
|
52 | inputs.dir('src/main/ts') | |
|
|
53 | 53 | inputs.file('src/tsconfig.json') |
|
|
54 | inputs.file('src/main/tsconfig.json') | |
|
|
54 | 55 | outputs.dir(distDir) |
|
|
55 | 56 | |
|
|
56 | 57 | commandLine 'node_modules/.bin/tsc', |
|
|
57 | '-p', 'src/tsconfig.json', | |
|
|
58 |
'--outDir', distDir |
|
|
|
59 | '--listFiles', | |
|
|
60 | '--traceResolution' | |
|
|
58 | '-p', 'src/main/tsconfig.json', | |
|
|
59 | '--outDir', distDir | |
|
|
61 | 60 | } |
|
|
62 | 61 | |
|
|
63 | 62 | task _packageMeta(type: Copy) { |
|
|
64 | 63 | inputs.property("version", version) |
|
|
65 | 64 | from('.') { |
|
|
66 | 65 | include 'package.json', '.npmignore', 'readme.md', 'license', 'history.md' |
|
|
67 | 66 | } |
|
|
68 | 67 | into distDir |
|
|
69 | 68 | doLast { |
|
|
70 | 69 | exec { |
|
|
71 | 70 | workingDir distDir |
|
|
72 | 71 | commandLine 'npm', 'version', version |
|
|
73 | 72 | } |
|
|
74 | 73 | } |
|
|
75 | 74 | } |
|
|
76 | 75 | |
|
|
77 | 76 | task build(dependsOn: [_legacyJs, _npmInstall, _buildTs, _packageMeta]) { |
|
|
78 | 77 | |
|
|
79 | 78 | } |
|
|
80 | 79 | |
|
|
81 | 80 | task _localInstall(dependsOn: build, type: Exec) { |
|
|
82 | 81 | inputs.file("$distDir/package.json") |
|
|
83 | 82 | outputs.upToDateWhen { |
|
|
84 | 83 | new File("$projectDir/node_modules/$packageName").exists() |
|
|
85 | 84 | } |
|
|
86 | 85 | |
|
|
87 | 86 | commandLine 'npm', 'install', '--no-save', '--force', distDir |
|
|
88 | 87 | } |
|
|
89 | 88 | |
|
|
90 | 89 | task copyJsTests(type: Copy) { |
|
|
91 | 90 | from 'test/js' |
|
|
92 | 91 | into testDir |
|
|
93 | 92 | } |
|
|
94 | 93 | |
|
|
95 | 94 | task buildTests(dependsOn: _localInstall, type: Exec) { |
|
|
96 | 95 | inputs.dir('test/ts') |
|
|
97 | 96 | inputs.file('test/tsconfig.json') |
|
|
98 | 97 | outputs.dir(testDir) |
|
|
99 | 98 | |
|
|
100 | 99 | commandLine 'node_modules/.bin/tsc', '-p', 'test/tsconfig.json', '--outDir', distDir |
|
|
101 | 100 | } |
|
|
102 | 101 | |
|
|
103 | 102 | task test(dependsOn: [copyJsTests, buildTests], type: Exec) { |
|
|
104 | 103 | commandLine 'node', 'run-amd-tests.js' |
|
|
105 | 104 | } |
|
|
106 | 105 | |
|
|
107 | 106 | task pack(dependsOn: build, type: Exec) { |
|
|
108 | 107 | workingDir = distDir |
|
|
109 | 108 | |
|
|
110 | 109 | commandLine 'npm', 'pack' |
|
|
111 | 110 | } No newline at end of file |
| @@ -1,450 +1,456 | |||
|
|
1 | 1 | { |
|
|
2 | 2 | "name": "@implab/core", |
|
|
3 | 3 | "version": "0.0.1-dev", |
|
|
4 | 4 | "lockfileVersion": 1, |
|
|
5 | 5 | "requires": true, |
|
|
6 | 6 | "dependencies": { |
|
|
7 | 7 | "@types/node": { |
|
|
8 | 8 | "version": "10.12.12", |
|
|
9 | 9 | "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz", |
|
|
10 | 10 | "integrity": "sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==", |
|
|
11 | 11 | "dev": true |
|
|
12 | 12 | }, |
|
|
13 | "@types/requirejs": { | |
|
|
14 | "version": "2.1.31", | |
|
|
15 | "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.31.tgz", | |
|
|
16 | "integrity": "sha512-b2soeyuU76rMbcRJ4e0hEl0tbMhFwZeTC0VZnfuWlfGlk6BwWNsev6kFu/twKABPX29wkX84wU2o+cEJoXsiTw==", | |
|
|
17 | "dev": true | |
|
|
18 | }, | |
|
|
13 | 19 | "@types/tape": { |
|
|
14 | 20 | "version": "4.2.32", |
|
|
15 | 21 | "resolved": "http://registry.npmjs.org/@types/tape/-/tape-4.2.32.tgz", |
|
|
16 | 22 | "integrity": "sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ==", |
|
|
17 | 23 | "dev": true, |
|
|
18 | 24 | "requires": { |
|
|
19 | 25 | "@types/node": "*" |
|
|
20 | 26 | } |
|
|
21 | 27 | }, |
|
|
22 | 28 | "balanced-match": { |
|
|
23 | 29 | "version": "1.0.0", |
|
|
24 | 30 | "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", |
|
|
25 | 31 | "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", |
|
|
26 | 32 | "dev": true |
|
|
27 | 33 | }, |
|
|
28 | 34 | "brace-expansion": { |
|
|
29 | 35 | "version": "1.1.11", |
|
|
30 | 36 | "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", |
|
|
31 | 37 | "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", |
|
|
32 | 38 | "dev": true, |
|
|
33 | 39 | "requires": { |
|
|
34 | 40 | "balanced-match": "^1.0.0", |
|
|
35 | 41 | "concat-map": "0.0.1" |
|
|
36 | 42 | } |
|
|
37 | 43 | }, |
|
|
38 | 44 | "concat-map": { |
|
|
39 | 45 | "version": "0.0.1", |
|
|
40 | 46 | "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", |
|
|
41 | 47 | "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", |
|
|
42 | 48 | "dev": true |
|
|
43 | 49 | }, |
|
|
44 | 50 | "core-util-is": { |
|
|
45 | 51 | "version": "1.0.2", |
|
|
46 | 52 | "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", |
|
|
47 | 53 | "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", |
|
|
48 | 54 | "dev": true |
|
|
49 | 55 | }, |
|
|
50 | 56 | "deep-equal": { |
|
|
51 | 57 | "version": "0.1.2", |
|
|
52 | 58 | "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz", |
|
|
53 | 59 | "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=", |
|
|
54 | 60 | "dev": true |
|
|
55 | 61 | }, |
|
|
56 | 62 | "define-properties": { |
|
|
57 | 63 | "version": "1.1.3", |
|
|
58 | 64 | "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", |
|
|
59 | 65 | "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", |
|
|
60 | 66 | "dev": true, |
|
|
61 | 67 | "requires": { |
|
|
62 | 68 | "object-keys": "^1.0.12" |
|
|
63 | 69 | }, |
|
|
64 | 70 | "dependencies": { |
|
|
65 | 71 | "object-keys": { |
|
|
66 | 72 | "version": "1.0.12", |
|
|
67 | 73 | "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", |
|
|
68 | 74 | "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", |
|
|
69 | 75 | "dev": true |
|
|
70 | 76 | } |
|
|
71 | 77 | } |
|
|
72 | 78 | }, |
|
|
73 | 79 | "defined": { |
|
|
74 | 80 | "version": "0.0.0", |
|
|
75 | 81 | "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz", |
|
|
76 | 82 | "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=", |
|
|
77 | 83 | "dev": true |
|
|
78 | 84 | }, |
|
|
79 | 85 | "dojo": { |
|
|
80 | 86 | "version": "1.14.2", |
|
|
81 | 87 | "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.14.2.tgz", |
|
|
82 | 88 | "integrity": "sha512-TI+Ytgfh/VfmHWERp45Jte6NFMdoJTPsvUP/uzJUvAXET8FP2h442LePWWJ/q/xZ4V0V8OtdJhx8It/GB+Zbxg==", |
|
|
83 | 89 | "dev": true |
|
|
84 | 90 | }, |
|
|
85 | 91 | "duplexer": { |
|
|
86 | 92 | "version": "0.1.1", |
|
|
87 |
"resolved": "http |
|
|
|
93 | "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", | |
|
|
88 | 94 | "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", |
|
|
89 | 95 | "dev": true |
|
|
90 | 96 | }, |
|
|
91 | 97 | "es-abstract": { |
|
|
92 | 98 | "version": "1.12.0", |
|
|
93 | 99 | "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", |
|
|
94 | 100 | "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", |
|
|
95 | 101 | "dev": true, |
|
|
96 | 102 | "requires": { |
|
|
97 | 103 | "es-to-primitive": "^1.1.1", |
|
|
98 | 104 | "function-bind": "^1.1.1", |
|
|
99 | 105 | "has": "^1.0.1", |
|
|
100 | 106 | "is-callable": "^1.1.3", |
|
|
101 | 107 | "is-regex": "^1.0.4" |
|
|
102 | 108 | } |
|
|
103 | 109 | }, |
|
|
104 | 110 | "es-to-primitive": { |
|
|
105 | 111 | "version": "1.2.0", |
|
|
106 | 112 | "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", |
|
|
107 | 113 | "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", |
|
|
108 | 114 | "dev": true, |
|
|
109 | 115 | "requires": { |
|
|
110 | 116 | "is-callable": "^1.1.4", |
|
|
111 | 117 | "is-date-object": "^1.0.1", |
|
|
112 | 118 | "is-symbol": "^1.0.2" |
|
|
113 | 119 | } |
|
|
114 | 120 | }, |
|
|
115 | 121 | "faucet": { |
|
|
116 | 122 | "version": "0.0.1", |
|
|
117 | 123 | "resolved": "https://registry.npmjs.org/faucet/-/faucet-0.0.1.tgz", |
|
|
118 | 124 | "integrity": "sha1-WX3PHSGJosBiMhtZHo8VHtIDnZw=", |
|
|
119 | 125 | "dev": true, |
|
|
120 | 126 | "requires": { |
|
|
121 | 127 | "defined": "0.0.0", |
|
|
122 | 128 | "duplexer": "~0.1.1", |
|
|
123 | 129 | "minimist": "0.0.5", |
|
|
124 | 130 | "sprintf": "~0.1.3", |
|
|
125 | 131 | "tap-parser": "~0.4.0", |
|
|
126 | 132 | "tape": "~2.3.2", |
|
|
127 | 133 | "through2": "~0.2.3" |
|
|
128 | 134 | }, |
|
|
129 | 135 | "dependencies": { |
|
|
130 | 136 | "tape": { |
|
|
131 | 137 | "version": "2.3.3", |
|
|
132 |
"resolved": "http |
|
|
|
138 | "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz", | |
|
|
133 | 139 | "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=", |
|
|
134 | 140 | "dev": true, |
|
|
135 | 141 | "requires": { |
|
|
136 | 142 | "deep-equal": "~0.1.0", |
|
|
137 | 143 | "defined": "~0.0.0", |
|
|
138 | 144 | "inherits": "~2.0.1", |
|
|
139 | 145 | "jsonify": "~0.0.0", |
|
|
140 | 146 | "resumer": "~0.0.0", |
|
|
141 | 147 | "through": "~2.3.4" |
|
|
142 | 148 | } |
|
|
143 | 149 | } |
|
|
144 | 150 | } |
|
|
145 | 151 | }, |
|
|
146 | 152 | "for-each": { |
|
|
147 | 153 | "version": "0.3.3", |
|
|
148 | 154 | "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", |
|
|
149 | 155 | "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", |
|
|
150 | 156 | "dev": true, |
|
|
151 | 157 | "requires": { |
|
|
152 | 158 | "is-callable": "^1.1.3" |
|
|
153 | 159 | } |
|
|
154 | 160 | }, |
|
|
155 | 161 | "fs.realpath": { |
|
|
156 | 162 | "version": "1.0.0", |
|
|
157 | 163 | "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", |
|
|
158 | 164 | "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", |
|
|
159 | 165 | "dev": true |
|
|
160 | 166 | }, |
|
|
161 | 167 | "function-bind": { |
|
|
162 | 168 | "version": "1.1.1", |
|
|
163 | 169 | "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", |
|
|
164 | 170 | "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", |
|
|
165 | 171 | "dev": true |
|
|
166 | 172 | }, |
|
|
167 | 173 | "glob": { |
|
|
168 | 174 | "version": "7.1.3", |
|
|
169 | 175 | "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", |
|
|
170 | 176 | "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", |
|
|
171 | 177 | "dev": true, |
|
|
172 | 178 | "requires": { |
|
|
173 | 179 | "fs.realpath": "^1.0.0", |
|
|
174 | 180 | "inflight": "^1.0.4", |
|
|
175 | 181 | "inherits": "2", |
|
|
176 | 182 | "minimatch": "^3.0.4", |
|
|
177 | 183 | "once": "^1.3.0", |
|
|
178 | 184 | "path-is-absolute": "^1.0.0" |
|
|
179 | 185 | } |
|
|
180 | 186 | }, |
|
|
181 | 187 | "has": { |
|
|
182 | 188 | "version": "1.0.3", |
|
|
183 | 189 | "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", |
|
|
184 | 190 | "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", |
|
|
185 | 191 | "dev": true, |
|
|
186 | 192 | "requires": { |
|
|
187 | 193 | "function-bind": "^1.1.1" |
|
|
188 | 194 | } |
|
|
189 | 195 | }, |
|
|
190 | 196 | "has-symbols": { |
|
|
191 | 197 | "version": "1.0.0", |
|
|
192 | 198 | "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", |
|
|
193 | 199 | "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", |
|
|
194 | 200 | "dev": true |
|
|
195 | 201 | }, |
|
|
196 | 202 | "inflight": { |
|
|
197 | 203 | "version": "1.0.6", |
|
|
198 | 204 | "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", |
|
|
199 | 205 | "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", |
|
|
200 | 206 | "dev": true, |
|
|
201 | 207 | "requires": { |
|
|
202 | 208 | "once": "^1.3.0", |
|
|
203 | 209 | "wrappy": "1" |
|
|
204 | 210 | } |
|
|
205 | 211 | }, |
|
|
206 | 212 | "inherits": { |
|
|
207 | 213 | "version": "2.0.3", |
|
|
208 | 214 | "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", |
|
|
209 | 215 | "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", |
|
|
210 | 216 | "dev": true |
|
|
211 | 217 | }, |
|
|
212 | 218 | "is-callable": { |
|
|
213 | 219 | "version": "1.1.4", |
|
|
214 | 220 | "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", |
|
|
215 | 221 | "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", |
|
|
216 | 222 | "dev": true |
|
|
217 | 223 | }, |
|
|
218 | 224 | "is-date-object": { |
|
|
219 | 225 | "version": "1.0.1", |
|
|
220 | 226 | "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", |
|
|
221 | 227 | "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", |
|
|
222 | 228 | "dev": true |
|
|
223 | 229 | }, |
|
|
224 | 230 | "is-regex": { |
|
|
225 | 231 | "version": "1.0.4", |
|
|
226 | 232 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", |
|
|
227 | 233 | "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", |
|
|
228 | 234 | "dev": true, |
|
|
229 | 235 | "requires": { |
|
|
230 | 236 | "has": "^1.0.1" |
|
|
231 | 237 | } |
|
|
232 | 238 | }, |
|
|
233 | 239 | "is-symbol": { |
|
|
234 | 240 | "version": "1.0.2", |
|
|
235 | 241 | "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", |
|
|
236 | 242 | "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", |
|
|
237 | 243 | "dev": true, |
|
|
238 | 244 | "requires": { |
|
|
239 | 245 | "has-symbols": "^1.0.0" |
|
|
240 | 246 | } |
|
|
241 | 247 | }, |
|
|
242 | 248 | "isarray": { |
|
|
243 | 249 | "version": "0.0.1", |
|
|
244 | 250 | "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", |
|
|
245 | 251 | "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", |
|
|
246 | 252 | "dev": true |
|
|
247 | 253 | }, |
|
|
248 | 254 | "jsonify": { |
|
|
249 | 255 | "version": "0.0.0", |
|
|
250 | 256 | "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", |
|
|
251 | 257 | "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", |
|
|
252 | 258 | "dev": true |
|
|
253 | 259 | }, |
|
|
254 | 260 | "minimatch": { |
|
|
255 | 261 | "version": "3.0.4", |
|
|
256 | 262 | "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", |
|
|
257 | 263 | "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", |
|
|
258 | 264 | "dev": true, |
|
|
259 | 265 | "requires": { |
|
|
260 | 266 | "brace-expansion": "^1.1.7" |
|
|
261 | 267 | } |
|
|
262 | 268 | }, |
|
|
263 | 269 | "minimist": { |
|
|
264 | 270 | "version": "0.0.5", |
|
|
265 | 271 | "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz", |
|
|
266 | 272 | "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=", |
|
|
267 | 273 | "dev": true |
|
|
268 | 274 | }, |
|
|
269 | 275 | "object-inspect": { |
|
|
270 | 276 | "version": "1.6.0", |
|
|
271 | 277 | "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", |
|
|
272 | 278 | "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", |
|
|
273 | 279 | "dev": true |
|
|
274 | 280 | }, |
|
|
275 | 281 | "object-keys": { |
|
|
276 | 282 | "version": "0.4.0", |
|
|
277 | 283 | "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", |
|
|
278 | 284 | "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", |
|
|
279 | 285 | "dev": true |
|
|
280 | 286 | }, |
|
|
281 | 287 | "once": { |
|
|
282 | 288 | "version": "1.4.0", |
|
|
283 | 289 | "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", |
|
|
284 | 290 | "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", |
|
|
285 | 291 | "dev": true, |
|
|
286 | 292 | "requires": { |
|
|
287 | 293 | "wrappy": "1" |
|
|
288 | 294 | } |
|
|
289 | 295 | }, |
|
|
290 | 296 | "path-is-absolute": { |
|
|
291 | 297 | "version": "1.0.1", |
|
|
292 |
"resolved": "http |
|
|
|
298 | "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", | |
|
|
293 | 299 | "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", |
|
|
294 | 300 | "dev": true |
|
|
295 | 301 | }, |
|
|
296 | 302 | "path-parse": { |
|
|
297 | 303 | "version": "1.0.6", |
|
|
298 | 304 | "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", |
|
|
299 | 305 | "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", |
|
|
300 | 306 | "dev": true |
|
|
301 | 307 | }, |
|
|
302 | 308 | "readable-stream": { |
|
|
303 | 309 | "version": "1.1.14", |
|
|
304 |
"resolved": "http |
|
|
|
310 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | |
|
|
305 | 311 | "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", |
|
|
306 | 312 | "dev": true, |
|
|
307 | 313 | "requires": { |
|
|
308 | 314 | "core-util-is": "~1.0.0", |
|
|
309 | 315 | "inherits": "~2.0.1", |
|
|
310 | 316 | "isarray": "0.0.1", |
|
|
311 | 317 | "string_decoder": "~0.10.x" |
|
|
312 | 318 | } |
|
|
313 | 319 | }, |
|
|
314 | 320 | "requirejs": { |
|
|
315 | 321 | "version": "2.3.6", |
|
|
316 | 322 | "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", |
|
|
317 | 323 | "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", |
|
|
318 | 324 | "dev": true |
|
|
319 | 325 | }, |
|
|
320 | 326 | "resolve": { |
|
|
321 | 327 | "version": "1.7.1", |
|
|
322 | 328 | "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", |
|
|
323 | 329 | "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", |
|
|
324 | 330 | "dev": true, |
|
|
325 | 331 | "requires": { |
|
|
326 | 332 | "path-parse": "^1.0.5" |
|
|
327 | 333 | } |
|
|
328 | 334 | }, |
|
|
329 | 335 | "resumer": { |
|
|
330 | 336 | "version": "0.0.0", |
|
|
331 | 337 | "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", |
|
|
332 | 338 | "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", |
|
|
333 | 339 | "dev": true, |
|
|
334 | 340 | "requires": { |
|
|
335 | 341 | "through": "~2.3.4" |
|
|
336 | 342 | } |
|
|
337 | 343 | }, |
|
|
338 | 344 | "sprintf": { |
|
|
339 | 345 | "version": "0.1.5", |
|
|
340 | 346 | "resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz", |
|
|
341 | 347 | "integrity": "sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=", |
|
|
342 | 348 | "dev": true |
|
|
343 | 349 | }, |
|
|
344 | 350 | "string.prototype.trim": { |
|
|
345 | 351 | "version": "1.1.2", |
|
|
346 | 352 | "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", |
|
|
347 | 353 | "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", |
|
|
348 | 354 | "dev": true, |
|
|
349 | 355 | "requires": { |
|
|
350 | 356 | "define-properties": "^1.1.2", |
|
|
351 | 357 | "es-abstract": "^1.5.0", |
|
|
352 | 358 | "function-bind": "^1.0.2" |
|
|
353 | 359 | } |
|
|
354 | 360 | }, |
|
|
355 | 361 | "string_decoder": { |
|
|
356 | 362 | "version": "0.10.31", |
|
|
357 |
"resolved": "http |
|
|
|
363 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", | |
|
|
358 | 364 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", |
|
|
359 | 365 | "dev": true |
|
|
360 | 366 | }, |
|
|
361 | 367 | "tap-parser": { |
|
|
362 | 368 | "version": "0.4.3", |
|
|
363 | 369 | "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-0.4.3.tgz", |
|
|
364 | 370 | "integrity": "sha1-pOrhkMENdsehEZIf84u+TVjwnuo=", |
|
|
365 | 371 | "dev": true, |
|
|
366 | 372 | "requires": { |
|
|
367 | 373 | "inherits": "~2.0.1", |
|
|
368 | 374 | "readable-stream": "~1.1.11" |
|
|
369 | 375 | } |
|
|
370 | 376 | }, |
|
|
371 | 377 | "tape": { |
|
|
372 | 378 | "version": "4.9.1", |
|
|
373 | 379 | "resolved": "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz", |
|
|
374 | 380 | "integrity": "sha512-6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw==", |
|
|
375 | 381 | "dev": true, |
|
|
376 | 382 | "requires": { |
|
|
377 | 383 | "deep-equal": "~1.0.1", |
|
|
378 | 384 | "defined": "~1.0.0", |
|
|
379 | 385 | "for-each": "~0.3.3", |
|
|
380 | 386 | "function-bind": "~1.1.1", |
|
|
381 | 387 | "glob": "~7.1.2", |
|
|
382 | 388 | "has": "~1.0.3", |
|
|
383 | 389 | "inherits": "~2.0.3", |
|
|
384 | 390 | "minimist": "~1.2.0", |
|
|
385 | 391 | "object-inspect": "~1.6.0", |
|
|
386 | 392 | "resolve": "~1.7.1", |
|
|
387 | 393 | "resumer": "~0.0.0", |
|
|
388 | 394 | "string.prototype.trim": "~1.1.2", |
|
|
389 | 395 | "through": "~2.3.8" |
|
|
390 | 396 | }, |
|
|
391 | 397 | "dependencies": { |
|
|
392 | 398 | "deep-equal": { |
|
|
393 | 399 | "version": "1.0.1", |
|
|
394 | 400 | "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", |
|
|
395 | 401 | "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", |
|
|
396 | 402 | "dev": true |
|
|
397 | 403 | }, |
|
|
398 | 404 | "defined": { |
|
|
399 | 405 | "version": "1.0.0", |
|
|
400 | 406 | "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", |
|
|
401 | 407 | "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", |
|
|
402 | 408 | "dev": true |
|
|
403 | 409 | }, |
|
|
404 | 410 | "minimist": { |
|
|
405 | 411 | "version": "1.2.0", |
|
|
406 | 412 | "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", |
|
|
407 | 413 | "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", |
|
|
408 | 414 | "dev": true |
|
|
409 | 415 | } |
|
|
410 | 416 | } |
|
|
411 | 417 | }, |
|
|
412 | 418 | "through": { |
|
|
413 | 419 | "version": "2.3.8", |
|
|
414 |
"resolved": "http |
|
|
|
420 | "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", | |
|
|
415 | 421 | "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", |
|
|
416 | 422 | "dev": true |
|
|
417 | 423 | }, |
|
|
418 | 424 | "through2": { |
|
|
419 | 425 | "version": "0.2.3", |
|
|
420 |
"resolved": "http |
|
|
|
426 | "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz", | |
|
|
421 | 427 | "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", |
|
|
422 | 428 | "dev": true, |
|
|
423 | 429 | "requires": { |
|
|
424 | 430 | "readable-stream": "~1.1.9", |
|
|
425 | 431 | "xtend": "~2.1.1" |
|
|
426 | 432 | } |
|
|
427 | 433 | }, |
|
|
428 | 434 | "typescript": { |
|
|
429 | 435 | "version": "3.2.1", |
|
|
430 | 436 | "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz", |
|
|
431 | 437 | "integrity": "sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==", |
|
|
432 | 438 | "dev": true |
|
|
433 | 439 | }, |
|
|
434 | 440 | "wrappy": { |
|
|
435 | 441 | "version": "1.0.2", |
|
|
436 | 442 | "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", |
|
|
437 | 443 | "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", |
|
|
438 | 444 | "dev": true |
|
|
439 | 445 | }, |
|
|
440 | 446 | "xtend": { |
|
|
441 | 447 | "version": "2.1.2", |
|
|
442 | 448 | "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", |
|
|
443 | 449 | "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", |
|
|
444 | 450 | "dev": true, |
|
|
445 | 451 | "requires": { |
|
|
446 | 452 | "object-keys": "~0.4.0" |
|
|
447 | 453 | } |
|
|
448 | 454 | } |
|
|
449 | 455 | } |
|
|
450 | 456 | } |
| @@ -1,31 +1,32 | |||
|
|
1 | 1 | { |
|
|
2 | 2 | "name": "@implab/core", |
|
|
3 | 3 | "version": "0.0.1-dev", |
|
|
4 | 4 | "description": "Dependency injection, logging, simple and fast text template engine", |
|
|
5 | 5 | "main": "main.js", |
|
|
6 | 6 | "keywords": [ |
|
|
7 | 7 | "di", |
|
|
8 | 8 | "ioc", |
|
|
9 | 9 | "logging", |
|
|
10 | 10 | "template engine", |
|
|
11 | 11 | "dependency injection" |
|
|
12 | 12 | ], |
|
|
13 | 13 | "author": "Implab team", |
|
|
14 | 14 | "license": "BSD-2-Clause", |
|
|
15 | 15 | "repository": "https://bitbucket.org/implab/implabjs", |
|
|
16 | 16 | "publishConfig": { |
|
|
17 | 17 | "access": "public" |
|
|
18 | 18 | }, |
|
|
19 | 19 | "peerDependencies": { |
|
|
20 | 20 | "dojo": "^1.10.0" |
|
|
21 | 21 | }, |
|
|
22 | 22 | "devDependencies": { |
|
|
23 | 23 | "typescript": "latest", |
|
|
24 | 24 | "tape": "latest", |
|
|
25 | 25 | "@types/tape": "latest", |
|
|
26 | "@types/requirejs": "latest", | |
|
|
26 | 27 | "requirejs": "latest", |
|
|
27 | 28 | "faucet": "latest", |
|
|
28 | 29 | "dojo": "^1.10.0" |
|
|
29 | 30 | }, |
|
|
30 | 31 | "types": "main.d.ts" |
|
|
31 | 32 | } |
| @@ -1,46 +1,35 | |||
|
|
1 | 1 | import { Uuid } from "../Uuid"; |
|
|
2 | 2 | import { argumentNotEmptyString } from "../safe"; |
|
|
3 | 3 | import { TraceSource } from "../log/TraceSource"; |
|
|
4 | 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 | 5 | export const rjs = require; |
|
|
13 | 6 | |
|
|
14 | 7 | declare function define(name: string, modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void; |
|
|
15 | 8 | declare function define(modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void; |
|
|
16 | 9 | |
|
|
17 | interface RequireJsResolverParams { | |
|
|
18 | contextRequire: RequireFn; | |
|
|
19 | } | |
|
|
20 | ||
|
|
21 | 10 | const trace = TraceSource.get("@implab/core/di/RequireJsHelper"); |
|
|
22 | 11 | |
|
|
23 |
export async function createContextRequire(moduleName: string): Promise<Require |
|
|
|
12 | export async function createContextRequire(moduleName: string): Promise<Require> { | |
|
|
24 | 13 | argumentNotEmptyString(moduleName, "moduleName"); |
|
|
25 | 14 | |
|
|
26 | 15 | const parts = moduleName.split("/"); |
|
|
27 | 16 | if (parts[0] === ".") |
|
|
28 | 17 | throw new Error("An absolute module path is required"); |
|
|
29 | 18 | |
|
|
30 | 19 | if (parts.length > 1) |
|
|
31 | 20 | parts.splice(-1, 1, Uuid()); |
|
|
32 | 21 | else |
|
|
33 | 22 | parts.push(Uuid()); |
|
|
34 | 23 | |
|
|
35 | 24 | const shim = parts.join("/"); |
|
|
36 | 25 | |
|
|
37 | 26 | trace.debug(`define shim ${shim}`); |
|
|
38 | 27 | |
|
|
39 |
return new Promise<Require |
|
|
|
28 | return new Promise<Require>(fulfill => { | |
|
|
40 | 29 | define(shim, ["require"], r => { |
|
|
41 | 30 | trace.debug("shim resolved"); |
|
|
42 | 31 | return r; |
|
|
43 | 32 | }); |
|
|
44 | 33 | require([shim], fulfill); |
|
|
45 | 34 | }); |
|
|
46 | 35 | } |
|
|
1 | NO CONTENT: file renamed from src/js/Uri.js to src/main/js/Uri.js |
|
|
1 | 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/MapSchema.js to src/main/js/data/MapSchema.js |
|
|
1 | 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/RestStore.js to src/main/js/data/RestStore.js |
|
|
1 | 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/StoreAdapter.js to src/main/js/data/StoreAdapter.js |
|
|
1 | 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/_StatefulModelMixin.js to src/main/js/data/_StatefulModelMixin.js |
|
|
1 | 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/declare/_load.js to src/main/js/declare/_load.js |
|
|
1 | NO CONTENT: file renamed from src/js/declare/override.js to src/main/js/declare/override.js |
|
|
1 | NO CONTENT: file renamed from src/js/log/trace.js to src/main/js/log/trace.js |
|
|
1 | NO CONTENT: file renamed from src/js/messaging/Client.js to src/main/js/messaging/Client.js |
|
|
1 | NO CONTENT: file renamed from src/js/messaging/Destination.js to src/main/js/messaging/Destination.js |
|
|
1 | NO CONTENT: file renamed from src/js/messaging/Listener.js to src/main/js/messaging/Listener.js |
|
|
1 | NO CONTENT: file renamed from src/js/messaging/Session.js to src/main/js/messaging/Session.js |
|
|
1 | NO CONTENT: file renamed from src/js/text/format-compile.js to src/main/js/text/format-compile.js |
|
|
1 | NO CONTENT: file renamed from src/js/text/format.js to src/main/js/text/format.js |
|
|
1 | NO CONTENT: file renamed from src/js/text/template-compile.js to src/main/js/text/template-compile.js |
|
|
1 | NO CONTENT: file renamed from src/ts/Cancellation.ts to src/main/ts/Cancellation.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/Observable.ts to src/main/ts/Observable.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/Uuid.ts to src/main/ts/Uuid.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/components/ActivatableMixin.ts to src/main/ts/components/ActivatableMixin.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/components/AsyncComponent.ts to src/main/ts/components/AsyncComponent.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di.ts to src/main/ts/di.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ActivationContext.ts to src/main/ts/di/ActivationContext.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ActivationError.ts to src/main/ts/di/ActivationError.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/AggregateDescriptor.ts to src/main/ts/di/AggregateDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ConfigError.ts to src/main/ts/di/ConfigError.ts |
| @@ -1,353 +1,353 | |||
|
|
1 | 1 | import { |
|
|
2 | 2 | ServiceRegistration, |
|
|
3 | 3 | TypeRegistration, |
|
|
4 | 4 | FactoryRegistration, |
|
|
5 | 5 | ServiceMap, |
|
|
6 | 6 | isDescriptor, |
|
|
7 | 7 | isDependencyRegistration, |
|
|
8 | 8 | DependencyRegistration, |
|
|
9 | 9 | ValueRegistration, |
|
|
10 | 10 | ActivationType, |
|
|
11 | 11 | isValueRegistration, |
|
|
12 | 12 | isTypeRegistration, |
|
|
13 | 13 | isFactoryRegistration |
|
|
14 | 14 | } from "./interfaces"; |
|
|
15 | 15 | |
|
|
16 | 16 | import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get } from "../safe"; |
|
|
17 | 17 | import { AggregateDescriptor } from "./AggregateDescriptor"; |
|
|
18 | 18 | import { ValueDescriptor } from "./ValueDescriptor"; |
|
|
19 | 19 | import { Container } from "./Container"; |
|
|
20 | 20 | import { ReferenceDescriptor } from "./ReferenceDescriptor"; |
|
|
21 | 21 | import { TypeServiceDescriptor } from "./TypeServiceDescriptor"; |
|
|
22 | 22 | import { FactoryServiceDescriptor } from "./FactoryServiceDescriptor"; |
|
|
23 |
import { rjs, createContextRequire |
|
|
|
23 | import { rjs, createContextRequire } from "./RequireJsHelper"; | |
|
|
24 | 24 | import { TraceSource } from "../log/TraceSource"; |
|
|
25 | 25 | import { ConfigError } from "./ConfigError"; |
|
|
26 | 26 | import { Cancellation } from "../Cancellation"; |
|
|
27 | 27 | |
|
|
28 | 28 | const trace = TraceSource.get("@implab/core/di/Configuration"); |
|
|
29 | 29 | |
|
|
30 | 30 | async function mapAll(data: object | any[], map?: (v, k) => any): Promise<any> { |
|
|
31 | 31 | if (data instanceof Array) { |
|
|
32 | 32 | return Promise.all(map ? data.map(map) : data); |
|
|
33 | 33 | } else { |
|
|
34 | 34 | const keys = Object.keys(data); |
|
|
35 | 35 | |
|
|
36 | 36 | const o: any = {}; |
|
|
37 | 37 | |
|
|
38 | 38 | await Promise.all(keys.map(async k => { |
|
|
39 | 39 | const v = map ? map(data[k], k) : data[k]; |
|
|
40 | 40 | o[k] = isPromise(v) ? await v : v; |
|
|
41 | 41 | })); |
|
|
42 | 42 | |
|
|
43 | 43 | return o; |
|
|
44 | 44 | } |
|
|
45 | 45 | } |
|
|
46 | 46 | |
|
|
47 | 47 | interface MapOf<T> { |
|
|
48 | 48 | [key: string]: T; |
|
|
49 | 49 | } |
|
|
50 | 50 | |
|
|
51 | 51 | type _key = string | number; |
|
|
52 | 52 | |
|
|
53 | 53 | export class Configuration { |
|
|
54 | 54 | |
|
|
55 | 55 | _hasInnerDescriptors = false; |
|
|
56 | 56 | |
|
|
57 | 57 | _container: Container; |
|
|
58 | 58 | |
|
|
59 | 59 | _path: Array<_key>; |
|
|
60 | 60 | |
|
|
61 | 61 | _configName: string; |
|
|
62 | 62 | |
|
|
63 | 63 | _require = rjs; |
|
|
64 | 64 | |
|
|
65 | 65 | constructor(container: Container) { |
|
|
66 | 66 | argumentNotNull(container, container); |
|
|
67 | 67 | this._container = container; |
|
|
68 | 68 | this._path = []; |
|
|
69 | 69 | } |
|
|
70 | 70 | |
|
|
71 | 71 | async loadConfiguration(moduleName: string, ct = Cancellation.none) { |
|
|
72 | 72 | argumentNotEmptyString(moduleName, "moduleName"); |
|
|
73 | 73 | |
|
|
74 | 74 | trace.log("loadConfiguration {0}", moduleName); |
|
|
75 | 75 | |
|
|
76 | 76 | this._configName = moduleName; |
|
|
77 | 77 | |
|
|
78 | 78 | const config = await this._loadModule(moduleName); |
|
|
79 | 79 | |
|
|
80 | 80 | this._require = await this._createContextRequire(moduleName); |
|
|
81 | 81 | |
|
|
82 | 82 | let services: ServiceMap; |
|
|
83 | 83 | |
|
|
84 | 84 | try { |
|
|
85 | 85 | services = await this._visitRegistrations(config, moduleName); |
|
|
86 | 86 | } catch (e) { |
|
|
87 | 87 | throw this._makeError(e); |
|
|
88 | 88 | } |
|
|
89 | 89 | |
|
|
90 | 90 | this._container.register(services); |
|
|
91 | 91 | } |
|
|
92 | 92 | |
|
|
93 |
async applyConfiguration(data: object, contextRequire?: Require |
|
|
|
93 | async applyConfiguration(data: object, contextRequire?: Require, ct = Cancellation.none) { | |
|
|
94 | 94 | argumentNotNull(data, "data"); |
|
|
95 | 95 | |
|
|
96 | 96 | trace.log("applyConfiguration"); |
|
|
97 | 97 | |
|
|
98 | 98 | this._configName = "$"; |
|
|
99 | 99 | |
|
|
100 | 100 | if (contextRequire) |
|
|
101 | 101 | this._require = contextRequire; |
|
|
102 | 102 | |
|
|
103 | 103 | let services: ServiceMap; |
|
|
104 | 104 | |
|
|
105 | 105 | try { |
|
|
106 | 106 | services = await this._visitRegistrations(data, "$"); |
|
|
107 | 107 | } catch (e) { |
|
|
108 | 108 | throw this._makeError(e); |
|
|
109 | 109 | } |
|
|
110 | 110 | |
|
|
111 | 111 | this._container.register(services); |
|
|
112 | 112 | } |
|
|
113 | 113 | |
|
|
114 | 114 | _makeError(inner) { |
|
|
115 | 115 | const e = new ConfigError("Failed to load configuration", inner); |
|
|
116 | 116 | e.configName = this._configName; |
|
|
117 | 117 | e.path = this._makePath(); |
|
|
118 | 118 | return e; |
|
|
119 | 119 | } |
|
|
120 | 120 | |
|
|
121 | 121 | _makePath() { |
|
|
122 | 122 | return this._path |
|
|
123 | 123 | .reduce( |
|
|
124 | 124 | (prev, cur) => typeof cur === "number" ? |
|
|
125 | 125 | `${prev}[${cur}]` : |
|
|
126 | 126 | `${prev}.${cur}` |
|
|
127 | 127 | ) |
|
|
128 | 128 | .toString(); |
|
|
129 | 129 | } |
|
|
130 | 130 | |
|
|
131 | 131 | async _resolveType(moduleName: string, localName: string) { |
|
|
132 | 132 | trace.log("resolveType moduleName={0}, localName={1}", moduleName, localName); |
|
|
133 | 133 | try { |
|
|
134 | 134 | const m = await this._loadModule(moduleName); |
|
|
135 | 135 | return localName ? get(localName, m) : m; |
|
|
136 | 136 | } catch (e) { |
|
|
137 | 137 | trace.error("Failed to resolve type moduleName={0}, localName={1}", moduleName, localName); |
|
|
138 | 138 | throw e; |
|
|
139 | 139 | } |
|
|
140 | 140 | } |
|
|
141 | 141 | |
|
|
142 | 142 | async _loadModule(moduleName: string) { |
|
|
143 | 143 | trace.debug("loadModule {0}", moduleName); |
|
|
144 | 144 | |
|
|
145 | 145 | const m = await new Promise(fulfill => { |
|
|
146 | 146 | this._require([moduleName], fulfill); |
|
|
147 | 147 | }); |
|
|
148 | 148 | |
|
|
149 | 149 | return m; |
|
|
150 | 150 | } |
|
|
151 | 151 | |
|
|
152 | 152 | _createContextRequire(moduleName: string) { |
|
|
153 | 153 | return createContextRequire(moduleName); |
|
|
154 | 154 | } |
|
|
155 | 155 | |
|
|
156 | 156 | async _visitRegistrations(data, name: _key) { |
|
|
157 | 157 | this._enter(name); |
|
|
158 | 158 | |
|
|
159 | 159 | if (data.constructor && |
|
|
160 | 160 | data.constructor.prototype !== Object.prototype) |
|
|
161 | 161 | throw new Error("Configuration must be a simple object"); |
|
|
162 | 162 | |
|
|
163 | 163 | const o: ServiceMap = {}; |
|
|
164 | 164 | const keys = Object.keys(data); |
|
|
165 | 165 | |
|
|
166 | 166 | const services = await mapAll(data, async (v, k) => { |
|
|
167 | 167 | const d = await this._visit(v, k); |
|
|
168 | 168 | return isDescriptor(d) ? d : new AggregateDescriptor(d); |
|
|
169 | 169 | }) as ServiceMap; |
|
|
170 | 170 | |
|
|
171 | 171 | this._leave(); |
|
|
172 | 172 | |
|
|
173 | 173 | return services; |
|
|
174 | 174 | } |
|
|
175 | 175 | |
|
|
176 | 176 | _enter(name: _key) { |
|
|
177 | 177 | this._path.push(name); |
|
|
178 | 178 | trace.debug(">{0}", name); |
|
|
179 | 179 | } |
|
|
180 | 180 | |
|
|
181 | 181 | _leave() { |
|
|
182 | 182 | const name = this._path.pop(); |
|
|
183 | 183 | trace.debug("<{0}", name); |
|
|
184 | 184 | } |
|
|
185 | 185 | |
|
|
186 | 186 | async _visit(data, name: string): Promise<any> { |
|
|
187 | 187 | if (isPrimitive(data) || isDescriptor(data)) |
|
|
188 | 188 | return data; |
|
|
189 | 189 | |
|
|
190 | 190 | if (isDependencyRegistration(data)) { |
|
|
191 | 191 | return this._visitDependencyRegistration(data, name); |
|
|
192 | 192 | } else if (isValueRegistration(data)) { |
|
|
193 | 193 | return this._visitValueRegistration(data, name); |
|
|
194 | 194 | } else if (isTypeRegistration(data)) { |
|
|
195 | 195 | return this._visitTypeRegistration(data, name); |
|
|
196 | 196 | } else if (isFactoryRegistration(data)) { |
|
|
197 | 197 | return this._visitFactoryRegistration(data, name); |
|
|
198 | 198 | } else if (data instanceof Array) { |
|
|
199 | 199 | return this._visitArray(data, name); |
|
|
200 | 200 | } |
|
|
201 | 201 | |
|
|
202 | 202 | return this._visitObject(data, name); |
|
|
203 | 203 | } |
|
|
204 | 204 | |
|
|
205 | 205 | async _visitObject(data: object, name: _key) { |
|
|
206 | 206 | if (data.constructor && |
|
|
207 | 207 | data.constructor.prototype !== Object.prototype) |
|
|
208 | 208 | return new ValueDescriptor(data); |
|
|
209 | 209 | |
|
|
210 | 210 | this._enter(name); |
|
|
211 | 211 | |
|
|
212 | 212 | const v = await mapAll(data, delegate(this, "_visit")); |
|
|
213 | 213 | |
|
|
214 | 214 | // TODO: handle inline descriptors properly |
|
|
215 | 215 | // const ex = { |
|
|
216 | 216 | // activate(ctx) { |
|
|
217 | 217 | // const value = ctx.activate(this.prop, "prop"); |
|
|
218 | 218 | // // some code |
|
|
219 | 219 | // }, |
|
|
220 | 220 | // // will be turned to ReferenceDescriptor |
|
|
221 | 221 | // prop: { $dependency: "depName" } |
|
|
222 | 222 | // }; |
|
|
223 | 223 | |
|
|
224 | 224 | this._leave(); |
|
|
225 | 225 | return v; |
|
|
226 | 226 | } |
|
|
227 | 227 | |
|
|
228 | 228 | async _visitArray(data: any[], name: _key) { |
|
|
229 | 229 | if (data.constructor && |
|
|
230 | 230 | data.constructor.prototype !== Array.prototype) |
|
|
231 | 231 | return new ValueDescriptor(data); |
|
|
232 | 232 | |
|
|
233 | 233 | this._enter(name); |
|
|
234 | 234 | |
|
|
235 | 235 | const v = await mapAll(data, delegate(this, "_visit")); |
|
|
236 | 236 | this._leave(); |
|
|
237 | 237 | |
|
|
238 | 238 | return v; |
|
|
239 | 239 | } |
|
|
240 | 240 | |
|
|
241 | 241 | _makeServiceParams(data: ServiceRegistration) { |
|
|
242 | 242 | const opts: any = { |
|
|
243 | 243 | owner: this._container |
|
|
244 | 244 | }; |
|
|
245 | 245 | if (data.services) |
|
|
246 | 246 | opts.services = this._visitRegistrations(data.services, "services"); |
|
|
247 | 247 | |
|
|
248 | 248 | if (data.inject) { |
|
|
249 | 249 | this._path.push("inject"); |
|
|
250 | 250 | opts.inject = mapAll( |
|
|
251 | 251 | data.inject instanceof Array ? |
|
|
252 | 252 | data.inject : |
|
|
253 | 253 | [data.inject], |
|
|
254 | 254 | delegate(this, "_visitObject") |
|
|
255 | 255 | ); |
|
|
256 | 256 | this._leave(); |
|
|
257 | 257 | } |
|
|
258 | 258 | |
|
|
259 | 259 | if ("params" in data) |
|
|
260 | 260 | opts.params = data.params instanceof Array ? |
|
|
261 | 261 | this._visitArray(data.params, "params") : |
|
|
262 | 262 | this._visit(data.params, "params"); |
|
|
263 | 263 | |
|
|
264 | 264 | if (data.activation) { |
|
|
265 | 265 | if (typeof (data.activation) === "string") { |
|
|
266 | 266 | switch (data.activation.toLowerCase()) { |
|
|
267 | 267 | case "singleton": |
|
|
268 | 268 | opts.activation = ActivationType.Singleton; |
|
|
269 | 269 | break; |
|
|
270 | 270 | case "container": |
|
|
271 | 271 | opts.activation = ActivationType.Container; |
|
|
272 | 272 | break; |
|
|
273 | 273 | case "hierarchy": |
|
|
274 | 274 | opts.activation = ActivationType.Hierarchy; |
|
|
275 | 275 | break; |
|
|
276 | 276 | case "context": |
|
|
277 | 277 | opts.activation = ActivationType.Context; |
|
|
278 | 278 | break; |
|
|
279 | 279 | case "call": |
|
|
280 | 280 | opts.activation = ActivationType.Call; |
|
|
281 | 281 | break; |
|
|
282 | 282 | default: |
|
|
283 | 283 | throw new Error("Unknown activation type: " + |
|
|
284 | 284 | data.activation); |
|
|
285 | 285 | } |
|
|
286 | 286 | } else { |
|
|
287 | 287 | opts.activation = Number(data.activation); |
|
|
288 | 288 | } |
|
|
289 | 289 | } |
|
|
290 | 290 | |
|
|
291 | 291 | if (data.cleanup) |
|
|
292 | 292 | opts.cleanup = data.cleanup; |
|
|
293 | 293 | |
|
|
294 | 294 | return opts; |
|
|
295 | 295 | } |
|
|
296 | 296 | |
|
|
297 | 297 | async _visitValueRegistration(data: ValueRegistration, name: _key) { |
|
|
298 | 298 | this._enter(name); |
|
|
299 | 299 | const d = data.parse ? new AggregateDescriptor(data.$value) : new ValueDescriptor(data.$value); |
|
|
300 | 300 | this._leave(); |
|
|
301 | 301 | return d; |
|
|
302 | 302 | } |
|
|
303 | 303 | |
|
|
304 | 304 | async _visitDependencyRegistration(data: DependencyRegistration, name: _key) { |
|
|
305 | 305 | argumentNotEmptyString(data && data.$dependency, "data.$dependency"); |
|
|
306 | 306 | this._enter(name); |
|
|
307 | 307 | const d = new ReferenceDescriptor({ |
|
|
308 | 308 | name: data.$dependency, |
|
|
309 | 309 | lazy: data.lazy, |
|
|
310 | 310 | optional: data.optional, |
|
|
311 | 311 | default: data.default, |
|
|
312 | 312 | services: data.services && await this._visitRegistrations(data.services, "services") |
|
|
313 | 313 | }); |
|
|
314 | 314 | this._leave(); |
|
|
315 | 315 | return d; |
|
|
316 | 316 | } |
|
|
317 | 317 | |
|
|
318 | 318 | async _visitTypeRegistration(data: TypeRegistration, name: _key) { |
|
|
319 | 319 | argumentNotNull(data.$type, "data.$type"); |
|
|
320 | 320 | this._enter(name); |
|
|
321 | 321 | |
|
|
322 | 322 | const opts = this._makeServiceParams(data); |
|
|
323 | 323 | if (data.$type instanceof Function) { |
|
|
324 | 324 | opts.type = data.$type; |
|
|
325 | 325 | } else { |
|
|
326 | 326 | const [moduleName, typeName] = data.$type.split(":", 2); |
|
|
327 | 327 | opts.type = this._resolveType(moduleName, typeName); |
|
|
328 | 328 | } |
|
|
329 | 329 | |
|
|
330 | 330 | const d = new TypeServiceDescriptor( |
|
|
331 | 331 | await mapAll(opts) |
|
|
332 | 332 | ); |
|
|
333 | 333 | |
|
|
334 | 334 | this._leave(); |
|
|
335 | 335 | |
|
|
336 | 336 | return d; |
|
|
337 | 337 | } |
|
|
338 | 338 | |
|
|
339 | 339 | async _visitFactoryRegistration(data: FactoryRegistration, name: _key) { |
|
|
340 | 340 | argumentOfType(data.$factory, Function, "data.$type"); |
|
|
341 | 341 | this._enter(name); |
|
|
342 | 342 | |
|
|
343 | 343 | const opts = this._makeServiceParams(data); |
|
|
344 | 344 | opts.factory = opts.$factory; |
|
|
345 | 345 | |
|
|
346 | 346 | const d = new FactoryServiceDescriptor( |
|
|
347 | 347 | await mapAll(opts) |
|
|
348 | 348 | ); |
|
|
349 | 349 | |
|
|
350 | 350 | this._leave(); |
|
|
351 | 351 | return d; |
|
|
352 | 352 | } |
|
|
353 | 353 | } |
|
|
1 | NO CONTENT: file renamed from src/ts/di/Container.ts to src/main/ts/di/Container.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/FactoryServiceDescriptor.ts to src/main/ts/di/FactoryServiceDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ReferenceDescriptor.ts to src/main/ts/di/ReferenceDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ServiceDescriptor.ts to src/main/ts/di/ServiceDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/TypeServiceDescriptor.ts to src/main/ts/di/TypeServiceDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/ValueDescriptor.ts to src/main/ts/di/ValueDescriptor.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/di/interfaces.ts to src/main/ts/di/interfaces.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/interfaces.ts to src/main/ts/interfaces.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/log/TraceSource.ts to src/main/ts/log/TraceSource.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/log/writers/ConsoleWriter.ts to src/main/ts/log/writers/ConsoleWriter.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/main.ts to src/main/ts/main.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/safe.ts to src/main/ts/safe.ts |
|
|
1 | NO CONTENT: file renamed from src/ts/text/format.d.ts to src/main/ts/text/format.d.ts |
| @@ -1,22 +1,21 | |||
|
|
1 | 1 | { |
|
|
2 | 2 | "compilerOptions": { |
|
|
3 | 3 | "target": "es3", |
|
|
4 | 4 | "module": "amd", |
|
|
5 | 5 | "sourceMap": true, |
|
|
6 | 6 | "declaration": true, |
|
|
7 | "moduleResolution": "node", | |
|
|
8 | "listFiles": true, | |
|
|
7 | 9 | "lib": [ |
|
|
8 | 10 | "es5", |
|
|
9 | 11 | "es2015.promise", |
|
|
10 | 12 | "es2015.symbol", |
|
|
11 | 13 | "dom" |
|
|
12 | 14 | ], |
|
|
13 | 15 | "rootDirs": [ |
|
|
14 | "ts", | |
|
|
16 | "main/ts", | |
|
|
15 | 17 | "amd/ts" |
|
|
16 | 18 | ], |
|
|
17 | 19 | "types": [] |
|
|
18 |
} |
|
|
|
19 | "include" : [ | |
|
|
20 | "ts/**/*.ts", "amd/ts/**/*.ts" | |
|
|
21 | ] | |
|
|
20 | } | |
|
|
22 | 21 | } No newline at end of file |
General Comments 0
You need to be logged in to leave comments.
Login now