chore: fix all compiler errors for ipfs-core-utils and ipfs-core

.gitignore

@@ -19,6 +19,7 @@ node_modules
 dist
 build
 bundle.js
+tsconfig-types.aegir.json
 
 # Deployment files
 .npmrc

examples/browser-ipns-publish/package.json

@@ -16,7 +16,7 @@
     "ipfs": "^0.54.3",
     "ipfs-http-client": "^49.0.3",
     "ipfs-utils": "^6.0.1",
-    "ipns": "^0.8.0",
+    "ipns": "^0.10.0",
     "it-last": "^1.0.4",
     "p-retry": "^4.2.0",
     "uint8arrays": "^2.1.3"

examples/traverse-ipld-graphs/package.json

@@ -16,7 +16,7 @@
     "cids": "^1.1.5",
     "ipfs": "^0.54.3",
     "ipld-block": "^0.11.0",
-    "ipld-dag-pb": "^0.21.0",
+    "ipld-dag-pb": "^0.22.0",
     "ipld-git": "^0.6.1",
     "ipld-ethereum": "^5.0.1",
     "multihashing-async": "^2.1.2"

packages/interface-ipfs-core/package.json

@@ -43,20 +43,20 @@
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
     "cids": "^1.1.5",
-    "delay": "^4.4.0",
+    "delay": "^5.0.0",
     "dirty-chai": "^2.0.1",
     "err-code": "^3.0.1",
-    "ipfs-unixfs": "^3.0.1",
-    "ipfs-unixfs-importer": "^6.0.1",
+    "ipfs-unixfs": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs?fix/declare-interface-types-in-d-ts",
+    "ipfs-unixfs-importer": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs-importer?fix/declare-interface-types-in-d-ts",
     "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",
+    "ipld-dag-cbor": "^0.18.0",
+    "ipld-dag-pb": "^0.22.0",
+    "ipns": "^0.10.0",
     "is-ipfs": "^4.0.0",
     "iso-random-stream": "^1.1.1",
     "it-all": "^1.0.4",
-    "it-buffer-stream": "^1.0.5",
+    "it-buffer-stream": "^2.0.0",
     "it-concat": "^1.0.1",
     "it-drain": "^1.0.3",
     "it-first": "^1.0.4",

packages/interface-ipfs-core/src/cat.js

@@ -10,7 +10,7 @@ const all = require('it-all')
 const drain = require('it-drain')
 const { getDescribe, getIt, expect } = require('./utils/mocha')
 const testTimeout = require('./utils/test-timeout')
