Rename for release

Author: awlayton

.vscode/settings.json

@@ -53,6 +53,7 @@
     "LDJSON",
     "LJSON",
     "ndjson",
+    "oadacli",
     "oadaified",
     "oadaify",
     "oclif",

README.md

@@ -3,9 +3,9 @@
 Pipeable OADA client CLI
 
 [![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
-[![Version](https://img.shields.io/npm/v/clioada.svg)](https://npmjs.org/package/clioada)
-[![Downloads/week](https://img.shields.io/npm/dw/clioada.svg)](https://npmjs.org/package/clioada)
-[![License](https://img.shields.io/npm/l/clioada.svg)](https://github.com/awlayton/clioada/blob/master/package.json)
+[![Version](https://img.shields.io/npm/v/@oada/cli.svg)](https://npmjs.org/package/@oada/cli)
+[![Downloads/week](https://img.shields.io/npm/dw/@oada/cli.svg)](https://npmjs.org/package/@oada/cli)
+[![License](https://img.shields.io/npm/l/@oada/cli.svg)](https://github.com/OADA/cli/blob/master/package.json)
 
 <!-- toc -->
 
@@ -55,11 +55,9 @@ and they will be expanded).
 <!-- usage -->
 
 ```sh-session
-$ npm install -g clioada
+$ yarn global add @oada/cli
 $ oada COMMAND
 running command...
-$ oada (-v|--version|version)
-clioada/1.1.0 linux-x64 node-v15.7.0
 $ oada --help [COMMAND]
 USAGE
   $ oada COMMAND
@@ -134,7 +132,7 @@ ALIASES
   $ oada config
 ```
 
-_See code: [src/commands/config/show.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/config/show.ts)_
+_See code: [src/commands/config/show.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/config/show.ts)_
 
 ### `oada delete PATHS...`
 
@@ -164,7 +162,7 @@ EXAMPLES
   $ oada rm /bookmarks/foo /bookmarks/bar /bookmarks/baz*
 ```
 
-_See code: [src/commands/delete.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/delete.ts)_
+_See code: [src/commands/delete.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/delete.ts)_
 
 ### `oada fs:copy PATHS... PATH`
 
@@ -192,7 +190,7 @@ EXAMPLES
   $ oada cp /resources/foo1 /resources/foo2 /bookmarks/foos/
 ```
 
-_See code: [src/commands/fs/copy.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/copy.ts)_
+_See code: [src/commands/fs/copy.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/copy.ts)_
 
 ### `oada fs:link PATHS... PATH`
 
@@ -222,7 +220,7 @@ EXAMPLES
   $ oada ln /resources/thingy1 /resources/thingy2 /bookmarks/thingies/
 ```
 
-_See code: [src/commands/fs/link.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/link.ts)_
+_See code: [src/commands/fs/link.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/link.ts)_
 
 ### `oada fs:list PATHS...`
 
@@ -246,7 +244,7 @@ ALIASES
   $ oada l
 ```
 
-_See code: [src/commands/fs/list.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/list.ts)_
+_See code: [src/commands/fs/list.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/list.ts)_
 
 ### `oada fs:move PATHS... PATH`
 
@@ -274,7 +272,7 @@ EXAMPLES
   $ oada mv /resources/foo1 /resources/foo2 /bookmarks/foos/
 ```
 
-_See code: [src/commands/fs/move.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/move.ts)_
+_See code: [src/commands/fs/move.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/move.ts)_
 
 ### `oada fs:remove PATHS...`
 
@@ -304,7 +302,7 @@ EXAMPLES
   $ oada rm /bookmarks/foo /bookmarks/bar /bookmarks/baz*
 ```
 
-_See code: [src/commands/fs/remove.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/remove.ts)_
+_See code: [src/commands/fs/remove.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/remove.ts)_
 
 ### `oada fs:touch PATHS...`
 
@@ -330,7 +328,7 @@ EXAMPLE
   $ oada touch /bookmarks
 ```
 
-_See code: [src/commands/fs/touch.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/fs/touch.ts)_
+_See code: [src/commands/fs/touch.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/fs/touch.ts)_
 
 ### `oada get PATHS...`
 
@@ -375,7 +373,7 @@ EXAMPLES
   700
 ```
 
-_See code: [src/commands/get.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/get.ts)_
+_See code: [src/commands/get.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/get.ts)_
 
 ### `oada head PATHS...`
 
@@ -405,7 +403,7 @@ EXAMPLES
   1
 ```
 
-_See code: [src/commands/head.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/head.ts)_
+_See code: [src/commands/head.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/head.ts)_
 
 ### `oada help [COMMAND]`
 
@@ -568,7 +566,7 @@ EXAMPLE
   $ oada post - /bookmarks/ <<< '{"a": 1}{"b": true}'
 ```
 
-_See code: [src/commands/post.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/post.ts)_
+_See code: [src/commands/post.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/post.ts)_
 
 ### `oada put PATHS... PATH`
 
@@ -597,7 +595,7 @@ EXAMPLE
   $ oada put - /bookmarks/ <<< '{"a": 1}'
 ```
 
-_See code: [src/commands/put.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/put.ts)_
+_See code: [src/commands/put.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/put.ts)_
 
 ### `oada watch PATH`
 
@@ -690,7 +688,7 @@ EXAMPLE
   ]
 ```
 
-_See code: [src/commands/watch.ts](https://github.com/awlayton/clioada/blob/v1.1.0/src/commands/watch.ts)_
+_See code: [src/commands/watch.ts](https://github.com/OADA/cli/blob/v1.1.0/src/commands/watch.ts)_
 
 <!-- commandsstop -->
 

package.json

@@ -10,9 +10,9 @@
     "node": ">=16.0.0"
   },
   "author": "Alex Layton <alex@layton.in>",
-  "homepage": "https://github.com/awlayton/clioada",
-  "repository": "awlayton/clioada",
-  "bugs": "https://github.com/awlayton/clioada/issues",
+  "homepage": "https://github.com/OADA/cli",
+  "repository": "OADA/cli",
+  "bugs": "https://github.com/OADA/cli/issues",
   "license": "MIT",
   "keywords": [
     "OADA",
@@ -31,8 +31,7 @@
     },
     "assets": [
       "oclif.manifest.json",
-      ".pnp.*",
-      ".yarn/**/*"
+      "dist/**/*.map"
     ],
     "scripts": "dist/**/*.js",
     "targets": [
@@ -75,7 +74,7 @@
     "yarn.lock"
   ],
   "dependencies": {
-    "@oada/client": "2.6.4",
+    "@oada/client": "3.0.3",
     "@oada/oadaify": "^1.0.1",
     "@oclif/command": "^1.8.15",
     "@oclif/config": "1.18.2",
@@ -85,20 +84,17 @@
     "@oclif/plugin-help": "^5.1.10",
     "@oclif/plugin-not-found": "^2.2.3",
     "@oclif/plugin-plugins": "^2.0.11",
-    "bluebird": "^3.7.2",
     "cli-highlight": "^2.1.11",
     "concatjson": "^2.0.1",
     "dotenv": "^10.0.0",
     "find-up": "^5.0.0",
     "gaxios": "^4.3.2",
     "hjson": "^3.2.2",
-    "ix": "^4.5.2",
     "json-6": "^1.1.4",
     "ksuid": "^3.0.0",
     "minimatch": "^3.0.4",
     "ndjson": "^2.0.0",
     "object-assign-deep": "^0.4.0",
-    "supports-color": "^9.2.1",
     "ts-node": "^10.4.0",
     "tslib": "^2.3.1",
     "type-fest": "^2.8.0"
@@ -107,15 +103,12 @@
     "@oclif/dev-cli": "^1.26.10",
     "@oclif/parser": "^3.8.6",
     "@tsconfig/node16": "^1.0.2",
-    "@types/bluebird": "^3.5.36",
     "@types/glob": "^7.2.0",
     "@types/json5": "^2.2.0",
     "@types/minimatch": "^3.0.5",
     "@types/ndjson": "^2.0.1",
     "@types/node": "^16.11.14",
     "@types/object-assign-deep": "^0.4.0",
-    "@types/semver": "^7.3.9",
-    "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "^5.7.0",
     "@typescript-eslint/parser": "^5.7.0",
     "@yarnpkg/sdks": "^2.5.1-rc.6",
@@ -148,10 +141,7 @@
     "oclif": "^2.0.1",
     "pkg": "^5.5.1",
     "prettier": "^2.5.1",
-    "shebang-loader": "^0.0.1",
-    "source-map-loader": "^3.0.0",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.4.4"
+    "typescript": "4.5.4"
   },
   "packageManager": "yarn@3.1.1"
 }

src/BaseCommand.ts

@@ -182,7 +182,7 @@ export default abstract class BaseCommand extends Command {
 
   override async init() {
     this.configFiles = [join(this.config.configDir, 'config')].concat(
-      (await findUp(configTypes.map((extension) => `.clioada${extension}`))) ??
+      (await findUp(configTypes.map((extension) => `.oadacli${extension}`))) ??
         []
     );
     const userConfig = await loadUserConfig(this.configFiles);

src/commands/watch.ts

@@ -11,12 +11,9 @@
 
 import { flags } from '@oclif/command';
 
-import { AsyncSink } from 'ix/asynciterable';
-
 import { json, shell } from '../highlight';
 import Command from '../BaseCommand';
 
-import type { WatchRequest } from '@oada/client';
 import getConn from '../connections';
 import { output } from '../io';
 
@@ -126,7 +123,6 @@ export default class Watch extends Command {
     const conn = getConn(this.iconfig);
 
     const path = `${rawpath}`;
-    const sink = new AsyncSink();
     await output(
       out,
       async function* () {
@@ -139,17 +135,15 @@ export default class Watch extends Command {
           rev = Number(current!) + rev;
         }
 
+        // @ts-expect-error the deprecated v2 API confuses the types
         // eslint-disable-next-line security/detect-non-literal-fs-filename
-        await conn.watch({
-          type,
+        const { changes } = await conn.watch({
+          type: type as 'single' | 'tree',
           rev: `${rev}`,
           path,
-          watchCallback(change: unknown) {
-            sink.write(change);
-          },
-        } as WatchRequest);
+        });
 
-        yield* sink;
+        yield* changes;
       },
       this.iconfig
     );

src/connections.ts

@@ -14,14 +14,12 @@
 
 import { URL } from 'node:url';
 
-import {
-  GETRequest,
-  OADAClient,
-  PUTRequest,
-  WatchRequest,
-  connect,
-} from '@oada/client';
+import { GETRequest, OADAClient, PUTRequest, connect } from '@oada/client';
 
+import type {
+  WatchRequestSingle,
+  WatchRequestTree,
+} from '@oada/client/dist/client';
 import type { IConfig } from './BaseCommand';
 
 interface Connections {
@@ -67,15 +65,24 @@ export function conn(config: IConfig): OADAClient {
     };
   }
 
-  client.watch = async ({ path: p, ...rest }: WatchRequest) => {
+  client.watch = async <R extends WatchRequestSingle | WatchRequestTree>({
+    path: p,
+    ...rest
+  }: R) => {
     let path = `${p}`;
     let host;
     try {
       ({ host, pathname: path } = new URL(p));
     } finally {
       const con = await getConnection(host);
       // eslint-disable-next-line security/detect-non-literal-fs-filename, no-unsafe-finally
-      return con.watch({ path, ...rest });
+      return con.watch(
+        // @ts-expect-error the deprecated v2 API screws up the types
+        {
+          path,
+          ...rest,
+        } as R
+      );
     }
   };