@leofcoin/peernet 1.2.18 → 1.2.19

package/package.json

@@ -1,300 +1,88 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "description": "",
   "browser": "./exports/browser/peernet.js",
   "exports": {
     ".": {
-      "import": "exports/peernet.js",
-      "types": "exports/types/peernet.d.ts"
+      "import": "./exports/peernet.js",
+      "types": "./exports/types/peernet.d.ts"
     },
     "./browser": {
-      "import": "./exports/browser.js",
-      "types": "./exports/types/src/prompts/password/browser.d.ts"
+      "import": "./exports/browser/peernet.js",
+      "types": "./exports/types/peernet.d.ts"
     },
     "./browser.js": {
-      "import": "./exports/browser.js",
-      "types": "./exports/types/src/prompts/password/browser.d.ts"
-    },
-    "./chat-message.proto": {
-      "import": "./exports/chat-message.proto.js",
-      "types": "./exports/types/src/proto/chat-message.proto.d.ts"
-    },
-    "./chat-message.proto.js": {
-      "import": "./exports/chat-message.proto.js",
-      "types": "./exports/types/src/proto/chat-message.proto.d.ts"
-    },
-    "./chat": {
-      "import": "./exports/chat.js",
-      "types": "./exports/types/src/messages/chat.d.ts"
-    },
-    "./chat.js": {
-      "import": "./exports/chat.js",
-      "types": "./exports/types/src/messages/chat.d.ts"
-    },
-    "./data-response": {
-      "import": "./exports/data-response.js",
-      "types": "./exports/types/src/messages/data-response.d.ts"
-    },
-    "./data-response.js": {
-      "import": "./exports/data-response.js",
-      "types": "./exports/types/src/messages/data-response.d.ts"
-    },
-    "./data-response.proto": {
-      "import": "./exports/data-response.proto.js",
-      "types": "./exports/types/src/proto/data-response.proto.d.ts"
-    },
-    "./data-response.proto.js": {
-      "import": "./exports/data-response.proto.js",
-      "types": "./exports/types/src/proto/data-response.proto.d.ts"
-    },
-    "./data": {
-      "import": "./exports/data.js",
-      "types": "./exports/types/src/handlers/data.d.ts"
-    },
-    "./data.js": {
-      "import": "./exports/data.js",
-      "types": "./exports/types/src/handlers/data.d.ts"
-    },
-    "./data.proto": {
-      "import": "./exports/data.proto.js",
-      "types": "./exports/types/src/proto/data.proto.d.ts"
-    },
-    "./data.proto.js": {
-      "import": "./exports/data.proto.js",
-      "types": "./exports/types/src/proto/data.proto.d.ts"
-    },
-    "./dht-response": {
-      "import": "./exports/dht-response.js",
-      "types": "./exports/types/src/messages/dht-response.d.ts"
-    },
-    "./dht-response.js": {
-      "import": "./exports/dht-response.js",
-      "types": "./exports/types/src/messages/dht-response.d.ts"
+      "import": "./exports/browser/peernet.js",
+      "types": "./exports/types/peernet.d.ts"
     },
-    "./dht-response.proto": {
-      "import": "./exports/dht-response.proto.js",
-      "types": "./exports/types/src/proto/dht-response.proto.d.ts"
-    },
-    "./dht-response.proto.js": {
-      "import": "./exports/dht-response.proto.js",
-      "types": "./exports/types/src/proto/dht-response.proto.d.ts"
-    },
-    "./dht": {
-      "import": "./exports/dht.js",
-      "types": "./exports/types/src/dht/dht.d.ts"
-    },
-    "./dht.js": {
-      "import": "./exports/dht.js",
-      "types": "./exports/types/src/dht/dht.d.ts"
-    },
-    "./dht.proto": {
-      "import": "./exports/dht.proto.js",
-      "types": "./exports/types/src/proto/dht.proto.d.ts"
-    },
-    "./dht.proto.js": {
-      "import": "./exports/dht.proto.js",
-      "types": "./exports/types/src/proto/dht.proto.d.ts"
-    },
-    "./errors": {
-      "import": "./exports/errors.js",
-      "types": "./exports/types/src/errors/errors.d.ts"
+    "./node": {
+      "import": "./exports/prompts/password.js",
+      "types": "./exports/types/prompts/password/node.d.ts"
     },
-    "./errors.js": {
-      "import": "./exports/errors.js",
-      "types": "./exports/types/src/errors/errors.d.ts"
+    "./node.js": {
+      "import": "./exports/prompts/password.js",
+      "types": "./exports/types/prompts/password/node.d.ts"
     },
-    "./file-link": {
-      "import": "./exports/file-link.js",
-      "types": "./exports/types/src/messages/file-link.d.ts"
+    "./browser/browser-store": {
+      "import": "./exports/browser/browser-store.js"
     },
-    "./file-link.js": {
-      "import": "./exports/file-link.js",
-      "types": "./exports/types/src/messages/file-link.d.ts"
+    "./browser/browser-store.js": {
+      "import": "./exports/browser/browser-store.js"
     },
-    "./file-link.proto": {
-      "import": "./exports/file-link.proto.js",
-      "types": "./exports/types/src/proto/file-link.proto.d.ts"
+    "./browser/identity": {
+      "import": "./exports/browser/identity.js",
+      "types": "./exports/types/identity.d.ts"
     },
-    "./file-link.proto.js": {
-      "import": "./exports/file-link.proto.js",
-      "types": "./exports/types/src/proto/file-link.proto.d.ts"
+    "./browser/identity.js": {
+      "import": "./exports/browser/identity.js",
+      "types": "./exports/types/identity.d.ts"
     },
-    "./file": {
-      "import": "./exports/file.js",
-      "types": "./exports/types/src/messages/file.d.ts"
+    "./browser/peernet": {
+      "import": "./exports/browser/peernet.js",
+      "types": "./exports/types/peernet.d.ts"
     },
-    "./file.js": {
-      "import": "./exports/file.js",
-      "types": "./exports/types/src/messages/file.d.ts"
+    "./browser/peernet.js": {
+      "import": "./exports/browser/peernet.js",
+      "types": "./exports/types/peernet.d.ts"
     },
-    "./file.proto": {
-      "import": "./exports/file.proto.js",
-      "types": "./exports/types/src/proto/file.proto.d.ts"
+    "./browser/prompts/password": {
+      "import": "./exports/browser/prompts/password.js",
+      "types": "./exports/types/prompts/password/browser.d.ts"
     },
-    "./file.proto.js": {
-      "import": "./exports/file.proto.js",
-      "types": "./exports/types/src/proto/file.proto.d.ts"
+    "./browser/prompts/password.js": {
+      "import": "./exports/browser/prompts/password.js",
+      "types": "./exports/types/prompts/password/browser.d.ts"
     },
     "./identity": {
       "import": "./exports/identity.js",
-      "types": "./exports/types/src/identity.d.ts"
+      "types": "./exports/types/identity.d.ts"
     },
     "./identity.js": {
       "import": "./exports/identity.js",
-      "types": "./exports/types/src/identity.d.ts"
-    },
-    "./message": {
-      "import": "./exports/message.js",
-      "types": "./exports/types/src/handlers/message.d.ts"
-    },
-    "./message.js": {
-      "import": "./exports/message.js",
-      "types": "./exports/types/src/handlers/message.d.ts"
-    },
-    "./messages": {
-      "import": "./exports/messages.js",
-      "types": "./exports/types/src/messages.d.ts"
-    },
-    "./messages.js": {
-      "import": "./exports/messages.js",
-      "types": "./exports/types/src/messages.d.ts"
-    },
-    "./node": {
-      "import": "./exports/node.js",
-      "types": "./exports/types/src/prompts/password/node.d.ts"
-    },
-    "./node.js": {
-      "import": "./exports/node.js",
-      "types": "./exports/types/src/prompts/password/node.d.ts"
-    },
-    "./peer-discovery": {
-      "import": "./exports/peer-discovery.js",
-      "types": "./exports/types/src/discovery/peer-discovery.d.ts"
-    },
-    "./peer-discovery.js": {
-      "import": "./exports/peer-discovery.js",
-      "types": "./exports/types/src/discovery/peer-discovery.d.ts"
-    },
-    "./peer-info": {
-      "import": "./exports/peer-info.js",
-      "types": "./exports/types/src/peer-info.d.ts"
-    },
-    "./peer-info.js": {
-      "import": "./exports/peer-info.js",
-      "types": "./exports/types/src/peer-info.d.ts"
-    },
-    "./peer-response": {
-      "import": "./exports/peer-response.js",
-      "types": "./exports/types/src/messages/peer-response.d.ts"
-    },
-    "./peer-response.js": {
-      "import": "./exports/peer-response.js",
-      "types": "./exports/types/src/messages/peer-response.d.ts"
-    },
-    "./peer-response.proto": {
-      "import": "./exports/peer-response.proto.js",
-      "types": "./exports/types/src/proto/peer-response.proto.d.ts"
-    },
-    "./peer-response.proto.js": {
-      "import": "./exports/peer-response.proto.js",
-      "types": "./exports/types/src/proto/peer-response.proto.d.ts"
-    },
-    "./peer": {
-      "import": "./exports/peer.js",
-      "types": "./exports/types/src/messages/peer.d.ts"
-    },
-    "./peer.js": {
-      "import": "./exports/peer.js",
-      "types": "./exports/types/src/messages/peer.d.ts"
-    },
-    "./peer.proto": {
-      "import": "./exports/peer.proto.js",
-      "types": "./exports/types/src/proto/peer.proto.d.ts"
-    },
-    "./peer.proto.js": {
-      "import": "./exports/peer.proto.js",
-      "types": "./exports/types/src/proto/peer.proto.d.ts"
+      "types": "./exports/types/identity.d.ts"
     },
     "./peernet": {
       "import": "./exports/peernet.js",
-      "types": "./exports/types/src/messages/peernet.d.ts"
+      "types": "./exports/types/peernet.d.ts"
     },
     "./peernet.js": {
       "import": "./exports/peernet.js",
-      "types": "./exports/types/src/messages/peernet.d.ts"
-    },
-    "./peernet.proto": {
-      "import": "./exports/peernet.proto.js",
-      "types": "./exports/types/src/proto/peernet.proto.d.ts"
-    },
-    "./peernet.proto.js": {
-      "import": "./exports/peernet.proto.js",
-      "types": "./exports/types/src/proto/peernet.proto.d.ts"
-    },
-    "./ps": {
-      "import": "./exports/ps.js",
-      "types": "./exports/types/src/messages/ps.d.ts"
-    },
-    "./ps.js": {
-      "import": "./exports/ps.js",
-      "types": "./exports/types/src/messages/ps.d.ts"
-    },
-    "./ps.proto": {
-      "import": "./exports/ps.proto.js",
-      "types": "./exports/types/src/proto/ps.proto.d.ts"
-    },
-    "./ps.proto.js": {
-      "import": "./exports/ps.proto.js",
-      "types": "./exports/types/src/proto/ps.proto.d.ts"
-    },
-    "./request": {
-      "import": "./exports/request.js",
-      "types": "./exports/types/src/messages/request.d.ts"
-    },
-    "./request.js": {
-      "import": "./exports/request.js",
-      "types": "./exports/types/src/messages/request.d.ts"
-    },
-    "./request.proto": {
-      "import": "./exports/request.proto.js",
-      "types": "./exports/types/src/proto/request.proto.d.ts"
-    },
-    "./request.proto.js": {
-      "import": "./exports/request.proto.js",
-      "types": "./exports/types/src/proto/request.proto.d.ts"
-    },
-    "./response": {
-      "import": "./exports/response.js",
-      "types": "./exports/types/src/messages/response.d.ts"
-    },
-    "./response.js": {
-      "import": "./exports/response.js",
-      "types": "./exports/types/src/messages/response.d.ts"
-    },
-    "./response.proto": {
-      "import": "./exports/response.proto.js",
-      "types": "./exports/types/src/proto/response.proto.d.ts"
-    },
-    "./response.proto.js": {
-      "import": "./exports/response.proto.js",
-      "types": "./exports/types/src/proto/response.proto.d.ts"
+      "types": "./exports/types/peernet.d.ts"
     },
-    "./types": {
-      "import": "./exports/types.js",
-      "types": "./exports/types/src/types.d.ts"
+    "./prompts/password": {
+      "import": "./exports/prompts/password.js",
+      "types": "./exports/types/prompts/password/node.d.ts"
     },
-    "./types.js": {
-      "import": "./exports/types.js",
-      "types": "./exports/types/src/types.d.ts"
+    "./prompts/password.js": {
+      "import": "./exports/prompts/password.js",
+      "types": "./exports/types/prompts/password/node.d.ts"
     },
-    "./utils": {
-      "import": "./exports/utils.js",
-      "types": "./exports/types/src/utils/utils.d.ts"
+    "./store": {
+      "import": "./exports/store.js"
     },
-    "./utils.js": {
-      "import": "./exports/utils.js",
-      "types": "./exports/types/src/utils/utils.d.ts"
+    "./store.js": {
+      "import": "./exports/store.js"
     }
   },
   "type": "module",
@@ -336,7 +124,6 @@
     "@rollup/plugin-wasm": "^6.2.2",
     "@types/node": "^25.9.1",
     "@types/qrcode": "^1.5.6",
-    "rollup": "^4.60.4",
-    "rollup-plugin-auto-exports": "^1.1.1"
+    "rollup": "^4.60.4"
   }
 }

package/rollup.config.js

@@ -2,9 +2,80 @@ import resolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import wasm from '@rollup/plugin-wasm'
+import { readdir, readFile, writeFile } from 'node:fs/promises'
+import { extname, relative, sep } from 'node:path'
 import rimraf from 'rimraf'
 import typescript from '@rollup/plugin-typescript'
-import autoExports from 'rollup-plugin-auto-exports'
+
+const toPosix = (value) => value.split(sep).join('/')
+
+const walk = async (dir) => {
+  const entries = await readdir(dir, { withFileTypes: true })
+  const files = []
+
+  for (const entry of entries) {
+    const fullPath = `${dir}/${entry.name}`
+    if (entry.isDirectory()) {
+      files.push(...(await walk(fullPath)))
+      continue
+    }
+    files.push(fullPath)
+  }
+
+  return files
+}
+
+const isHashedChunk = (runtimePath) => /-[A-Za-z0-9_-]{8,}\.js$/.test(runtimePath)
+
+const runtimeFirstExports = ({ exportsDir = 'exports', declarationsDir = 'exports/types' } = {}) => ({
+  name: 'runtime-first-exports',
+  writeBundle: async () => {
+    const runtimeFiles = (await walk(exportsDir))
+      .map((file) => toPosix(relative(exportsDir, file)))
+      .filter((file) => extname(file) === '.js')
+      .filter((file) => !file.startsWith('types/'))
+      .filter((file) => !isHashedChunk(file))
+      .sort((a, b) => a.localeCompare(b))
+
+    const declarationFiles = (await walk(declarationsDir))
+      .map((file) => toPosix(relative(declarationsDir, file)))
+      .filter((file) => extname(file) === '.ts' && file.endsWith('.d.ts'))
+
+    const declarationByRuntime = new Map(declarationFiles.map((file) => [file.slice(0, -'.d.ts'.length), file]))
+
+    const declarationAliases = {
+      'prompts/password': 'prompts/password/node',
+      'browser/prompts/password': 'prompts/password/browser',
+      'browser/peernet': 'peernet',
+      'browser/identity': 'identity'
+    }
+
+    const packageExports = {
+      '.': { import: './exports/peernet.js', types: './exports/types/peernet.d.ts' },
+      './browser': { import: './exports/browser/peernet.js', types: './exports/types/peernet.d.ts' },
+      './browser.js': { import: './exports/browser/peernet.js', types: './exports/types/peernet.d.ts' },
+      './node': { import: './exports/prompts/password.js', types: './exports/types/prompts/password/node.d.ts' },
+      './node.js': { import: './exports/prompts/password.js', types: './exports/types/prompts/password/node.d.ts' }
+    }
+
+    for (const runtimeFile of runtimeFiles) {
+      const runtimeKey = runtimeFile.slice(0, -'.js'.length)
+      const exportKey = `./${runtimeKey}`
+      const exportJsKey = `./${runtimeKey}.js`
+      const importPath = `./${exportsDir}/${runtimeFile}`
+      const declarationKey = declarationAliases[runtimeKey] || runtimeKey
+      const declarationPath = declarationByRuntime.get(declarationKey)
+      const typesPath = declarationPath ? `./${declarationsDir}/${declarationPath}` : undefined
+
+      packageExports[exportKey] = typesPath ? { import: importPath, types: typesPath } : { import: importPath }
+      packageExports[exportJsKey] = typesPath ? { import: importPath, types: typesPath } : { import: importPath }
+    }
+
+    const packageJson = JSON.parse(await readFile('./package.json', 'utf8'))
+    packageJson.exports = packageExports
+    await writeFile('./package.json', `${JSON.stringify(packageJson, null, '  ')}\n`)
+  }
+})
 
 rimraf.sync('./exports/**')
 
@@ -43,27 +114,23 @@ export default [
           outDir: 'exports',
           declarationDir: 'exports/types'
         }
-      }),
-      autoExports({
-        defaultExports: {
-          '.': { import: 'exports/peernet.js', types: 'exports/types/peernet.d.ts' }
-        }
       })
     ],
-    external: ['./prompts/password.js']
+    external: ['./prompts/password.js', './prompts/password/browser.js', './prompts/password/node.js']
   },
   {
     input: ['./src/prompts/password/browser.js'],
     output: {
       format: 'es',
-      file: 'exports/browser/src/prompts/password.js'
+      file: 'exports/browser/prompts/password.js'
     }
   },
   {
     input: ['./src/prompts/password/node.js'],
     output: {
       format: 'es',
-      file: 'exports/src/prompts/password.js'
-    }
+      file: 'exports/prompts/password.js'
+    },
+    plugins: [runtimeFirstExports()]
   }
 ]

package/tsconfig.json

@@ -4,6 +4,7 @@
     "target": "ESNext",
     "declaration": true,
     "outDir": "./exports",
+    "rootDir": "./src",
     "moduleResolution": "NodeNext",
     "allowJs": true,
     "skipLibCheck": true