tadcode-wpsjs 0.3.0 → 1.0.0

package/README.md

@@ -51,32 +51,10 @@ const scriptToken = 'xxxx'
 /* webhook url地址 具体获取方式参考上面 */
 const webhookURL = 'xxxx'
 const wpsjsGlobal = initRemoteCallWpsjsGlobal({ scriptToken, webhookURL,  })
-const data = await wpsjsGlobal.Application.Sheet.GetSheets().execution()
+const data = await wpsjsGlobal.Application.Sheet.GetSheets()
 console.log(data)
 ```
 
-### 对于智能表格执行赋值操作
-
-```ts
-import { initRemoteCallWpsjsGlobal } from 'tadcode-wpsjs'
-/* 脚本令牌 具体获取方式参考上面 */
-const scriptToken = 'xxxx'
-/* webhook url地址 具体获取方式参考上面 */
-const webhookURL = 'xxxx'
-const wpsjsGlobal = initRemoteCallWpsjsGlobal({ scriptToken, webhookURL,  })
-const values = [
-  ['name', 'price'],
-  ['米', 2.5],
-]
-function setValue(data: any[][], rangeReference = 'a1') {
-  const rowCount = data.length
-  const columnCount = data[0].length
-  wpsjsGlobal.Application.ActiveSheet.Range(rangeReference).Resize(rowCount, columnCount).Value2 = data
-  return wpsjsGlobal.execution() as unknown as boolean
-}
-setValue(values)
-```
-
 ### 执行脚本并且返回（不用部署remoteCode代码）
 
 ```ts

package/index.js

