From 36ec06493e5649374a98d1b4068cd8d89d0a9bf6 Mon Sep 17 00:00:00 2001 From: zhiyuan <32867472+zhiyuang@users.noreply.github.com> Date: Sun, 9 Oct 2022 13:36:33 +0800 Subject: Fix fetch response redirected (#1303) * fix: sync codegen * fix: generate class script * fix: sync codegen * fix: add response redirected property --- src/bun.js/scripts/generate-classes.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/bun.js/scripts/generate-classes.ts') diff --git a/src/bun.js/scripts/generate-classes.ts b/src/bun.js/scripts/generate-classes.ts index 55627bcc4..13e1780f4 100644 --- a/src/bun.js/scripts/generate-classes.ts +++ b/src/bun.js/scripts/generate-classes.ts @@ -35,7 +35,7 @@ function constructorName(typeName) { return `JS${typeName}Constructor`; } -function appendSymbols(to, symbolName, prop) { +function appendSymbols(to: Map, symbolName: (name: string) => string, prop) { var { defaultValue, getter, setter, accesosr, fn } = prop; if (accesosr) { @@ -43,16 +43,16 @@ function appendSymbols(to, symbolName, prop) { setter = accesosr.setter; } - if (getter) { - to.push([getter, symbolName(getter)]); + if (getter && !to.get(getter)) { + to.set(getter, symbolName(getter)); } - if (setter) { - to.push([setter, symbolName(setter)]); + if (setter && !to.get(setter)) { + to.set(setter, symbolName(setter)); } - if (fn) { - to.push([fn, symbolName(fn)]); + if (fn && !to.get(fn)) { + to.set(fn, symbolName(fn)); } } function propRow( @@ -929,18 +929,18 @@ function generateZig( estimatedSize, } = {} as ClassDefinition ) { - const exports: [string, string][] = []; + const exports = new Map(); if (construct) { - exports.push([`constructor`, classSymbolName(typeName, "construct")]); + exports.set(`constructor`, classSymbolName(typeName, "construct")); } if (finalize) { - exports.push([`finalize`, classSymbolName(typeName, "finalize")]); + exports.set(`finalize`, classSymbolName(typeName, "finalize")); } if (estimatedSize) { - exports.push([`estimatedSize`, symbolName(typeName, "estimatedSize")]); + exports.set(`estimatedSize`, symbolName(typeName, "estimatedSize")); } Object.values(klass).map((a) => @@ -1108,7 +1108,7 @@ pub const ${className(typeName)} = struct { comptime { ${typeCheck()} if (!JSC.is_bindgen) { -${exports +${[...exports] .sort(([a], [b]) => a.localeCompare(b)) .map( ([internalName, externalName]) => -- cgit v1.2.3