@liuli-util/cli 3.18.0 → 3.19.0

package/src/commands/esbuild/index.ts

@@ -30,17 +30,30 @@ export const esbuildCommand = new Command('build')
       }),
   )
   .addCommand(
-    (['iife', 'cli', 'esm', 'cjs', 'dts'] as TaskTypeEnum[]).reduce((res, type) => {
-      res.addCommand(
-        new Command(type)
-          .description(`单独构建 ${type}`)
-          .option('-w --watch', '监视模式')
-          .action(async (options: CliBuildOptions) => {
-            program.isWatch = !!options.watch
-            const tasks = await program.getTasks()
-            await program.execTasks([tasks[type]])
-          }),
-      )
-      return res
-    }, new Command('single').description('单独构建某种类型的 bundle')),
+    (['iife', 'cli', 'esm', 'cjs', 'dts'] as TaskTypeEnum[]).reduce(
+      (res, type) => {
+        res.addCommand(
+          new Command(type)
+            .description(`单独构建 ${type}`)
+            .option('-w --watch', '监视模式')
+            .action(async (options: CliBuildOptions) => {
+              program.isWatch = !!options.watch
+              const tasks = await program.getTasks()
+              await program.execTasks([tasks[type]])
+            }),
+        )
+        return res
+      },
+      new Command('single')
+        .description('单独构建某种类型的 bundle')
+        .option('-t, --target <target...>', '构建目标，是一个数组，可以使用 , 分割')
+        .option('-w, --watch', '监视模式')
+        .action(async (options: { target: TaskTypeEnum[]; watch?: boolean }) => {
+          program.isWatch = !!options.watch
+          const tasks = await program.getTasks()
+          await program.execTasks(
+            options.target.flatMap((s) => s.split(',') as TaskTypeEnum[]).map((type) => tasks[type]),
+          )
+        }),
+    ),
   )

package/src/commands/esbuild/util/esbuildPlugins.ts

@@ -1,5 +1,6 @@
 import { Plugin } from 'esbuild'