@@ -1 +1 @@
-var{writeFile:M}=(()=>({}));function o(e){if(typeof e!=="string")throw TypeError("Path must be a string. Received "+JSON.stringify(e))}function m(e,r){var n="",l=0,t=-1,f=0,i;for(var s=0;s<=e.length;++s){if(s<e.length)i=e.charCodeAt(s);else if(i===47)break;else i=47;if(i===47){if(t===s-1||f===1);else if(t!==s-1&&f===2){if(n.length<2||l!==2||n.charCodeAt(n.length-1)!==46||n.charCodeAt(n.length-2)!==46){if(n.length>2){var c=n.lastIndexOf("/");if(c!==n.length-1){if(c===-1)n="",l=0;else n=n.slice(0,c),l=n.length-1-n.lastIndexOf("/");t=s,f=0;continue}}else if(n.length===2||n.length===1){n="",l=0,t=s,f=0;continue}}if(r){if(n.length>0)n+="/..";else n="..";l=2}}else{if(n.length>0)n+="/"+e.slice(t+1,s);else n=e.slice(t+1,s);l=s-t-1}t=s,f=0}else if(i===46&&f!==-1)++f;else f=-1}return n}function h(e,r){var n=r.dir||r.root,l=r.base||(r.name||"")+(r.ext||"");if(!n)return l;if(n===r.root)return n+l;return n+e+l}function A(){var e="",r=!1,n;for(var l=arguments.length-1;l>=-1&&!r;l--){var t;if(l>=0)t=arguments[l];else{if(n===void 0)n=process.cwd();t=n}if(o(t),t.length===0)continue;e=t+"/"+e,r=t.charCodeAt(0)===47}if(e=m(e,!r),r)if(e.length>0)return"/"+e;else return"/";else if(e.length>0)return e;else return"."}function b(e){if(o(e),e.length===0)return".";var r=e.charCodeAt(0)===47,n=e.charCodeAt(e.length-1)===47;if(e=m(e,!r),e.length===0&&!r)e=".";if(e.length>0&&n)e+="/";if(r)return"/"+e;return e}function S(e){return o(e),e.length>0&&e.charCodeAt(0)===47}function k(){if(arguments.length===0)return".";var e;for(var r=0;r<arguments.length;++r){var n=arguments[r];if(o(n),n.length>0)if(e===void 0)e=n;else e+="/"+n}if(e===void 0)return".";return b(e)}function y(e,r){if(o(e),o(r),e===r)return"";if(e=A(e),r=A(r),e===r)return"";var n=1;for(;n<e.length;++n)if(e.charCodeAt(n)!==47)break;var l=e.length,t=l-n,f=1;for(;f<r.length;++f)if(r.charCodeAt(f)!==47)break;var i=r.length,s=i-f,c=t<s?t:s,g=-1,u=0;for(;u<=c;++u){if(u===c){if(s>c){if(r.charCodeAt(f+u)===47)return r.slice(f+u+1);else if(u===0)return r.slice(f+u)}else if(t>c){if(e.charCodeAt(n+u)===47)g=u;else if(u===0)g=0}break}var v=e.charCodeAt(n+u),a=r.charCodeAt(f+u);if(v!==a)break;else if(v===47)g=u}var d="";for(u=n+g+1;u<=l;++u)if(u===l||e.charCodeAt(u)===47)if(d.length===0)d+="..";else d+="/..";if(d.length>0)return d+r.slice(f+g);else{if(f+=g,r.charCodeAt(f)===47)++f;return r.slice(f)}}function P(e){return e}function z(e){if(o(e),e.length===0)return".";var r=e.charCodeAt(0),n=r===47,l=-1,t=!0;for(var f=e.length-1;f>=1;--f)if(r=e.charCodeAt(f),r===47){if(!t){l=f;break}}else t=!1;if(l===-1)return n?"/":".";if(n&&l===1)return"//";return e.slice(0,l)}function D(e,r){if(r!==void 0&&typeof r!=="string")throw TypeError('"ext" argument must be a string');o(e);var n=0,l=-1,t=!0,f;if(r!==void 0&&r.length>0&&r.length<=e.length){if(r.length===e.length&&r===e)return"";var i=r.length-1,s=-1;for(f=e.length-1;f>=0;--f){var c=e.charCodeAt(f);if(c===47){if(!t){n=f+1;break}}else{if(s===-1)t=!1,s=f+1;if(i>=0)if(c===r.charCodeAt(i)){if(--i===-1)l=f}else i=-1,l=s}}if(n===l)l=s;else if(l===-1)l=e.length;return e.slice(n,l)}else{for(f=e.length-1;f>=0;--f)if(e.charCodeAt(f)===47){if(!t){n=f+1;break}}else if(l===-1)t=!1,l=f+1;if(l===-1)return"";return e.slice(n,l)}}function E(e){o(e);var r=-1,n=0,l=-1,t=!0,f=0;for(var i=e.length-1;i>=0;--i){var s=e.charCodeAt(i);if(s===47){if(!t){n=i+1;break}continue}if(l===-1)t=!1,l=i+1;if(s===46){if(r===-1)r=i;else if(f!==1)f=1}else if(r!==-1)f=-1}if(r===-1||l===-1||f===0||f===1&&r===l-1&&r===n+1)return"";return e.slice(r,l)}function J(e){if(e===null||typeof e!=="object")throw TypeError('The "pathObject" argument must be of type Object. Received type '+typeof e);return h("/",e)}function w(e){o(e);var r={root:"",dir:"",base:"",ext:"",name:""};if(e.length===0)return r;var n=e.charCodeAt(0),l=n===47,t;if(l)r.root="/",t=1;else t=0;var f=-1,i=0,s=-1,c=!0,g=e.length-1,u=0;for(;g>=t;--g){if(n=e.charCodeAt(g),n===47){if(!c){i=g+1;break}continue}if(s===-1)c=!1,s=g+1;if(n===46){if(f===-1)f=g;else if(u!==1)u=1}else if(f!==-1)u=-1}if(f===-1||s===-1||u===0||u===1&&f===s-1&&f===i+1){if(s!==-1)if(i===0&&l)r.base=r.name=e.slice(1,s);else r.base=r.name=e.slice(i,s)}else{if(i===0&&l)r.name=e.slice(1,f),r.base=e.slice(1,s);else r.name=e.slice(i,f),r.base=e.slice(i,s);r.ext=e.slice(f,s)}if(i>0)r.dir=e.slice(0,i-1);else if(l)r.dir="/";return r}var B="/",H=":",K=((e)=>(e.posix=e,e))({resolve:A,normalize:b,isAbsolute:S,join:k,relative:y,_makeLong:P,dirname:z,basename:D,extname:E,format:J,parse:w,sep:B,delimiter:H,win32:null,posix:null}),C=K;var q=(e)=>{let{scriptToken:r,webhookURL:n,isAsync:l=!1,printLog:t=!1,writeLogFile:f=!1}=e,i=[];return new Proxy(()=>{},{get:(c,g,u)=>{return i.push({method:"get",arguments:[g]}),u},set:(c,g,u,v)=>{return i.push({method:"set",arguments:[g,u]}),v},apply:(c,g,u)=>{if(i.at(-1)?.arguments[0]==="execution")return i.pop(),Q({scriptToken:r,webhookURL:n,isAsync:l,argv:{info:i}}).then(async(a)=>{let d=await a.json();if(i=[],t)X(d);if(f)await Y(d);return d.data.result});return i.push({method:"apply",arguments:u}),g}})},Q=({scriptToken:e,webhookURL:r,isAsync:n,argv:l})=>{let t=JSON.stringify({Context:{argv:l}}),f=C.parse(r);f.base=n?"task":"sync_task";let i=C.format(f);return fetch(i,{method:"post",headers:{"Content-Type":"application/json","AirScript-Token":e},body:t})},G=(e)=>{let r=new URL("https://www.kdocs.cn/api/v3/script/task");return r.searchParams.append("task_id",e),fetch(r)},X=(e)=>{let r=e,{status:n,data:l,error:t,error_details:f}=r;console.log("status:",n);let i=l.logs.at(-1).unix_time-l.logs[1].unix_time;if(console.log("runtime:",i),t)console.error(f.name),console.error(f.msg),console.error(f.stack);let s=l.logs.filter((c)=>c.filename!=="<system>");if(s.length!==0){console.log("log:");for(let c of s)console[c.level](...c.args)}return console.log("result:"),console.log(l.result),r},Y=(e)=>{return M("./wpsjs.log.json",JSON.stringify(e,void 0,2))};export{Y as writeLogFileToCurrent,G as queryTask,q as initRemoteCallWpsjsGlobal,Q as execution};
+import{writeFile as W}from"fs/promises";import G from"path";var Q=Symbol("info"),Z=Symbol("then"),_=(B)=>{let{scriptToken:E,webhookURL:V,isAsync:H=!1,printLog:X=!1,writeLogFile:J=!1}=B,N={get(K,M,$){let Y=K[Q]??=[],z=()=>{};if(z[Z]=!1,z[Q]=[...Y],M!=="then")z[Q].push({method:"get",arguments:[M]});else z[Z]=!0;return new Proxy(z,N)},apply(K,M,$){if(!K[Z]){let Y=K[Q]??=[],z=()=>{};return z[Z]=!1,z[Q]=[...Y,{method:"apply",arguments:$}],new Proxy(z,N)}else{let Y=K[Q];return v({scriptToken:E,webhookURL:V,isAsync:H,argv:{info:Y}}).then(async(z)=>{let q=await z.json();if(X)D(q);if(J)await P(q);return q?.data.result}).then(...$)}}};return new Proxy(()=>{},N)},v=({scriptToken:B,webhookURL:E,isAsync:V,argv:H})=>{let X=JSON.stringify({Context:{argv:H}}),J=G.parse(E);J.base=V?"task":"sync_task";let N=G.format(J);return fetch(N,{method:"post",headers:{"Content-Type":"application/json","AirScript-Token":B},body:X})},j=(B)=>{let E=new URL("https://www.kdocs.cn/api/v3/script/task");return E.searchParams.append("task_id",B),fetch(E)},D=(B)=>{let E=B,{status:V,data:H,error:X,error_details:J}=E;console.log("status:",V);let N=H.logs.at(-1).unix_time-H.logs[1].unix_time;if(console.log("runtime:",N),X)console.error(J.name),console.error(J.msg),console.error(J.stack);let K=H.logs.filter((M)=>M.filename!=="<system>");if(K.length!==0){console.log("log:");for(let M of K)console[M.level](...M.args)}return console.log("result:"),console.log(H.result),E},P=(B)=>{return W("./wpsjs.log.json",JSON.stringify(B,void 0,2))};export{P as writeLogFileToCurrent,j as queryTask,_ as initRemoteCallWpsjsGlobal,v as execution};

