Skip to content

Commit a64f782

Browse files
m1212em1212e
committed
Merge commit '7f81df93b82786126bd6dc7a968d25e939a0d995' into rework
2 parents 530365f + 7f81df9 commit a64f782

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5576
-5554
lines changed

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["markis.code-coverage", "biomejs.biome"]
2+
"recommendations": ["markis.code-coverage", "biomejs.biome"]
33
}

‎.vscode/launch.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"type": "bun",
6-
"internalConsoleOptions": "neverOpen",
7-
"request": "launch",
8-
"name": "Debug File",
9-
"program": "${file}",
10-
"cwd": "${workspaceFolder}",
11-
"stopOnEntry": false,
12-
"watchMode": false
13-
},
14-
{
15-
"type": "bun",
16-
"internalConsoleOptions": "neverOpen",
17-
"request": "launch",
18-
"name": "Run File",
19-
"program": "${file}",
20-
"cwd": "${workspaceFolder}",
21-
"noDebug": true,
22-
"watchMode": false
23-
},
24-
{
25-
"type": "bun",
26-
"internalConsoleOptions": "neverOpen",
27-
"request": "attach",
28-
"name": "Attach Bun",
29-
"url": "ws://localhost:6499/",
30-
"stopOnEntry": false
31-
}
32-
]
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "bun",
6+
"internalConsoleOptions": "neverOpen",
7+
"request": "launch",
8+
"name": "Debug File",
9+
"program": "${file}",
10+
"cwd": "${workspaceFolder}",
11+
"stopOnEntry": false,
12+
"watchMode": false
13+
},
14+
{
15+
"type": "bun",
16+
"internalConsoleOptions": "neverOpen",
17+
"request": "launch",
18+
"name": "Run File",
19+
"program": "${file}",
20+
"cwd": "${workspaceFolder}",
21+
"noDebug": true,
22+
"watchMode": false
23+
},
24+
{
25+
"type": "bun",
26+
"internalConsoleOptions": "neverOpen",
27+
"request": "attach",
28+
"name": "Attach Bun",
29+
"url": "ws://localhost:6499/",
30+
"stopOnEntry": false
31+
}
32+
]
3333
}

‎.vscode/settings.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"editor.defaultFormatter": "biomejs.biome",
3-
"[typescript]": {
4-
"editor.defaultFormatter": "biomejs.biome"
5-
}
2+
"editor.defaultFormatter": "biomejs.biome",
3+
"[typescript]": {
4+
"editor.defaultFormatter": "biomejs.biome"
5+
}
66
}

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,9 @@ schemaBuilder.queryFields((t) => {
144144
return db.query.posts.findMany(
145145
query(
146146
// here we apply the ability filter
147-
ctx.abilities.users.filter("read", {
148-
// we can inject one time filters into the permission filter
149-
inject: {
150-
where: args.where,
151-
},
152-
}).query.many,
147+
ctx.abilities.users.filter("read")
148+
// we can merge one time filters into the permission filter for this specific request
149+
.merge({ where: args.where }).query.many,
153150
),
154151
);
155152
},

‎biome.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.1.1/schema.json",
3-
"vcs": {
4-
"enabled": true,
5-
"clientKind": "git",
6-
"useIgnoreFile": true
7-
},
8-
"files": {
9-
"ignoreUnknown": false
10-
},
11-
"formatter": {
12-
"enabled": true,
13-
"indentStyle": "tab"
14-
},
15-
"linter": {
16-
"enabled": true,
17-
"rules": {
18-
"recommended": true,
19-
"suspicious": {
20-
"noExplicitAny": "off"
21-
},
22-
"style": {
23-
"noNonNullAssertion": "off"
24-
}
25-
}
26-
},
27-
"javascript": {
28-
"formatter": {
29-
"quoteStyle": "double"
30-
}
31-
},
32-
"assist": {
33-
"enabled": true,
34-
"actions": {
35-
"source": {
36-
"organizeImports": "on"
37-
}
38-
}
39-
}
2+
"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
3+
"vcs": {
4+
"enabled": true,
5+
"clientKind": "git",
6+
"useIgnoreFile": true
7+
},
8+
"files": {
9+
"ignoreUnknown": false
10+
},
11+
"formatter": {
12+
"enabled": true,
13+
"indentStyle": "space"
14+
},
15+
"linter": {
16+
"enabled": true,
17+
"rules": {
18+
"recommended": true,
19+
"suspicious": {
20+
"noExplicitAny": "off"
21+
},
22+
"style": {
23+
"noNonNullAssertion": "off"
24+
}
25+
}
26+
},
27+
"javascript": {
28+
"formatter": {
29+
"quoteStyle": "double"
30+
}
31+
},
32+
"assist": {
33+
"enabled": true,
34+
"actions": {
35+
"source": {
36+
"organizeImports": "on"
37+
}
38+
}
39+
}
4040
}

‎build.ts‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@ const outDir = join(rumbleDir, "out");
1010
const libIndex = join(rumbleDir, "lib", "index.ts");
1111

