Merge branch 'master' of https://github.com/mikeal/ipjs

Author: mikeal

cli.js

@@ -49,8 +49,6 @@ commands.serve = async args => {
 commands.seed = async args => seed(await _argv(args))
 */
 
-const _argv = argv({})
-
 commands.build = async args => build({ ...await argv(build.schema)(args), ...nodeEnv })
 
 commands.publish = async args => {

package.json

@@ -8,7 +8,7 @@
     "ipjs": "cli.js"
   },
   "scripts": {
-    "test": "estest test/test-*.js"
+    "test": "standard && estest test/test-*.js"
   },
   "repository": {
     "type": "git",

src/demo/pkg/index.js

@@ -1,8 +1,6 @@
 import { readFileSync } from 'fs'
 import Block from '@ipld/block/defaults.js'
 
-const schema = JSON.parse(readFileSync(new URL('./schema.json', import.meta.url)))
-
 const encode = obj => Block.encoder(obj, 'dag-cbor')
 
 const createPackage = async function * (seedFile) {

src/demo/seed-lite.js

@@ -1,9 +1,7 @@
 import pkg from './pkg/index.js'
 import ipfs from '@textile/ipfs-lite'
-import setup from '@textile/ipfs-lite/dist/setup/index.js'
 import storage from 'interface-datastore'
 const { Peer, BlockStore, Block } = ipfs
-const { setupLibP2PHost } = setup
 const { MemoryDatastore } = storage
 
 const store = new BlockStore(new MemoryDatastore())

src/package/dynamicImports.js

@@ -3,7 +3,7 @@ const walk = (node, imports = new Set()) => {
   if (node.type === 'ImportExpression') {
     if (node.source.value) imports.add(node.source.value)
   }
-  for (const [key, value] of Object.entries(node)) {
+  for (const [, value] of Object.entries(node)) {
     if (Array.isArray(value)) value.forEach(v => walk(v, imports))
     else if (typeof value === 'object') walk(value, imports)
   }

src/package/index.js

@@ -8,10 +8,12 @@ import { join } from 'path'
 import rmtree from '@tgrajewski/rmtree'
 import preserveShebangs from 'rollup-plugin-preserve-shebangs'
 
+const docFileRegex = /^(readme|license)/i
+
 const copy = o => JSON.parse(JSON.stringify(o))
 const vals = Object.values
 
-const { writeFile, mkdir, unlink, readdir, readFile } = fs
+const { writeFile, mkdir, unlink, readdir, readFile, copyFile } = fs
 
 const plugins = [ preserveShebangs.preserveShebangs() ]
 
@@ -72,6 +74,7 @@ class Package {
     }
     this.exports = exports
     let promises = [...this.files.values()]
+    this.docFiles = new Map((await this.getDocFiles()).map(f => [f, toURL(f)]))
     if (this.includeTests) {
       const testFiles = await this.getTestFiles()
       this.tests = new Map(testFiles.map(k => [k, this.testFile(toURL(k))]))
@@ -104,6 +107,10 @@ class Package {
     return this.pkgjson.exports[key]
   }
 
+  async getDocFiles () {
+    return (await readdir(this.cwd)).filter(f => docFileRegex.test(f))
+  }
+
   async getTestFiles () {
     const files = await readdir(this.cwd)
     const testFiles = []
@@ -159,11 +166,13 @@ class Package {
   async deflate (dist) {
     if (!(dist instanceof URL)) dist = path(dist)
     rmtree(fileURLToPath(dist))
-    await mkdir(dist)
-    await mkdir(new URL(dist + '/cjs'))
+    await mkdir(new URL(dist + '/cjs'), { recursive: true })
     await mkdir(new URL(dist + '/esm'))
 
     const pending = [...this.files.values()].map(p => p.then(f => f.deflate(dist)))
+    for (const [f, url] of this.docFiles) {
+      pending.push(copyFile(url, new URL(`${dist}/${f}`)))
+    }
     if (this.includeTests) {
       pending.push(...[...this.testFiles.values()].map(p => p.then(f => f.deflate(dist))))
     }

src/package/testFile.js

@@ -7,7 +7,7 @@ import dynamicImports from './dynamicImports.js'
 
 const { File, writeFile } = file
 
-const { readFile, mkdir } = fs
+const { readFile } = fs
 const { generate } = astring
 
 const stropts = { format: { indent: { style: '  ' } } }
@@ -41,7 +41,7 @@ class TestFile extends File {
           const rel = p => {
             const u = pathToFileURL(this.pkg.cwd)
             const r = this.url.toString().slice(u.toString().length + 1)
-            const pre = (r.match(/\//g) || []).map(() => '../').join('')
+            let pre = (r.match(/\//g) || []).map(() => '../').join('')
             if (!pre.length) pre = './'
             return pre + p.slice(2)
           }

src/package/worker.js

@@ -1,5 +1,5 @@
 import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
-import { fileURLToPath, pathToFileURL } from 'url'
+import { fileURLToPath } from 'url'
 import { promises as fs } from 'fs'
 import acorn from 'acorn'
 import astring from 'escodegen'
@@ -73,9 +73,6 @@ const run = async () => {
     return writeFile(url, data)
   }
 
-  let cjsCompile
-  let esmCompile
-
   const commands = {}
   commands.deflate = async (dist, cwd) => {
     const path = fileURLToPath(url)
@@ -93,8 +90,8 @@ const run = async () => {
   })
   parentPort.postMessage({ id: 'init', ret: imports })
   convert(cjs)
-  cjsCompile = generate(cjs, stropts)
-  esmCompile = generate(program, stropts)
+  const cjsCompile = generate(cjs, stropts)
+  const esmCompile = generate(program, stropts)
 }
 
 let mod = null

src/run.js

@@ -1,11 +1,12 @@
 import pathToUrl from './path-to-url.js'
 import api from './api.js'
 // import IPFS from 'ipfs'
-import Block from '@ipld/block/defaults.js'
+// import Block from '@ipld/block/defaults.js'
 import { client } from './demo/registry/index.js'
 import { fromModule } from './util.js'
-import { promises as fs } from 'fs'
+// import { promises as fs } from 'fs'
 
+/*
 const getIPFS = cid => IPFS.create({
   repo: `/tmp/ipjs-${cid}`,
   silent: true,
@@ -18,6 +19,7 @@ const getIPFS = cid => IPFS.create({
     }
   }
 })
+*/
 
 const fromPackage = pkg => {
   const buffer = Buffer.from(pkg.nodejs)