每日合并
@@ -19,9 +19,17 @@ import { dailyMerge} from 't-comm/lib/daily-merge/index'; **参数**： -| 参数名 | 类型 | 描述 | -| --- | --- | --- | -| param |object | 参数
| +| 参数名 | 类型 | 默认值 | 描述 | +| --- | --- | --- | --- | +| param0 |object | | 参数
| +| param0.webhookUrl |string | | 机器人地址
| +| param0.appName |string | | 项目名称
| +| param0.devRoot |string | | 项目根路径
| +| param0.baseUrl |string | | 基础请求 url
| +| param0.repoName |string | | 仓库名称
| +| param0.privateToken |string | | 密钥
| +| [param0.isDryRun] |boolean | false | 是否演练
| +| [param0.mainBranch] |string | "'develop'" | 主分支
| diff --git a/docs/zh/git.md b/docs/zh/git.md index 50e1d728..233d585f 100644 --- a/docs/zh/git.md +++ b/docs/zh/git.md @@ -4,27 +4,61 @@ ```ts import { + getAllGitRepo, getGitCurBranch, getGitCommitMessage, getGitCommitInfo, getGitLastTag, getGitCommitsBeforeTag, - getGitAuthor + getGitAuthor, + reCloneGitRemote } from 't-comm'; // or import { + getAllGitRepo, getGitCurBranch, getGitCommitMessage, getGitCommitInfo, getGitLastTag, getGitCommitsBeforeTag, - getGitAuthor + getGitAuthor, + reCloneGitRemote } from 't-comm/lib/git/index'; ``` +## `getAllGitRepo(root)` + + +**描述**：获取所有 git 仓库
+ +**参数**： + + +| 参数名 | 类型 | 描述 | +| --- | --- | --- | +| root |string | 根路径
| + +**返回**:array路径列表
+ +**示例** + +```ts +getAllGitRepo('/root/yang'); + +[ + { + root: '/root', + origin: 'git@git.address', + } +] +``` + + ## `getGitCurBranch()` @@ -149,3 +183,21 @@ getGitCommitInfo() **返回**:user
+ + +## `reCloneGitRemote(list)` + + +**描述**：根据配置表，重新 clone 仓库
+ +**参数**： + + +| 参数名 | 类型 | 描述 | +| --- | --- | --- | +| list |Array<item> | 列表
| +| item.root |string | 路径
| +| item.origin |string | origin
| + + + diff --git a/docs/zh/i18n.md b/docs/zh/i18n.md new file mode 100644 index 00000000..669b016b --- /dev/null +++ b/docs/zh/i18n.md @@ -0,0 +1,37 @@ +[[toc]] + +## 引入 + +```ts +import { getI18nToken } from 't-comm'; + +// or + +import { getI18nToken} from 't-comm/lib/i18n/index'; +``` + + +## `getI18nToken(appId, appKey)` + + +**描述**：获取 i18n token
+ +**参数**： + + +| 参数名 | 类型 | 描述 | +| --- | --- | --- | +| appId |string | appId
| +| appKey |string | appKey
| + +**返回**:Promise.<string>token
+ +**示例** + +```ts +getI18nToken('appId', 'appKey').then(token => { + console.log('token', token) +}) +``` diff --git a/docs/zh/slash.md b/docs/zh/slash.md new file mode 100644 index 00000000..b9eaace2 --- /dev/null +++ b/docs/zh/slash.md @@ -0,0 +1,94 @@ +[[toc]] + +## 引入 + +```ts +import { + removeFirstSlash, + removeLastSlash, + removeFirstAndLastSlash +} from 't-comm'; + +// or + +import { + removeFirstSlash, + removeLastSlash, + removeFirstAndLastSlash +} from 't-comm/lib/slash/index'; +``` + + +## `removeFirstSlash([str])` + + +**描述**：移除第一个反斜杠
+ +**参数**： + + +| 参数名 | 类型 | 默认值 | 描述 | +| --- | --- | --- | --- | +| [str] |string | "''" | 输入字符串
| + +**返回**:string字符串
+ +**示例** + +```ts +removeFirstSlash('/abc/ddd/') + +'abc/ddd/' +``` + + +## `removeLastSlash([str])` + + +**描述**：移除最后一个反斜杠
+ +**参数**： + + +| 参数名 | 类型 | 默认值 | 描述 | +| --- | --- | --- | --- | +| [str] |string | "''" | 输入字符串
| + +**返回**:string字符串
+ +**示例** + +```ts +removeLastSlash('/abc/') + +'/abc' +``` + + +## `removeFirstAndLastSlash([str])` + + +**描述**：移除第一个和最后一个反斜杠
+ +**参数**： + + +| 参数名 | 类型 | 默认值 | 描述 | +| --- | --- | --- | --- | +| [str] |string | "''" | 输入字符串
| + +**返回**:string字符串
+ +**示例** + +```ts +removeFirstAndLastSlash('/abc/') + +'abc' +``` diff --git a/package.json b/package.json index 31e80619..69388cfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "t-comm", - "version": "1.3.80", + "version": "1.3.90", "description": "丰富易用的工具库", "main": "lib/index.js", "module": "lib/index.esm.js", diff --git a/script/trial/tgit/project.js b/script/trial/tgit/project.js new file mode 100644 index 00000000..1a3c9358 --- /dev/null +++ b/script/trial/tgit/project.js @@ -0,0 +1,18 @@ +const { getOneProjectDetail } = require('../../../lib'); +require('../../utils/env'); + +console.log('process.env', process.env); +function main() { + getOneProjectDetail({ + projectName: 'pmd-mobile/match/pro', + privateToken: process.env.GIT_WOA_PRIVATE_TOKEN, + baseUrl: process.env.GIT_WOA_BASE_URL, + }).then((res) => { + console.log('res', res); + }) + .catch((err) => { + console.log('err', err); + }); +} + +main(); diff --git a/src/ast/index.ts b/src/ast/index.ts new file mode 100644 index 00000000..a7c9e766 --- /dev/null +++ b/src/ast/index.ts @@ -0,0 +1,3 @@ +export { IImportType } from './types'; +export { parseReplaceConfig } from './parse-config-list'; +export { replaceDependencies } from './replace-dependencies'; diff --git a/src/ast/parse-config-list.ts b/src/ast/parse-config-list.ts new file mode 100644 index 00000000..c2096795 --- /dev/null +++ b/src/ast/parse-config-list.ts @@ -0,0 +1,89 @@ +import { IImportItem, IImportType, IReplaceConfig } from './types'; + + +function parseOneReplaceConfig(config: IImportItem): { + sourceName: string; + sourceType: IImportType; + targetName: string; + targetType: IImportType; +} { + if (typeof config === 'string') { + return { + sourceName: config, + sourceType: IImportType.ImportSpecifier, + targetName: config, + targetType: IImportType.ImportSpecifier, + }; + } + if (Array.isArray(config)) { + return { + sourceName: config[0], + sourceType: IImportType.ImportSpecifier, + targetName: config[1] || config[0], + targetType: IImportType.ImportSpecifier, + }; + } + + return { + sourceName: config.sourceName || '', + sourceType: config.sourceType || IImportType.ImportSpecifier, + targetName: config.targetName || config.sourceName || '', + targetType: config.targetType || config.sourceType || IImportType.ImportSpecifier, + }; +} + + +export function parseReplaceConfig(configList: Array