@effect/sql-d1 0.5.6 → 0.6.0

package/dist/cjs/D1Client.js

@@ -83,9 +83,10 @@ const make = options => Effect.gen(function* () {
         message: `Failed to execute statement`
       })
     });
-    const run = (sql, params = []) => Effect.flatMap(prepareCache.get(sql), s => runStatement(s, params));
-    const runRaw = (sql, params = []) => Effect.map(runStatement(db.prepare(sql), params), transformRows);
-    const runTransform = options.transformResultNames ? (sql, params) => Effect.map(run(sql, params), transformRows) : run;
+    const runRaw = (sql, params = []) => runStatement(db.prepare(sql), params);
+    const runCached = (sql, params = []) => Effect.flatMap(prepareCache.get(sql), s => runStatement(s, params));
+    const runUncached = (sql, params = []) => Effect.map(runRaw(sql, params), transformRows);
+    const runTransform = options.transformResultNames ? (sql, params) => Effect.map(runCached(sql, params), transformRows) : runCached;
     const runValues = (sql, params) => Effect.flatMap(prepareCache.get(sql), statement => Effect.tryPromise({
       try: () => {
         return statement.bind(...params).raw();
@@ -99,14 +100,17 @@ const make = options => Effect.gen(function* () {
       execute(sql, params) {
         return runTransform(sql, params);
       },
+      executeRaw(sql, params) {
+        return runRaw(sql, params);
+      },
       executeValues(sql, params) {
         return runValues(sql, params);
       },
       executeWithoutTransform(sql, params) {
-        return run(sql, params);
+        return runCached(sql, params);
       },
-      executeRaw(sql, params) {
-        return runRaw(sql, params);
+      executeUnprepared(sql, params) {
+        return runUncached(sql, params);
       },
       executeStream(_sql, _params) {
         return Effect.dieMessage("executeStream not implemented");

package/dist/cjs/D1Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"D1Client.js","names":["Client","_interopRequireWildcard","require","_SqlError","Statement","Otel","Cache","Config","Context","Duration","Effect","_Function","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","D1Client","GenericTag","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","cause","SqlError","message","runStatement","statement","params","tryPromise","response","bind","all","error","results","run","flatMap","s","runRaw","map","runTransform","runValues","raw","identity","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","connection","acquirer","succeed","transactionAcquirer","assign","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","layer","scopedContext","unwrap","pipe","client","add","SqlClient"],"sources":["../../src/D1Client.ts"],"sourcesContent":[null],"mappings":";;;;;;AAIA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAEA,IAAAC,SAAA,gBAAAD,OAAA;AACA,IAAAE,SAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,IAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AACA,IAAAI,KAAA,gBAAAL,uBAAA,eAAAC,OAAA;AACA,IAAAK,MAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAEA,IAAAM,OAAA,gBAAAP,uBAAA,eAAAC,OAAA;AACA,IAAAO,QAAA,gBAAAR,uBAAA,eAAAC,OAAA;AACA,IAAAQ,MAAA,gBAAAT,uBAAA,eAAAC,OAAA;AACA,IAAAS,SAAA,gBAAAT,OAAA;AACA,IAAAU,KAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAAqC,SAAAW,yBAAAC,CAAA;EAAA,yBAAAC,OAAA;EAAA,IAAAC,CAAA,OAAAD,OAAA;IAAAE,CAAA,OAAAF,OAAA;EAAA,QAAAF,wBAAA,YAAAA,CAAAC,CAAA;IAAA,OAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA;EAAA,GAAAF,CAAA;AAAA;AAAA,SAAAb,wBAAAa,CAAA,EAAAE,CAAA;EAAA,KAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA;EAAA,aAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA;IAAAK,OAAA,EAAAL;EAAA;EAAA,IAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA;EAAA,IAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA;EAAA,IAAAQ,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA;EAAA,SAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA;IAAA,IAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA;IAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA;EAAA;EAAA,OAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA;AAGrC;;;;AAIO,MAAMW,MAAM,GAAAC,OAAA,CAAAD,MAAA,gBAAkBE,MAAM,CAACC,GAAG,CAAC,yBAAyB,CAAC;AAoB1E;;;;AAIO,MAAMC,QAAQ,GAAAH,OAAA,CAAAG,QAAA,gBAAG7B,OAAO,CAAC8B,UAAU,CAAW,yBAAyB,CAAC;AAgB/E;;;;AAIO,MAAMC,IAAI,GACfC,OAAuB,IAEvB9B,MAAM,CAAC+B,GAAG,CAAC,aAAS;EAClB,MAAMC,QAAQ,GAAGtC,SAAS,CAACuC,kBAAkB,CAACH,OAAO,CAACI,mBAAmB,CAAC;EAC1E,MAAMC,aAAa,GAAGzC,SAAS,CAAC0C,iBAAiB,CAC/CN,OAAO,CAACO,oBAAqB,CAC9B,CAACC,KAAK;EAEP,MAAMC,cAAc,GAAGvC,MAAM,CAAC+B,GAAG,CAAC,aAAS;IACzC,MAAMS,EAAE,GAAGV,OAAO,CAACU,EAAE;IAErB,MAAMC,YAAY,GAAG,OAAO7C,KAAK,CAACiC,IAAI,CAAC;MACrCa,QAAQ,EAAEZ,OAAO,CAACa,gBAAgB,IAAI,GAAG;MACzCC,UAAU,EAAEd,OAAO,CAACe,eAAe,IAAI9C,QAAQ,CAAC+C,OAAO,CAAC,EAAE,CAAC;MAC3DC,MAAM,EAAGC,GAAW,IAClBhD,MAAM,CAACiD,GAAG,CAAC;QACTA,GAAG,EAAEA,CAAA,KAAMT,EAAE,CAACU,OAAO,CAACF,GAAG,CAAC;QAC1BG,KAAK,EAAGC,KAAK,IAAK,IAAI3D,SAAA,CAAA4D,QAAQ,CAAC;UAAED,KAAK;UAAEE,OAAO,EAAE;QAA6B,CAAE;OACjF;KACJ,CAAC;IAEF,MAAMC,YAAY,GAAGA,CACnBC,SAA8B,EAC9BC,MAAA,GAA6C,EAAE,KAE/CzD,MAAM,CAAC0D,UAAU,CAAC;MAChBT,GAAG,EAAE,MAAAA,CAAA,KAAW;QACd,MAAMU,QAAQ,GAAG,MAAMH,SAAS,CAACI,IAAI,CAAC,GAAGH,MAAM,CAAC,CAACI,GAAG,EAAE;QACtD,IAAIF,QAAQ,CAACG,KAAK,EAAE;UAClB,MAAMH,QAAQ,CAACG,KAAK;QACtB;QACA,OAAOH,QAAQ,CAACI,OAAO,IAAI,EAAE;MAC/B,CAAC;MACDZ,KAAK,EAAGC,KAAK,IAAK,IAAI3D,SAAA,CAAA4D,QAAQ,CAAC;QAAED,KAAK;QAAEE,OAAO,EAAE;MAA6B,CAAE;KACjF,CAAC;IAEJ,MAAMU,GAAG,GAAGA,CACVhB,GAAW,EACXS,MAAA,GAA6C,EAAE,KAC5CzD,MAAM,CAACiE,OAAO,CAACxB,YAAY,CAAC9B,GAAG,CAACqC,GAAG,CAAC,EAAGkB,CAAC,IAAKX,YAAY,CAACW,CAAC,EAAET,MAAM,CAAC,CAAC;IAE1E,MAAMU,MAAM,GAAGA,CACbnB,GAAW,EACXS,MAAA,GAA6C,EAAE,KAC5CzD,MAAM,CAACoE,GAAG,CAACb,YAAY,CAACf,EAAE,CAACU,OAAO,CAACF,GAAG,CAAC,EAAES,MAAM,CAAC,EAAEtB,aAAa,CAAC;IAErE,MAAMkC,YAAY,GAAGvC,OAAO,CAACO,oBAAoB,GAC7C,CAACW,GAAW,EAAES,MAA2C,KAAKzD,MAAM,CAACoE,GAAG,CAACJ,GAAG,CAAChB,GAAG,EAAES,MAAM,CAAC,EAAEtB,aAAa,CAAC,GACzG6B,GAAG;IAEP,MAAMM,SAAS,GAAGA,CAChBtB,GAAW,EACXS,MAA0C,KAE1CzD,MAAM,CAACiE,OAAO,CACZxB,YAAY,CAAC9B,GAAG,CAACqC,GAAG,CAAC,EACpBQ,SAAS,IACRxD,MAAM,CAAC0D,UAAU,CAAC;MAChBT,GAAG,EAAEA,CAAA,KAAK;QACR,OAAOO,SAAS,CAACI,IAAI,CAAC,GAAGH,MAAM,CAAC,CAACc,GAAG,EAInC;MACH,CAAC;MACDpB,KAAK,EAAGC,KAAK,IAAK,IAAI3D,SAAA,CAAA4D,QAAQ,CAAC;QAAED,KAAK;QAAEE,OAAO,EAAE;MAA6B,CAAE;KACjF,CAAC,CACL;IAEH,OAAO,IAAArD,SAAA,CAAAuE,QAAQ,EAAa;MAC1BC,OAAOA,CAACzB,GAAG,EAAES,MAAM;QACjB,OAAOY,YAAY,CAACrB,GAAG,EAAES,MAAM,CAAC;MAClC,CAAC;MACDiB,aAAaA,CAAC1B,GAAG,EAAES,MAAM;QACvB,OAAOa,SAAS,CAACtB,GAAG,EAAES,MAAM,CAAC;MAC/B,CAAC;MACDkB,uBAAuBA,CAAC3B,GAAG,EAAES,MAAM;QACjC,OAAOO,GAAG,CAAChB,GAAG,EAAES,MAAM,CAAC;MACzB,CAAC;MACDmB,UAAUA,CAAC5B,GAAG,EAAES,MAAM;QACpB,OAAOU,MAAM,CAACnB,GAAG,EAAES,MAAM,CAAC;MAC5B,CAAC;MACDoB,aAAaA,CAACC,IAAI,EAAEC,OAAO;QACzB,OAAO/E,MAAM,CAACgF,UAAU,CAAC,+BAA+B,CAAC;MAC3D;KACD,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMC,UAAU,GAAG,OAAO1C,cAAc;EACxC,MAAM2C,QAAQ,GAAGlF,MAAM,CAACmF,OAAO,CAACF,UAAU,CAAC;EAC3C,MAAMG,mBAAmB,GAAGpF,MAAM,CAACgF,UAAU,CAAC,sCAAsC,CAAC;EAErF,OAAOjE,MAAM,CAACsE,MAAM,CAClB/F,MAAM,CAACuC,IAAI,CAAC;IACVqD,QAAQ;IACRlD,QAAQ;IACRoD,mBAAmB;IACnBE,cAAc,EAAE,CACd,IAAIxD,OAAO,CAACwD,cAAc,GAAGvE,MAAM,CAACwE,OAAO,CAACzD,OAAO,CAACwD,cAAc,CAAC,GAAG,EAAE,CAAC,EACzE,CAAC3F,IAAI,CAAC6F,kBAAkB,EAAE7F,IAAI,CAAC8F,qBAAqB,CAAC;GAExD,CAAa,EACd;IACE,CAAClE,MAAM,GAAGA,MAAgB;IAC1BmE,MAAM,EAAE5D;GACT,CACF;AACH,CAAC,CAAC;AAEJ;;;;AAAAN,OAAA,CAAAK,IAAA,GAAAA,IAAA;AAIO,MAAM8D,KAAK,GAChBD,MAA0C,IAE1CxF,KAAK,CAAC0F,aAAa,CACjB/F,MAAM,CAACgG,MAAM,CAACH,MAAM,CAAC,CAACI,IAAI,CACxB9F,MAAM,CAACiE,OAAO,CAACpC,IAAI,CAAC,EACpB7B,MAAM,CAACoE,GAAG,CAAE2B,MAAM,IAChBjG,OAAO,CAAC+B,IAAI,CAACF,QAAQ,EAAEoE,MAAM,CAAC,CAACD,IAAI,CACjChG,OAAO,CAACkG,GAAG,CAAC1G,MAAM,CAAC2G,SAAS,EAAEF,MAAM,CAAC,CACtC,CACF,CACF,CACF;AAAAvE,OAAA,CAAAmE,KAAA,GAAAA,KAAA","ignoreList":[]}
+{"version":3,"file":"D1Client.js","names":["Client","_interopRequireWildcard","require","_SqlError","Statement","Otel","Cache","Config","Context","Duration","Effect","_Function","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","D1Client","GenericTag","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","cause","SqlError","message","runStatement","statement","params","tryPromise","response","bind","all","error","results","runRaw","runCached","flatMap","s","runUncached","map","runTransform","runValues","raw","identity","execute","executeRaw","executeValues","executeWithoutTransform","executeUnprepared","executeStream","_sql","_params","dieMessage","connection","acquirer","succeed","transactionAcquirer","assign","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","layer","scopedContext","unwrap","pipe","client","add","SqlClient"],"sources":["../../src/D1Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dts/D1Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"D1Client.d.ts","sourceRoot":"","sources":["../../src/D1Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,2BAA2B,CAAA;AAChF,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAM/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAA8C,CAAA;AAE1E;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,MAAM,WAAW,QAAS,SAAQ,MAAM,CAAC,SAAS;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;IAE/B,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,iCAA0D,CAAA;AAE/E;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,cAAc,KACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CA0GzC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KACzC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,WAAW,CAUpD,CAAA"}
+{"version":3,"file":"D1Client.d.ts","sourceRoot":"","sources":["../../src/D1Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,2BAA2B,CAAA;AAChF,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAM/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAA8C,CAAA;AAE1E;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,MAAM,WAAW,QAAS,SAAQ,MAAM,CAAC,SAAS;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;IAE/B,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,iCAA0D,CAAA;AAE/E;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,cAAc,KACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAmHzC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KACzC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,WAAW,CAUpD,CAAA"}

package/dist/esm/D1Client.js

@@ -52,9 +52,10 @@ export const make = options => Effect.gen(function* () {
         message: `Failed to execute statement`
       })
     });
-    const run = (sql, params = []) => Effect.flatMap(prepareCache.get(sql), s => runStatement(s, params));
-    const runRaw = (sql, params = []) => Effect.map(runStatement(db.prepare(sql), params), transformRows);
-    const runTransform = options.transformResultNames ? (sql, params) => Effect.map(run(sql, params), transformRows) : run;
+    const runRaw = (sql, params = []) => runStatement(db.prepare(sql), params);
+    const runCached = (sql, params = []) => Effect.flatMap(prepareCache.get(sql), s => runStatement(s, params));
+    const runUncached = (sql, params = []) => Effect.map(runRaw(sql, params), transformRows);
+    const runTransform = options.transformResultNames ? (sql, params) => Effect.map(runCached(sql, params), transformRows) : runCached;
     const runValues = (sql, params) => Effect.flatMap(prepareCache.get(sql), statement => Effect.tryPromise({
       try: () => {
         return statement.bind(...params).raw();
@@ -68,14 +69,17 @@ export const make = options => Effect.gen(function* () {
       execute(sql, params) {
         return runTransform(sql, params);
       },
+      executeRaw(sql, params) {
+        return runRaw(sql, params);
+      },
       executeValues(sql, params) {
         return runValues(sql, params);
       },
       executeWithoutTransform(sql, params) {
-        return run(sql, params);
+        return runCached(sql, params);
       },
-      executeRaw(sql, params) {
-        return runRaw(sql, params);
+      executeUnprepared(sql, params) {
+        return runUncached(sql, params);
       },
       executeStream(_sql, _params) {
         return Effect.dieMessage("executeStream not implemented");

package/dist/esm/D1Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"D1Client.js","names":["Client","SqlError","Statement","Otel","Cache","Config","Context","Duration","Effect","identity","Layer","TypeId","Symbol","for","D1Client","GenericTag","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","cause","message","runStatement","statement","params","tryPromise","response","bind","all","error","results","run","flatMap","get","s","runRaw","map","runTransform","runValues","raw","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","connection","acquirer","succeed","transactionAcquirer","Object","assign","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","layer","scopedContext","unwrap","pipe","client","add","SqlClient"],"sources":["../../src/D1Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"D1Client.js","names":["Client","SqlError","Statement","Otel","Cache","Config","Context","Duration","Effect","identity","Layer","TypeId","Symbol","for","D1Client","GenericTag","make","options","gen","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","cause","message","runStatement","statement","params","tryPromise","response","bind","all","error","results","runRaw","runCached","flatMap","get","s","runUncached","map","runTransform","runValues","raw","execute","executeRaw","executeValues","executeWithoutTransform","executeUnprepared","executeStream","_sql","_params","dieMessage","connection","acquirer","succeed","transactionAcquirer","Object","assign","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","layer","scopedContext","unwrap","pipe","client","add","SqlClient"],"sources":["../../src/D1Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-d1",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "A Cloudflare D1 integration for Effect",
   "license": "MIT",
   "repository": {
@@ -10,13 +10,13 @@
   },
   "sideEffects": [],
   "dependencies": {
-    "@cloudflare/workers-types": "^4.20240712.0",
+    "@cloudflare/workers-types": "^4.20240806.0",
     "@opentelemetry/semantic-conventions": "^1.24.1"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.61.7",
-    "@effect/sql": "^0.8.6",
-    "effect": "^3.6.2"
+    "@effect/platform": "^0.62.0",
+    "effect": "^3.6.4",
+    "@effect/sql": "^0.9.0"
   },
   "publishConfig": {
     "provenance": true

package/src/D1Client.ts

@@ -102,19 +102,25 @@ export const make = (
           catch: (cause) => new SqlError({ cause, message: `Failed to execute statement` })
         })
 
-      const run = (
+      const runRaw = (
+        sql: string,
+        params: ReadonlyArray<Statement.Primitive> = []
+      ) => runStatement(db.prepare(sql), params)
+
+      const runCached = (
         sql: string,
         params: ReadonlyArray<Statement.Primitive> = []
       ) => Effect.flatMap(prepareCache.get(sql), (s) => runStatement(s, params))
 
-      const runRaw = (
+      const runUncached = (
         sql: string,
         params: ReadonlyArray<Statement.Primitive> = []
-      ) => Effect.map(runStatement(db.prepare(sql), params), transformRows)
+      ) => Effect.map(runRaw(sql, params), transformRows)
 
       const runTransform = options.transformResultNames
-        ? (sql: string, params?: ReadonlyArray<Statement.Primitive>) => Effect.map(run(sql, params), transformRows)
-        : run
+        ? (sql: string, params?: ReadonlyArray<Statement.Primitive>) =>
+          Effect.map(runCached(sql, params), transformRows)
+        : runCached
 
       const runValues = (
         sql: string,
@@ -139,14 +145,17 @@ export const make = (
         execute(sql, params) {
           return runTransform(sql, params)
         },
+        executeRaw(sql, params) {
+          return runRaw(sql, params)
+        },
         executeValues(sql, params) {
           return runValues(sql, params)
         },
         executeWithoutTransform(sql, params) {
-          return run(sql, params)
+          return runCached(sql, params)
         },
-        executeRaw(sql, params) {
-          return runRaw(sql, params)
+        executeUnprepared(sql, params) {
+          return runUncached(sql, params)
         },
         executeStream(_sql, _params) {
           return Effect.dieMessage("executeStream not implemented")