1212
try {
13-
await access("outDir");
14-
console.info("Cleaning outDir...");
15-
await rm(outDir, { recursive: true, force: true });
16-
console.info("Cleaned outDir!");
13+
await access("outDir");
14+
console.info("Cleaning outDir...");
15+
await rm(outDir, { recursive: true, force: true });
16+
console.info("Cleaned outDir!");
1717
} catch (_error) {}
1818

1919
console.info("Creating outDir...");
2020
await mkdir(outDir, { recursive: true });
2121
console.info("Created outDir!");
2222

2323
await build({
24-
entry: [libIndex],
25-
format: ["cjs", "esm"],
26-
target: ["node20", "es2020"],
27-
minify: true,
28-
dts: true,
29-
outDir,
30-
sourcemap: true,
31-
treeshake: true,
32-
globalName: "rumble",
33-
splitting: true,
34-
external: [
35-
...Object.keys(packagejson.dependencies),
36-
...Object.keys(packagejson.peerDependencies),
37-
...Object.keys(packagejson.devDependencies),
38-
],
24+
entry: [libIndex],
25+
format: ["cjs", "esm"],
26+
target: ["node20", "es2020"],
27+
minify: true,
28+
dts: true,
29+
outDir,
30+
sourcemap: true,
31+
treeshake: true,
32+
globalName: "rumble",
33+
splitting: true,
34+
external: [
35+
...Object.keys(packagejson.dependencies),
36+
...Object.keys(packagejson.peerDependencies),
37+
...Object.keys(packagejson.devDependencies),
38+
],
3939
});
4040

4141
// ==============================
@@ -48,42 +48,42 @@ finalPackageJson.scripts = undefined as any;
4848
finalPackageJson.devDependencies = undefined as any;
4949

5050
(finalPackageJson.dependencies as any) = Object.entries(
51-
finalPackageJson.dependencies,
51+
finalPackageJson.dependencies,
5252
).reduce(
53-
(acc, [key, value]) => {
54-
acc[key] = value;
55-
return acc;
56-
},
57-
{} as Record<string, string>,
53+
(acc, [key, value]) => {
54+
acc[key] = value;
55+
return acc;
56+
},
57+
{} as Record<string, string>,
5858
);
5959

6060
(finalPackageJson.peerDependencies as any) = Object.entries(
61-
finalPackageJson.peerDependencies,
61+
finalPackageJson.peerDependencies,
6262
).reduce(
63-
(acc, [key, value]) => {
64-
acc[key] = value;
65-
return acc;
66-
},
67-
{} as Record<string, string>,
63+
(acc, [key, value]) => {
64+
acc[key] = value;
65+
return acc;
66+
},
67+
{} as Record<string, string>,
6868
);
6969

7070
(finalPackageJson as any).version =
71-
process.env.REF_NAME ?? (packagejson as any).version ?? "0.0.1";
71+
process.env.REF_NAME ?? (packagejson as any).version ?? "0.0.1";
7272

7373
(finalPackageJson as any).exports = {
74-
"./package.json": "./package.json",
75-
".": {
76-
require: "./index.cjs",
77-
import: "./index.js",
78-
node: "./index.cjs",
79-
default: "./index.cjs",
80-
},
74+
"./package.json": "./package.json",
75+
".": {
76+
require: "./index.cjs",
77+
import: "./index.js",
78+
node: "./index.cjs",
79+
default: "./index.cjs",
80+
},
8181
};
8282

8383
await writeFile(
84-
join(outDir, "package.json"),
85-
JSON.stringify(finalPackageJson),
86-
{ encoding: "utf-8" },
84+
join(outDir, "package.json"),
85+
JSON.stringify(finalPackageJson),
86+
{ encoding: "utf-8" },
8787
);
8888
console.info("Created package.json!");
8989

@@ -93,7 +93,7 @@ console.info("Created package.json!");
9393

9494
console.info("Copying README.md...");
9595
const readme = await readFile(join(rumbleDir, "README.md"), {
96-
encoding: "utf-8",
96+
encoding: "utf-8",
9797
});
9898
await writeFile(join(outDir, "README.md"), readme, { encoding: "utf-8" });
9999
console.info("Copied README.md!");
@@ -104,7 +104,7 @@ console.info("Copied README.md!");
104104

105105
console.info("Copying LICENSE...");
106106
const license = await readFile(join(rumbleDir, "LICENSE"), {
107-
encoding: "utf-8",
107+
encoding: "utf-8",
108108
});
109109
await writeFile(join(outDir, "LICENSE"), license, { encoding: "utf-8" });
110110
console.info("Copied LICENSE!");

‎bun.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/drizzle.config.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { defineConfig } from "drizzle-kit";
22

33
export default defineConfig({
4-
out: "./drizzle",
5-
schema: "./src/db/schema.ts",
6-
dialect: "postgresql",
7-
dbCredentials: {
8-
url: "postgres://postgres:postgres@localhost:5432/postgres",
9-
},
4+
out: "./drizzle",
5+
schema: "./src/db/schema.ts",
6+
dialect: "postgresql",
7+
dbCredentials: {
8+
url: "postgres://postgres:postgres@localhost:5432/postgres",
9+
},
1010
});

0 commit comments

Comments
 (0)