@freelog/tools-lib 0.1.56 → 0.1.58

package/dist/utils/regexp.d.ts

@@ -9,3 +9,4 @@ export declare const MOBILE_PHONE_NUMBER: RegExp;
 export declare const EMAIL_ADDRESS: RegExp;
 export declare const USERNAME: RegExp;
 export declare const PASSWORD: RegExp;
+export declare const NATURAL_NUMBER: RegExp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/utils/format.ts

@@ -1,89 +1,89 @@
-import moment from 'moment';
-import {report} from '@freelog/resource-policy-lang/dist';
-import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
-
-const {compile} = require('@freelog/resource-policy-lang');
-
-/**
- * 将对应的字节数，转换为易读单位数量
- * @param bytes
- * @return {string}
- */
-export function humanizeSize(bytes: number): string {
-  // console.log('dddhumanizeSizesdfsd');
-  if (bytes <= 0) {
-    return '0 B';
-  }
-  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-  const index = Math.floor(Math.log(bytes) / Math.log(1024));
-  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
-  return size + ' ' + unitArr[index];
-}
-
-/**
- * 格式化日期时间
- */
-export function formatDateTime(date: string, showTime: boolean = false) {
-  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
-}
-
-/**
- * 根据传入的子域名拼合成完整的适合的url
- * @param domain 要组合的三级域名
- */
-export function completeUrlByDomain(domain: string): string {
-  let origin: string = `http://${domain}.testfreelog.com`;
-
-  if (window.location.origin.includes('.freelog.com')) {
-    origin = `https://${domain}.freelog.com`;
-  }
-
-  return origin;
-}
-
-/**
- * 根据策略代码和标的物类型，生成对应的翻译
- * @param code 策略代码
- * @param targetType 标的物类型
- */
-export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
-  error: string[] | null;
-  text?: string;
-}> {
-  try {
-    const result = await compile(
-      code,
-      targetType,
-      completeUrlByDomain('qi'),
-      window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
-    );
-    const contract: ContractEntity = {
-      audiences: result.state_machine.audiences,
-      fsmStates: Object.entries<any>(result.state_machine.states)
-        .map((st) => {
-          return {
-            name: st[0],
-            serviceStates: st[1].serviceStates,
-            events: st[1].transitions.map((ts: any) => {
-
-              return {
-                id: ts.code,
-                name: ts.name,
-                args: ts.args,
-                state: ts.toState,
-              };
-            }),
-          };
-        }),
-    };
-    const rrr = report(contract);
-    return {
-      error: null,
-      text: rrr.audienceInfos[0].content + rrr.content,
-    };
-  } catch (err) {
-    return {
-      error: [err.message],
-    };
-  }
-}
+import moment from 'moment';
+import {report} from '@freelog/resource-policy-lang/dist';
+import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
+
+const {compile} = require('@freelog/resource-policy-lang');
+
+/**
+ * 将对应的字节数，转换为易读单位数量
+ * @param bytes
+ * @return {string}
+ */
+export function humanizeSize(bytes: number): string {
+  // console.log('dddhumanizeSizesdfsd');
+  if (bytes <= 0) {
+    return '0 B';
+  }
+  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  const index = Math.floor(Math.log(bytes) / Math.log(1024));
+  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
+  return size + ' ' + unitArr[index];
+}
+
+/**
+ * 格式化日期时间
+ */
+export function formatDateTime(date: string, showTime: boolean = false) {
+  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
+}
+
+/**
+ * 根据传入的子域名拼合成完整的适合的url
+ * @param domain 要组合的三级域名
+ */
+export function completeUrlByDomain(domain: string): string {
+  let origin: string = `http://${domain}.testfreelog.com`;
+
+  if (window.location.origin.includes('.freelog.com')) {
+    origin = `https://${domain}.freelog.com`;
+  }
+
+  return origin;
+}
+
+/**
+ * 根据策略代码和标的物类型，生成对应的翻译
+ * @param code 策略代码
+ * @param targetType 标的物类型
+ */
+export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
+  error: string[] | null;
+  text?: string;
+}> {
+  try {
+    const result = await compile(
+      code,
+      targetType,
+      completeUrlByDomain('qi'),
+      window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
+    );
+    const contract: ContractEntity = {
+      audiences: result.state_machine.audiences,
+      fsmStates: Object.entries<any>(result.state_machine.states)
+        .map((st) => {
+          return {
+            name: st[0],
+            serviceStates: st[1].serviceStates,
+            events: st[1].transitions.map((ts: any) => {
+
+              return {
+                id: ts.code,
+                name: ts.name,
+                args: ts.args,
+                state: ts.toState,
+              };
+            }),
+          };
+        }),
+    };
+    const rrr = report(contract);
+    return {
+      error: null,
+      text: rrr.audienceInfos[0].content + rrr.content,
+    };
+  } catch (err) {
+    return {
+      error: [err.message],
+    };
+  }
+}

package/src/utils/regexp.ts

@@ -14,22 +14,25 @@ export const CUSTOM_KEY: RegExp = /^[a-zA-Z0-9_]{1,20}$/;
 export const NODE_NAME: RegExp = /^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/;
 
 // 节点地址
-export const NODE_DOMAIN = /^(?!-)[a-z0-9-]{4,24}(?<!-)$/;
+export const NODE_DOMAIN: RegExp = /^(?!-)[a-z0-9-]{4,24}(?<!-)$/;
 
 // 支付密码
-export const PAY_PASSWORD = /^\d{6}$/;
+export const PAY_PASSWORD: RegExp = /^\d{6}$/;
 
 // 手机号码
 export const MOBILE_PHONE_NUMBER = /^1[345789]\d{9}$/;
 // export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
 
 // 邮箱地址
-export const EMAIL_ADDRESS = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+export const EMAIL_ADDRESS: RegExp = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
 
 // 用户名
 // export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
-export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
+export const USERNAME: RegExp = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
 
 // 用户密码
 // export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
-export const PASSWORD = /^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/;
+export const PASSWORD: RegExp = /^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/;
+
+// 自然数
+export const NATURAL_NUMBER: RegExp = /^[0-9]*$/;