package/index.ts

@@ -1,110 +1,115 @@
-import type { InfoItem, RemoteCallWpsjsGlobalReturn, WithExecutionWpsjsGlobal } from './types'
-import { writeFile } from 'fs/promises'
-import path from 'path'
-
-interface Config {
-  /**脚本令牌 */
-  scriptToken: string
-  /**脚本链接 */
-  webhookURL: string
-  /**异步任务 */
-  isAsync?: boolean
-  /**在控制台打印日志 */
-  printLog?: boolean
-  /**在当前路径下写入日志文件 */
-  writeLogFile?: boolean
-}
-
-const initRemoteCallWpsjsGlobal = (config: Config) => {
-  const { scriptToken, webhookURL, isAsync = false, printLog = false, writeLogFile = false, } = config
-  let info: InfoItem[] = []
-  const handle: ProxyHandler<() => void> = {
-    get: (_target, p: string, receiver) => {
-      info.push({ method: 'get', arguments: [p] })
-      return receiver
-    },
-    set: (_target, p: string, newValue, receiver) => {
-      info.push({ method: 'set', arguments: [p, newValue] })
-      return receiver
-    },
-    apply: (_target, thisArg, argArray) => {
-      const lastInfo = info.at(-1)
-      if (lastInfo?.arguments[0] === 'execution') {
-        info.pop() /* 删除 execution的调用信息 */
-        return execution({ scriptToken, webhookURL, isAsync, argv: { info } })
-          .then(async (response) => {
-            const responseObj = await response.json()
-            info = []	/* 执行结束，清空调用 */
-            if (printLog) printInfo(responseObj)
-
-            if (writeLogFile) await writeLogFileToCurrent(responseObj)
-            return responseObj['data']['result']
-          })
-      }
-      info.push({ method: 'apply', arguments: argArray })
-      return thisArg
-    },
-  }
-  return new Proxy(() => { }, handle) as unknown as WithExecutionWpsjsGlobal
-}
-
-type ExecutionConfig = Pick<Config, 'scriptToken' | 'webhookURL' | 'isAsync'> & { argv?: Record<string | number, any> }
-
-const execution = ({ scriptToken, webhookURL, isAsync, argv }: ExecutionConfig) => {
-  /* 获取请求信息 */
-  const data = JSON.stringify({ Context: { argv, } })
-  /* 根据是否同步返回不同的url */
-  const parsedPath = path.parse(webhookURL)
-  parsedPath.base = isAsync ? 'task' : 'sync_task'
-  const url = path.format(parsedPath)
-  return fetch(url, {
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json',
-      'AirScript-Token': scriptToken
-    },
-    body: data
-  })
-}
-
-const queryTask = (id: string) => {
-  const url = new URL('https://www.kdocs.cn/api/v3/script/task')
-  url.searchParams.append('task_id', id)
-  return fetch(url)
-}
-
-const printInfo = (remoteCallResponse: RemoteCallWpsjsGlobalReturn) => {
-  const responseData = remoteCallResponse as RemoteCallWpsjsGlobalReturn
-  const { status, data, error, error_details } = responseData
-  console.log('status:', status)
-  const time = data.logs.at(-1)!.unix_time - data.logs[1].unix_time
-  console.log('runtime:', time)
-  if (error) {
-    console.error(error_details.name)
-    console.error(error_details.msg)
-    console.error(error_details.stack)
-  }
-  const userInfo = data.logs.filter(x => x.filename !== '<system>')
-  if (userInfo.length !== 0) {
-    console.log('log:')
-    for (const item of userInfo) {
-      console[item.level](...item.args)
-    }
-  }
-  console.log('result:')
-  console.log(data.result)
-  return responseData
-}
-
-const writeLogFileToCurrent = (data: object) => {
-  return writeFile('./wpsjs.log.json', JSON.stringify((data), undefined, 2))
-}
-
-export type * from './types'
-
-export {
-  execution,
-  initRemoteCallWpsjsGlobal,
-  queryTask,
-  writeLogFileToCurrent,
-}
+import type { InfoItem, RemoteCallWpsjsGlobalReturn, WpsjsGlobalApi } from './types'
+import { writeFile } from 'fs/promises'
+import path from 'path'
+
+interface Config {
+  /**脚本令牌 */
+  scriptToken: string
+  /**脚本链接 */
+  webhookURL: string
+  /**异步任务 */
+  isAsync?: boolean
+  /**在控制台打印日志 */
+  printLog?: boolean
+  /**在当前路径下写入日志文件 */
+  writeLogFile?: boolean
+}
+const infoSymbol = Symbol('info')
+const isThenSymbol = Symbol('then')
+const initRemoteCallWpsjsGlobal = (config: Config) => {
+  const { scriptToken, webhookURL, isAsync = false, printLog = false, writeLogFile = false, } = config
+  type ProxyTarget = { (): void;[infoSymbol]: InfoItem[], [isThenSymbol]: boolean }
+
+  const handle: ProxyHandler<ProxyTarget> = {
+    get(target, p: string, _receiver) {
+      const oldInfo = target[infoSymbol] ??= []
+      const func: ProxyTarget = () => { }
+      func[isThenSymbol] = false
+      func[infoSymbol] = [...oldInfo]
+      if (p !== 'then')
+        func[infoSymbol].push({ method: 'get', arguments: [p] })
+      else
+        func[isThenSymbol] = true
+      return new Proxy(func, handle)
+    },
+    apply(target, _thisArg, argArray) {
+      if (!target[isThenSymbol]) {
+        const oldInfo = target[infoSymbol] ??= []
+        const func: ProxyTarget = () => { }
+        func[isThenSymbol] = false
+        func[infoSymbol] = [...oldInfo, { method: 'apply', arguments: argArray }]
+        return new Proxy(func, handle)
+      } else {
+        const info = target[infoSymbol]
+        return execution({ scriptToken, webhookURL, isAsync, argv: { info } })
+          .then(async (response) => {
+            const responseObj = await response.json()
+            if (printLog) printInfo(responseObj)
+            if (writeLogFile) await writeLogFileToCurrent(responseObj)
+            return responseObj?.['data']['result']
+          })
+          .then(...argArray)
+      }
+    },
+  }
+  return new Proxy(() => { }, handle) as unknown as WpsjsGlobalApi
+}
+
+type ExecutionConfig = Pick<Config, 'scriptToken' | 'webhookURL' | 'isAsync'> & { argv?: Record<string | number, any> }
+
+const execution = ({ scriptToken, webhookURL, isAsync, argv }: ExecutionConfig) => {
+  /* 请求信息 */
+  const data = JSON.stringify({ Context: { argv, } })
+  /* 根据是否同步返回不同的url */
+  const parsedPath = path.parse(webhookURL)
+  parsedPath.base = isAsync ? 'task' : 'sync_task'
+  const url = path.format(parsedPath)
+  return fetch(url, {
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json',
+      'AirScript-Token': scriptToken
+    },
+    body: data
+  })
+}
+
+const queryTask = (id: string) => {
+  const url = new URL('https://www.kdocs.cn/api/v3/script/task')
+  url.searchParams.append('task_id', id)
+  return fetch(url)
+}
+
+const printInfo = (remoteCallResponse: RemoteCallWpsjsGlobalReturn) => {
+  const responseData = remoteCallResponse as RemoteCallWpsjsGlobalReturn
+  const { status, data, error, error_details } = responseData
+  console.log('status:', status)
+  const time = data.logs.at(-1)!.unix_time - data.logs[1].unix_time
+  console.log('runtime:', time)
+  if (error) {
+    console.error(error_details.name)
+    console.error(error_details.msg)
+    console.error(error_details.stack)
+  }
+  const userInfo = data.logs.filter(x => x.filename !== '<system>')
+  if (userInfo.length !== 0) {
+    console.log('log:')
+    for (const item of userInfo) {
+      console[item.level](...item.args)
+    }
+  }
+  console.log('result:')
+  console.log(data.result)
+  return responseData
+}
+
+const writeLogFileToCurrent = (data: object) => {
+  return writeFile('./wpsjs.log.json', JSON.stringify((data), undefined, 2))
+}
+
+export {
+  execution,
+  initRemoteCallWpsjsGlobal,
+  queryTask,
+  writeLogFileToCurrent,
+}

