JavaScript exception mapping fixes (#2562)

cpp/src/slice2js/Gen.cpp

@@ -948,7 +948,7 @@ Slice::Gen::ImportVisitor::writeImports(const UnitPtr& p)
 
         if (_seenUserException)
         {
-            jsIceImports.insert("Exception");
+            jsIceImports.insert("UserException");
             jsIceImports.insert("TypeRegistry");
         }
 

js/src/Ice/AsyncResult.js

@@ -5,8 +5,8 @@
 import { AsyncResultBase } from "./AsyncResultBase.js";
 import { OutputStream } from "./Stream.js";
 import { Protocol } from "./Protocol.js";
-import { UserException } from "./Exception.js";
-import { InvocationCanceledException } from "./LocalException.js";
+import { UserException } from "./UserException.js";
+import { InvocationCanceledException } from "./LocalExceptions.js";
 import { Debug } from "./Debug.js";
 
 export class AsyncResult extends AsyncResultBase {

js/src/Ice/Communicator.js

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-import { CommunicatorDestroyedException } from "./LocalException.js";
+import { CommunicatorDestroyedException } from "./LocalExceptions.js";
 import { generateUUID } from "./UUID.js";
 import { identityToString } from "./IdentityUtil.js";
 import { Promise } from "./Promise.js";

js/src/Ice/ConnectRequestHandler.js

@@ -3,7 +3,7 @@
 //
 
 import { AsyncStatus } from "./AsyncStatus.js";
-import { LocalException } from "./Exception.js";
+import { LocalException } from "./LocalException.js";
 import { RetryException } from "./RetryException.js";
 import { Debug } from "./Debug.js";
 

js/src/Ice/ConnectionI.js

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-import { LocalException } from "./Exception.js";
+import { LocalException } from "./LocalException.js";
 import {
     IllegalMessageSizeException,
     ObjectAdapterDeactivatedException,
@@ -21,7 +21,7 @@ import {
     ConnectionNotValidatedException,
     UnknownMessageException,
     UnknownException,
-} from "./LocalException.js";
+} from "./LocalExceptions.js";
 
 import { ConnectionClose } from "./Connection.js";
 

js/src/Ice/DefaultsAndOverrides.js

@@ -5,7 +5,7 @@
 import { FormatType } from "./FormatType.js";
 import { EndpointSelectionType } from "./EndpointSelectionType.js";
 import { Protocol, stringToEncodingVersion, encodingVersionToString } from "./Protocol.js";
-import { EndpointSelectionTypeParseException } from "./LocalException.js";
+import { EndpointSelectionTypeParseException } from "./LocalExceptions.js";
 import { TcpTransceiver } from "./TcpTransceiver.js";
 
 export class DefaultsAndOverrides {

js/src/Ice/EndpointFactoryManager.js

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-import { EndpointParseException } from "./LocalException.js";
+import { EndpointParseException } from "./LocalExceptions.js";
 import { StringUtil } from "./StringUtil.js";
 import { OpaqueEndpointI } from "./OpaqueEndpoint.js";
 import { Protocol } from "./Protocol.js";

js/src/Ice/ExUtil.js

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-import { UnexpectedObjectException, MemoryLimitException } from "./LocalException.js";
+import { UnexpectedObjectException, MemoryLimitException } from "./LocalExceptions.js";
 
 export function throwUOE(expectedType, v) {
     const type = v.ice_id();

js/src/Ice/Exception.d.ts

@@ -24,21 +24,5 @@ declare module "ice" {
 
             ice_cause: string | Error;
         }
-
-        /**
-         * Base class for all Ice run-time exceptions.
-         */
-        abstract class LocalException extends Exception {}
-
-        /**
-         * Base class for all Ice user exceptions.
-         */
-        abstract class UserException extends Exception {
-            /**
-             * Obtains the Slice type ID of this exception.
-             * @return The fully-scoped type ID.
-             */
-            static ice_staticId(): string;
-        }
     }
 }

js/src/Ice/Exception.js

@@ -38,7 +38,7 @@ const toString = function (key, object, objectTable, ident) {
 //
 // Ice.Exception
 //
-class Exception extends Error {
+export class Exception extends Error {
     constructor(cause) {
         super();
         if (cause) {
@@ -86,95 +86,3 @@ class Exception extends Error {
         }
     }
 }
-
-//
-// Ice.LocalException
-//
-class LocalException extends Exception {
-    constructor(cause) {
-        super(cause);
-        Exception.captureStackTrace(this);
-    }
-
-    static get _id() {
-        return "::Ice::LocalException";
-    }
-}
-
-//
-// Ice.UserException
-//
-class UserException extends Exception {
-    constructor(cause) {
-        super(cause);
-        Exception.captureStackTrace(this);
-    }
-
-    static get _id() {
-        return "::Ice::UserException";
-    }
-
-    _write(os) {
-        os.startException();
-        writeImpl(this, os, this._mostDerivedType());
-        os.endException();
-    }
-
-    _read(is) {
-        is.startException();
-        readImpl(this, is, this._mostDerivedType());
-        is.endException();
-    }
-
-    _usesClasses() {
-        return false;
-    }
-
-    _mostDerivedType() {
-        return UserException;
-    }
-}
-
-//
-// Private methods
-//
-
-const writeImpl = function (obj, os, type) {
-    //
-    // The writeImpl method is a recursive method that goes down the
-    // class hierarchy to marshal each slice of the class using the
-    // generated _writeMemberImpl method.
-    //
-
-    if (type === undefined || type === UserException) {
-        return; // Don't marshal anything for Ice.UserException
-    }
-
-    os.startSlice(type._id, -1, type._parent === UserException);
-    if (type.prototype.hasOwnProperty("_writeMemberImpl")) {
-        type.prototype._writeMemberImpl.call(obj, os);
-    }
-    os.endSlice();
-    writeImpl(obj, os, type._parent);
-};
-
-const readImpl = function (obj, is, type) {
-    //
-    // The readImpl method is a recursive method that goes down the
-    // class hierarchy to marshal each slice of the class using the
-    // generated _readMemberImpl method.
-    //
-
-    if (type === undefined || type === UserException) {
-        return; // Don't marshal anything for UserException
-    }
-
-    is.startSlice();
-    if (type.prototype.hasOwnProperty("_readMemberImpl")) {
-        type.prototype._readMemberImpl.call(obj, is);
-    }
-    is.endSlice();
-    readImpl(obj, is, type._parent);
-};
-
-export { Exception, LocalException, UserException };

js/src/Ice/IPEndpointI.js

@@ -3,7 +3,7 @@
 //
 
 import { Address } from "./Address.js";
-import { EndpointParseException } from "./LocalException.js";
+import { EndpointParseException } from "./LocalExceptions.js";
 import { HashUtil } from "./HashUtil.js";
 import { StringUtil } from "./StringUtil.js";
 import { EndpointI } from "./EndpointI.js";

js/src/Ice/IdentityUtil.js

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-import { IdentityParseException } from "./LocalException.js";
+import { IdentityParseException } from "./LocalExceptions.js";
 import { StringUtil } from "./StringUtil.js";
 import { Ice as Ice_Identity } from "./Identity.js";
 import { ToStringMode } from "./ToStringMode.js";

js/src/Ice/ImplicitContext.js

@@ -5,7 +5,7 @@
 import { Ice as Ice_Context } from "./Context.js";
 const { Context, ContextHelper } = Ice_Context;
 
-import { InitializationException } from "./LocalException.js";
+import { InitializationException } from "./LocalExceptions.js";
 
 //
 // The base class for all ImplicitContext implementations

js/src/Ice/IncomingAsync.js

@@ -11,7 +11,8 @@ import { Ice as Ice_Identity } from "./Identity.js";
 const { Identity } = Ice_Identity;
 import { identityToString } from "./IdentityUtil.js";
 import { FormatType } from "./FormatType.js";
-import { LocalException, UserException } from "./Exception.js";
+import { LocalException } from "./LocalException.js";
+import { UserException } from "./UserException.js";
 import {
     FacetNotExistException,
     MarshalException,
@@ -21,7 +22,7 @@ import {
     UnknownException,
     UnknownLocalException,
     UnknownUserException,
-} from "./LocalException.js";
+} from "./LocalExceptions.js";
 
 import { Protocol } from "./Protocol.js";
 import { OutputStream } from "./Stream.js";

js/src/Ice/Initialize.js

@@ -4,7 +4,7 @@
 
 import { Communicator } from "./Communicator.js";
 import { Protocol } from "./Protocol.js";
-import { InitializationException } from "./LocalException.js";
+import { InitializationException } from "./LocalExceptions.js";
 import { Properties } from "./Properties.js";
 
 export class InitializationData {

js/src/Ice/InstanceExtensions.js

@@ -17,8 +17,8 @@ import { RouterManager } from "./RouterManager.js";
 import { Timer } from "./Timer.js";
 import { TraceLevels } from "./TraceLevels.js";
 import { ValueFactoryManager } from "./ValueFactoryManager.js";
-import { LocalException } from "./Exception.js";
-import { CommunicatorDestroyedException, InitializationException } from "./LocalException.js";
+import { LocalException } from "./LocalException.js";
+import { CommunicatorDestroyedException, InitializationException } from "./LocalExceptions.js";
 import { getProcessLogger } from "./ProcessLogger.js";
 import { ToStringMode } from "./ToStringMode.js";
 import { ProtocolInstance } from "./ProtocolInstance.js";