diff options
author | 2023-03-02 19:02:10 -0800 | |
---|---|---|
committer | 2023-03-02 19:02:10 -0800 | |
commit | 9388b3f8257bc2e580deaece4cd2677928104fc6 (patch) | |
tree | 3f6aff2009cef69897f599fe51305b894f81a376 /misctools | |
parent | b469e5035161286abeb1a7726518d1afcc163a51 (diff) | |
download | bun-9388b3f8257bc2e580deaece4cd2677928104fc6.tar.gz bun-9388b3f8257bc2e580deaece4cd2677928104fc6.tar.zst bun-9388b3f8257bc2e580deaece4cd2677928104fc6.zip |
Add a zig fmt action (#2277)
* Add a zig fmt action
* add failing file
* Setup prettier better
* Update prettier-fmt.yml
* Fail on error
* Update prettier-fmt.yml
* boop
* boop2
* tar.gz
* Update zig-fmt.yml
* Update zig-fmt.yml
* Update zig-fmt.yml
* Update zig-fmt.yml
* Update zig-fmt.yml
* boop
* Update prettier-fmt.yml
* tag
* newlines
* multiline
* fixup
* Update zig-fmt.yml
* update it
* fixup
* both
* w
* Update prettier-fmt.yml
* prettier all the things
* Update package.json
* zig fmt
* ❌ ✅
* bump
* .
* quotes
* fix prettier ignore
* once more
* Update prettier-fmt.yml
* Update fallback.ts
* consistentcy
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'misctools')
-rw-r--r-- | misctools/gen-unicode-table.js | 40 | ||||
-rw-r--r-- | misctools/headers-cleaner.js | 43 | ||||
-rw-r--r-- | misctools/mime.js | 23 | ||||
-rw-r--r-- | misctools/publish-examples.js | 51 |
4 files changed, 36 insertions, 121 deletions
diff --git a/misctools/gen-unicode-table.js b/misctools/gen-unicode-table.js index ad38a0ec5..1696a4b9e 100644 --- a/misctools/gen-unicode-table.js +++ b/misctools/gen-unicode-table.js @@ -58,18 +58,12 @@ const idContinueESNext = require("@unicode/unicode-13.0.0/Binary_Property/ID_Con const idContinueESNextSet = new Set(idContinueESNext); // These identifiers are valid in both ES5 and ES6+ (i.e. an intersection of both) -const idStartES5AndESNext = idStartES5.filter((n) => idStartESNextSet.has(n)); -const idContinueES5AndESNext = idContinueES5.filter((n) => - idContinueESNextSet.has(n), -); +const idStartES5AndESNext = idStartES5.filter(n => idStartESNextSet.has(n)); +const idContinueES5AndESNext = idContinueES5.filter(n => idContinueESNextSet.has(n)); // These identifiers are valid in either ES5 or ES6+ (i.e. a union of both) -const idStartES5OrESNext = [...new Set(idStartES5.concat(idStartESNext))].sort( - (a, b) => a - b, -); -const idContinueES5OrESNext = [ - ...new Set(idContinueES5.concat(idContinueESNext)), -].sort((a, b) => a - b); +const idStartES5OrESNext = [...new Set(idStartES5.concat(idStartESNext))].sort((a, b) => a - b); +const idContinueES5OrESNext = [...new Set(idContinueES5.concat(idContinueESNext))].sort((a, b) => a - b); function generateRangeTable(codePoints) { let lines = []; @@ -86,11 +80,7 @@ function generateRangeTable(codePoints) { while (index < codePoints.length && codePoints[index] < 0x1000) { let start = codePoints[index]; index++; - while ( - index < codePoints.length && - codePoints[index] < 0x1000 && - codePoints[index] === codePoints[index - 1] + 1 - ) { + while (index < codePoints.length && codePoints[index] < 0x1000 && codePoints[index] === codePoints[index - 1] + 1) { index++; } let end = codePoints[index - 1]; @@ -103,10 +93,7 @@ function generateRangeTable(codePoints) { while (index < codePoints.length) { let start = codePoints[index]; index++; - while ( - index < codePoints.length && - codePoints[index] === codePoints[index - 1] + 1 - ) { + while (index < codePoints.length && codePoints[index] === codePoints[index - 1] + 1) { index++; } let end = codePoints[index - 1]; @@ -132,11 +119,7 @@ function generateBigSwitchStatement(codePoints) { while (index < codePoints.length && codePoints[index] < 0x1000) { let start = codePoints[index]; index++; - while ( - index < codePoints.length && - codePoints[index] < 0x1000 && - codePoints[index] === codePoints[index - 1] + 1 - ) { + while (index < codePoints.length && codePoints[index] < 0x1000 && codePoints[index] === codePoints[index - 1] + 1) { index++; } let end = codePoints[index - 1]; @@ -147,10 +130,7 @@ function generateBigSwitchStatement(codePoints) { while (index < codePoints.length) { let start = codePoints[index]; index++; - while ( - index < codePoints.length && - codePoints[index] === codePoints[index - 1] + 1 - ) { + while (index < codePoints.length && codePoints[index] === codePoints[index - 1] + 1) { index++; } let end = codePoints[index - 1]; @@ -165,9 +145,7 @@ function generateBigSwitchStatement(codePoints) { fs.writeFileSync( path.join(__dirname, "..", "src", "js_lexer", "unicode.zig"), - `// This file was automatically generated by ${path.basename( - __filename, - )}. Do not edit. + `// This file was automatically generated by ${path.basename(__filename)}. Do not edit. const RangeTable = @import("./range_table.zig"); diff --git a/misctools/headers-cleaner.js b/misctools/headers-cleaner.js index 0f003cc5c..9c74e1ba3 100644 --- a/misctools/headers-cleaner.js +++ b/misctools/headers-cleaner.js @@ -3,10 +3,7 @@ var { readFileSync, writeFileSync } = require("fs"); var { join } = require("path"); const destination = join(__dirname, "../src/bun.js/bindings/headers.zig"); -const replacements = join( - __dirname, - "../src/bun.js/bindings/headers-replacements.zig", -); +const replacements = join(__dirname, "../src/bun.js/bindings/headers-replacements.zig"); console.log("Writing to", destination); var output = "// GENERATED CODE - DO NOT MODIFY BY HAND\n\n"; @@ -16,16 +13,9 @@ const first_extern = input.indexOf("extern fn"); const first_extern_line = input.indexOf("\n", first_extern - 128); const last_extern_fn = input.lastIndexOf("extern"); const last_extern_fn_line = input.indexOf("\n", last_extern_fn); -const keep = ( - input.substring(0, first_extern_line) + input.substring(last_extern_fn_line) -) +const keep = (input.substring(0, first_extern_line) + input.substring(last_extern_fn_line)) .split("\n") - .filter( - (a) => - /const (JSC|WTF|Web)_/gi.test(a) && - !a.includes("JSValue") && - !a.includes("CatchScope"), - ) + .filter(a => /const (JSC|WTF|Web)_/gi.test(a) && !a.includes("JSValue") && !a.includes("CatchScope")) .join("\n") .trim(); @@ -34,21 +24,12 @@ input = input.replaceAll("*WebCore__", "*bindings."); input = input.replaceAll("*JSC__", "*bindings."); input = input.replaceAll("[*c] JSC__", "[*c]bindings."); input = input.replaceAll("[*c]JSC__", "[*c]bindings."); -input = input.replaceAll( - "[*c]bindings.JSGlobalObject", - "*bindings.JSGlobalObject", -); +input = input.replaceAll("[*c]bindings.JSGlobalObject", "*bindings.JSGlobalObject"); input = input.replaceAll("[*c]bindings.JSPromise", "?*bindings.JSPromise"); -input = input.replaceAll( - "[*c]const bindings.JSPromise", - "?*const bindings.JSPromise", -); +input = input.replaceAll("[*c]const bindings.JSPromise", "?*const bindings.JSPromise"); input = input.replaceAll("[*c] const JSC__", "[*c]const bindings."); -input = input.replaceAll( - "[*c]Inspector__ScriptArguments", - "[*c]bindings.ScriptArguments", -); +input = input.replaceAll("[*c]Inspector__ScriptArguments", "[*c]bindings.ScriptArguments"); input = input .replaceAll("VirtualMachine", "bindings.VirtualMachine") @@ -104,14 +85,6 @@ for (let i = 0; i < lines.length; i++) { continue; } } -input = lines.filter((a) => a.length > 0).join("\n"); +input = lines.filter(a => a.length > 0).join("\n"); -writeFileSync( - destination, - output + - "\n" + - readFileSync(replacements, "utf8").trim() + - "\n" + - input.trim() + - "\n", -); +writeFileSync(destination, output + "\n" + readFileSync(replacements, "utf8").trim() + "\n" + input.trim() + "\n"); diff --git a/misctools/mime.js b/misctools/mime.js index 6f46a711f..27b58a5b7 100644 --- a/misctools/mime.js +++ b/misctools/mime.js @@ -1,17 +1,6 @@ -const json = await ( - await fetch("https://raw.githubusercontent.com/jshttp/mime-db/master/db.json") -).json(); - -json["application/javascript"].extensions.push( - `ts`, - `tsx`, - `mts`, - `mtsx`, - `cts`, - `cjs`, - `mjs`, - `js`, -); +const json = await (await fetch("https://raw.githubusercontent.com/jshttp/mime-db/master/db.json")).json(); + +json["application/javascript"].extensions.push(`ts`, `tsx`, `mts`, `mtsx`, `cts`, `cjs`, `mjs`, `js`); delete json["application/node"]; delete json["application/deno"]; @@ -28,11 +17,11 @@ for (let key of Object.keys(json).sort()) { const withExtensions = [ ...new Set([ ...Object.keys(json) - .filter((key) => { + .filter(key => { return !!json[key]?.extensions?.length; }) - .flatMap((mime) => { - return [...new Set([...json[mime].extensions])].map((ext) => { + .flatMap(mime => { + return [...new Set([...json[mime].extensions])].map(ext => { return [`.{.@"${ext}", all.@"${mime}"}`]; }); }) diff --git a/misctools/publish-examples.js b/misctools/publish-examples.js index 4124d0785..dcbb0d3eb 100644 --- a/misctools/publish-examples.js +++ b/misctools/publish-examples.js @@ -14,10 +14,7 @@ const DRY_RUN = !!process.env.DRY_RUN; var count = 0; -const examplesFolderEntries = fs.readdirSync( - path.join(process.cwd(), "examples"), - { withFileTypes: true }, -); +const examplesFolderEntries = fs.readdirSync(path.join(process.cwd(), "examples"), { withFileTypes: true }); const packageNames = []; @@ -28,10 +25,7 @@ for (let folder of examplesFolderEntries) { let packageJSONText; try { - packageJSONText = fs.readFileSync( - path.join(absolute, "package.json"), - "utf8", - ); + packageJSONText = fs.readFileSync(path.join(absolute, "package.json"), "utf8"); } catch { continue; } @@ -43,9 +37,7 @@ for (let folder of examplesFolderEntries) { var version = "0.0.1"; try { - const _versions = exec(`npm view ${packageJSON.name} versions --json`) - .toString() - .trim(); + const _versions = exec(`npm view ${packageJSON.name} versions --json`).toString().trim(); if (_versions.length > 0) { const versionsArray = JSON.parse(_versions); @@ -70,10 +62,7 @@ for (let folder of examplesFolderEntries) { } catch (exception) {} try { - fs.copyFileSync( - path.join(absolute, ".gitignore"), - path.join(absolute, "gitignore"), - ); + fs.copyFileSync(path.join(absolute, ".gitignore"), path.join(absolute, "gitignore")); } catch (exception) {} restart: while (retryCount-- > 0) { @@ -85,18 +74,13 @@ for (let folder of examplesFolderEntries) { delete packageJSON.main; } - fs.writeFileSync( - path.join(absolute, "package.json"), - JSON.stringify(packageJSON, null, 2), - ); + fs.writeFileSync(path.join(absolute, "package.json"), JSON.stringify(packageJSON, null, 2)); try { exec(`npm version patch --force --no-commit-hooks --no-git-tag-version`, { cwd: absolute, }); - packageJSON = JSON.parse( - fs.readFileSync(path.join(absolute, "package.json"), "utf8"), - ); + packageJSON = JSON.parse(fs.readFileSync(path.join(absolute, "package.json"), "utf8")); version = packageJSON.version; } catch (e) { if (e.code !== "E404") { @@ -105,12 +89,9 @@ for (let folder of examplesFolderEntries) { } try { - exec( - `npm publish ${ - DRY_RUN ? "--dry-run" : "" - } --access public --registry https://registry.npmjs.org/`, - { cwd: absolute }, - ); + exec(`npm publish ${DRY_RUN ? "--dry-run" : ""} --access public --registry https://registry.npmjs.org/`, { + cwd: absolute, + }); packageNames.push([ packageJSON.name, { @@ -147,16 +128,10 @@ if (packageNames.length > 0) { recursive: true, }); } catch (exception) {} - fs.writeFileSync( - path.join(dir, "package.json"), - JSON.stringify(packageJSON, null, 2), - ); - exec( - `npm publish ${ - DRY_RUN ? "--dry-run" : "" - } --access public --registry https://registry.npmjs.org/`, - { cwd: dir }, - ); + fs.writeFileSync(path.join(dir, "package.json"), JSON.stringify(packageJSON, null, 2)); + exec(`npm publish ${DRY_RUN ? "--dry-run" : ""} --access public --registry https://registry.npmjs.org/`, { + cwd: dir, + }); } console.log(`Published ${count} packages`); |