update prettier width

.eslintrc.json

@@ -11,4 +11,4 @@
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off"
   }
-}
+}

.prettierrc.json

@@ -1,5 +1,4 @@
 {
-  "printWidth": 160,
   "semi": false,
   "singleQuote": true
 }

package.json

@@ -15,7 +15,7 @@
     "build": "rm -rf dist && tsc && cp package.json *.md dist && rm -rf dist/test",
     "test": "node dist/test",
     "lint": "eslint .",
-    "prettier": "prettier -w .",
+    "format": "prettier -w .",
     "sync": "curl -X PUT 'https://npm.taobao.org/sync/coa-ali-sls?sync_upstream=true'"
   },
   "dependencies": {

src/lib/AliSlsBin.ts

@@ -16,7 +16,9 @@ export class AliSlsBin {
     const headers = this.getHeaders('GET', path)
     const baseURL = `https://${this.config.project}.${this.config.endpoint}`
 
-    const result = await axios.get(url, { params, headers, baseURL }).catch(this.resultError)
+    const result = await axios
+      .get(url, { params, headers, baseURL })
+      .catch(this.resultError)
 
     return this.resultResponse(result)
   }
@@ -44,15 +46,21 @@ export class AliSlsBin {
     return { body, info }
   }
 
-  private getSortQueryString(params: AliSls.Dic<string | number | boolean | undefined>) {
+  private getSortQueryString(
+    params: AliSls.Dic<string | number | boolean | undefined>
+  ) {
     const list = [] as string[]
     _.forEach(params, (v, k) => {
       list.push(k + '=' + v)
     })
     return list.sort().join('&')
   }
 
-  private getHeaders(method: string, path: string, headers: AliSls.Dic<string> = {}) {
+  private getHeaders(
+    method: string,
+    path: string,
+    headers: AliSls.Dic<string> = {}
+  ) {
     _.defaults(headers, {
       'x-log-bodyrawsize': '0',
       'x-log-apiversion': '0.6.0',
@@ -82,7 +90,11 @@ export class AliSlsBin {
     signs.push(...x_list.sort())
     signs.push(path)
 
-    const signature = secure.sha1_hmac(signs.join('\n'), this.config.accessKeySecret, 'base64')
+    const signature = secure.sha1_hmac(
+      signs.join('\n'),
+      this.config.accessKeySecret,
+      'base64'
+    )
 
     return `LOG ${this.config.accessKeyId}:${signature}`
   }

src/lib/AliSlsQuery.ts

@@ -53,8 +53,17 @@ export class AliSlsQuery {
    * @param field 列名
    * @param alias 输出别名
    */
-  timeSeries(field: string, alias: string, grainSize: string, format = '%Y-%m-%d %H:%i', padding = 0) {
-    return this.column(`time_series(${field}, '${grainSize}', '${format}', '${padding}')`, alias)
+  timeSeries(
+    field: string,
+    alias: string,
+    grainSize: string,
+    format = '%Y-%m-%d %H:%i',
+    padding = 0
+  ) {
+    return this.column(
+      `time_series(${field}, '${grainSize}', '${format}', '${padding}')`,
+      alias
+    )
   }
 
   /**
@@ -166,10 +175,18 @@ export class AliSlsQuery {
    * @param wrapValue 是否把值当作字符串处理 是：在查询值两边添加单引号 否：不添加单引号
    * @param checkEmpty true进行空值检查，false不进行空值检查
    */
-  private where(field: string, operate: string, value: string, wrapValue: boolean, checkEmpty: boolean) {
+  private where(
+    field: string,
+    operate: string,
+    value: string,
+    wrapValue: boolean,
+    checkEmpty: boolean
+  ) {
     // 当开启空值检查 并且当前值为空的时候跳过该值
     if (checkEmpty && !value) return this
-    const str = wrapValue ? `"${field}" ${operate} '${value}'` : `"${field}" ${operate} ${value}`
+    const str = wrapValue
+      ? `"${field}" ${operate} '${value}'`
+      : `"${field}" ${operate} ${value}`
     this._where.push(str)
     return this
   }

src/service/AliSlsPageService.ts

@@ -10,23 +10,35 @@ export class AliSlsPageService {
   /**
    * 获取日志查询控制台链接
    */
-  getLogSearchConsolePageUrl(project: string, logstore: string, params: { [key: string]: string }) {
+  getLogSearchConsolePageUrl(
+    project: string,
+    logstore: string,
+    params: { [key: string]: string }
+  ) {
     const search = new URLSearchParams(params).toString()
     return `${baseURL}/lognext/project/${project}/logsearch/${logstore}?${search}`
   }
 
   /**
    * 获取快速查询控制台链接
    */
-  getSavedSearchConsolePageUrl(project: string, savedsearch: string, params: { [key: string]: string }) {
+  getSavedSearchConsolePageUrl(
+    project: string,
+    savedsearch: string,
+    params: { [key: string]: string }
+  ) {
     const search = new URLSearchParams(params).toString()
     return `${baseURL}/lognext/project/${project}/savedsearch/${savedsearch}?${search}`
   }
 
   /**
    * 获取仪表盘控制台链接
    */
-  getDashboardConsolePageUrl(project: string, dashboard: string, params: { [key: string]: string }) {
+  getDashboardConsolePageUrl(
+    project: string,
+    dashboard: string,
+    params: { [key: string]: string }
+  ) {
     const search = new URLSearchParams(params).toString()
     return `${baseURL}/lognext/project/${project}/dashboard/${dashboard}?${search}`
   }

src/service/AliSlsService.ts

@@ -17,7 +17,13 @@ export class AliSlsService {
     name: string,
     from: number,
     to: number,
-    param?: { query?: string; topic?: string; offset?: number; line?: number; reverse?: boolean }
+    param?: {
+      query?: string
+      topic?: string
+      offset?: number
+      line?: number
+      reverse?: boolean
+    }
   ) {
     const params = {
       type: 'log',
@@ -33,7 +39,18 @@ export class AliSlsService {
   }
 
   // GetLogs 接口查询指定 Project 下某个 Logstore 中的日志数据
-  async getLogs(name: string, from: Dayjs, to: Dayjs, param?: { query?: string; topic?: string; offset?: number; line?: number; reverse?: boolean }) {
+  async getLogs(
+    name: string,
+    from: Dayjs,
+    to: Dayjs,
+    param?: {
+      query?: string
+      topic?: string
+      offset?: number
+      line?: number
+      reverse?: boolean
+    }
+  ) {
     const params = {
       type: 'log',
       from: from.unix(),
@@ -45,7 +62,13 @@ export class AliSlsService {
   }
 
   // 查询指定 Project 下某个 Logstore 中日志的分布情况
-  async getHistograms(name: string, from: Dayjs, to: Dayjs, query?: string, topic?: string) {
+  async getHistograms(
+    name: string,
+    from: Dayjs,
+    to: Dayjs,
+    query?: string,
+    topic?: string
+  ) {
     const params = {
       type: 'histogram',
       from: from.unix(),

src/test/test-page-service.ts

@@ -4,7 +4,11 @@ import { AliSlsPageService } from '..'
 $.run(async () => {
   const pageService = new AliSlsPageService()
 
-  const url = pageService.getLogSearchConsolePageUrl('xxx-project-xxx', 'xxx-logstore-xx', { isShare: 'true' })
+  const url = pageService.getLogSearchConsolePageUrl(
+    'xxx-project-xxx',
+    'xxx-logstore-xx',
+    { isShare: 'true' }
+  )
 
   console.log(url)
 })