TypeScript improvements

11 files changed, 87 insertions, 188 deletions

diff --git a/js/src/Glacier2/index.d.ts b/js/src/Glacier2/index.d.ts
deleted file mode 100644
index 3987c582165..00000000000
--- a/js/src/Glacier2/index.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./PermissionsVerifier.d.ts"/>
-/// <reference path="./PermissionsVerifierF.d.ts"/>
-/// <reference path="./Router.d.ts"/>
-/// <reference path="./RouterF.d.ts"/>
-/// <reference path="./Session.d.ts"/>
-/// <reference path="./SSLInfo.d.ts"/>
-
-export namespace Glacier2 {}
-export namespace IceMX {}
-
-declare module "ice" {}
diff --git a/js/src/Ice/.gitignore b/js/src/Ice/.gitignore
index d016235a5fb..7055973191e 100644
--- a/js/src/Ice/.gitignore
+++ b/js/src/Ice/.gitignore
@@ -1,50 +1,79 @@
 # Ignore generated files
-BuiltinSequences.js
 BuiltinSequences.d.ts
+BuiltinSequences.js
 Communicator.d.ts
-Connection.js
+Communicator.js
+CommunicatorF.d.ts
+CommunicatorF.js
 Connection.d.ts
-ConnectionInfo.js
+Connection.js
+ConnectionF.d.ts
+ConnectionF.js
 ConnectionInfo.d.ts
-Current.js
+ConnectionInfo.js
 Current.d.ts
-Endpoint.js
+Current.js
 Endpoint.d.ts
+Endpoint.js
 EndpointF.d.ts
-EndpointInfo.js
+EndpointF.js
 EndpointInfo.d.ts
-EndpointTypes.js
+EndpointInfo.js
 EndpointTypes.d.ts
+EndpointTypes.js
 FacetMap.d.ts
-Identity.js
+FacetMap.js
 Identity.d.ts
+Identity.js
 ImplicitContext.d.ts
-LocalException.js
+ImplicitContext.js
+ImplicitContextF.d.ts
+ImplicitContextF.js
+InstrumentationF.d.ts
+InstrumentationF.js
 LocalException.d.ts
-Locator.js
+LocalException.js
 Locator.d.ts
+Locator.js
+LocatorF.d.ts
+LocatorF.js
 Logger.d.ts
-Metrics.js
+Logger.js
+LoggerF.d.ts
+LoggerF.js
 Metrics.d.ts
+Metrics.js
 ObjectAdapter.d.ts
+ObjectAdapter.js
+ObjectAdapterF.d.ts
+ObjectAdapterF.js
 ObjectFactory.d.ts
-Process.js
+ObjectFactory.js
+PluginF.d.ts
+PluginF.js
 Process.d.ts
+Process.js
+ProcessF.d.ts
+ProcessF.js
 Properties.d.ts
-PropertiesAdmin.js
+Properties.js
 PropertiesAdmin.d.ts
-RemoteLogger.js
+PropertiesAdmin.js
+PropertiesF.d.ts
+PropertiesF.js
 RemoteLogger.d.ts
-Router.js
+RemoteLogger.js
 Router.d.ts
-ServantLocator.js
+Router.js
+RouterF.d.ts
+RouterF.js
 ServantLocator.d.ts
-SliceChecksumDict.js
+ServantLocator.js
+ServantLocatorF.d.ts
+ServantLocatorF.js
 SliceChecksumDict.d.ts
+SliceChecksumDict.js
 ValueFactory.d.ts
-Version.js
+ValueFactory.js
 Version.d.ts
