Types: moved all TS type descriptions to ts/ in the repo root.

diff --git a/auto/make b/auto/make
index b834ab0a1bea67bafb82374d9c542977b958bf4f..c085e95dc0e46a3d10c08beb52fed1330718992f 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -234,10 +234,11 @@ benchmark: $NJS_BUILD_DIR/njs_auto_config.h \\
 
        $NJS_BUILD_DIR/njs_benchmark
 
+.PHONY: ts
 ts:
-       mkdir -p $NJS_BUILD_DIR/ts
-       cp nginx/ts/*.ts $NJS_BUILD_DIR/ts/
-       cp src/ts/*.ts $NJS_BUILD_DIR/ts/
+       mkdir -p $NJS_BUILD_DIR/ts/njs_modules
+       cp ts/*.d.ts $NJS_BUILD_DIR/ts/
+       cp ts/njs_modules/* $NJS_BUILD_DIR/ts/njs_modules/
 
 ts_test: ts
        tsc ./test/ts/test.ts

diff --git a/nginx/ts/ngx_http_js_module.d.ts b/ts/ngx_http_js_module.d.ts
similarity index 100%
rename from nginx/ts/ngx_http_js_module.d.ts
rename to ts/ngx_http_js_module.d.ts

diff --git a/nginx/ts/ngx_stream_js_module.d.ts b/ts/ngx_stream_js_module.d.ts
similarity index 100%
rename from nginx/ts/ngx_stream_js_module.d.ts
rename to ts/ngx_stream_js_module.d.ts

diff --git a/src/ts/njs_core.d.ts b/ts/njs_core.d.ts
similarity index 100%
rename from src/ts/njs_core.d.ts
rename to ts/njs_core.d.ts

diff --git a/src/ts/crypto.d.ts b/ts/njs_modules/crypto.d.ts
similarity index 98%
rename from src/ts/crypto.d.ts
rename to ts/njs_modules/crypto.d.ts
index 5895b3e74a2cdc765c57eb343d9be121edd1bbdc..345a2d1a757c853d12b6b53c7d0764095f2abd40 100644 (file)
--- a/src/ts/crypto.d.ts
+++ b/ts/njs_modules/crypto.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="njs_core.d.ts" />
+/// <reference path="../njs_core.d.ts" />
 
 declare module "crypto" {
 

diff --git a/src/ts/fs.d.ts b/ts/njs_modules/fs.d.ts
similarity index 99%
rename from src/ts/fs.d.ts
rename to ts/njs_modules/fs.d.ts
index 682cee49092f83e3b50ab15b05074fc6a553d6bb..cc24f243a62e1eaddf1f64b6fec3e2c91062893b 100644 (file)
--- a/src/ts/fs.d.ts
+++ b/ts/njs_modules/fs.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="njs_core.d.ts" />
+/// <reference path="../njs_core.d.ts" />
 
 declare module "fs" {
 

diff --git a/src/ts/querystring.d.ts b/ts/njs_modules/querystring.d.ts
similarity index 99%
rename from src/ts/querystring.d.ts
rename to ts/njs_modules/querystring.d.ts
index 0368ec1c49d5ba2ca0f083126376ba86bc41f7f3..4058f5a1c4ec131f78a463c9782b81b1c633372f 100644 (file)
--- a/src/ts/querystring.d.ts
+++ b/ts/njs_modules/querystring.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="njs_core.d.ts" />
+/// <reference path="../njs_core.d.ts" />
 
 declare module "querystring" {
 

diff --git a/src/ts/njs_shell.d.ts b/ts/njs_shell.d.ts
similarity index 100%
rename from src/ts/njs_shell.d.ts
rename to ts/njs_shell.d.ts