package/package.json

@@ -1,17 +1,35 @@
-{
-  "name": "tadcode-wpsjs",
-  "version": "0.3.0",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "hot": "NODE_ENV=development bun --hot ignore/index.ts",
-    "dev": "NODE_ENV=development bun --watch index.ts",
-    "build": "NODE_ENV=production bun build index.ts --minify --outfile index.js"
-  },
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
-  "keywords": [
-    "tadcode-wpsjs"
-  ]
-}
+{
+  "name": "tadcode-wpsjs",
+  "version": "1.0.0",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "hot": "NODE_ENV=development bun --hot ignore/index.ts",
+    "dev": "NODE_ENV=development bun --watch index.ts",
+    "build": "NODE_ENV=production bun build index.ts --target node --minify --outfile index.js"
+  },
+  "devDependencies": {
+    "@types/bun": "latest"
+  },
+  "keywords": [
+    "tadcode-wpsjs"
+  ],
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "types": "./index.ts"
+    },
+    "./types": {
+      "types": "./types/index.d.ts"
+    },
+    "./types/DB_Application": {
+      "types": "./types/DB_Application.d.ts"
+    },
+    "./types/KSDrive": {
+      "types": "./types/KSDrive.d.ts"
+    },
+    "./types/KSheet_Application": {
+      "types": "./types/KSheet_Application.d.ts"
+    }
+  }
+}

