refactor: migrate to maven dir layout, update zx to v6.2.0

README.md

@@ -1,39 +1,43 @@
 # 🦪 zx-extra
-[zx](https://github.com/google/zx) with some useful extras
+[zx](https://github.com/google/zx) with some out-of-scope extras.
 
 ## Install
 ```shell
 # npm
 npm i zx-extra
 
 # yarn
-npm i zx-extra
+yarn add zx-extra
 ```
 
 ## Usage
-### ``$.raw`command` ``
-Evaluates target cmd as is with disabled `shq`.
+
+### `$.raw`
+Evaluates target cmd as is without `shq`.
 ```js
 const cmd = 'echo foo'
 const msg = 'bar'
 const output = (await $.raw`${cmd} ${msg}`).toString().trim()
 // $ echo foo bar
 ```
 
-### ``$.silent`command` `` (merged as `quiet`)
-Sets `verbose = false` for once invocation.
+### `$.silent`
+_merged as [bf88f50](bf88f5064b31dea79da4999f25425ca0fe0b8013)_    
+Sets `verbose = false` for a single invocation.
 ```js
 await $.silent`echo foo`
 // <no output in console>
 ```
 
-### ~~`` $.fs / global.fs ``~~ (merged)
+### ~~` $.fs / global.fs `~~
+_merged as [d8b6b87](73cd163d710f88d1ff835ffc3e76214eca07bb9b)_  
 Refers to [fs-extra](https://www.npmjs.com/package/fs-extra) instead of standard Node.js `fs` module.
 ```js
 await fs.copy('/tmp/myfile', '/tmp/mynewfile')
 ```
 
-### ~~`` global.argv ``~~ (merged)
+### ~~`` global.argv ``~~
+_merged as [d8b6b87](https://github.com/google/zx/commit/d8b6b87e5d48023fc23fd2a4f8513a896ee13c68)_   
 Represents parsed with [minimist](https://www.npmjs.com/package/minimist) script arguments
 ```js
 // zx-extra test.mjs --foo=bar

package.json

@@ -2,18 +2,19 @@
   "name": "zx-extra",
   "version": "0.0.4",
   "description": "zx with some useful extras",
-  "main": "index.mjs",
+  "main": "./src/main/js/index.mjs",
+  "type": "module",
   "bin": {
-    "zx-extra": "./cli.mjs"
+    "zx-extra": "./src/main/js/cli.mjs"
   },
   "scripts": {
-    "test": "node cli.mjs test.mjs",
+    "test": "node src/main/js/cli.mjs src/test/js/test.mjs",
     "publish": "npm publish --no-git-tag-version",
     "publish:beta": "npm publish --no-git-tag-version --tag beta",
     "publish:rc": "npm publish --no-git-tag-version --tag rc"
   },
   "files": [
-    "*.mjs",
+    "src/js",
     "README.md",
     "LICENSE"
   ],
@@ -34,7 +35,7 @@
   },
   "homepage": "https://github.com/qiwi/zx-extra#readme",
   "dependencies": {
-    "@types/node": "^17.0.26",
-    "zx": "^6.1.0"
+    "@types/node": "^17.0.38",
+    "zx": "^6.2.0"
   }
 }

cli.mjs → src/main/js/cli.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 import './index.mjs'
-import 'zx/zx.mjs'
+import 'zx/cli'

index.mjs → src/main/js/index.mjs

@@ -1,4 +1,4 @@
-import {$} from 'zx'
+import {$, quiet} from 'zx'
 
 export * from 'zx'
 
@@ -13,8 +13,6 @@ $.raw = async (...args) => {
 }
 
 $.silent = async (...args) => {
-  const v = $.verbose
-  $.verbose = false
   // https://github.com/google/zx/pull/134
-  return $(...args).finally(() => {$.verbose = v})
+  return quiet($(...args))
 }

test.mjs → src/test/js/test.mjs

@@ -1,18 +1,18 @@
-import {$} from './index.mjs'
+import {$} from '../../main/js/index.mjs'
 
 import {strict as assert} from 'node:assert'
 
 // $.raw
 {
-  const cmd = 'echo foo'
+  const cmd = 'echo raw foo'
   const msg = 'bar'
   const output = (await $.raw`${cmd} ${msg}`).toString().trim()
-  assert(output === 'foo bar')
+  assert(output === 'raw foo bar')
 }
 
 // $.silent
 {
-  await $.silent`echo foo`
+  await $.silent`echo silent`
 }
 
 // fs-extra