clanka 0.2.30 → 0.2.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +5 -6
- package/dist/Agent.js.map +1 -1
- package/dist/ScriptPreprocessing.test.js +1 -0
- package/dist/ScriptPreprocessing.test.js.map +1 -1
- package/package.json +10 -10
- package/src/Agent.ts +5 -6
- package/src/ScriptPreprocessing.test.ts +1 -0
- package/src/fixtures/patch15-broken.txt +90 -0
- package/src/fixtures/patch15-fixed.txt +90 -0
package/dist/Agent.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AAEjD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,KAAK,mBAAmB,MAAM,6CAA6C,CAAA;AACvF,OAAO,KAAK,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAClE,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAA;AACnD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAA;AACrD,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAG/C,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAG/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,IAAI,MAAM,yBAAyB,CAAA;AAC/C,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAA;AAIrD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,eAAe,CAAA;AAEpC;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,MAAwB,CAAA;AAE7C;;;GAGG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAEzB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAEtD;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ;;WAEG;QACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAA;QAChC;;;WAGG;QACH,QAAQ,CAAC,MAAM,CAAC,EACZ,MAAM,GACN,CAAC,CAAC,OAAO,EAAE;YACT,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;YACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;SAC1B,KAAK,MAAM,CAAC,GACb,SAAS,CAAA;KACd,GAAG,MAAM,CAAC,MAAM,CACf,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,EACtD,KAAK,EACH,KAAK,CAAC,KAAK,GACX,aAAa,CAAC,aAAa,GAC3B,KAAK,CAAC,YAAY,GAClB,KAAK,CAAC,SAAS,GACf,aAAa,CAChB,CAAA;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC5C;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,kCAA4C,CAAA;AAE9D;;;GAGG;AACH,eAAO,MAAM,IAAI,wEAyWf,CAAA;
|
|
1
|
+
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"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"}
|
package/dist/Agent.js
CHANGED
|
@@ -289,10 +289,9 @@ ${content}
|
|
|
289
289
|
});
|
|
290
290
|
});
|
|
291
291
|
const retryPolicy = Schedule.exponential(100, 1.5).pipe(Schedule.either(Schedule.spaced(5000)), Schedule.jittered);
|
|
292
|
-
const defaultSystem = (options) => `You are a world-class software engineer: precise, rigorous, thoughtful, and
|
|
292
|
+
const defaultSystem = (options) => `You are a world-class software engineer: precise, rigorous, thoughtful, and efficient. You fully understand the task, verify assumptions, and produce minimal, correct, maintainable solutions. You make no mistakes.
|
|
293
293
|
|
|
294
|
-
-
|
|
295
|
-
- Use the current state of the codebase to inform your decisions. Don't look at git history unless explicity asked to.
|
|
294
|
+
- Fully read and understand your task before proceeding.
|
|
296
295
|
- Only add comments when necessary.
|
|
297
296
|
|
|
298
297
|
${options.toolInstructions}
|
|
@@ -302,15 +301,15 @@ ${options.agentsMd}
|
|
|
302
301
|
const generateSystemTools = (capabilities, conversationMode) => `**YOU ONLY HAVE ACCESS TO ONE TOOL** "execute", to run javascript code to do your work.
|
|
303
302
|
|
|
304
303
|
- Use \`console.log\` to print any output you need.
|
|
305
|
-
- Top level await is supported.${capabilities.supportsSearch
|
|
304
|
+
- Top level await is supported - no need to wrap with async functions.${capabilities.supportsSearch
|
|
306
305
|
? `
|
|
307
|
-
-
|
|
306
|
+
- PREFER USING the "search" function over "rg", unless you are targeting specific files or patterns.`
|
|
308
307
|
: ""}
|
|
309
308
|
- Do as much work as possible in a single script, using \`Promise.all\` to run multiple functions in parallel.
|
|
310
309
|
- You can add / update / remove multiple files in one go with "applyPatch".
|
|
311
310
|
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
312
311
|
- **Variables are not shared** between executions, so you must include all necessary code in each script you execute.
|
|
313
|
-
- DO NOT use \`require\`, \`import\`, \`process\`, or any other
|
|
312
|
+
- DO NOT use \`require\`, \`import\`, \`process\`, or any other Node.js apis.
|
|
314
313
|
- Make use of the todo functions to keep track of your progress.${conversationMode
|
|
315
314
|
? ""
|
|
316
315
|
: `
|
package/dist/Agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,6 +114,7 @@ describe("preprocessScript", () => {
|
|
|
114
114
|
"patch12",
|
|
115
115
|
"patch13",
|
|
116
116
|
"patch14",
|
|
117
|
+
"patch15",
|
|
117
118
|
])("fixes broken %s", (fixture) => {
|
|
118
119
|
const content = readFileSync(join(__dirname, "fixtures", `${fixture}-broken.txt`), "utf-8");
|
|
119
120
|
const fixed = readFileSync(join(__dirname, "fixtures", `${fixture}-fixed.txt`), "utf-8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptPreprocessing.test.js","sourceRoot":"","sources":["../src/ScriptPreprocessing.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,MAAM,IAAI,GAAG,GAAG,CAAA;AAChB,MAAM,OAAO,GAAG,KAAK,CAAA;AACrB,MAAM,oBAAoB,GAAG,MAAM,CAAA;AACnC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,EAAE,CAAA;AAExE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,KAAK,GAAG;YACZ,oBAAoB;YACpB,iBAAiB;YACjB,iCAAiC;YACjC,IAAI;YACJ,yBAAyB;YACzB,yBAAyB;YACzB,eAAe;YACf,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,OAAO,MAAM,OAAO,EAAE,CAAC,EAC5D,IAAI,CACL,CAAA;QACD,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,OAAO,MAAM,OAAO,EAAE,CAAC,EAC5D,IAAI,CACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,KAAK,GAAG;YACZ,oBAAoB;YACpB,iBAAiB;YACjB,iCAAiC;YACjC,IAAI;YACJ,6BAA6B;YAC7B,eAAe;YACf,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CAAC,kBAAkB,oBAAoB,YAAY,CAAC,EACnE,IAAI,CACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,KAAK,GAAG;YACZ,mBAAmB;YACnB,2BAA2B;YAC3B,oCAAoC;YACpC,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CACb,YAAY,YAAY,CAAC,iBAAiB,OAAO,OAAO,OAAO,EAAE,CAAC,GAAG,CACtE,EACD,IAAI,CACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,KAAK,GAAG,0DAA0D,CAAA;QAExE,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,EACN,sBAAsB,YAAY,CAAC,eAAe,OAAO,cAAc,OAAO,WAAW,CAAC,GAAG,CAC9F,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,KAAK,GAAG;YACZ,oBAAoB,YAAY,CAAC,iBAAiB,OAAO,OAAO,OAAO,EAAE,CAAC,GAAG;YAC7E,oBAAoB,YAAY,CAAC,iBAAiB,oBAAoB,OAAO,CAAC,GAAG;YACjF,sDAAsD,YAAY,CAAC,WAAW,OAAO,OAAO,OAAO,EAAE,CAAC,KAAK;YAC3G,sBAAsB,YAAY,CAAC,iBAAiB,OAAO,OAAO,OAAO,aAAa,CAAC,GAAG;SAC3F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,KAAK,GAAG,2CAA2C,CAAA;QAEzD,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,KAAK,GAAG;YACZ,gCAAgC;YAChC,iCAAiC;YACjC,IAAI;YACJ,yBAAyB;YACzB,yBAAyB;YACzB,iBAAiB;YACjB,yBAAyB;SAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,OAAO,MAAM,OAAO,EAAE,CAAC,EAC5D,IAAI,CACL,CAAA;QACD,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,OAAO,MAAM,OAAO,EAAE,CAAC,EAC5D,IAAI,CACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,MAAM,KAAK,GAAG;YACZ,uDAAuD;YACvD,6BAA6B;SAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,EACN;YACE,mBAAmB,YAAY,CAAC,eAAe,OAAO,cAAc,OAAO,WAAW,CAAC,GAAG;YAC1F,6BAA6B;SAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,KAAK,GAAG;YACZ,sCAAsC;YACtC,mBAAmB;YACnB,2BAA2B;YAC3B,kBAAkB;YAClB,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAEtC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,QAAQ,CACb,gBAAgB,YAAY,CAAC,iBAAiB,OAAO,OAAO,OAAO,EAAE,CAAC,GAAG,CAC1E,EACD,IAAI,CACL,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,IAAI,CAAC;QACN,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,SAAS;QACT,SAAS;QACT,SAAS;QACT,SAAS;KACV,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,YAAY,CAC1B,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,aAAa,CAAC,EACpD,OAAO,CACR,CAAA;QACD,MAAM,KAAK,GAAG,YAAY,CACxB,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,YAAY,CAAC,EACnD,OAAO,CACR,CAAA;QACD,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"ScriptPreprocessing.test.js","sourceRoot":"","sources":["../src/ScriptPreprocessing.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "clanka",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.32",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"url": "https://github.com/Effectful-Tech/clanka.git"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@effect/ai-openai": "4.0.0-beta.
|
|
29
|
-
"@effect/platform-node": "4.0.0-beta.
|
|
30
|
-
"@effect/sql-sqlite-node": "4.0.0-beta.
|
|
28
|
+
"@effect/ai-openai": "4.0.0-beta.37",
|
|
29
|
+
"@effect/platform-node": "4.0.0-beta.37",
|
|
30
|
+
"@effect/sql-sqlite-node": "4.0.0-beta.37",
|
|
31
31
|
"@modelcontextprotocol/sdk": "^1.27.1",
|
|
32
32
|
"@vscode/ripgrep": "^1.17.1",
|
|
33
33
|
"chalk": "^5.6.2",
|
|
@@ -47,20 +47,20 @@
|
|
|
47
47
|
"@sqliteai/sqlite-vector-win32-x86_64": "0.9.93"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@effect/ai-openai": "4.0.0-beta.
|
|
51
|
-
"@effect/ai-openai-compat": "4.0.0-beta.
|
|
52
|
-
"effect": "4.0.0-beta.
|
|
50
|
+
"@effect/ai-openai": "4.0.0-beta.37",
|
|
51
|
+
"@effect/ai-openai-compat": "4.0.0-beta.37",
|
|
52
|
+
"effect": "4.0.0-beta.37"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
55
|
"@changesets/changelog-github": "^0.6.0",
|
|
56
56
|
"@changesets/cli": "^2.29.8",
|
|
57
|
-
"@effect/ai-openai-compat": "4.0.0-beta.
|
|
57
|
+
"@effect/ai-openai-compat": "4.0.0-beta.37",
|
|
58
58
|
"@effect/language-service": "^0.80.0",
|
|
59
|
-
"@effect/vitest": "4.0.0-beta.
|
|
59
|
+
"@effect/vitest": "4.0.0-beta.37",
|
|
60
60
|
"@types/node": "^25.5.0",
|
|
61
61
|
"@types/turndown": "^5.0.6",
|
|
62
62
|
"@typescript/native-preview": "7.0.0-dev.20260318.1",
|
|
63
|
-
"effect": "4.0.0-beta.
|
|
63
|
+
"effect": "4.0.0-beta.37",
|
|
64
64
|
"husky": "^9.1.7",
|
|
65
65
|
"lint-staged": "^16.4.0",
|
|
66
66
|
"oxlint": "^1.56.0",
|
package/src/Agent.ts
CHANGED
|
@@ -475,10 +475,9 @@ const retryPolicy = Schedule.exponential(100, 1.5).pipe(
|
|
|
475
475
|
const defaultSystem = (options: {
|
|
476
476
|
readonly toolInstructions: string
|
|
477
477
|
readonly agentsMd: string | null
|
|
478
|
-
}) => `You are a world-class software engineer: precise, rigorous, thoughtful, and
|
|
478
|
+
}) => `You are a world-class software engineer: precise, rigorous, thoughtful, and efficient. You fully understand the task, verify assumptions, and produce minimal, correct, maintainable solutions. You make no mistakes.
|
|
479
479
|
|
|
480
|
-
-
|
|
481
|
-
- Use the current state of the codebase to inform your decisions. Don't look at git history unless explicity asked to.
|
|
480
|
+
- Fully read and understand your task before proceeding.
|
|
482
481
|
- Only add comments when necessary.
|
|
483
482
|
|
|
484
483
|
${options.toolInstructions}
|
|
@@ -492,17 +491,17 @@ const generateSystemTools = (
|
|
|
492
491
|
) => `**YOU ONLY HAVE ACCESS TO ONE TOOL** "execute", to run javascript code to do your work.
|
|
493
492
|
|
|
494
493
|
- Use \`console.log\` to print any output you need.
|
|
495
|
-
- Top level await is supported.${
|
|
494
|
+
- Top level await is supported - no need to wrap with async functions.${
|
|
496
495
|
capabilities.supportsSearch
|
|
497
496
|
? `
|
|
498
|
-
-
|
|
497
|
+
- PREFER USING the "search" function over "rg", unless you are targeting specific files or patterns.`
|
|
499
498
|
: ""
|
|
500
499
|
}
|
|
501
500
|
- Do as much work as possible in a single script, using \`Promise.all\` to run multiple functions in parallel.
|
|
502
501
|
- You can add / update / remove multiple files in one go with "applyPatch".
|
|
503
502
|
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
504
503
|
- **Variables are not shared** between executions, so you must include all necessary code in each script you execute.
|
|
505
|
-
- DO NOT use \`require\`, \`import\`, \`process\`, or any other
|
|
504
|
+
- DO NOT use \`require\`, \`import\`, \`process\`, or any other Node.js apis.
|
|
506
505
|
- Make use of the todo functions to keep track of your progress.${
|
|
507
506
|
conversationMode
|
|
508
507
|
? ""
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
const patch = `*** Begin Patch
|
|
2
|
+
*** Update File: packages/sql/pg/src/PgClient.ts
|
|
3
|
+
@@
|
|
4
|
+
- const listenClient = yield* RcRef.make({
|
|
5
|
+
- acquire: reserveRaw
|
|
6
|
+
- })
|
|
7
|
+
+ const onListenClientError = (_cause: Error) => {
|
|
8
|
+
+ //
|
|
9
|
+
+ }
|
|
10
|
+
+ const listenClient = yield* RcRef.make({
|
|
11
|
+
+ acquire: Effect.acquireRelease(
|
|
12
|
+
+ Effect.tryPromise({
|
|
13
|
+
+ try: async () => {
|
|
14
|
+
+ const client = new Pg.Client(pool.options)
|
|
15
|
+
+ client.on("error", onListenClientError)
|
|
16
|
+
+ await client.connect()
|
|
17
|
+
+ return client
|
|
18
|
+
+ },
|
|
19
|
+
+ catch: (cause) =>
|
|
20
|
+
+ new SqlError({
|
|
21
|
+
+ reason: classifyError(cause, "Failed to acquire connection for listen", "listen")
|
|
22
|
+
+ })
|
|
23
|
+
+ }),
|
|
24
|
+
+ (client) =>
|
|
25
|
+
+ Effect.promise(() => {
|
|
26
|
+
+ client.off("error", onListenClientError)
|
|
27
|
+
+ return client.end()
|
|
28
|
+
+ }).pipe(
|
|
29
|
+
+ Effect.timeoutOption(1000)
|
|
30
|
+
+ )
|
|
31
|
+
+ )
|
|
32
|
+
+ })
|
|
33
|
+
*** Add File: packages/sql/pg/test/Listen.test.ts
|
|
34
|
+
+import { PgClient } from "@effect/sql-pg"
|
|
35
|
+
+import { assert, it } from "@effect/vitest"
|
|
36
|
+
+import { Effect, Fiber, Option, Stream } from "effect"
|
|
37
|
+
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
|
|
38
|
+
+import * as Pg from "pg"
|
|
39
|
+
+import { PgContainer } from "./utils.ts"
|
|
40
|
+
+
|
|
41
|
+
+it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgClient listen", (it) => {
|
|
42
|
+
+ it.effect("uses a dedicated connection outside of the pool", () =>
|
|
43
|
+
+ Effect.scoped(
|
|
44
|
+
+ Effect.gen(function*() {
|
|
45
|
+
+ const container = yield* PgContainer
|
|
46
|
+
+ const pool = new Pg.Pool({
|
|
47
|
+
+ connectionString: container.getConnectionUri(),
|
|
48
|
+
+ max: 1,
|
|
49
|
+
+ application_name: "@effect/sql-pg-test-listen"
|
|
50
|
+
+ })
|
|
51
|
+
+ yield* Effect.addFinalizer(() => Effect.promise(() => pool.end()))
|
|
52
|
+
+
|
|
53
|
+
+ const client = yield* PgClient.fromPool({
|
|
54
|
+
+ acquire: Effect.succeed(pool)
|
|
55
|
+
+ }).pipe(
|
|
56
|
+
+ Effect.provide(Reactivity.layer)
|
|
57
|
+
+ )
|
|
58
|
+
+
|
|
59
|
+
+ const channel = \`listen_\${Date.now()}_\${Math.random().toString(36).slice(2)}\`
|
|
60
|
+
+ const listener = yield* client.listen(channel).pipe(
|
|
61
|
+
+ Stream.take(1),
|
|
62
|
+
+ Stream.runHead,
|
|
63
|
+
+ Effect.forkScoped
|
|
64
|
+
+ )
|
|
65
|
+
+
|
|
66
|
+
+ yield* Effect.sleep(200)
|
|
67
|
+
+ assert.strictEqual(pool.totalCount, 0)
|
|
68
|
+
+
|
|
69
|
+
+ const rows = yield* client<{ value: number }>(\`SELECT 1 AS value\`).pipe(
|
|
70
|
+
+ Effect.timeoutFail({
|
|
71
|
+
+ duration: "3 seconds",
|
|
72
|
+
+ onTimeout: () => new Error("query timed out while listen was active")
|
|
73
|
+
+ })
|
|
74
|
+
+ )
|
|
75
|
+
+ assert.deepEqual(rows, [{ value: 1 }])
|
|
76
|
+
+
|
|
77
|
+
+ yield* client.notify(channel, "payload")
|
|
78
|
+
+ const message = yield* Fiber.join(listener)
|
|
79
|
+
+ assert.deepEqual(message, Option.some("payload"))
|
|
80
|
+
+ })
|
|
81
|
+
+ ))
|
|
82
|
+
+})
|
|
83
|
+
*** Add File: .changeset/ten-pens-rule.md
|
|
84
|
+
+---
|
|
85
|
+
+"@effect/sql-pg": patch
|
|
86
|
+
+---
|
|
87
|
+
+
|
|
88
|
+
+Change `PgClient.listen` to use a dedicated PostgreSQL connection instead of reserving one from the pool.
|
|
89
|
+
*** End Patch`
|
|
90
|
+
console.log(await applyPatch(patch))
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
const patch = `*** Begin Patch
|
|
2
|
+
*** Update File: packages/sql/pg/src/PgClient.ts
|
|
3
|
+
@@
|
|
4
|
+
- const listenClient = yield* RcRef.make({
|
|
5
|
+
- acquire: reserveRaw
|
|
6
|
+
- })
|
|
7
|
+
+ const onListenClientError = (_cause: Error) => {
|
|
8
|
+
+ //
|
|
9
|
+
+ }
|
|
10
|
+
+ const listenClient = yield* RcRef.make({
|
|
11
|
+
+ acquire: Effect.acquireRelease(
|
|
12
|
+
+ Effect.tryPromise({
|
|
13
|
+
+ try: async () => {
|
|
14
|
+
+ const client = new Pg.Client(pool.options)
|
|
15
|
+
+ client.on("error", onListenClientError)
|
|
16
|
+
+ await client.connect()
|
|
17
|
+
+ return client
|
|
18
|
+
+ },
|
|
19
|
+
+ catch: (cause) =>
|
|
20
|
+
+ new SqlError({
|
|
21
|
+
+ reason: classifyError(cause, "Failed to acquire connection for listen", "listen")
|
|
22
|
+
+ })
|
|
23
|
+
+ }),
|
|
24
|
+
+ (client) =>
|
|
25
|
+
+ Effect.promise(() => {
|
|
26
|
+
+ client.off("error", onListenClientError)
|
|
27
|
+
+ return client.end()
|
|
28
|
+
+ }).pipe(
|
|
29
|
+
+ Effect.timeoutOption(1000)
|
|
30
|
+
+ )
|
|
31
|
+
+ )
|
|
32
|
+
+ })
|
|
33
|
+
*** Add File: packages/sql/pg/test/Listen.test.ts
|
|
34
|
+
+import { PgClient } from "@effect/sql-pg"
|
|
35
|
+
+import { assert, it } from "@effect/vitest"
|
|
36
|
+
+import { Effect, Fiber, Option, Stream } from "effect"
|
|
37
|
+
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
|
|
38
|
+
+import * as Pg from "pg"
|
|
39
|
+
+import { PgContainer } from "./utils.ts"
|
|
40
|
+
+
|
|
41
|
+
+it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgClient listen", (it) => {
|
|
42
|
+
+ it.effect("uses a dedicated connection outside of the pool", () =>
|
|
43
|
+
+ Effect.scoped(
|
|
44
|
+
+ Effect.gen(function*() {
|
|
45
|
+
+ const container = yield* PgContainer
|
|
46
|
+
+ const pool = new Pg.Pool({
|
|
47
|
+
+ connectionString: container.getConnectionUri(),
|
|
48
|
+
+ max: 1,
|
|
49
|
+
+ application_name: "@effect/sql-pg-test-listen"
|
|
50
|
+
+ })
|
|
51
|
+
+ yield* Effect.addFinalizer(() => Effect.promise(() => pool.end()))
|
|
52
|
+
+
|
|
53
|
+
+ const client = yield* PgClient.fromPool({
|
|
54
|
+
+ acquire: Effect.succeed(pool)
|
|
55
|
+
+ }).pipe(
|
|
56
|
+
+ Effect.provide(Reactivity.layer)
|
|
57
|
+
+ )
|
|
58
|
+
+
|
|
59
|
+
+ const channel = \`listen_\${Date.now()}_\${Math.random().toString(36).slice(2)}\`
|
|
60
|
+
+ const listener = yield* client.listen(channel).pipe(
|
|
61
|
+
+ Stream.take(1),
|
|
62
|
+
+ Stream.runHead,
|
|
63
|
+
+ Effect.forkScoped
|
|
64
|
+
+ )
|
|
65
|
+
+
|
|
66
|
+
+ yield* Effect.sleep(200)
|
|
67
|
+
+ assert.strictEqual(pool.totalCount, 0)
|
|
68
|
+
+
|
|
69
|
+
+ const rows = yield* client<{ value: number }>(\`SELECT 1 AS value\`).pipe(
|
|
70
|
+
+ Effect.timeoutFail({
|
|
71
|
+
+ duration: "3 seconds",
|
|
72
|
+
+ onTimeout: () => new Error("query timed out while listen was active")
|
|
73
|
+
+ })
|
|
74
|
+
+ )
|
|
75
|
+
+ assert.deepEqual(rows, [{ value: 1 }])
|
|
76
|
+
+
|
|
77
|
+
+ yield* client.notify(channel, "payload")
|
|
78
|
+
+ const message = yield* Fiber.join(listener)
|
|
79
|
+
+ assert.deepEqual(message, Option.some("payload"))
|
|
80
|
+
+ })
|
|
81
|
+
+ ))
|
|
82
|
+
+})
|
|
83
|
+
*** Add File: .changeset/ten-pens-rule.md
|
|
84
|
+
+---
|
|
85
|
+
+"@effect/sql-pg": patch
|
|
86
|
+
+---
|
|
87
|
+
+
|
|
88
|
+
+Change \`PgClient.listen\` to use a dedicated PostgreSQL connection instead of reserving one from the pool.
|
|
89
|
+
*** End Patch`
|
|
90
|
+
console.log(await applyPatch(patch))
|