@ywfe/fe-tools 1.2.1-beta.13 → 1.2.1-beta.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@ywfe/fe-tools",
-  "version": "1.2.1-beta.13",
+  "version": "1.2.1-beta.15",
   "description": "工具函数库",
   "main": "./lib/ywfe-tools.cjs",
   "module": "./lib/ywfe-tools.esm.js",
@@ -24,16 +24,17 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-typescript": "^11.1.6",
+    "@ywfe/utils": "^0.10.74",
     "crypto-js": "^4.0.0",
     "ramda": "^0.27.1",
+    "rollup": "^4.18.0",
     "rollup-plugin-clear": "^2.0.7",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-progress": "^1.1.2",
     "rollup-plugin-terser": "^7.0.2",
     "strtok3": "^6.3.0",
     "token-types": "^4.2.0",
-    "uuid": "^8.3.2",
-    "rollup": "^4.18.0"
+    "uuid": "^8.3.2"
   },
   "gitHead": "795058c747c80a3a69f6904dccffb53c42acfcc7"
-}
+}

package/request.ts

@@ -1,49 +1,55 @@
 // Ctrl-S保存代码
-import {querystring} from '@ywfe/utils'
+import { querystring } from "@ywfe/utils";
 interface RequestOptions {
-  url:string,
-  method?:string,
-  params?:any
+  url: string;
+  method?: string;
+  params?: any;
 }
-async function request({input}:{input:RequestOptions}){
-  const method = input.method || 'GET';
+async function request({ input }: { input: RequestOptions }) {
+  const method = input.method || "GET";
   const 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"],
+  ]);
   const getBasePath = () => {
-   const env = '{{env}}';
-   return basePathMap.get(env);
+    const env = "{{env}}";
+    return basePathMap.get(env);
   };
-  const isValidURL = (url:string)=> {
+  const isValidURL = (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
+      "^(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);
-}
-  const prefix = getBasePath()
-  let requestUrl = isValidURL(input.url) ? input.url :`${prefix}${input.url}`
-  const fetchOption: {[key:string]:any} = {
+  };
+  const prefix = getBasePath();
+  let requestUrl = isValidURL(input.url) ? input.url : `${prefix}${input.url}`;
+  const fetchOption: { [key: string]: any } = {
     method: method,
     headers: {
-      'Content-type': 'application/json',
-      'x-token': '{{token}}',
+      "Content-type": "application/json",
+      "x-token": "{{token}}",
     },
   };
-  if (method.toUpperCase() === 'POST') {
-     fetchOption.body = JSON.stringify(input.params);
-  }else if(method.toUpperCase() === 'GET'){
-    requestUrl = `${requestUrl}?${querystring.stringify(input.params || {})}`
-    
+  if (method.toUpperCase() === "POST") {
+    fetchOption.body = JSON.stringify(input.params);
+  } else if (method.toUpperCase() === "GET") {
+    requestUrl = `${requestUrl}?${querystring.stringify(input.params || {})}`;
+  }
+  const response = await fetch(requestUrl, fetchOption);
+  if (!response.ok) {
+    const message = `An error has occured: ${response.status}`;
+    return { success: false, message };
   }
-  
-  const res = await fetch(requestUrl, fetchOption);
-  return res.json();
+  const result = await response.json();
+  return result;
 }
+
 export default request

package/lib/userInputToJson.d.ts

@@ -1,8 +0,0 @@
-interface userInput {
-    userInput?: string;
-    rules?: string;
-}
-declare function userInputToJson({ input }: {
-    input: userInput;
-}): Promise<any>;
-export default userInputToJson;

package/userInputToJson.ts

@@ -1,24 +0,0 @@
-import {request} from './index'
-// Ctrl-S保存代码
-interface userInput {
-  userInput?: string;
-  rules?: string;
-}
-async function userInputToJson({ input }: { input: userInput }) {
-  console.log("input", input);
-  const res: { message: string; success: boolean; data: any } =
-    await request({
-      input: {
-        url: "https://fc-typechat.ywwl.com/userInputToJson",
-        method: "GET",
-        params: input,
-      },
-    });
-  if (res.success) {
-    const result = res.data;
-    return result.success ? result.data : result;
-  } else {
-    return res.success ? res.data : res;
-  }
-}
-export default userInputToJson