-ConnectionF.js
-EndpointF.js
-ObjectAdapterF.js
-ProcessF.js
+Version.js
diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/CommunicatorI.js
index afc9fe8670e..afc9fe8670e 100644
--- a/js/src/Ice/Communicator.js
+++ b/js/src/Ice/CommunicatorI.js
diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js
index 04049df7d96..84cbc3c5be6 100644
--- a/js/src/Ice/Ice.js
+++ b/js/src/Ice/Ice.js
@@ -13,14 +13,17 @@ module.exports.Ice = _ModuleRegistry.require(module,
     [
         "../Ice/Initialize",
         "../Ice/Communicator",
+        "../Ice/CommunicatorI",
         "../Ice/HashMap",
         "../Ice/Object",
         "../Ice/Value",
         "../Ice/Long",
         "../Ice/Logger",
+        "../Ice/LoggerI",
         "../Ice/ObjectPrx",
         "../Ice/BatchRequestQueue",
         "../Ice/Properties",
+        "../Ice/PropertiesI",
         "../Ice/IdentityUtil",
         "../Ice/ProcessLogger",
         "../Ice/Protocol",
diff --git a/js/src/Ice/Logger.js b/js/src/Ice/LoggerI.js
index 03264b73e57..03264b73e57 100644
--- a/js/src/Ice/Logger.js
+++ b/js/src/Ice/LoggerI.js
diff --git a/js/src/Ice/ProcessLogger.js b/js/src/Ice/ProcessLogger.js
index 2a6b2cae2b0..e1c4dc67eca 100644
--- a/js/src/Ice/ProcessLogger.js
+++ b/js/src/Ice/ProcessLogger.js
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-const Ice = require("../Ice/Logger").Ice;
+const Ice = require("../Ice/LoggerI").Ice;
 const Logger = Ice.Logger;
 
 let processLogger = null;
diff --git a/js/src/Ice/Properties.js b/js/src/Ice/PropertiesI.js
index 098d144beca..098d144beca 100644
--- a/js/src/Ice/Properties.js
+++ b/js/src/Ice/PropertiesI.js
diff --git a/js/src/Ice/index.d.ts b/js/src/Ice/index.d.ts
deleted file mode 100644
index 77dff580102..00000000000
--- a/js/src/Ice/index.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Address.d.ts"/>
-/// <reference path="./ArrayUtil.d.ts"/>
-/// <reference path="./AsyncResult.d.ts"/>
-/// <reference path="./AsyncResultBase.d.ts"/>
-/// <reference path="./BuiltinSequences.d.ts"/>
-/// <reference path="./Communicator.d.ts"/>
-/// <reference path="./Connection.d.ts"/>
-/// <reference path="./ConnectionInfo.d.ts"/>
-/// <reference path="./Current.d.ts"/>
-/// <reference path="./Debug.d.ts"/>
-/// <reference path="./Endpoint.d.ts"/>
-/// <reference path="./EndpointF.d.ts"/>
-/// <reference path="./EndpointInfo.d.ts"/>
-/// <reference path="./EndpointTypes.d.ts"/>
-/// <reference path="./Exception.d.ts"/>
-/// <reference path="./FacetMap.d.ts"/>
-/// <reference path="./FormatType.d.ts"/>
-/// <reference path="./HashMap.d.ts"/>
-/// <reference path="./Holder.d.ts"/>
-/// <reference path="./Identity.d.ts"/>
-/// <reference path="./IdentityUtil.d.ts"/>
-/// <reference path="./ImplicitContext.d.ts"/>
-/// <reference path="./Initialize.d.ts"/>
-/// <reference path="./LocalException.d.ts"/>
-/// <reference path="./Locator.d.ts"/>
-/// <reference path="./Logger.d.ts"/>
-/// <reference path="./Long.d.ts"/>
-/// <reference path="./MapUtil.d.ts"/>
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./Object.d.ts"/>
-/// <reference path="./ObjectAdapter.d.ts"/>
-/// <reference path="./ObjectFactory.d.ts"/>
-/// <reference path="./ObjectPrx.d.ts"/>
-/// <reference path="./OptionalFormat.d.ts"/>
-/// <reference path="./Process.d.ts"/>
-/// <reference path="./Promise.d.ts"/>
-/// <reference path="./Properties.d.ts"/>
-/// <reference path="./PropertiesAdmin.d.ts"/>
-/// <reference path="./Protocol.d.ts"/>
-/// <reference path="./RemoteLogger.d.ts"/>
-/// <reference path="./Router.d.ts"/>
-/// <reference path="./ServantLocator.d.ts"/>
-/// <reference path="./SliceChecksumDict.d.ts"/>
-/// <reference path="./Stream.d.ts"/>
-/// <reference path="./UnknownSlicedValue.d.ts"/>
-/// <reference path="./UUID.d.ts"/>
-/// <reference path="./Value.d.ts"/>
-/// <reference path="./ValueFactory.d.ts"/>
-/// <reference path="./Version.d.ts"/>
-
-export namespace Ice {}
-export namespace IceMX {}
-export namespace IceSSL {}
-
-declare module "ice" {}
diff --git a/js/src/Ice/sources.json b/js/src/Ice/sources.json
index 0f6ea95349c..fea3eda4f95 100644
--- a/js/src/Ice/sources.json
+++ b/js/src/Ice/sources.json
@@ -4,31 +4,10 @@
 
     "slice":[
         "Ice/BuiltinSequences.ice",
-        "Ice/Connection.ice",
-        "Ice/ConnectionF.ice",
-        "Ice/Current.ice",
-        "Ice/Endpoint.ice",
-        "Ice/EndpointF.ice",
-        "Ice/EndpointTypes.ice",
-        "Ice/Identity.ice",
-        "Ice/LocalException.ice",
-        "Ice/Locator.ice",
-        "Ice/Metrics.ice",
-        "Ice/ObjectAdapterF.ice",
-        "Ice/Process.ice",
-        "Ice/ProcessF.ice",
-        "Ice/PropertiesAdmin.ice",
-        "Ice/RemoteLogger.ice",
-        "Ice/Router.ice",
-        "Ice/SliceChecksumDict.ice",
-        "Ice/Version.ice",
-        "IceSSL/EndpointInfo.ice",
-        "IceSSL/ConnectionInfo.ice"],
-
-    "typescriptSlice":[
-        "Ice/BuiltinSequences.ice",
         "Ice/Communicator.ice",
+        "Ice/CommunicatorF.ice",
         "Ice/Connection.ice",
+        "Ice/ConnectionF.ice",
         "Ice/Current.ice",
         "Ice/Endpoint.ice",
         "Ice/EndpointF.ice",
@@ -36,23 +15,34 @@
         "Ice/FacetMap.ice",
         "Ice/Identity.ice",
         "Ice/ImplicitContext.ice",
+        "Ice/ImplicitContextF.ice",
+        "Ice/InstrumentationF.ice",
         "Ice/LocalException.ice",
         "Ice/Locator.ice",
+        "Ice/LocatorF.ice",
         "Ice/Logger.ice",
+        "Ice/LoggerF.ice",
         "Ice/Metrics.ice",
         "Ice/ObjectAdapter.ice",
+        "Ice/ObjectAdapterF.ice",
         "Ice/ObjectFactory.ice",
+        "Ice/PluginF.ice",
         "Ice/Process.ice",
+        "Ice/ProcessF.ice",
         "Ice/Properties.ice",
         "Ice/PropertiesAdmin.ice",
+        "Ice/PropertiesF.ice",
         "Ice/RemoteLogger.ice",
         "Ice/Router.ice",
+        "Ice/RouterF.ice",
         "Ice/ServantLocator.ice",
+        "Ice/ServantLocatorF.ice",
         "Ice/SliceChecksumDict.ice",
         "Ice/ValueFactory.ice",
         "Ice/Version.ice",
-        "IceSSL/EndpointInfo.ice",
-        "IceSSL/ConnectionInfo.ice"],
+        "IceSSL/ConnectionInfo.ice",
+        "IceSSL/EndpointInfo.ice"
+    ],
 
     "common": [
         "ACM.js",
@@ -65,29 +55,33 @@
         "BatchRequestQueue.js",
         "Buffer.js",
         "Communicator.js",
+        "CommunicatorI.js",
         "CompactIdRegistry.js",
+        "ConnectRequestHandler.js",
+        "ConnectionF.js",
         "ConnectionI.js",
         "ConnectionRequestHandler.js",
-        "ConnectRequestHandler.js",
         "DefaultsAndOverrides.js",
-        "EndpointI.js",
         "EndpointFactoryManager.js",
+        "EndpointI.js",
         "EnumBase.js",
-        "Exception.js",
         "ExUtil.js",
+        "Exception.js",
         "FormatType.js",
         "HashMap.js",
         "HashUtil.js",
+        "IPEndpointI.js",
         "IdentityUtil.js",
         "ImplicitContextI.js",
         "IncomingAsync.js",
         "Initialize.js",
         "Instance.js",
-        "IPEndpointI.js",
+        "InstrumentationF.js",
         "LocatorInfo.js",
         "LocatorManager.js",
         "LocatorTable.js",
         "Logger.js",
+        "LoggerI.js",
         "Long.js",
         "MapUtil.js",
         "Object.js",
@@ -99,9 +93,11 @@
         "OptionalFormat.js",
         "OutgoingAsync.js",
         "OutgoingConnectionFactory.js",
+        "PluginF.js",
         "ProcessLogger.js",
         "Promise.js",
         "Properties.js",
+        "PropertiesI.js",
         "Property.js",
         "PropertyNames.js",
         "Protocol.js",
@@ -126,23 +122,26 @@
         "ToStringMode.js",
         "TraceLevels.js",
         "TraceUtil.js",
-        "UnknownSlicedValue.js",
         "UUID.js",
+        "UnknownSlicedValue.js",
         "Value.js",
         "ValueFactoryManagerI.js",
         "WSEndpoint.js",
-        "WSEndpointFactory.js"],
+        "WSEndpointFactory.js"
+    ],
 
     "node":[
         "Debug.js",
         "Ice.js",
         "ModuleRegistry.js",
         "TcpTransceiver.js",
-        "TimerUtil.js"],
+        "TimerUtil.js"
+    ],
 
     "browser":[
         "browser/Debug.js",
         "browser/ModuleRegistry.js",
         "browser/TimerUtil.js",
-        "browser/WSTransceiver.js"]
+        "browser/WSTransceiver.js"
+    ]
 }
diff --git a/js/src/IceStorm/index.d.ts b/js/src/IceStorm/index.d.ts
deleted file mode 100644
index 5e6aca0fce9..00000000000
--- a/js/src/IceStorm/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./IceStorm.d.ts"/>
-
-export namespace IceStorm {}
-export namespace IceMX {}
-
-declare module "ice" {}
diff --git a/js/src/index.d.ts b/js/src/index.d.ts
deleted file mode 100644
index 59e42f73c32..00000000000
--- a/js/src/index.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-/// <reference path="./Ice/index.d.ts"/>
-/// <reference path="./Glacier2/index.d.ts"/>
-/// <reference path="./IceStorm/index.d.ts"/>
-/// <reference path="./IceGrid/index.d.ts"/>
-
-export namespace Ice {}
-export namespace IceMX {}
-export namespace IceSSL {}
-export namespace Glacier2 {}
-export namespace IceStorm {}
-export namespace IceGrid {}
-
-declare module "ice" {}