-import { writeJson } from 'fs-extra'
+import { readJson, writeJson } from 'fs-extra'
+import path from 'path'
 
 /**
  * 处理 nodejs 原生模块
@@ -93,3 +94,38 @@ export function metafile(metafilePath: string): Plugin {
     },
   }
 }
+
+function generateBanner(meta: object) {
+  return (
+    [
+      '// ==UserScript==',
+      ...Object.entries(meta)
+        .map(([key, value]) => {
+          if (Array.isArray(value)) {
+            return value.map((item) => `// @${key} ${item}`)
+          }
+          return `// @${key} ${value}`
+        })
+        .flat(),
+      '// ==/UserScript==',
+    ].join('\n') + '\n'
+  )
+}
+
+export function userJS(): Plugin {
+  return {
+    name: 'esbuild-plugin-userjs',
+    async setup(build) {
+      const json = (await readJson(path.resolve(build.initialOptions.absWorkingDir!, 'package.json'))) as {
+        userjs: object
+      }
+      if (!json.userjs) {
+        throw new Error('userjs is not supported')
+      }
+      if (!build.initialOptions.banner) {
+        build.initialOptions.banner = {}
+      }
+      build.initialOptions.banner!['js'] = generateBanner(json.userjs)
+    },
+  }
+}

package/src/commands/generate/__tests__/.temp/README.md

@@ -0,0 +1 @@
+# @liuli-util/.temp

package/src/commands/generate/__tests__/.temp/package.json

@@ -0,0 +1,3 @@
+{
+  "name": ".temp"
+}

package/src/commands/generate/__tests__/.temp/test-cli/CHANGELOG.md

@@ -0,0 +1 @@
+# CHANGELOG

package/src/commands/generate/__tests__/.temp/test-cli/README.md

@@ -0,0 +1 @@
+# @liuli-util/cli-test-cli

package/src/commands/generate/__tests__/.temp/test-cli/bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+// eslint-disable-next-line no-undef
+require('./dist/bin.js')

package/src/commands/generate/__tests__/.temp/test-cli/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "test-cli",
+  "version": "0.1.0",
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "types": "dist/index.d.ts",
+  "license": "MIT",
+  "scripts": {
+    "build": "liuli-cli build cli",
+    "dev": "liuli-cli build cli -w",
+    "start": "esno src/bin.ts"
+  },
+  "bin": {
+    "cli-name": "./bin.js"
+  },
+  "dependencies": {
+    "commander": "^8.2.0",
+    "enquirer": "^2.3.6",
+    "fs-extra": "^10.0.0"
+  },
+  "devDependencies": {
+    "@liuli-util/cli": "^3.18.0",
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^27.0.2",
+    "@types/lodash": "^4.14.173",
+    "@types/node": "^16.9.6",
+    "esno": "^0.9.1",
+    "jest": "^27.4.7",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^27.1.3",
+    "type-fest": "^2.3.4",
+    "typescript": "^4.5.5"
+  }
+}

package/src/commands/generate/__tests__/.temp/test-cli/src/bin.ts

@@ -0,0 +1,13 @@
+import { Command } from 'commander'
+import { prompt } from 'enquirer'
+
+new Command()
+  .action(async () => {
+    const { name } = await prompt<{ name: string }>({
+      type: 'input',
+      name: 'name',
+      message: '请输入名字',
+    })
+    console.log(`hello ${name}`)
+  })
+  .parse()

package/src/commands/generate/__tests__/.temp/test-cli/src/index.ts

@@ -0,0 +1 @@
+export {}

package/src/commands/generate/__tests__/.temp/test-cli/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": [
+      "ESNext"
+    ],
+    "outDir": "./dist",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "src"
+  ],
+  "typedocOptions": {
+    "entryPoints": [
+      "src/index.ts"
+    ],
+    "out": "docs",
+    "readme": "README.md",
+    "gitRemote": "origin"
+  }
+}

package/src/commands/sync/SyncProgram.ts

@@ -1,6 +1,6 @@
 import { readFile, readJson, writeFile, writeJson } from 'fs-extra'
 import path from 'path'
-import { merge } from 'lodash-es'
+import { merge } from 'lodash'
 import { PackageJson } from 'type-fest'
 import prettier from '@liuli-util/prettier-standard-config/package.json'
 import eslintTs from '@liuli-util/eslint-config-ts/package.json'

package/src/commands/sync/__tests__/SyncProgram.test.ts

@@ -1,7 +1,7 @@
 import { mkdir, readJson, remove, writeJson } from 'fs-extra'
 import path from 'path'
 import { SyncConfigType, SyncProgram } from '../SyncProgram'
-import { merge } from 'lodash-es'
+import { merge } from 'lodash'
 import { PackageJson } from 'type-fest'
 
 describe('测试 SyncProgram', () => {

package/src/commands/sync/__tests__/when.test.ts

@@ -1,17 +1,13 @@
 import { isIncludeDep, isNpmPackage, isYarnRoot, isYarnSubModule } from '../when'
-import { pathExists, readJson } from 'fs-extra'
-import { PackageJson } from 'type-fest'
-import path from 'path'
+import { pathExists } from 'fs-extra'
+import * as path from 'path'
 import { findParent } from '../../../utils'
 
 describe('测试 when', () => {
   let rootPath: string
   let subModulePath: string
   beforeAll(async () => {
-    rootPath = (await findParent(__dirname, async (dir) => {
-      const jsonPath = path.resolve(dir, 'package.json')
-      return (await pathExists(jsonPath)) && !!((await readJson(jsonPath)) as PackageJson).workspaces
-    }))!
+    rootPath = (await findParent(__dirname, (dir) => pathExists(path.resolve(dir, 'pnpm-workspace.yaml'))))!
     subModulePath = (await findParent(__dirname, async (dir) => pathExists(path.join(dir, 'package.json'))))!
   })
   it('测试 isNpmPackage', async () => {

package/src/commands/sync/when.ts

@@ -1,5 +1,5 @@
 import { pathExists, readJson } from 'fs-extra'
-import path from 'path'
+import * as path from 'path'
 import { PackageJson } from 'type-fest'
 import { findParent } from '../../utils'
 
@@ -7,9 +7,7 @@ import { findParent } from '../../utils'
  * 判断是否包含 package.json
  * @param cwd
  */
