@esri/hub-common 10.0.0-next.3 → 10.0.0-next.6

package/dist/esm/resources/validate-url.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import { ItemType } from "../types";
 import { Logger } from "../utils";
 import { isUrl, isFeatureService, isService, pingFeatureService, pingUrl, detectDataTypeFromHeader, getFileName, detectDataTypeFromExtension, shouldHaveDataUrl, } from "./_internal/_validate-url-helpers";
@@ -9,95 +8,79 @@ import { isUrl, isFeatureService, isService, pingFeatureService, pingUrl, detect
  * @param {string} url
  * @return {*}  {Promise<any>}
  */
-export function validateUrl(url) {
-    return __awaiter(this, void 0, void 0, function () {
-        var isFeatureServiceUrl, isServiceUrl, type, item, pingResult, _a, e_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    // If URL doesn't pass then exit out immediately.
-                    if (!isUrl(url)) {
-                        return [2 /*return*/, {
-                                pass: false,
-                                error: "invalidFormat",
-                            }];
-                    }
-                    isFeatureServiceUrl = isFeatureService(url);
-                    isServiceUrl = isService(url);
-                    if (isServiceUrl && !isFeatureServiceUrl) {
-                        return [2 /*return*/, {
-                                pass: false,
-                                error: "invalidFormat",
-                            }];
-                    }
-                    pingResult = {};
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 6, , 7]);
-                    if (!isFeatureServiceUrl) return [3 /*break*/, 3];
-                    return [4 /*yield*/, pingFeatureService(url)];
-                case 2:
-                    _a = _b.sent();
-                    return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, pingUrl(url)];
-                case 4:
-                    _a = _b.sent();
-                    _b.label = 5;
-                case 5:
-                    pingResult = _a;
-                    // return an error if the response is not okay
-                    if (!pingResult.ok) {
-                        return [2 /*return*/, {
-                                pass: false,
-                                error: "invalidUrl",
-                            }];
-                    }
-                    return [3 /*break*/, 7];
-                case 6:
-                    e_1 = _b.sent();
-                    // TODO: This is tricky. The fetch() API rejects when a network error
-                    // happens. This error can be a CORS error, or a 404 error, or a timeout
-                    // error. While an error like 404 does suggest a bad URL, the CORS occurs
-                    // because this is a front-end request and the file is likely accessible by
-                    // the server. Unfortunately, the error doesn't have any information about
-                    // underline failure type. For now, the network failure is ignored, so the
-                    // user can paste a URL from any domain and avoid the CORS issue.
-                    Logger.error("error requesting url");
-                    return [3 /*break*/, 7];
-                case 7:
-                    // Use the metadata from the ping response if exists, otherwise guess the file
-                    // name from the URL
-                    if (pingResult.item) {
-                        item = pingResult.item;
-                    }
-                    else {
-                        item = { title: getFileName(url), url: url };
-                    }
-                    if (pingResult.headers) {
-                        type = detectDataTypeFromHeader(pingResult.headers);
-                    }
-                    if (isFeatureServiceUrl) {
-                        type = ItemType["Feature Service"];
-                    }
-                    else if (!type) {
-                        // Guess the data type from the extension
-                        type = detectDataTypeFromExtension(url);
-                    }
-                    if (type) {
-                        item.type = type;
-                    }
-                    if (item.type && shouldHaveDataUrl(item.type)) {
-                        item.dataUrl = item.url;
-                    }
-                    return [2 /*return*/, {
-                            pass: true,
-                            // The type may or may not be true
-                            type: type,
-                            // fetched / calculated item
-                            item: item,
-                        }];
-            }
-        });
-    });
+export async function validateUrl(url) {
+    // If URL doesn't pass then exit out immediately.
+    if (!isUrl(url)) {
+        return {
+            pass: false,
+            error: "invalidFormat",
+        };
+    }
+    // Check if it's a FS, Map service, or image service
+    const isFeatureServiceUrl = isFeatureService(url);
+    const isServiceUrl = isService(url);
+    if (isServiceUrl && !isFeatureServiceUrl) {
+        return {
+            pass: false,
+            error: "invalidFormat",
+        };
+    }
+    // Content type which can be determined bby the url file extnesion or the request response header
+    let type;
+    let item;
+    let pingResult = {};
+    try {
+        pingResult = isFeatureServiceUrl
+            ? await pingFeatureService(url)
+            : await pingUrl(url);
+        // return an error if the response is not okay
+        if (!pingResult.ok) {
+            return {
+                pass: false,
+                error: "invalidUrl",
+            };
+        }
+    }
+    catch (e) {
+        // TODO: This is tricky. The fetch() API rejects when a network error
+        // happens. This error can be a CORS error, or a 404 error, or a timeout
+        // error. While an error like 404 does suggest a bad URL, the CORS occurs
+        // because this is a front-end request and the file is likely accessible by
+        // the server. Unfortunately, the error doesn't have any information about
+        // underline failure type. For now, the network failure is ignored, so the
+        // user can paste a URL from any domain and avoid the CORS issue.
+        Logger.error(`error requesting url`);
+    }
+    // Use the metadata from the ping response if exists, otherwise guess the file
+    // name from the URL
+    if (pingResult.item) {
+        item = pingResult.item;
+    }
+    else {
+        item = { title: getFileName(url), url };
+    }
+    if (pingResult.headers) {
+        type = detectDataTypeFromHeader(pingResult.headers);
+    }
+    if (isFeatureServiceUrl) {
+        type = ItemType["Feature Service"];
+    }
+    else if (!type) {
+        // Guess the data type from the extension
+        type = detectDataTypeFromExtension(url);
+    }
+    if (type) {
+        item.type = type;
+    }
+    if (item.type && shouldHaveDataUrl(item.type)) {
+        item.dataUrl = item.url;
+    }
+    return {
+        pass: true,
+        // The type may or may not be true
+        type,
+        // fetched / calculated item
+        item,
+    };
 }
 //# sourceMappingURL=validate-url.js.map