package/types/DB_Application.d.ts

@@ -4,6 +4,31 @@ import type DBField from './DB_Application_Field'
 import type DBRecord from './DB_Application_Record'
 import type DBSelection from './DB_Application_Selection'
 
+interface DBUserInfo {
+  id: string
+  name: string
+}
+
+interface DBFileInfo {
+  id: string
+  name: string
+  officeType: string
+  creator: {
+    id: string
+    name: string
+    avatar_url: string
+    logined: boolean
+    attrs: {
+      real_userid: string
+    }
+    real_id: string
+  }
+  size: number
+  groupId: string
+  docType: number
+  version: number
+}
+
 export type * from './DB_Application_Sheet'
 export type * from './DB_Application_View'
 export type * from './DB_Application_Field'
@@ -18,5 +43,7 @@ export default interface DB_Application {
   Field: DBField
   Record: DBRecord
   Selection: DBSelection
+  UserInfo: DBUserInfo
+  FileInfo: DBFileInfo
 }
 

package/types/DB_Application_Record.d.ts

@@ -166,11 +166,11 @@ interface RecordFuncOptions {
   Filter: RecordsFuncOptionsFilter
 }
 
-export type { Operator, DynamicDateRange, RecordItem, RecordFuncOptions }
+export type { Operator, DynamicDateRange, RecordItem, RecordFuncOptions, RecordsFuncOptionsFilter }
 
 /* 行记录 */
 export default interface DBRecord {
-  CreateRecords(options: Pick<RecordFuncOptions, 'SheetId'> & { Records: Omit<RecordItem, 'id'>[] }): RecordItem[]
+  CreateRecords(options: Pick<RecordFuncOptions, 'SheetId'> & { Records: { fields: Record<string, any> }[] }): RecordItem[]
   GetRecord(options: Pick<RecordFuncOptions, 'SheetId' | 'RecordId'>): RecordItem
   GetRecords(options: Pick<RecordFuncOptions, 'SheetId'> & Partial<Pick<RecordFuncOptions, 'ViewId' | 'PageSize' | 'Offset' | 'MaxRecords' | 'Fields' | 'Filter'>>): { records: RecordItem[] }
   UpdateRecords(options: Pick<RecordFuncOptions, 'SheetId' | 'Records'>): RecordItem[]

package/types/DB_Application_Selection.ts

@@ -1,22 +1,22 @@
-import type { RecordItem } from './DB_Application_Record'
-
-interface ActiveView {
-  "sheetId": number
-  "viewId": string
-  "name": string
-  "type": string
-}
-
-interface ActiveSheet {
-  "sheetId": number
-  "name": string
-  "description": string
-}
-
-export type { ActiveView, ActiveSheet }
-
-export default interface DBSelection {
-  GetActiveView(): ActiveView
-  GetSelectionRecords(): RecordItem[]
-  GetActiveSheet(): ActiveSheet
-}
+import type { RecordItem } from './DB_Application_Record'
+
+interface ActiveView {
+  "sheetId": number
+  "viewId": string
+  "name": string
+  "type": string
+}
+
+interface ActiveSheet {
+  "sheetId": number
+  "name": string
+  "description": string
+}
+
+export type { ActiveView, ActiveSheet }
+
+export default interface DBSelection {
+  GetActiveView(): ActiveView
+  GetSelectionRecords(): RecordItem[]
+  GetActiveSheet(): ActiveSheet
+}

package/types/KSDrive.d.ts

@@ -1,13 +1,33 @@
 import type DB_Application from './DB_Application'
 import type KSheet_Application from './KSheet_Application'
 
+interface FileType {
+  /**智能文档 */
+  AP: 'o'
+  /**智能表格 */
+  KSheet: 'k'
+  /**表格 */
+  ET: 's'
+  /**多维表 */
+  DB: 'd'
+}
+
+/**
+ * 文件类型
+ * - 'o': 智能文档
+ * - 'k': 智能表格
+ * - 's': 表格
+ * - 'd': 多维表
+ */
+type FileTypeValue = FileType[keyof FileType]
+
 interface CreateOptions {
   /**是	新文件的文件名 */
   name: string
   /**否	新文件的文件目录 */
-  dirUrl: string
+  dirUrl?: string
   /**否	将目标文件另存为新文件 */
-  source: string
+  source?: string
 }
 
 interface FilesInfo {
@@ -26,25 +46,17 @@ interface FileInfo {
   updateTime: number
 }
 
-export default interface KSDrive {
-  FileType: {
-    /**智能文档 */
-    AP: 'o'
-    /**智能表格 */
-    KSheet: 'k'
-    /**表格 */
-    ET: 's'
-    /**多维表 */
-    DB: 'd'
-  }
+export type { FileType, FileTypeValue, CreateOptions, FilesInfo, FileInfo }
 
+export default interface KSDrive {
+  FileType: FileType
   /**
    * 创建文件
    * @param type 新文件的类型
    * @param createOptions 新文件的参数选项
-   * @returns {string} 新文件url
+   * @returns 新文件url
    */
-  createFile(type: string, createOptions: createOptions): string
+  createFile(type: FileTypeValue, createOptions: CreateOptions): string
 
   openFile(url: string): {
     Application: KSheet_Application & DB_Application
@@ -52,9 +64,9 @@ export default interface KSDrive {
   }
 
   listFiles(options?: {
-    dirUrl: string
-    offset: number
-    count: number
-    includeExts: string[]
-  })
+    dirUrl?: string
+    offset?: number
+    count?: number
+    includeExts?: string[]
+  }): FilesInfo
 }

package/types/KSheet_Application.d.ts

@@ -1,11 +1,11 @@
-interface Range {
+interface KSheetRange {
   Value2: any
   Formula: any
-  Resize(RowSize: number, ColumnSize?: number): Range
+  Resize(RowSize: number, ColumnSize?: number): KSheetRange
 }
 
-interface Sheet {
-  UsedRange: Range
+interface KSheetSheet {
+  UsedRange: KSheetRange
   /**
    * 获取一个单元格或单元格区域，返回一个 Range 对象
    * @paramaddress — 地址，可以是单元格地址或者选区范围范围地址
@@ -17,13 +17,15 @@ interface Sheet {
    * // 修改当前活动工作表D2单元格的内容
    * sheet.Range('D2').Value = 'this is D2'
    */
-  Range(address: string): Range
+  Range(address: string): KSheetRange
 }
 
+export type { KSheetRange, KSheetSheet }
+
 export default interface KSheet_Application {
-  ActiveSheet: Sheet
+  ActiveSheet: KSheetSheet
   Sheets: {
-    Item(index: number | string): Sheet
+    Item(index: number | string): KSheetSheet
   }
-  Range(index: string): Range
+  Range(index: string): KSheetRange
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { WithExecution } from './type-tools'
+import type { WithPromise } from './type-tools'
 import type DB_Application from './DB_Application'
 import type KSheet_Application from './KSheet_Application'
 import type KSDrive from './KSDrive'
@@ -8,40 +8,56 @@ interface WpsjsGlobal {
   Application: KSheet_Application & DB_Application
 }
 
-type WithExecutionWpsjsGlobal = WithExecution<WpsjsGlobal>
+type WpsjsGlobalApi = WithPromise<WpsjsGlobal>
 
 interface InfoItem {
   method: keyof typeof Reflect
   arguments: string[]
 }
 
+/* 基本 */
 interface RemoteCallWpsjsGlobalReturn {
-  "data": {
-    "logs": {
-      "filename": string
-      "timestamp": string
-      "unix_time": number
-      "level": 'info' | 'error' | 'warn'
-      "args": string[]
+  data: {
+    logs: {
+      filename: string
+      timestamp: string
+      unix_time: number
+      level: 'info' | 'error' | 'warn'
+      args: string[]
     }[]
-    "result": unknown
-    "task_id": string
+    result: unknown
+    task_id: string
   }
-  "error": string
-  "error_details": {
-    "name": string
-    "msg": string
-    "stack": string[]
-    "unix_time": number
+  error: string
+  error_details: {
+    name: string
+    msg: string
+    stack: string[]
+    unix_time: number
   }
-  "status": "finished"
-  "task_id": string
-  "task_type": string
+  status: 'finished'
+  task_id: string
+  task_type: string
+}
+
+/* token 过期 */
+interface RemoteCallWpsjsGlobalReturn {
+  errno: 10000
+  msg: string
+  reason: string
+  result: ApiTokenExpired
 }
 
 export {
   WpsjsGlobal,
-  WithExecutionWpsjsGlobal,
+  WpsjsGlobalApi,
   InfoItem,
   RemoteCallWpsjsGlobalReturn,
 }
+
+export type * from './DB_Application'
+export type { default as DB_Application } from './DB_Application'
+export type * from './KSDrive'
+export type { default as KSDrive } from './KSDrive'
+export type * from './KSheet_Application'
+export type { default as KSheet_Application } from './KSheet_Application'

package/types/type-tools.ts

@@ -24,10 +24,27 @@ type DeepPartial<T> = T extends object
 type DistributiveOmit<T, K extends PropertyKey> =
   T extends any ? Omit<T, K> : never
 
+/**根据给的对象，添加promise方法 */
+type WithPromise<T> = T extends (...args: infer A) => infer R ?
+  ((...args: A) => WithPromise<R>) & Promise<T> :
+  T extends Array<infer U> ?
+  Array<WithPromise<U>> & Promise<T> :
+  T extends object ?
+  { [K in keyof T]: WithPromise<T[K]> } & Promise<T> :
+  T extends boolean ?
+  Promise<boolean> :
+  T extends number ?
+  Promise<number> :
+  T extends string ?
+  Promise<string>
+  : T & Promise<T>
+
+// 搞定！🎉
 export type {
   WithExecution,
   MakePropertyOptional,
   PickModify,
   DeepPartial,
   DistributiveOmit,
+  WithPromise,
 }