fix: workshop flow #128

.prettierrc.cjs

@@ -4,7 +4,4 @@ module.exports = {
   tabWidth: 2,
   semi: false,
   singleQuote: true,
-  importOrder: ['^[./]'],
-  importOrderSeparation: true,
-  importOrderSortSpecifiers: true,
 }

package.json

@@ -25,10 +25,20 @@
     "test:dev": "vitest"
   },
   "dependencies": {
+    "@ucanto/interface": "^1.0.0",
     "@ipld/unixfs": "^1.1.0-dev",
     "@ucanto/server": "^1.0.2",
+    "@ucanto/transport": "^1.0.1",
+    "@ucanto/core": "^1.0.1",
+    "uint8arrays": "^3.1.0",
+    "@ipld/dag-cbor": "^8.0.0",
+    "@ipld/dag-json": "^8.0.11",
+    "@ipld/dag-pb": "^2.1.18",
+    "@ucanto/principal": "^1.0.1",
     "@web-std/stream": "^1.0.1",
-    "@web3-storage/w3up-client": "3.0.2",
+    "@web3-storage/w3up-client": "^3.0.4",
+    "multiformats": "^9.9.0",
+    "@ipld/car": "^4.1.6",
     "archy": "^1.0.0",
     "cli-table": "^0.3.11",
     "conf": "^10.2.0",
@@ -41,7 +51,6 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^3.3.0",
     "@types/inquirer": "^9.0.1",
     "@types/yargs": "^17.0.11",
     "chai": "^4.3.6",

src/client.js

@@ -54,9 +54,9 @@ export function getClient(profile = 'main') {
   const settings = getProfileSettings(profile)
 
   const client = new W3Client({
-    serviceDID: cliSettings.W3_STORE_DID,
+    serviceDID: /** @type {`did:${string}`} */ (cliSettings.W3_STORE_DID),
     serviceURL: cliSettings.SERVICE_URL,
-    accessDID: cliSettings.ACCESS_DID,
+    accessDID: /** @type {`did:${string}`} */ (cliSettings.ACCESS_DID),
     accessURL: cliSettings.ACCESS_URL,
     settings,
   })

src/commands/delegations/list.js

@@ -18,7 +18,7 @@ const handler = async ({ profile }) => {
   const client = getClient(profile)
   const id = await client.account()
   const settings = await client.settings
-  const selected = settings.get('delegation')
+  const selected = settings.get('account')
   const delegations = settings.get('delegations')
 
   const table = buildSimpleConsoleTable(['selected', 'alias', 'did'])

src/commands/delegations/switch.js

@@ -40,7 +40,7 @@ const handler = async ({ did, alias, profile }) => {
     const found = choices.find((x) => x.alias == alias)
     if (found) {
       const del = found.value
-      settings.set('delegation', del)
+      settings.set('account', del)
       console.log(`now using account: ${del}`)
     } else {
       console.log(
@@ -68,12 +68,12 @@ async function inquirerPick(choices, client) {
         type: 'list',
         name: 'Choose an account',
         choices,
-        default: settings.get('delegation'),
+        default: settings.get('account'),
       },
     ])
     .then((answers) => {
       const del = answers['Choose an account']
-      settings.set('delegation', del)
+      settings.set('account', del)
       console.log(`now using account: ${del}`)
     })
 }

src/commands/settings/export.js

@@ -28,7 +28,7 @@ const handler = async ({ filename, profile, stdout = false, yes = false }) => {
   const client = getClient(profile)
 
   if (stdout) {
-    const store = await exportSettings(client.settings)
+    const store = await exportSettings(await client.settings)
     process.stdout.write(JSON.stringify(store))
     return
   }

src/commands/settings/import.js

@@ -43,12 +43,13 @@ const handler = async ({ fileName, profile, yes = false }) => {
 
   if (show && fileName) {
     try {
-      client.settings.clear()
+      const settings = await client.settings
+      settings.clear()
       const json = fs.readFileSync(fileName, { encoding: 'utf-8' })
       const imported = await importSettings(json)
 
       for (const [key, value] of imported.entries()) {
-        client.settings.set(key, value)
+        settings.set(key, value)
       }
 
       await client.identity()

src/commands/uploadCars.js

@@ -1,10 +1,10 @@
-// @ts-expect-error
-import * as CAR from '@ipld/car'
+import { CarReader } from '@ipld/car/reader'
 import fs from 'fs'
 import ora from 'ora'
 import path from 'path'
 // @ts-ignore
 import toIterator from 'stream-to-it'
+import { TransformStream } from '@web-std/stream'
 
 import { getClient } from '../client.js'
 import { getAllFiles, isDirectory } from '../lib/car/file.js'
@@ -103,7 +103,7 @@ const handler = async (argv) => {
     uploadExistingCar(car, client, view).then(async (buffer) => {
       if (buffer) {
         const bytes = Uint8Array.from(buffer)
-        const reader = await CAR.CarReader.fromBytes(bytes)
+        const reader = await CarReader.fromBytes(bytes)
         const roots = await reader.getRoots()
         const cid = await bytesToCarCID(bytes)
         for (const root of roots) {

src/lib/car/buildCar.js

@@ -3,12 +3,11 @@ import * as CAR from '@ipld/car'
 import * as UnixFS from '@ipld/unixfs'
 import fs from 'fs'
 import path from 'path'
-import 'web-streams-polyfill'
 
 import { isDirectory } from '../../utils.js'
 import { walkDir, wrapFilesWithDir } from './dir.js'
 import { streamFileToBlock } from './file.js'
-
+import { TransformStream } from '@web-std/stream'
 // Internal unixfs read stream capacity that can hold around 32 blocks
 const CAPACITY = UnixFS.BLOCK_SIZE_LIMIT * 32
 const MAX_CARS_AT_ONCE = 8

src/main.js

@@ -18,11 +18,10 @@ import whoami from './commands/whoami.js'
 import printQuickstart from './quickstart.js'
 
 /**
- * @type {import('yargs').Argv<{}>} yargs
+ * @param {string[]} args
  */
-const yargs = _yargs(hideBin(process.argv))
-
-export const main = async () => {
+export const main = async (args = hideBin(process.argv)) => {
+  const yargs = _yargs(args)
   const argv = await yargs
     .scriptName('w3up')
     //     .usage('Usage:\n  $0 <cmd> [options]')

src/validation.js

@@ -104,14 +104,14 @@ export const hasEmail = ({ profile }) => {
 export const hasOtherDelegation = ({ profile }) => {
   const settings = getProfileSettings(profile)
 
-  if (!settings.has('delegation')) {
+  if (!settings.has('account')) {
     return false
   }
 
   const delegations = settings.get('delegations')
-  const delegation = settings.get('delegation')
+  const account = settings.get('account')
 
-  if (delegations[delegation].alias != 'self') {
+  if (delegations[account].alias != 'self') {
     return true
   } else {
     return false