package/dist/esm/resources/validate-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-url.js","sourceRoot":"","sources":["../../../src/resources/validate-url.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,OAAO,EACP,wBAAwB,EACxB,WAAW,EACX,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,UAAgB,WAAW,CAAC,GAAW;;;;;;oBAC3C,iDAAiD;oBACjD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBACf,sBAAO;gCACL,IAAI,EAAE,KAAK;gCACX,KAAK,EAAE,eAAe;6BACvB,EAAC;qBACH;oBAGK,mBAAmB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;oBAC5C,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;oBAEpC,IAAI,YAAY,IAAI,CAAC,mBAAmB,EAAE;wBACxC,sBAAO;gCACL,IAAI,EAAE,KAAK;gCACX,KAAK,EAAE,eAAe;6BACvB,EAAC;qBACH;oBAOG,UAAU,GAA4D,EAAE,CAAC;;;;yBAG9D,mBAAmB,EAAnB,wBAAmB;oBAC5B,qBAAM,kBAAkB,CAAC,GAAG,CAAC,EAAA;;oBAA7B,KAAA,SAA6B,CAAA;;wBAC7B,qBAAM,OAAO,CAAC,GAAG,CAAC,EAAA;;oBAAlB,KAAA,SAAkB,CAAA;;;oBAFtB,UAAU,KAEY,CAAC;oBAEvB,8CAA8C;oBAC9C,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE;wBAClB,sBAAO;gCACL,IAAI,EAAE,KAAK;gCACX,KAAK,EAAE,YAAY;6BACpB,EAAC;qBACH;;;;oBAED,qEAAqE;oBACrE,wEAAwE;oBACxE,yEAAyE;oBACzE,2EAA2E;oBAC3E,0EAA0E;oBAC1E,0EAA0E;oBAC1E,iEAAiE;oBACjE,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;;;oBAEvC,8EAA8E;oBAC9E,oBAAoB;oBACpB,IAAI,UAAU,CAAC,IAAI,EAAE;wBACnB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;qBACxB;yBAAM;wBACL,IAAI,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,KAAA,EAAE,CAAC;qBACzC;oBAED,IAAI,UAAU,CAAC,OAAO,EAAE;wBACtB,IAAI,GAAG,wBAAwB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;qBACrD;oBAED,IAAI,mBAAmB,EAAE;wBACvB,IAAI,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;qBACpC;yBAAM,IAAI,CAAC,IAAI,EAAE;wBAChB,yCAAyC;wBACzC,IAAI,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;qBACzC;oBAED,IAAI,IAAI,EAAE;wBACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;qBAClB;oBAED,IAAI,IAAI,CAAC,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;wBAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC;qBACzB;oBAED,sBAAO;4BACL,IAAI,EAAE,IAAI;4BACV,kCAAkC;4BAClC,IAAI,MAAA;4BACJ,4BAA4B;4BAC5B,IAAI,MAAA;yBACL,EAAC;;;;CACH"}
+{"version":3,"file":"validate-url.js","sourceRoot":"","sources":["../../../src/resources/validate-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,OAAO,EACP,wBAAwB,EACxB,WAAW,EACX,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW;IAC3C,iDAAiD;IACjD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACf,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,eAAe;SACvB,CAAC;KACH;IAED,oDAAoD;IACpD,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,YAAY,IAAI,CAAC,mBAAmB,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,eAAe;SACvB,CAAC;KACH;IAED,iGAAiG;IACjG,IAAI,IAAI,CAAC;IAET,IAAI,IAAI,CAAC;IAET,IAAI,UAAU,GAA4D,EAAE,CAAC;IAE7E,IAAI;QACF,UAAU,GAAG,mBAAmB;YAC9B,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,CAAC;YAC/B,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;QAEvB,8CAA8C;QAC9C,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE;YAClB,OAAO;gBACL,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,YAAY;aACpB,CAAC;SACH;KACF;IAAC,OAAO,CAAC,EAAE;QACV,qEAAqE;QACrE,wEAAwE;QACxE,yEAAyE;QACzE,2EAA2E;QAC3E,0EAA0E;QAC1E,0EAA0E;QAC1E,iEAAiE;QACjE,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACtC;IACD,8EAA8E;IAC9E,oBAAoB;IACpB,IAAI,UAAU,CAAC,IAAI,EAAE;QACnB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;KACxB;SAAM;QACL,IAAI,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;KACzC;IAED,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,IAAI,GAAG,wBAAwB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACrD;IAED,IAAI,mBAAmB,EAAE;QACvB,IAAI,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;KACpC;SAAM,IAAI,CAAC,IAAI,EAAE;QAChB,yCAAyC;QACzC,IAAI,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;KACzC;IAED,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC;KACzB;IAED,OAAO;QACL,IAAI,EAAE,IAAI;QACV,kCAAkC;QAClC,IAAI;QACJ,4BAA4B;QAC5B,IAAI;KACL,CAAC;AACJ,CAAC"}