From 8dd0028e8f7292e442ed90af4cc28b7ed68b02fc Mon Sep 17 00:00:00 2001 From: Nathan Flurry Date: Mon, 7 Oct 2024 16:51:46 -0700 Subject: [PATCH] chore(backend): format --- packages/backend/cli/tasks/dev.ts | 5 +- packages/backend/cli/tasks/format.ts | 6 +- packages/backend/cli/tasks/lint.ts | 6 +- packages/backend/cli/tasks/test.ts | 5 +- packages/backend/deno.lock | 55 ++--------------- .../backend/toolchain/build/plan/project.ts | 10 +++- packages/backend/toolchain/sdk/generate.ts | 60 +++++++++---------- 7 files changed, 59 insertions(+), 88 deletions(-) diff --git a/packages/backend/cli/tasks/dev.ts b/packages/backend/cli/tasks/dev.ts index 746558c8..8a8ddb8b 100644 --- a/packages/backend/cli/tasks/dev.ts +++ b/packages/backend/cli/tasks/dev.ts @@ -74,7 +74,10 @@ runTask({ // Determine args const args = [ - "--config", projectDataPath(project, DENO_JSON_PATH), "--lock", projectDataPath(project, DENO_LOCK_PATH), + "--config", + projectDataPath(project, DENO_JSON_PATH), + "--lock", + projectDataPath(project, DENO_LOCK_PATH), "--allow-env", "--allow-net", "--allow-read", diff --git a/packages/backend/cli/tasks/format.ts b/packages/backend/cli/tasks/format.ts index d7ba81e0..61897e52 100644 --- a/packages/backend/cli/tasks/format.ts +++ b/packages/backend/cli/tasks/format.ts @@ -19,8 +19,10 @@ runTask({ const cmd = await new Deno.Command(denoExecutablePath(), { args: [ "fmt", - "--config", projectDataPath(project, DENO_JSON_PATH), - "--lock", projectDataPath(project, DENO_LOCK_PATH), + "--config", + projectDataPath(project, DENO_JSON_PATH), + "--lock", + projectDataPath(project, DENO_LOCK_PATH), ...input.check ? ["--check"] : [], ...sourceFiles, ], diff --git a/packages/backend/cli/tasks/lint.ts b/packages/backend/cli/tasks/lint.ts index 77af2f81..fb44451a 100644 --- a/packages/backend/cli/tasks/lint.ts +++ b/packages/backend/cli/tasks/lint.ts @@ -19,7 +19,10 @@ runTask({ const cmd = await new Deno.Command(denoExecutablePath(), { args: [ "lint", - "--config", projectDataPath(project, DENO_JSON_PATH), "--lock", projectDataPath(project, DENO_LOCK_PATH), + "--config", + projectDataPath(project, DENO_JSON_PATH), + "--lock", + projectDataPath(project, DENO_LOCK_PATH), ...sourceFiles, ], stdout: "inherit", @@ -35,4 +38,3 @@ runTask({ function projectDataPath(project: Project, DENO_JSON_PATH: any): string { throw new Error("Function not implemented."); } - diff --git a/packages/backend/cli/tasks/test.ts b/packages/backend/cli/tasks/test.ts index 131f5b73..6619a6eb 100644 --- a/packages/backend/cli/tasks/test.ts +++ b/packages/backend/cli/tasks/test.ts @@ -52,7 +52,10 @@ runTask({ // Determine args const args = [ - "--config", projectDataPath(project, DENO_JSON_PATH), "--lock", projectDataPath(project, DENO_LOCK_PATH), + "--config", + projectDataPath(project, DENO_JSON_PATH), + "--lock", + projectDataPath(project, DENO_LOCK_PATH), "--allow-env", "--allow-net", "--allow-read", diff --git a/packages/backend/deno.lock b/packages/backend/deno.lock index 9050051b..b2f7bcbf 100644 --- a/packages/backend/deno.lock +++ b/packages/backend/deno.lock @@ -8,7 +8,7 @@ "jsr:@cross/env@^1.0.0": "jsr:@cross/env@1.0.2", "jsr:@cross/runtime@^1.0.0": "jsr:@cross/runtime@1.1.0", "jsr:@cross/utils@^0.7.0": "jsr:@cross/utils@0.7.1", - "jsr:@david/code-block-writer@^13": "jsr:@david/code-block-writer@13.0.2", + "jsr:@david/code-block-writer@^13": "jsr:@david/code-block-writer@13.0.3", "jsr:@hono/hono@^4.6.3": "jsr:@hono/hono@4.6.3", "jsr:@rivet-gg/esbuild-deno-loader@^0.10.3-fork.3": "jsr:@rivet-gg/esbuild-deno-loader@0.10.3-fork.3", "jsr:@std/assert@0.213": "jsr:@std/assert@0.213.1", @@ -42,9 +42,7 @@ "jsr:@ts-morph/common@^0.24.0": "jsr:@ts-morph/common@0.24.0", "jsr:@ts-morph/ts-morph@^23.0.0": "jsr:@ts-morph/ts-morph@23.0.0", "npm:@asteasolutions/zod-to-openapi@^7.1.1": "npm:@asteasolutions/zod-to-openapi@7.1.1_zod@3.23.8", - "npm:@cloudflare/workers-types": "npm:@cloudflare/workers-types@4.20240919.0", "npm:dedent@^1.5.3": "npm:dedent@1.5.3", - "npm:drizzle-orm@0.33.0": "npm:drizzle-orm@0.33.0_@cloudflare+workers-types@4.20240919.0", "npm:esbuild-plugins-node-modules-polyfill@1.6.4": "npm:esbuild-plugins-node-modules-polyfill@1.6.4_esbuild@0.20.2", "npm:esbuild@^0.20.2": "npm:esbuild@0.20.2", "npm:glob@^11.0.0": "npm:glob@11.0.0", @@ -93,8 +91,8 @@ "jsr:@cross/runtime@^1.0.0" ] }, - "@david/code-block-writer@13.0.2": { - "integrity": "14dd3baaafa3a2dea8bf7dfbcddeccaa13e583da2d21d666c01dc6d681cd74ad" + "@david/code-block-writer@13.0.3": { + "integrity": "f98c77d320f5957899a61bfb7a9bead7c6d83ad1515daee92dbacc861e13bb7f" }, "@hono/hono@4.6.3": { "integrity": "a1f5a18cd12a0db54755b0461dd5a4e2d93a6f85403073eb710103eacc42daf3" @@ -220,10 +218,6 @@ "zod": "zod@3.23.8" } }, - "@cloudflare/workers-types@4.20240919.0": { - "integrity": "sha512-DZwTpZVAV+fKTLxo6ntC2zMNRL/UJwvtMKUt/U7ZyJdR+t0qcBUZGx8jLi9gOFWYxkzO3s7slajwkR2hQRPXYQ==", - "dependencies": {} - }, "@esbuild/aix-ppc64@0.20.2": { "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", "dependencies": {} @@ -389,12 +383,6 @@ "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", "dependencies": {} }, - "drizzle-orm@0.33.0_@cloudflare+workers-types@4.20240919.0": { - "integrity": "sha512-SHy72R2Rdkz0LEq0PSG/IdvnT3nGiWuRk+2tXZQ90GVq/XQhpCzu/EFT3V2rox+w8MlkBQxifF8pCStNYnERfA==", - "dependencies": { - "@cloudflare/workers-types": "@cloudflare/workers-types@4.20240919.0" - } - }, "eastasianwidth@0.2.0": { "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dependencies": {} @@ -631,42 +619,7 @@ } } }, - "remote": { - "https://deno.land/std@0.224.0/assert/_constants.ts": "a271e8ef5a573f1df8e822a6eb9d09df064ad66a4390f21b3e31f820a38e0975", - "https://deno.land/std@0.224.0/assert/assert.ts": "09d30564c09de846855b7b071e62b5974b001bb72a4b797958fe0660e7849834", - "https://deno.land/std@0.224.0/assert/assert_almost_equals.ts": "9e416114322012c9a21fa68e187637ce2d7df25bcbdbfd957cd639e65d3cf293", - "https://deno.land/std@0.224.0/assert/assert_array_includes.ts": "14c5094471bc8e4a7895fc6aa5a184300d8a1879606574cb1cd715ef36a4a3c7", - "https://deno.land/std@0.224.0/assert/assert_equals.ts": "3bbca947d85b9d374a108687b1a8ba3785a7850436b5a8930d81f34a32cb8c74", - "https://deno.land/std@0.224.0/assert/assert_exists.ts": "43420cf7f956748ae6ed1230646567b3593cb7a36c5a5327269279c870c5ddfd", - "https://deno.land/std@0.224.0/assert/assert_false.ts": "3e9be8e33275db00d952e9acb0cd29481a44fa0a4af6d37239ff58d79e8edeff", - "https://deno.land/std@0.224.0/assert/assert_greater.ts": "5e57b201fd51b64ced36c828e3dfd773412c1a6120c1a5a99066c9b261974e46", - "https://deno.land/std@0.224.0/assert/assert_greater_or_equal.ts": "9870030f997a08361b6f63400273c2fb1856f5db86c0c3852aab2a002e425c5b", - "https://deno.land/std@0.224.0/assert/assert_instance_of.ts": "e22343c1fdcacfaea8f37784ad782683ec1cf599ae9b1b618954e9c22f376f2c", - "https://deno.land/std@0.224.0/assert/assert_is_error.ts": "f856b3bc978a7aa6a601f3fec6603491ab6255118afa6baa84b04426dd3cc491", - "https://deno.land/std@0.224.0/assert/assert_less.ts": "60b61e13a1982865a72726a5fa86c24fad7eb27c3c08b13883fb68882b307f68", - "https://deno.land/std@0.224.0/assert/assert_less_or_equal.ts": "d2c84e17faba4afe085e6c9123a63395accf4f9e00150db899c46e67420e0ec3", - "https://deno.land/std@0.224.0/assert/assert_match.ts": "ace1710dd3b2811c391946954234b5da910c5665aed817943d086d4d4871a8b7", - "https://deno.land/std@0.224.0/assert/assert_not_equals.ts": "78d45dd46133d76ce624b2c6c09392f6110f0df9b73f911d20208a68dee2ef29", - "https://deno.land/std@0.224.0/assert/assert_not_instance_of.ts": "3434a669b4d20cdcc5359779301a0588f941ffdc2ad68803c31eabdb4890cf7a", - "https://deno.land/std@0.224.0/assert/assert_not_match.ts": "df30417240aa2d35b1ea44df7e541991348a063d9ee823430e0b58079a72242a", - "https://deno.land/std@0.224.0/assert/assert_not_strict_equals.ts": "37f73880bd672709373d6dc2c5f148691119bed161f3020fff3548a0496f71b8", - "https://deno.land/std@0.224.0/assert/assert_object_match.ts": "411450fd194fdaabc0089ae68f916b545a49d7b7e6d0026e84a54c9e7eed2693", - "https://deno.land/std@0.224.0/assert/assert_rejects.ts": "4bee1d6d565a5b623146a14668da8f9eb1f026a4f338bbf92b37e43e0aa53c31", - "https://deno.land/std@0.224.0/assert/assert_strict_equals.ts": "b4f45f0fd2e54d9029171876bd0b42dd9ed0efd8f853ab92a3f50127acfa54f5", - "https://deno.land/std@0.224.0/assert/assert_string_includes.ts": "496b9ecad84deab72c8718735373feb6cdaa071eb91a98206f6f3cb4285e71b8", - "https://deno.land/std@0.224.0/assert/assert_throws.ts": "c6508b2879d465898dab2798009299867e67c570d7d34c90a2d235e4553906eb", - "https://deno.land/std@0.224.0/assert/assertion_error.ts": "ba8752bd27ebc51f723702fac2f54d3e94447598f54264a6653d6413738a8917", - "https://deno.land/std@0.224.0/assert/equal.ts": "bddf07bb5fc718e10bb72d5dc2c36c1ce5a8bdd3b647069b6319e07af181ac47", - "https://deno.land/std@0.224.0/assert/fail.ts": "0eba674ffb47dff083f02ced76d5130460bff1a9a68c6514ebe0cdea4abadb68", - "https://deno.land/std@0.224.0/assert/mod.ts": "48b8cb8a619ea0b7958ad7ee9376500fe902284bb36f0e32c598c3dc34cbd6f3", - "https://deno.land/std@0.224.0/assert/unimplemented.ts": "8c55a5793e9147b4f1ef68cd66496b7d5ba7a9e7ca30c6da070c1a58da723d73", - "https://deno.land/std@0.224.0/assert/unreachable.ts": "5ae3dbf63ef988615b93eb08d395dda771c96546565f9e521ed86f6510c29e19", - "https://deno.land/std@0.224.0/fmt/colors.ts": "508563c0659dd7198ba4bbf87e97f654af3c34eb56ba790260f252ad8012e1c5", - "https://deno.land/std@0.224.0/internal/diff.ts": "6234a4b493ebe65dc67a18a0eb97ef683626a1166a1906232ce186ae9f65f4e6", - "https://deno.land/std@0.224.0/internal/format.ts": "0a98ee226fd3d43450245b1844b47003419d34d210fa989900861c79820d21c2", - "https://deno.land/std@0.224.0/internal/mod.ts": "534125398c8e7426183e12dc255bb635d94e06d0f93c60a297723abe69d3b22e", - "https://esm.sh/zod-validation-error@3.3.0": "d8825ca67952b6adff6b35026dc465f9638d4923dbd54fe9e8e81fbfddca9630" - }, + "remote": {}, "workspace": { "dependencies": [ "jsr:@bartlomieju/postgres@^0.17.2", diff --git a/packages/backend/toolchain/build/plan/project.ts b/packages/backend/toolchain/build/plan/project.ts index 24c9ab30..e6f0d1a7 100644 --- a/packages/backend/toolchain/build/plan/project.ts +++ b/packages/backend/toolchain/build/plan/project.ts @@ -322,7 +322,15 @@ export async function planProjectBuild( description: "entrypoint.ts", async build() { const checkOutput = await new Deno.Command(denoExecutablePath(), { - args: ["check", "--config", projectDataPath(project, DENO_JSON_PATH), "--lock", projectDataPath(project, DENO_LOCK_PATH), "--quiet", projectDataPath(project, ENTRYPOINT_PATH)], + args: [ + "check", + "--config", + projectDataPath(project, DENO_JSON_PATH), + "--lock", + projectDataPath(project, DENO_LOCK_PATH), + "--quiet", + projectDataPath(project, ENTRYPOINT_PATH), + ], signal, }).output(); if (!checkOutput.success) { diff --git a/packages/backend/toolchain/sdk/generate.ts b/packages/backend/toolchain/sdk/generate.ts index c791a5cd..e21f2cdc 100644 --- a/packages/backend/toolchain/sdk/generate.ts +++ b/packages/backend/toolchain/sdk/generate.ts @@ -22,7 +22,7 @@ export async function generateSdk( ) { const targetString = targetToString(sdk.target); const sdkGenPath = resolve(projectDataPath(project, SDK_PATH), targetString); - const sdkOutput = resolve(Deno.cwd(), sdk.output); + const sdkOutput = resolve(Deno.cwd(), sdk.output); // Clear artifacts try { @@ -35,52 +35,52 @@ export async function generateSdk( progress("Building SDK", targetString); - // Generate files - // - // preservePaths is used for preserving generated artifacts from things like - // `npm install`. - let preservePaths: string[]; + // Generate files + // + // preservePaths is used for preserving generated artifacts from things like + // `npm install`. + let preservePaths: string[]; if (sdk.target == SdkTarget.TypeScript) { - preservePaths = ["dist"]; + preservePaths = ["dist"]; await generateTypescript(project, sdkGenPath); } else if (sdk.target == SdkTarget.Unity) { - preservePaths = []; + preservePaths = []; await generateUnity(project, sdkGenPath); } else if (sdk.target == SdkTarget.Godot) { - preservePaths = []; + preservePaths = []; await generateGodot(project, sdkGenPath); } else { throw new UnreachableError(sdk.target); } - // Delete target dir - const preserveTempDir = await Deno.makeTempDir(); + // Delete target dir + const preserveTempDir = await Deno.makeTempDir(); if (await exists(sdkOutput, { isDirectory: true })) { - // Preserve files before deleting the output path - for (const path of preservePaths) { - const srcPreservePath = resolve(sdkOutput, path); - const dstPreservePath = resolve(preserveTempDir, path); - if (await exists(srcPreservePath)) { - await move(srcPreservePath, dstPreservePath); - } else { - } - } + // Preserve files before deleting the output path + for (const path of preservePaths) { + const srcPreservePath = resolve(sdkOutput, path); + const dstPreservePath = resolve(preserveTempDir, path); + if (await exists(srcPreservePath)) { + await move(srcPreservePath, dstPreservePath); + } else { + } + } - // Remove output + // Remove output await Deno.remove(sdkOutput, { recursive: true }); } - // Move generated SDK + // Move generated SDK await move(sdkGenPath, sdkOutput, { overwrite: true }); - // Move back preserved files - for (const path of preservePaths) { - const srcPreservePath = resolve(preserveTempDir, path); - const dstPreservePath = resolve(sdkOutput, path); - if (await exists(srcPreservePath, { isDirectory: true })) { - await move(srcPreservePath, dstPreservePath, { overwrite: false }); - } - } + // Move back preserved files + for (const path of preservePaths) { + const srcPreservePath = resolve(preserveTempDir, path); + const dstPreservePath = resolve(sdkOutput, path); + if (await exists(srcPreservePath, { isDirectory: true })) { + await move(srcPreservePath, dstPreservePath, { overwrite: false }); + } + } success("Success"); }