@tapjs/processinfo 1.0.3 → 1.0.5

package/index.d.ts

@@ -1,11 +1,14 @@
 /// <reference types="node" />
 import {
-  spawn,
-  spawnSync,
-  exec,
-  execSync,
-  execFile,
-  execFileSync,
+  ChildProcess,
+  ExecException,
+  ExecFileOptions,
+  ExecFileSyncOptions,
+  ExecOptions,
+  ExecSyncOptions,
+  SpawnOptions,
+  SpawnSyncOptions,
+  SpawnSyncReturns,
 } from 'node:child_process'
 
 declare interface ProcessInfoOptions {
@@ -21,6 +24,52 @@ declare class ProcessInfoNode {
   link(db: ProcessInfo): void
 }
 
+declare interface ProcessInfoSpawnOptions extends SpawnOptions {
+  externalID?: string
+}
+
+declare interface ProcessInfoSpawnSyncOptions extends SpawnSyncOptions {
+  externalID?: string
+}
+declare interface ProcessInfoSpawnSyncOptionsWithStringEncoding
+  extends ProcessInfoSpawnSyncOptions {
+  encoding: BufferEncoding
+}
+interface ProcessInfoSpawnSyncOptionsWithBufferEncoding
+  extends ProcessInfoSpawnSyncOptions {
+  encoding?: 'buffer' | null | undefined
+}
+
+declare interface ProcessInfoExecSyncOptions extends ExecSyncOptions {
+  externalID?: string
+}
+declare interface ProcessInfoExecSyncOptionsWithStringEncoding
+  extends ProcessInfoExecSyncOptions {
+  encoding: BufferEncoding
+}
+declare interface ProcessInfoExecSyncOptionsWithBufferEncoding
+  extends ProcessInfoExecSyncOptions {
+  encoding?: 'buffer' | null | undefined
+}
+
+declare interface ProcessInfoExecOptions extends ExecOptions {
+  externalID?: string
+}
+declare interface ProcessInfoExecFileSyncOptions extends ExecFileSyncOptions {
+  externalID?: string
+}
+declare interface ProcessInfoExecFileSyncOptionsWithStringEncoding
+  extends ProcessInfoExecFileSyncOptions {
+  encoding: BufferEncoding
+}
+declare interface ProcessInfoExecFileSyncOptionsWithBufferEncoding
+  extends ProcessInfoExecFileSyncOptions {
+  encoding?: 'buffer' | null | undefined
+}
+declare interface ProcessInfoExecFileOptions extends ExecFileOptions {
+  externalID?: string
+}
+
 declare class ProcessInfo {
   public dir: string
   public exclude: RegExp
@@ -44,12 +93,104 @@ declare class ProcessInfo {
 
   static get Node(): typeof ProcessInfoNode
   static get ProcessInfo(): typeof ProcessInfo
-  static get spawn(): typeof spawn
-  static get spawnSync(): typeof spawnSync
-  static get exec(): typeof exec
-  static get execSync(): typeof execSync
-  static get execFile(): typeof execFile
-  static get execFileSync(): typeof execFileSync
+
+  static spawn(
+    cmd: string,
+    args: string[],
+    options: ProcessInfoSpawnOptions
+  ): ChildProcess
+
+  static spawnSync(cmd: string): SpawnSyncReturns<Buffer>
+  static spawnSync(
+    cmd: string,
+    options: ProcessInfoSpawnSyncOptionsWithStringEncoding
+  ): SpawnSyncReturns<string>
+  static spawnSync(
+    cmd: string,
+    options: ProcessInfoSpawnSyncOptionsWithBufferEncoding
+  ): SpawnSyncReturns<Buffer>
+  static spawnSync(
+    cmd: string,
+    options?: ProcessInfoSpawnSyncOptions
+  ): SpawnSyncReturns<string | Buffer>
+  static spawnSync(
+    cmd: string,
+    args: readonly string[]
+  ): SpawnSyncReturns<Buffer>
+  static spawnSync(
+    cmd: string,
+    args: readonly string[],
+    options: ProcessInfoSpawnSyncOptionsWithStringEncoding
+  ): SpawnSyncReturns<string>
+  static spawnSync(
+    cmd: string,
+    args: readonly string[],
+    options: ProcessInfoSpawnSyncOptionsWithBufferEncoding
+  ): SpawnSyncReturns<Buffer>
+  static spawnSync(
+    cmd: string,
+    args?: readonly string[],
+    options?: ProcessInfoSpawnSyncOptions
+  ): SpawnSyncReturns<string | Buffer>
+
+  static exec(
+    cmd: string,
+    options: ProcessInfoExecOptions,
+    callback?: (
+      error: ExecException | null,
+      stdout: Buffer,
+      stderr: Buffer
+    ) => void
+  ): ChildProcess
+
+  static execSync(
+    cmd: string,
+    options: ProcessInfoExecSyncOptionsWithStringEncoding
+  ): string
+  static execSync(
+    cmd: string,
+    options: ProcessInfoExecSyncOptionsWithBufferEncoding
+  ): Buffer
+  static execSync(
+    cmd: string,
+    options?: ProcessInfoExecSyncOptions
+  ): string | Buffer
+
+  static execFile(
+    cmd: string,
+    args: string[],
+    options: ProcessInfoExecFileOptions
+  ): ChildProcess
+
+  static execFileSync(file: string): Buffer
+  static execFileSync(
+    file: string,
+    options: ProcessInfoExecFileSyncOptionsWithStringEncoding
+  ): string
+  static execFileSync(
+    file: string,
+    options: ProcessInfoExecFileSyncOptionsWithBufferEncoding
+  ): Buffer
+  static execFileSync(
+    file: string,
+    options?: ProcessInfoExecFileSyncOptions
+  ): string | Buffer
+  static execFileSync(file: string, args: readonly string[]): Buffer
+  static execFileSync(
+    file: string,
+    args: readonly string[],
+    options: ProcessInfoExecFileSyncOptionsWithStringEncoding
+  ): string
+  static execFileSync(
+    file: string,
+    args: readonly string[],
+    options: ProcessInfoExecFileSyncOptionsWithBufferEncoding
+  ): Buffer
+  static execFileSync(
+    file: string,
+    args?: readonly string[],
+    options?: ProcessInfoExecFileSyncOptions
+  ): string | Buffer
 }
 
 export = ProcessInfo

package/lib/child_process.cjs

@@ -12,10 +12,28 @@ const k = '_TAPJS_PROCESSINFO_EXCLUDE_'
 
 module.exports = {
   spawn(cmd, args, options) {
+    if (
+      args &&
+      typeof args === 'object' &&
+      !Array.isArray(args) &&
+      options === undefined
+    ) {
+      options = args
+      args = []
+    }
     return spawn(cmd, args, spawnOpts(options, getExclude(k)))
   },
 
   spawnSync(cmd, args, options) {
+    if (
+      args &&
+      typeof args === 'object' &&
+      !Array.isArray(args) &&
+      options === undefined
+    ) {
+      options = args
+      args = []
+    }
     return spawnSync(cmd, args, spawnOpts(options, getExclude(k)))
   },
 

package/lib/esm.mjs

@@ -7,15 +7,18 @@ import './cjs.cjs'
 const processInfo = getProcessInfo()
 const exclude = getExclude('_TAPJS_PROCESSINFO_EXCLUDE_')
 
-const others = Promise.all(
+let others = Promise.all(
   [...new URL(import.meta.url).searchParams.keys()].map(s =>
     import(s).catch(() => ({}))
   )
-)
-const hasLoad = (async () =>
+).then(o => others = o)
+
+let hasLoad = (async () =>
   (await others).filter(loader => typeof loader.load === 'function'))()
-const hasResolve = (async () =>
+  .then(has => hasLoad = has)
+let hasResolve = (async () =>
   (await others).filter(loader => typeof loader.resolve === 'function'))()
+  .then(has => hasResolve = has)
 
 const myLoad = defaultFn => async (url, context) => {
   if (/^file:/.test(url)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapjs/processinfo",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "main": "lib/index.cjs",
   "files": [
     "index.d.ts",
@@ -36,7 +36,6 @@
   "dependencies": {
     "pirates": "^4.0.5",
     "process-on-spawn": "^1.0.0",
-    "tap": "^16.3.0",
     "uuid": "^8.3.2"
   },
   "engines": {
@@ -48,7 +47,8 @@
     "@types/node": "^18.11.9",
     "diff": "^5.0.0",
     "eslint-config-prettier": "^8.5.0",
-    "prettier": "^2.6.2"
+    "prettier": "^2.6.2",
+    "tap": "^16.3.0"
   },
   "repository": "https://github.com/tapjs/processinfo"
 }