chore: update aegir config

Author: achingbrain

examples/custom-ipfs-repo/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "datastore-fs": "^2.0.0",
     "ipfs": "^0.54.3",
-    "ipfs-repo": "^8.0.0",
+    "ipfs-repo": "^9.0.0",
     "it-all": "^1.0.4"
   },
   "devDependencies": {

packages/interface-ipfs-core/package.json

@@ -45,15 +45,15 @@
     "cids": "^1.1.5",
     "delay": "^4.4.0",
     "dirty-chai": "^2.0.1",
-    "err-code": "^2.0.3",
+    "err-code": "^3.0.1",
     "ipfs-unixfs": "^3.0.1",
     "ipfs-unixfs-importer": "^6.0.1",
     "ipfs-utils": "^6.0.1",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.21.0",
     "ipns": "^0.8.0",
-    "is-ipfs": "^2.0.0",
+    "is-ipfs": "^4.0.0",
     "iso-random-stream": "^1.1.1",
     "it-all": "^1.0.4",
     "it-buffer-stream": "^1.0.5",

packages/ipfs-cli/package.json

@@ -32,14 +32,14 @@
     "cid-tool": "^1.0.0",
     "cids": "^1.1.5",
     "debug": "^4.1.1",
-    "err-code": "^2.0.3",
+    "err-code": "^3.0.1",
     "execa": "^5.0.0",
     "get-folder-size": "^2.0.1",
     "ipfs-core": "^0.5.3",
     "ipfs-core-utils": "^0.7.2",
     "ipfs-daemon": "^0.5.3",
     "ipfs-http-client": "^49.0.3",
-    "ipfs-repo": "^8.0.0",
+    "ipfs-repo": "^9.0.0",
     "ipfs-utils": "^6.0.1",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.21.0",

packages/ipfs-cli/tsconfig.json

@@ -1,7 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "importsNotUsedAsValues": "preserve"
   },
   "include": [
     "src",

packages/ipfs-client/tsconfig.json

@@ -1,18 +1,19 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "importsNotUsedAsValues": "preserve"
   },
+  "include": [
+    "src",
+    "package.json"
+  ],
   "references": [
     {
       "path": "../ipfs-http-client"
     },
     {
       "path": "../ipfs-grpc-client"
     }
-  ],
-  "include": [
-    "src",
-    "package.json"
   ]
 }

packages/ipfs-core-types/src/basic.ts renamed to packages/ipfs-core-types/src/basic.d.ts

@@ -1,14 +1,15 @@
 import CID from 'cids'
 import { AwaitIterable } from './basic'
