@magda/utils 3.0.0-alpha.0 → 3.0.0-alpha.2

package/dist/index-web.js

@@ -2502,12 +2502,14 @@ function encodeURIComponentWithApost(string) {
 
 // ../../magda-typescript-common/dist/formatServiceError.js
 function formatServiceError(baseMessage, e, retriesLeft) {
+  var _a, _b, _c, _d;
   let messageParts = [baseMessage];
   if (retriesLeft) {
     messageParts.push(`${retriesLeft} retries left.`);
   }
-  if (e && e.response && e.response.statusCode && e.body) {
-    messageParts.push(`Status code: ${e.response.statusCode}, body:
+  if ((((_a = e == null ? void 0 : e.response) == null ? void 0 : _a.statusCode) || ((_b = e == null ? void 0 : e.response) == null ? void 0 : _b.status)) && e.body) {
+    const statusCode = ((_c = e == null ? void 0 : e.response) == null ? void 0 : _c.status) || ((_d = e == null ? void 0 : e.response) == null ? void 0 : _d.statusCode);
+    messageParts.push(`Status code: ${statusCode}, body:
 ${JSON.stringify(e.body, null, "  ")}`);
   } else if (e && e instanceof Error) {
     messageParts.push(`Exception:
@@ -2537,8 +2539,10 @@ ${JSON.stringify(errorResponse, null, "  ")}`, e);
   }
 };
 function createServiceError(e) {
-  if (e && e.response && e.response.statusCode && e.body) {
-    return new BadRequestError(e.response.statusCode, e.body, e);
+  var _a, _b, _c, _d;
+  if ((((_a = e == null ? void 0 : e.response) == null ? void 0 : _a.statusCode) || ((_b = e == null ? void 0 : e.response) == null ? void 0 : _b.status)) && e.body) {
+    const statusCode = ((_c = e == null ? void 0 : e.response) == null ? void 0 : _c.status) || ((_d = e == null ? void 0 : e.response) == null ? void 0 : _d.statusCode);
+    return new BadRequestError(statusCode, e.body, e);
   } else if (e && e instanceof Error) {
     return e;
   } else if (e && e.toString() !== {}.toString()) {

package/dist/index.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="node" />
-
 import { Arguments } from 'yargs';
-import requestOriginal from 'request';
 
 /**
  * Checks to see whether the passed argv has a jwtSecret object. If not,
@@ -17,6 +14,17 @@ export declare function addJwtSecretFromEnvVar<T>(argv: {
     [key in keyof Arguments<T>]: Arguments<T>[key];
 };
 
+/**
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 0.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 declare class ApiError {
     'message': string;
 }
@@ -161,8 +169,6 @@ declare interface Monad<T> {
     chain<U>(f: (t: T) => Monad<U>): Monad<U>;
 }
 
-export declare const request: requestOriginal.RequestAPI<requestOriginal.Request, requestOriginal.CoreOptions, requestOriginal.RequiredUriUrl>;
-
 declare type RequestContentType = RequestContentTypeJson | RequestContentTypePlainText | RequestContentTypeForm | RequestContentTypeBinary | RequestContentTypeMultipartForm;
 
 declare type RequestContentTypeBinary = "application/octet-stream";