-const importer = require('ipfs-unixfs-importer')
+const { importer } = require('ipfs-unixfs-importer')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
 /**

packages/interface-ipfs-core/src/dag/get.js

@@ -5,8 +5,8 @@ const uint8ArrayFromString = require('uint8arrays/from-string')
 const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
 const dagCBOR = require('ipld-dag-cbor')
-const importer = require('ipfs-unixfs-importer')
-const Unixfs = require('ipfs-unixfs')
+const { importer } = require('ipfs-unixfs-importer')
+const { UnixFS } = require('ipfs-unixfs')
 const all = require('it-all')
 const CID = require('cids')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
@@ -193,7 +193,7 @@ module.exports = (common, options) => {
       const cidv0 = cidv1.toV0()
 
       const output = await ipfs.dag.get(cidv0)
-      expect(Unixfs.unmarshal(output.value.Data).data).to.eql(input)
+      expect(UnixFS.unmarshal(output.value.Data).data).to.eql(input)
     })
 
     it('should be able to get part of a dag-cbor node', async () => {

packages/interface-ipfs-core/src/get.js

@@ -12,7 +12,7 @@ const last = require('it-last')
 const map = require('it-map')
 const { getDescribe, getIt, expect } = require('./utils/mocha')
 const testTimeout = require('./utils/test-timeout')
-const importer = require('ipfs-unixfs-importer')
+const { importer } = require('ipfs-unixfs-importer')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
 /**

packages/interface-ipfs-core/src/object/get.js

@@ -5,7 +5,7 @@ const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
 const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const UnixFs = require('ipfs-unixfs')
+const { UnixFS } = require('ipfs-unixfs')
 const randomBytes = require('iso-random-stream/src/random')
 const { asDAGLink } = require('./utils')
 const testTimeout = require('../utils/test-timeout')
@@ -147,7 +147,7 @@ module.exports = (common, options) => {
       })
 
       const node = await ipfs.object.get(result.cid)
-      const meta = UnixFs.unmarshal(node.Data)
+      const meta = UnixFS.unmarshal(node.Data)
 
       expect(meta.fileSize()).to.equal(data.length)
     })

packages/interface-ipfs-core/src/refs-local.js

@@ -4,7 +4,7 @@
 const { fixtures } = require('./utils')
 const { getDescribe, getIt, expect } = require('./utils/mocha')
 const all = require('it-all')
-const importer = require('ipfs-unixfs-importer')
+const { importer } = require('ipfs-unixfs-importer')
 const drain = require('it-drain')
 const testTimeout = require('./utils/test-timeout')
 const CID = require('cids')

packages/interface-ipfs-core/src/refs.js

@@ -12,7 +12,7 @@ const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
 const DAGLink = dagPB.DAGLink
 
-const UnixFS = require('ipfs-unixfs')
+const { UnixFS } = require('ipfs-unixfs')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
 /**

packages/interface-ipfs-core/src/utils/is-shard-at-path.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const UnixFS = require('ipfs-unixfs')
+const { UnixFS } = require('ipfs-unixfs')
 
 module.exports = async (path, ipfs) => {
   const stats = await ipfs.files.stat(path)

packages/ipfs-cli/package.json

@@ -41,8 +41,8 @@
     "ipfs-http-client": "^49.0.3",
     "ipfs-repo": "^9.0.0",
     "ipfs-utils": "^6.0.1",
-    "ipld-dag-cbor": "^0.17.0",
-    "ipld-dag-pb": "^0.21.0",
+    "ipld-dag-cbor": "^0.18.0",
+    "ipld-dag-pb": "^0.22.0",
     "it-all": "^1.0.4",
     "it-concat": "^1.0.1",
     "it-first": "^1.0.4",

packages/ipfs-cli/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "aegir/src/config/tsconfig.aegir.json",
+  "extends": "../../node_modules/aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
     "outDir": "dist",
     "importsNotUsedAsValues": "preserve"

packages/ipfs-client/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "aegir/src/config/tsconfig.aegir.json",
+  "extends": "../../node_modules/aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
     "outDir": "dist",
     "importsNotUsedAsValues": "preserve"

packages/ipfs-core-types/package.json

@@ -3,7 +3,7 @@
   "version": "0.3.1",
   "description": "IPFS interface definitions used by implementations for API compatibility.",
   "leadMaintainer": "Alex Potsides <alex@achingbrain.net>",
-  "types": "src/index.ts",
+  "types": "src/index.d.ts",
   "homepage": "https://github.com/ipfs/js-ipfs/tree/master/packages/interface-ipfs-core#readme",
   "bugs": "https://github.com/ipfs/js-ipfs/issues",
   "scripts": {
@@ -30,6 +30,7 @@
   "dependencies": {
     "cids": "^1.1.5",
     "multiaddr": "^8.0.0",
+    "multibase": "^4.0.2",
     "peer-id": "^0.14.1"
   },
   "devDependencies": {

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

@@ -1,3 +1,111 @@
+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?: number
+  mtime?: Mtime
+}
+export interface FileEntry <Content extends AsyncIterable<Uint8Array>|Blob> extends BaseEntry {
+  content?: Content
+}
+
+export interface DirectoryEntry extends BaseEntry {
+  content?: undefined
+}
+
+export type ImportSource =
+| AwaitIterable<ToEntry>
+| ReadableStream<ToEntry>
+
+export type ToEntry =
+  | ToFile
+  | ToDirectory
+  | ToContent
+
+export interface ToFile extends ToFileMetadata {
+  path?: string
+  content: ToContent
+}
+
+export interface ToDirectory extends ToFileMetadata {
+  path: string
+  content?: undefined
+}
+
+export interface ToFileMetadata {
+  mode?: ToMode
+  mtime?: ToMTime
+}
+
+/**
+ * File content in arbitrary (supported) representation. It is used in input
+ * positions and is usually normalized to `Blob` in browser contexts and
+ * `AsyncIterable<Uint8Array>` in node.
+ */
+export type ToContent =
+  | string
+  | InstanceType<typeof String>
+  | ArrayBufferView
+  | ArrayBuffer
+  | Blob
+  | AwaitIterable<Uint8Array>
+  | ReadableStream<Uint8Array>
+
+/**
+ * Timestamp representation in arbitrary (supported) in representations. It is
+ * used in input positions and usually gets normalised to `MTime` before use.
+ */
+export type ToMTime =
+  | Date
+  | HRTime
+  | MTimeLike
+
+export type ToMode =
+  | string
+  | number
+
+export interface BaseFile {
+  cid: CID
+  path: string
+  name: string
+}
+
+export interface InputFile extends BaseFile {
+  unixfs: undefined
+}
+
+export interface MTimeLike {
+  /**
+   * The number of seconds since (positive) or before (negative) the Unix Epoch
+   * began.
+   */
+  secs: number
+
+  /**
+   * The number of nanoseconds since the last full second
+   */
+  nsecs?: number
+}
+
+/**
+ * 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]
+
+export interface BrowserImportCandidate {
+  path?: string,
+  content?: Blob,
+  mtime?: Mtime,
+  mode?: number
+}
+
 /**
  * Represents a value that you can await on, which is either value or a promise
  * of one.
@@ -30,10 +138,27 @@ export interface AbortOptions {
   timeout?: number
 }
 
+export interface PreloadOptions {
+  preload?: boolean
+}
+
 export type ToJSON =
   | null
   | string
   | number
   | boolean
   | ToJSON[]
   | { toJSON?: () => ToJSON } & { [key: string]: ToJSON }
+
+/**
+ * An IPFS path or CID
+ */
+export type IPFSPath = CID | string
+
+export interface BufferStore {
+  put: (key: Uint8Array, value: Uint8Array) => Promise<void>
+  get: (key: Uint8Array) => Promise<Uint8Array>
+  stores: any[]
+}
+
+export type HigherOrderFn = (fn: (...args: Parameters<T>) => ReturnType<T>) => (...args: Parameters<T>) => ReturnType<T>