+import { Mtime } from 'ipfs-unixfs'
 
 export type Entry<Content extends AsyncIterable<Uint8Array>|Blob> =
   | FileEntry<Content>
   | DirectoryEntry
 
 export interface BaseEntry {
   path: string
-  mode?: Mode
-  mtime?: MTime
+  mode?: number
+  mtime?: Mtime
 }
 export interface FileEntry <Content extends AsyncIterable<Uint8Array>|Blob> extends BaseEntry {
   content?: Content
@@ -58,7 +59,7 @@ export type ToContent =
 
 /**
  * Timestamp representation in arbitrary (supported) in representations. It is
- * used in input positions and usurally get's normalised to `MTime` before use.
+ * used in input positions and usually gets normalised to `MTime` before use.
  */
 export type ToMTime =
   | Date
@@ -82,8 +83,8 @@ export interface File {
    * File content
    */
   readonly content?: AsyncIterable<Uint8Array>
-  mode?: Mode
-  mtime?: MTime
+  mode?: number
+  mtime?: Mtime
   size?: number
   depth?: number
 }
@@ -96,8 +97,8 @@ export interface Directory {
    * Directory path
    */
   path: string
-  mode?: Mode
-  mtime?: MTime
+  mode?: number
+  mtime?: Mtime
   size?: number
   depth?: number
 }
@@ -114,32 +115,6 @@ export interface InputFile extends BaseFile {
   unixfs: undefined
 }
 
-export interface UnixFSFile extends BaseFile {
-  content: () => AsyncIterable<Uint8Array>
-  unixfs: UnixFS
-}
-
-export interface UnixFSEntry {
-  path: string
-  cid: CID
-  mode: Mode
-  mtime: MTime
-  size: number
-}
-
-export interface MTime {
-  /**
-   * The number of seconds since(positive) or before (negative) the Unix Epoch
-   * began.
-   */
-  readonly secs: number
-
-  /**
-   * The number of nanoseconds since the last full second
-   */
-  readonly nsecs: number
-}
-
 export interface MTimeLike {
   /**
    * The number of seconds since(positive) or before (negative) the Unix Epoch
@@ -153,20 +128,15 @@ export interface MTimeLike {
   nsecs?: number
 }
 
-interface UnixFS {
-  readonly type: 'directory' | 'file' | 'dir'
-  readonly mode: Mode
-  readonly mtime: MTime
-
-  fileSize: () => number
-  content: () => AsyncIterable<Uint8Array>
-}
-
 /**
  * Time representation as tuple of two integers, as per the output of
  * [`process.hrtime()`](https://nodejs.org/dist/latest/docs/api/process.html#process_process_hrtime_time).
  */
 type HRTime = [number, number]
 
-// It's just a named type alias, but it better captures intent.
-export type Mode = number
+export interface BrowserImportCandidate {
+  path?: string,
+  content?: Blob,
+  mtime?: Mtime,
+  mode?: number
+}

packages/ipfs-core-types/src/bitswap.ts renamed to packages/ipfs-core-types/src/bitswap.d.ts

@@ -1,17 +1,19 @@
 import { AbortOptions } from './basic'
 import { Options as PreloadOptions } from './preload'
-import { ImportSource, IPFSEntry, ToEntry, UnixFSEntry } from './files'
+import { ImportSource, ToEntry, IPFSEntry } from './files'
 import CID, { CIDVersion } from 'cids'
+import { ImportResult } from 'ipfs-unixfs-importer'
 
 export interface RootAPI {
-  add: (entry: ToEntry, options?: AddOptions) => Promise<UnixFSEntry>
-  addAll: (source: ImportSource, options?: AddAllOptions & AbortOptions) => AsyncIterable<UnixFSEntry>
+  add: (entry: ToEntry, options?: AddOptions) => Promise<ImportResult>
+  addAll: RootAddAll
   cat: (ipfsPath: IPFSPath, options?: CatOptions) => AsyncIterable<Uint8Array>
   get: (ipfsPath: IPFSPath, options?: GetOptions) => AsyncIterable<IPFSEntry>
-
   ls: (ipfsPath: IPFSPath, options?: ListOptions) => AsyncIterable<IPFSEntry>
 }
 
+export type RootAddAll = (source: ImportSource, options?: AddAllOptions & AbortOptions) => AsyncIterable<ImportResult>
+
 export interface AddProgressFn { (bytes: number, path: string): void }
 
 export interface AddOptions extends AbortOptions {
@@ -65,6 +67,10 @@ export interface AddOptions extends AbortOptions {
    */
   wrapWithDirectory?: boolean
 
+  /**
+   * Whether to preload all blocks created during this operation
+   */
+  preload?: boolean
 }
 
 export interface AddAllOptions extends AddOptions {

packages/ipfs-core-types/src/bitswap/moving-avarage.ts renamed to packages/ipfs-core-types/src/bitswap/moving-avarage.d.ts

@@ -1,7 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
-    "noImplicitAny": true
+    "outDir": "dist",
+    "importsNotUsedAsValues": "preserve"
   },
   "include": [
     "src"

packages/ipfs-core-types/src/block-service.ts renamed to packages/ipfs-core-types/src/block-service.d.ts

@@ -40,7 +40,7 @@
     "blob-to-it": "^1.0.1",
     "browser-readablestream-to-it": "^1.0.1",
     "cids": "^1.1.5",
-    "err-code": "^2.0.3",
+    "err-code": "^3.0.1",
     "ipfs-core-types": "^0.3.1",
     "ipfs-utils": "^6.0.1",
     "it-all": "^1.0.4",

packages/ipfs-core-types/src/block-store.ts renamed to packages/ipfs-core-types/src/block-store.d.ts

@@ -16,6 +16,12 @@ const S_IROTH = parseInt('4', 8) //      others have read permission
 const S_IWOTH = parseInt('2', 8) //      others have write permission
 const S_IXOTH = parseInt('1', 8) //      others have execute permission
 
+/**
+ * @param {number} mode
+ * @param {number} perm
+ * @param {string} type
+ * @param {string[]} output
+ */
 function checkPermission (mode, perm, type, output) {
   if ((mode & perm) === perm) {
     output.push(type)
@@ -25,8 +31,7 @@ function checkPermission (mode, perm, type, output) {
 }
 
 /**
- *
- * @param {import('ipfs-core-types/src/files').Mode} mode
+ * @param {number} mode
  * @param {boolean} isDirectory
  * @returns {string}
  */

packages/ipfs-core-types/src/datastore.ts renamed to packages/ipfs-core-types/src/datastore.d.ts

@@ -1,15 +1,15 @@
 'use strict'
 
 /**
- * @param {import('ipfs-core-types/src/files').MTime} mtime
+ * @param {import('ipfs-unixfs').Mtime} mtime
  * @returns {string}
  */
 function formatMtime (mtime) {
   if (mtime == null) {
     return '-'
   }
 
-  const date = new Date((mtime.secs * 1000) + Math.round(mtime.nsecs / 1000))
+  const date = new Date((mtime.secs * 1000) + Math.round((mtime.nsecs || 0) / 1000))
 
   return date.toLocaleDateString(Intl.DateTimeFormat().resolvedOptions().locale, {
     year: 'numeric',

packages/ipfs-core-types/src/files.ts renamed to packages/ipfs-core-types/src/files.d.ts

@@ -3,6 +3,11 @@
 const normaliseContent = require('./normalise-content.browser')
 const normaliseInput = require('./normalise-input')
 
+/**
+ * @typedef {import('ipfs-core-types/src/files').ImportSource} ImportSource
+ * @typedef {import('ipfs-core-types/src/files').BrowserImportCandidate} BrowserImportCandidate
+ */
+
 /**
  * Transforms any of the `ipfs.add` input types into
  *
@@ -12,7 +17,8 @@ const normaliseInput = require('./normalise-input')
  *
  * See https://github.com/ipfs/js-ipfs/blob/master/docs/core-api/FILES.md#ipfsadddata-options
  *
- * @param {import('ipfs-core-types/src/files').ImportSource} input
- * @returns {AsyncIterable<import('ipfs-core-types/src/files').Entry<Blob>>}
+ * @param {ImportSource} input
+ * @returns {AsyncGenerator<BrowserImportCandidate, void, undefined>}
  */
+// @ts-ignore
 module.exports = (input) => normaliseInput(input, normaliseContent)

packages/ipfs-core-types/src/index.ts renamed to packages/ipfs-core-types/src/index.d.ts

@@ -3,6 +3,10 @@
 const normaliseContent = require('./normalise-content')
 const normaliseInput = require('./normalise-input')
 
+/**
+ * @typedef {import('ipfs-core-types/src/files').ImportSource} ImportSource
+ */
+
 /**
  * Transforms any of the `ipfs.add` input types into
  *
@@ -12,7 +16,6 @@ const normaliseInput = require('./normalise-input')
  *
  * See https://github.com/ipfs/js-ipfs/blob/master/docs/core-api/FILES.md#ipfsadddata-options
  *
- * @param {import('ipfs-core-types/src/files').ImportSource} input
- * @returns {AsyncIterable<import('ipfs-core-types/src/files').Entry<AsyncIterable<Uint8Array>>>}
+ * @param {ImportSource} input
  */
 module.exports = (input) => normaliseInput(input, normaliseContent)

packages/ipfs-core-types/src/ipld.ts renamed to packages/ipfs-core-types/src/ipld.d.ts

@@ -13,7 +13,6 @@ const {
 
 /**
  * @param {import('./normalise-input').ToContent} input
- * @returns {Promise<Blob>}
  */
 async function toBlob (input) {
   // Bytes
@@ -37,7 +36,7 @@ async function toBlob (input) {
   }
 
   // (Async)Iterator<?>
-  if (input[Symbol.iterator] || input[Symbol.asyncIterator]) {
+  if (Symbol.iterator in input || Symbol.asyncIterator in input) {
     /** @type {any} peekable */
     const peekable = itPeekable(input)
 
@@ -67,7 +66,6 @@ async function toBlob (input) {
 
 /**
  * @param {AsyncIterable<BlobPart>|Iterable<BlobPart>} stream
- * @returns {Promise<Blob>}
  */
 async function itToBlob (stream) {
   const parts = []

packages/ipfs-core-types/src/ipld/format.ts renamed to packages/ipfs-core-types/src/ipld/format.d.ts

@@ -15,7 +15,6 @@ const {
 
 /**
  * @param {import('./normalise-input').ToContent} input
- * @returns {AsyncIterable<Uint8Array>}
  */
 async function * toAsyncIterable (input) {
   // Bytes | String
@@ -41,7 +40,7 @@ async function * toAsyncIterable (input) {
   }
 
   // (Async)Iterator<?>
-  if (input[Symbol.iterator] || input[Symbol.asyncIterator]) {
+  if (Symbol.iterator in input || Symbol.asyncIterator in input) {
     /** @type {any} peekable */
     const peekable = itPeekable(input)
 
@@ -73,9 +72,7 @@ async function * toAsyncIterable (input) {
 }
 
 /**
- *
  * @param {ArrayBuffer | ArrayBufferView | string | InstanceType<typeof window.String> | number[]} chunk
- * @returns {Uint8Array}
  */
 function toBytes (chunk) {
   if (chunk instanceof Uint8Array) {