-export async function isNpmPackage(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isNpmPackage(cwd: string = process.cwd()): Promise<boolean> {
   return await pathExists(path.resolve(cwd, './package.json'))
 }
 
@@ -17,24 +15,18 @@ export async function isNpmPackage(
  * 判断是 yarn2 monorepo 项目
  * @param cwd
  */
-export async function isYarnRoot(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isYarnRoot(cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
-  const json = (await readJson(
-    path.resolve(cwd, './package.json'),
-  )) as PackageJson
+  const json = (await readJson(path.resolve(cwd, './package.json'))) as PackageJson
   return !!json.workspaces
 }
 
 /**
  * 判断是 yarn2 monorepo 的子模块
  */
-export async function isYarnSubModule(
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isYarnSubModule(cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
@@ -50,18 +42,11 @@ export async function isYarnSubModule(
  * @param deps
  * @param cwd
  */
-export async function isIncludeDep(
-  deps: string[],
-  cwd: string = process.cwd(),
-): Promise<boolean> {
+export async function isIncludeDep(deps: string[], cwd: string = process.cwd()): Promise<boolean> {
   if (!(await isNpmPackage(cwd))) {
     return false
   }
-  const json = (await readJson(
-    path.resolve(cwd, './package.json'),
-  )) as PackageJson
-  const set = new Set(
-    Object.keys({ ...json.dependencies, ...json.devDependencies }),
-  )
+  const json = (await readJson(path.resolve(cwd, './package.json'))) as PackageJson
+  const set = new Set(Object.keys({ ...json.dependencies, ...json.devDependencies }))
   return deps.every((dep) => set.has(dep))
 }

package/templates/cli/package.json

@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && liuli-cli build cli",
+    "build": "liuli-cli build cli",
     "dev": "liuli-cli build cli -w",
     "start": "esno src/bin.ts"
   },
@@ -25,10 +25,10 @@
     "@types/lodash": "^4.14.173",
     "@types/node": "^16.9.6",
     "esno": "^0.9.1",
-    "jest": "^27.2.1",
+    "jest": "^27.4.7",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^27.1.3",
     "type-fest": "^2.3.4",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.5"
   }
 }

package/templates/lib/package.json

@@ -7,13 +7,13 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && liuli-cli build lib",
+    "build": "liuli-cli build lib",
     "dev": "liuli-cli build lib -w"
   },
   "devDependencies": {
     "@liuli-util/cli": "^3.18.0",
     "rimraf": "^3.0.2",
     "type-fest": "^2.3.4",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.5"
   }
 }

package/dist/commands/deploy/util/FileLock.d.ts

@@ -1,14 +0,0 @@
-export declare class FileLock {
-    private readonly lockFilePath;
-    constructor(lockFilePath: string);
-    private lockId?;
-    /**
-     * 加锁
-     */
-    lock(): Promise<boolean>;
-    /**
-     * 解锁
-     */
-    unlock(): Promise<void>;
-}
-//# sourceMappingURL=FileLock.d.ts.map

package/dist/commands/deploy/util/FileLock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileLock.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/util/FileLock.ts"],"names":[],"mappings":"AAGA,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,MAAM;IAEjD,OAAO,CAAC,MAAM,CAAC,CAAQ;IAEvB;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAS9B;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAO9B"}

package/src/commands/deploy/__tests__/FileLock.test.ts

@@ -1,27 +0,0 @@
-import * as path from 'path'
-import { FileLock } from '../util/FileLock'
-import { AsyncArray } from '../../../utils'
-import { wait } from '../util/wait'
-
-describe('测试文件锁', () => {
-  const tempPath = path.resolve(__dirname, '.temp/test.lock')
-  it('基本示例', async () => {
-    const fileLock = new FileLock(tempPath)
-    expect(await fileLock.lock()).toBeTruthy()
-    expect(await fileLock.lock()).toBeFalsy()
-    await fileLock.unlock()
-    expect(await fileLock.lock()).toBeTruthy()
-    await fileLock.unlock()
-  })
-  it('测试并发调用', async () => {
-    const start = Date.now()
-    await AsyncArray.forEach(Array(10).fill(0), async () => {
-      const fileLock = new FileLock(tempPath)
-      await wait(() => fileLock.lock())
-      await wait(100)
-      await fileLock.unlock()
-    })
-    const time = Date.now() - start
-    expect(time).toBeLessThan(3000)
-  })
-})

package/src/commands/deploy/util/FileLock.ts

@@ -1,31 +0,0 @@
-import { close, open, remove } from 'fs-extra'
-import path from 'path'
-
-export class FileLock {
-  constructor(private readonly lockFilePath: string) {}
-
-  private lockId?: number
-
-  /**
-   * 加锁
-   */
-  async lock(): Promise<boolean> {
-    try {
-      this.lockId = await open(path.resolve(this.lockFilePath), 'wx')
-      return true
-    } catch (e) {
-      return false
-    }
-  }
-
-  /**
-   * 解锁
-   */
-  async unlock(): Promise<void> {
-    if (!this.lockId) {
-      throw new Error('未加锁')
-    }
-    await remove(path.resolve(this.lockFilePath))
-    close(this.lockId)
-  }
-}