@ywfe/fe-tools 1.2.1-beta.21 → 1.2.1-beta.23

package/lib/userInputToJson.d.ts

@@ -4,5 +4,5 @@ interface userInput {
 }
 declare function userInputToJson({ input }: {
     input: userInput;
-}): Promise<string>;
+}): Promise<any>;
 export default userInputToJson;

package/lib/ywfe-tools.cjs

@@ -8706,29 +8706,29 @@ var require$$1 = /*@__PURE__*/getAugmentedNamespace(empty$1);
 
 function request(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
-        var method, basePathMap, getBasePath, isValidURL, prefix, requestUrl, fetchOption, res;
+        var method, basePathMap, getBasePath, isValidURL, prefix, requestUrl, fetchOption, response, message, result;
         var input = _b.input;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    method = input.method || 'GET';
+                    method = input.method || "GET";
                     basePathMap = new Map([
-                        ['prod', 'https://gateway.ywwl.com'],
-                        ['test', 'https://test-gateway.ywwl.com'],
-                        ['test2', 'https://test2-gateway.ywwl.com'],
-                        ['dev', 'https://dev-gateway.ywwl.com'],
+                        ["prod", "https://gateway.ywwl.com"],
+                        ["test", "https://test-gateway.ywwl.com"],
+                        ["test2", "https://test2-gateway.ywwl.com"],
+                        ["dev", "https://dev-gateway.ywwl.com"],
                     ]);
                     getBasePath = function () {
-                        var env = '{{env}}';
+                        var env = "{{env}}";
                         return basePathMap.get(env);
                     };
                     isValidURL = function (url) {
-                        var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
-                            '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-                            '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-                            '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-                            '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-                            '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+                        var pattern = new RegExp("^(https?:\\/\\/)?" + // protocol
+                            "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
+                            "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
+                            "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
+                            "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
+                            "(\\#[-a-z\\d_]*)?$", "i"); // fragment locator
                         return !!pattern.test(url);
                     };
                     prefix = getBasePath();
@@ -8736,20 +8736,27 @@ function request(_a) {
                     fetchOption = {
                         method: method,
                         headers: {
-                            'Content-type': 'application/json',
-                            'x-token': '{{token}}',
+                            "Content-type": "application/json",
+                            "x-token": "{{token}}",
                         },
                     };
-                    if (method.toUpperCase() === 'POST') {
+                    if (method.toUpperCase() === "POST") {
                         fetchOption.body = JSON.stringify(input.params);
                     }
-                    else if (method.toUpperCase() === 'GET') {
+                    else if (method.toUpperCase() === "GET") {
                         requestUrl = "".concat(requestUrl, "?").concat(ywfeUtils_esm.querystring.stringify(input.params || {}));
                     }
                     return [4 /*yield*/, fetch(requestUrl, fetchOption)];
                 case 1:
-                    res = _c.sent();
-                    return [2 /*return*/, res.json()];
+                    response = _c.sent();
+                    if (!response.ok) {
+                        message = "An error has occured: ".concat(response.status);
+                        return [2 /*return*/, { success: false, message: message }];
+                    }
+                    return [4 /*yield*/, response.json()];
+                case 2:
+                    result = _c.sent();
+                    return [2 /*return*/, result];
             }
         });
     });
@@ -8757,16 +8764,29 @@ function request(_a) {
 
 function userInputToJson(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
+        var res, result;
         var input = _b.input;
         return __generator(this, function (_c) {
-            input.userInput, input.rules;
-            //const res = await fetools.request({
-            //input:{
-            //url:"https://fc-typechat.ywwl.com/userInputToJson",
-            //method:"GET"
-            //}
-            //})
-            return [2 /*return*/, "2"];
+            switch (_c.label) {
+                case 0:
+                    console.log("input", input);
+                    return [4 /*yield*/, request({
+                            input: {
+                                url: "https://fc-typechat.ywwl.com/userInputToJson",
+                                method: "GET",
+                                params: input,
+                            },
+                        })];
+                case 1:
+                    res = _c.sent();
+                    if (res.success) {
+                        result = res.data;
+                        return [2 /*return*/, result.success ? result.data : result];
+                    }
+                    else {
+                        return [2 /*return*/, res.success ? res.data : res];
+                    }
+            }
         });
     });
 }