Flatten fromSources

Author: dy

README.md

@@ -143,12 +143,11 @@ import { bundleFile } from 'subscript/util/bundle.js'
 console.log(await bundleFile('jessie.js'))
 
 // Browser / custom sources
-import { bundle, fromSources } from 'subscript/util/bundle.js'
-const read = fromSources({
+import { bundle } from 'subscript/util/bundle.js'
+console.log(await bundle('main.js', {
   'main.js': `import { x } from './lib.js'; export default x * 2`,
   'lib.js': `export const x = 21`
-})
-console.log(await bundle('main.js', read))
+}))
 // → "const x = 21;\nexport { x as default }"
 ```
 

todo.md

@@ -95,7 +95,7 @@
 
 - [x] ~~Warn Jessie on bad ASI~~ no complaints
 
-- [ ] Better error pointers
+- [x] Better error pointers
 
 - [ ] Bundle itself instead of esbuild
 

util/bundle.js

@@ -292,9 +292,17 @@ const resolvePath = (from, to) => {
 /**
  * Bundle ES modules into single file
  * @param {string} entry - Entry file path
- * @param {(path: string) => string|Promise<string>} read - File reader
+ * @param {Object|Function} read - Source map {path: code} or reader function
  */
 export async function bundle(entry, read) {
+  // Accept object as source map
+  if (typeof read === 'object') {
+    const sources = read;
+    read = path => {
+      if (!(path in sources)) throw Error(`Module not found: ${path}`);
+      return sources[path];
+    };
+  }
   const modules = new Map();
   const order = [];
 
@@ -485,16 +493,6 @@ export async function bundle(entry, read) {
   return result;
 }
 
-/**
- * Create a read function from a map of path → source code
- * @param {Object<string, string>} sources - Map of path to source code
- * @returns {(path: string) => string}
- */
-export const fromSources = sources => path => {
-  if (!(path in sources)) throw Error(`Module not found: ${path}`);
-  return sources[path];
-};
-
 /**
  * Bundle with Node.js fs (only available in Node.js environment)
  * Dynamically imports fs/path to avoid browser errors