@ywfe/fe-tools 1.2.1-beta.40 → 1.2.1-beta.5

package/index.ts

@@ -1,3 +1,2 @@
 export { default as request } from './request'
 export { default as userInputToJson } from './userInputToJson'
-export { default as JSON2String } from './JSON2String'

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 export { default as request } from './request';
 export { default as userInputToJson } from './userInputToJson';
-export { default as JSON2String } from './JSON2String';

package/lib/userInputToJson.d.ts

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

package/lib/ywfe-tools.cjs

@@ -8706,54 +8706,50 @@ 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, response, message, result;
+        var method, basePathMap, getBasePath, isValidURL, prefix, requestUrl, fetchOption, res;
         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 regex = /^https?:\/\//;
-                        return regex.test(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
+                        return !!pattern.test(url);
                     };
                     prefix = getBasePath();
                     requestUrl = isValidURL(input.url) ? input.url : "".concat(prefix).concat(input.url);
                     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:
-                    response = _c.sent();
-                    if (!response.ok) {
-                        message = "An error has occured: ".concat(response.status);
-                        console.log('req result', message);
-                        return [2 /*return*/, { success: false, message: message }];
-                    }
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    result = _c.sent();
-                    console.log('req result', result);
-                    return [2 /*return*/, result];
+                    res = _c.sent();
+                    return [2 /*return*/, res.json()];
             }
         });
     });
@@ -8761,40 +8757,20 @@ function request(_a) {
 
 function userInputToJson(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
-        var res;
         var input = _b.input;
         return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, request({
-                        input: {
-                            url: "https://fc-typechat.ywwl.com/userInputToJson",
-                            method: "GET",
-                            params: input,
-                        },
-                    })];
-                case 1:
-                    res = _c.sent();
-                    console.log('userINput1', res);
-                    return [2 /*return*/, res];
-            }
+            input.userInput, input.rules;
+            //const res = await fetools.request({
+            //input:{
+            //url:"https://fc-typechat.ywwl.com/userInputToJson",
+            //method:"GET"
+            //}
+            //})
+            return [2 /*return*/, "2"];
         });
     });
 }
 
-// Ctrl-S保存代码
-function JSON2String(_a) {
-    var input = _a.input;
-    var data = input.data;
-    try {
-        var str = JSON.stringify(data);
-        return '```json' + str + 'json```';
-    }
-    catch (error) {
-        return '```json' + '{}' + 'json```';
-    }
-}
-
-exports.JSON2String = JSON2String;
 exports.request = request;
 exports.userInputToJson = userInputToJson;
 //# sourceMappingURL=ywfe-tools.cjs.map