Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: support new ESM loader API #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2021
Merged

fix: support new ESM loader API #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d22e464
chore(loader): rename `load` ~> `toConfig` helper
lukeed Oct 27, 2021
221143e
chore(loader): add deprecated note to self
lukeed Oct 27, 2021
e44ab69
fix(loader): add new `load` hook for new API design;
lukeed Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 3
strategy:
matrix:
nodejs: [12, 14, 16]
nodejs: [12, 14, 16.11, 16]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v2
Expand Down
45 changes: 40 additions & 5 deletions src/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { existsSync } from 'fs';
import { existsSync, promises as fs } from 'fs';
import { fileURLToPath, URL } from 'url';
import * as tsm from './utils.js';

Expand All @@ -22,7 +22,10 @@ type Resolve = (
parentURL?: string;
},
fallback: Resolve
) => Promisable<{ url: string }>;
) => Promisable<{
url: string;
format?: Format;
}>;

type Inspect = (
url: string,
Expand All @@ -36,7 +39,16 @@ type Transform = (
fallback: Transform
) => Promisable<{ source: Source }>;

async function load(): Promise<Config> {
type Load = (
url: string,
context: { format?: Format },
fallback: Load
) => Promisable<{
format: Format;
source: Source;
}>;

async function toConfig(): Promise<Config> {
let mod = await setup;
mod = mod && mod.default || mod;
return (tsm as TSM).$finalize(env, mod);
Expand All @@ -46,7 +58,7 @@ const EXTN = /\.\w+(?=\?|$)/;
const isTS = /\.[mc]?tsx?(?=\?|$)/;
const isJS = /\.([mc])?js$/;
async function toOptions(uri: string): Promise<Options|void> {
config = config || await load();
config = config || await toConfig();
let [extn] = EXTN.exec(uri) || [];
return config[extn as `.${string}`];
}
Expand Down Expand Up @@ -91,7 +103,7 @@ export const resolve: Resolve = async function (ident, context, fallback) {
}
}

config = config || await load();
config = config || await toConfig();

for (ext in config) {
path = check(output.href + ext);
Expand All @@ -101,12 +113,35 @@ export const resolve: Resolve = async function (ident, context, fallback) {
return fallback(ident, context, fallback);
}

export const load: Load = async function (uri, context, fallback) {
// note: inline `getFormat`
let options = await toOptions(uri);
if (options == null) return fallback(uri, context, fallback);
let format: Format = options.format === 'cjs' ? 'commonjs' : 'module';

// TODO: decode SAB/U8 correctly
let path = fileURLToPath(uri);
let source = await fs.readFile(path);

// note: inline `transformSource`
esbuild = esbuild || await import('esbuild');
let result = await esbuild.transform(source.toString(), {
...options,
sourcefile: path,
format: format === 'module' ? 'esm' : 'cjs',
});

return { format, source: result.code };
}

/** @deprecated */
export const getFormat: Inspect = async function (uri, context, fallback) {
let options = await toOptions(uri);
if (options == null) return fallback(uri, context, fallback);
return { format: options.format === 'cjs' ? 'commonjs' : 'module' };
}

/** @deprecated */
export const transformSource: Transform = async function (source, context, xform) {
let options = await toOptions(context.url);
if (options == null) return xform(source, context, xform);
Expand Down