@effect/sql-clickhouse 0.46.0 → 4.0.0-beta.1

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.
Files changed (33) hide show
  1. package/dist/{dts/ClickhouseClient.d.ts → ClickhouseClient.d.ts} +16 -18
  2. package/dist/ClickhouseClient.d.ts.map +1 -0
  3. package/dist/{esm/ClickhouseClient.js → ClickhouseClient.js} +50 -42
  4. package/dist/ClickhouseClient.js.map +1 -0
  5. package/dist/{dts/ClickhouseMigrator.d.ts → ClickhouseMigrator.d.ts} +4 -8
  6. package/dist/ClickhouseMigrator.d.ts.map +1 -0
  7. package/dist/{esm/ClickhouseMigrator.js → ClickhouseMigrator.js} +2 -9
  8. package/dist/ClickhouseMigrator.js.map +1 -0
  9. package/dist/index.d.ts +12 -0
  10. package/dist/index.d.ts.map +1 -0
  11. package/dist/{esm/index.js → index.js} +4 -0
  12. package/dist/index.js.map +1 -0
  13. package/package.json +51 -51
  14. package/src/ClickhouseClient.ts +85 -82
  15. package/src/ClickhouseMigrator.ts +4 -9
  16. package/src/index.ts +8 -2
  17. package/ClickhouseClient/package.json +0 -6
  18. package/ClickhouseMigrator/package.json +0 -6
  19. package/dist/cjs/ClickhouseClient.js +0 -278
  20. package/dist/cjs/ClickhouseClient.js.map +0 -1
  21. package/dist/cjs/ClickhouseMigrator.js +0 -60
  22. package/dist/cjs/ClickhouseMigrator.js.map +0 -1
  23. package/dist/cjs/index.js +0 -12
  24. package/dist/cjs/index.js.map +0 -1
  25. package/dist/dts/ClickhouseClient.d.ts.map +0 -1
  26. package/dist/dts/ClickhouseMigrator.d.ts.map +0 -1
  27. package/dist/dts/index.d.ts +0 -9
  28. package/dist/dts/index.d.ts.map +0 -1
  29. package/dist/esm/ClickhouseClient.js.map +0 -1
  30. package/dist/esm/ClickhouseMigrator.js.map +0 -1
  31. package/dist/esm/index.js.map +0 -1
  32. package/dist/esm/package.json +0 -4
  33. package/index/package.json +0 -6
@@ -2,28 +2,26 @@
2
2
  * @since 1.0.0
3
3
  */
4
4
  import * as Clickhouse from "@clickhouse/client";
5
- import * as Reactivity from "@effect/experimental/Reactivity";
6
- import * as Client from "@effect/sql/SqlClient";
7
- import { SqlError } from "@effect/sql/SqlError";
8
- import * as Statement from "@effect/sql/Statement";
9
5
  import * as Config from "effect/Config";
10
- import type { ConfigError } from "effect/ConfigError";
11
- import * as Context from "effect/Context";
12
6
  import * as Effect from "effect/Effect";
13
- import * as FiberRef from "effect/FiberRef";
14
7
  import * as Layer from "effect/Layer";
15
8
  import type * as Scope from "effect/Scope";
9
+ import * as ServiceMap from "effect/ServiceMap";
10
+ import * as Reactivity from "effect/unstable/reactivity/Reactivity";
11
+ import * as Client from "effect/unstable/sql/SqlClient";
12
+ import { SqlError } from "effect/unstable/sql/SqlError";
13
+ import * as Statement from "effect/unstable/sql/Statement";
16
14
  import type { Readable } from "node:stream";
17
15
  /**
18
16
  * @category type ids
19
17
  * @since 1.0.0
20
18
  */
21
- export declare const TypeId: unique symbol;
19
+ export declare const TypeId: TypeId;
22
20
  /**
23
21
  * @category type ids
24
22
  * @since 1.0.0
25
23
  */
26
- export type TypeId = typeof TypeId;
24
+ export type TypeId = "~@effect/sql-clickhouse/ClickhouseClient";
27
25
  /**
28
26
  * @category models
29
27
  * @since 1.0.0
@@ -51,7 +49,7 @@ export interface ClickhouseClient extends Client.SqlClient {
51
49
  * @category tags
52
50
  * @since 1.0.0
53
51
  */
54
- export declare const ClickhouseClient: Context.Tag<ClickhouseClient, ClickhouseClient>;
52
+ export declare const ClickhouseClient: ServiceMap.Service<ClickhouseClient, ClickhouseClient>;
55
53
  /**
56
54
  * @category constructors
57
55
  * @since 1.0.0
@@ -67,30 +65,30 @@ export interface ClickhouseClientConfig extends Clickhouse.ClickHouseClientConfi
67
65
  */
68
66
  export declare const make: (options: ClickhouseClientConfig) => Effect.Effect<ClickhouseClient, SqlError, Scope.Scope | Reactivity.Reactivity>;
69
67
  /**
70
- * @category fiber refs
68
+ * @category References
71
69
  * @since 1.0.0
72
70
  */
73
- export declare const currentClientMethod: FiberRef.FiberRef<"query" | "command" | "insert">;
71
+ export declare const ClientMethod: ServiceMap.Reference<"query" | "command" | "insert">;
74
72
  /**
75
- * @category fiber refs
73
+ * @category References
76
74
  * @since 1.0.0
77
75
  */
78
- export declare const currentQueryId: FiberRef.FiberRef<string | undefined>;
76
+ export declare const QueryId: ServiceMap.Reference<string | undefined>;
79
77
  /**
80
- * @category fiber refs
78
+ * @category References
81
79
  * @since 1.0.0
82
80
  */
83
- export declare const currentClickhouseSettings: FiberRef.FiberRef<NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>>;
81
+ export declare const ClickhouseSettings: ServiceMap.Reference<NonNullable<Clickhouse.BaseQueryParams["clickhouse_settings"]>>;
84
82
  /**
85
83
  * @category layers
86
84
  * @since 1.0.0
87
85
  */
88
- export declare const layerConfig: (config: Config.Config.Wrap<ClickhouseClientConfig>) => Layer.Layer<ClickhouseClient | Client.SqlClient, ConfigError | SqlError>;
86
+ export declare const layerConfig: (config: Config.Wrap<ClickhouseClientConfig>) => Layer.Layer<ClickhouseClient | Client.SqlClient, Config.ConfigError | SqlError>;
89
87
  /**
90
88
  * @category layers
91
89
  * @since 1.0.0
92
90
  */
93
- export declare const layer: (config: ClickhouseClientConfig) => Layer.Layer<ClickhouseClient | Client.SqlClient, ConfigError | SqlError>;
91
+ export declare const layer: (config: ClickhouseClientConfig) => Layer.Layer<ClickhouseClient | Client.SqlClient, Config.ConfigError | SqlError>;
94
92
  /**
95
93
  * @category compiler
96
94
  * @since 1.0.0
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ClickhouseClient.d.ts","sourceRoot":"","sources":["../src/ClickhouseClient.ts"],"names":[],"mappings":"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"}
@@ -2,21 +2,19 @@
2
2
  * @since 1.0.0
3
3
  */
4
4
  import * as Clickhouse from "@clickhouse/client";
5
- import * as Reactivity from "@effect/experimental/Reactivity";
6
5
  import * as NodeStream from "@effect/platform-node/NodeStream";
7
- import * as Client from "@effect/sql/SqlClient";
8
- import { SqlError } from "@effect/sql/SqlError";
9
- import * as Statement from "@effect/sql/Statement";
10
- import * as Chunk from "effect/Chunk";
11
6
  import * as Config from "effect/Config";
12
- import * as Context from "effect/Context";
13
7
  import * as Duration from "effect/Duration";
14
8
  import * as Effect from "effect/Effect";
15
- import * as FiberRef from "effect/FiberRef";
9
+ import * as Fiber from "effect/Fiber";
16
10
  import { dual } from "effect/Function";
17
- import { globalValue } from "effect/GlobalValue";
18
11
  import * as Layer from "effect/Layer";
12
+ import * as ServiceMap from "effect/ServiceMap";
19
13
  import * as Stream from "effect/Stream";
14
+ import * as Reactivity from "effect/unstable/reactivity/Reactivity";
15
+ import * as Client from "effect/unstable/sql/SqlClient";
16
+ import { SqlError } from "effect/unstable/sql/SqlError";
17
+ import * as Statement from "effect/unstable/sql/Statement";
20
18
  import * as Crypto from "node:crypto";
21
19
  const ATTR_DB_SYSTEM_NAME = "db.system.name";
22
20
  const ATTR_DB_NAMESPACE = "db.namespace";
@@ -24,12 +22,12 @@ const ATTR_DB_NAMESPACE = "db.namespace";
24
22
  * @category type ids
25
23
  * @since 1.0.0
26
24
  */
27
- export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-clickhouse/ClickhouseClient");
25
+ export const TypeId = "~@effect/sql-clickhouse/ClickhouseClient";
28
26
  /**
29
27
  * @category tags
30
28
  * @since 1.0.0
31
29
  */
32
- export const ClickhouseClient = /*#__PURE__*/Context.GenericTag("@effect/sql-clickhouse/ClickhouseClient");
30
+ export const ClickhouseClient = /*#__PURE__*/ServiceMap.Service("@effect/sql-clickhouse/ClickhouseClient");
33
31
  /**
34
32
  * @category constructors
35
33
  * @since 1.0.0
@@ -46,12 +44,12 @@ export const make = options => Effect.gen(function* () {
46
44
  cause,
47
45
  message: "ClickhouseClient: Failed to connect"
48
46
  })
49
- }), () => Effect.promise(() => client.close())).pipe(Effect.timeoutFail({
47
+ }), () => Effect.promise(() => client.close())).pipe(Effect.timeoutOrElse({
50
48
  duration: Duration.seconds(5),
51
- onTimeout: () => new SqlError({
49
+ onTimeout: () => Effect.fail(new SqlError({
52
50
  message: "ClickhouseClient: Connection timeout",
53
51
  cause: new Error("connection timeout")
54
- })
52
+ }))
55
53
  }));
56
54
  class ConnectionImpl {
57
55
  conn;
@@ -63,11 +61,11 @@ export const make = options => Effect.gen(function* () {
63
61
  for (let i = 0; i < params.length; i++) {
64
62
  paramsObj[`p${i + 1}`] = params[i];
65
63
  }
66
- return Effect.withFiberRuntime(fiber => {
67
- const method = fiber.getFiberRef(currentClientMethod);
68
- return Effect.async(resume => {
69
- const queryId = fiber.getFiberRef(currentQueryId) ?? Crypto.randomUUID();
70
- const settings = fiber.getFiberRef(currentClickhouseSettings) ?? {};
64
+ return Effect.withFiber(fiber => {
65
+ const method = fiber.getRef(ClientMethod);
66
+ return Effect.callback(resume => {
67
+ const queryId = fiber.getRef(QueryId) ?? Crypto.randomUUID();
68
+ const settings = fiber.getRef(ClickhouseSettings);
71
69
  const controller = new AbortController();
72
70
  if (method === "command") {
73
71
  this.conn.command({
@@ -127,10 +125,13 @@ export const make = options => Effect.gen(function* () {
127
125
  if (!("stream" in result)) {
128
126
  return Stream.empty;
129
127
  }
130
- return NodeStream.fromReadable(() => result.stream(), cause => new SqlError({
131
- cause,
132
- message: "Failed to execute stream"
133
- }));
128
+ return NodeStream.fromReadable({
129
+ evaluate: () => result.stream(),
130
+ onError: cause => new SqlError({
131
+ cause,
132
+ message: "Failed to execute stream"
133
+ })
134
+ });
134
135
  }), Stream.unwrap, Stream.chunks, Stream.mapEffect(chunk => {
135
136
  const promises = [];
136
137
  for (const rows of chunk) {
@@ -139,13 +140,13 @@ export const make = options => Effect.gen(function* () {
139
140
  }
140
141
  }
141
142
  return Effect.tryPromise({
142
- try: () => Promise.all(promises).then(rows => Chunk.unsafeFromArray(transformRows ? transformRows(rows) : rows)),
143
+ try: () => Promise.all(promises).then(rows => transformRows ? transformRows(rows) : rows),
143
144
  catch: cause => new SqlError({
144
145
  cause,
145
146
  message: "Failed to parse row"
146
147
  })
147
148
  });
148
- }), Stream.flattenChunks);
149
+ }), Stream.flattenIterable);
149
150
  }
150
151
  }
151
152
  const connection = new ConnectionImpl(client);
@@ -159,15 +160,16 @@ export const make = options => Effect.gen(function* () {
159
160
  [TypeId]: TypeId,
160
161
  config: options,
161
162
  param(dataType, value) {
162
- return clickhouseParam(dataType, value);
163
+ return Statement.fragment([clickhouseParam(dataType, value)]);
163
164
  },
164
165
  asCommand(effect) {
165
- return Effect.locally(effect, currentClientMethod, "command");
166
+ return Effect.provideService(effect, ClientMethod, "command");
166
167
  },
167
168
  insertQuery(options) {
168
- return Effect.withFiberRuntime(fiber => Effect.async(resume => {
169
- const queryId = fiber.getFiberRef(currentQueryId) ?? Crypto.randomUUID();
170
- const settings = fiber.getFiberRef(currentClickhouseSettings);
169
+ return Effect.callback(resume => {
170
+ const fiber = Fiber.getCurrent();
171
+ const queryId = fiber.getRef(QueryId) ?? Crypto.randomUUID();
172
+ const settings = fiber.getRef(ClickhouseSettings);
171
173
  const controller = new AbortController();
172
174
  client.insert({
173
175
  format: "JSONEachRow",
@@ -185,42 +187,48 @@ export const make = options => Effect.gen(function* () {
185
187
  query: `KILL QUERY WHERE query_id = '${queryId}'`
186
188
  }));
187
189
  });
188
- }));
190
+ });
189
191
  },
190
- withQueryId: dual(2, (effect, queryId) => Effect.locally(effect, currentQueryId, queryId)),
191
- withClickhouseSettings: dual(2, (effect, settings) => Effect.locally(effect, currentClickhouseSettings, settings))
192
+ withQueryId: dual(2, (effect, queryId) => Effect.provideService(effect, QueryId, queryId)),
193
+ withClickhouseSettings: dual(2, (effect, settings) => Effect.provideService(effect, ClickhouseSettings, settings))
192
194
  });
193
195
  });
194
196
  /**
195
- * @category fiber refs
197
+ * @category References
196
198
  * @since 1.0.0
197
199
  */
198
- export const currentClientMethod = /*#__PURE__*/globalValue("@effect/sql-clickhouse/ClickhouseClient/currentClientMethod", () => FiberRef.unsafeMake("query"));
200
+ export const ClientMethod = /*#__PURE__*/ServiceMap.Reference("@effect/sql-clickhouse/ClickhouseClient/ClientMethod", {
201
+ defaultValue: () => "query"
202
+ });
199
203
  /**
200
- * @category fiber refs
204
+ * @category References
201
205
  * @since 1.0.0
202
206
  */
203
- export const currentQueryId = /*#__PURE__*/globalValue("@effect/sql-clickhouse/ClickhouseClient/currentQueryId", () => FiberRef.unsafeMake(undefined));
207
+ export const QueryId = /*#__PURE__*/ServiceMap.Reference("@effect/sql-clickhouse/ClickhouseClient/QueryId", {
208
+ defaultValue: () => undefined
209
+ });
204
210
  /**
205
- * @category fiber refs
211
+ * @category References
206
212
  * @since 1.0.0
207
213
  */
208
- export const currentClickhouseSettings = /*#__PURE__*/globalValue("@effect/sql-clickhouse/ClickhouseClient/currentClickhouseSettings", () => FiberRef.unsafeMake({}));
214
+ export const ClickhouseSettings = /*#__PURE__*/ServiceMap.Reference("@effect/sql-clickhouse/ClickhouseClient/ClickhouseSettings", {
215
+ defaultValue: () => ({})
216
+ });
209
217
  /**
210
218
  * @category layers
211
219
  * @since 1.0.0
212
220
  */
213
- export const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
221
+ export const layerConfig = config => Layer.effectServices(Config.unwrap(config).asEffect().pipe(Effect.flatMap(make), Effect.map(client => ServiceMap.make(ClickhouseClient, client).pipe(ServiceMap.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
214
222
  /**
215
223
  * @category layers
216
224
  * @since 1.0.0
217
225
  */
218
- export const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(ClickhouseClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
226
+ export const layer = config => Layer.effectServices(Effect.map(make(config), client => ServiceMap.make(ClickhouseClient, client).pipe(ServiceMap.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
219
227
  const typeFromUnknown = value => {
220
228
  if (Statement.isFragment(value)) {
221
229
  return typeFromUnknown(value.segments[0]);
222
230
  } else if (isClickhouseParam(value)) {
223
- return value.i0;
231
+ return value.paramA;
224
232
  } else if (Array.isArray(value)) {
225
233
  return `Array(${typeFromUnknown(value[0])})`;
226
234
  }
@@ -256,7 +264,7 @@ export const makeCompiler = transform => Statement.makeCompiler({
256
264
  return ["", []];
257
265
  },
258
266
  onCustom(type, placeholder) {
259
- return [placeholder(type), [type.i1]];
267
+ return [placeholder(type), [type.paramB]];
260
268
  }
261
269
  });
262
270
  // compiler helpers
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ClickhouseClient.js","names":["Clickhouse","NodeStream","Config","Duration","Effect","Fiber","dual","Layer","ServiceMap","Stream","Reactivity","Client","SqlError","Statement","Crypto","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","TypeId","ClickhouseClient","Service","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","client","createClient","acquireRelease","tryPromise","try","exec","query","catch","cause","message","promise","close","pipe","timeoutOrElse","duration","seconds","onTimeout","fail","Error","ConnectionImpl","conn","constructor","runRaw","sql","params","format","paramsObj","i","length","withFiber","fiber","method","getRef","ClientMethod","callback","resume","queryId","QueryId","randomUUID","settings","ClickhouseSettings","controller","AbortController","command","query_params","abort_signal","signal","query_id","clickhouse_settings","then","result","succeed","suspend","abort","run","flatMap","json","data","execute","map","executeRaw","executeValues","executeUnprepared","executeStream","empty","fromReadable","evaluate","stream","onError","unwrap","chunks","mapEffect","chunk","promises","rows","row","push","Promise","all","flattenIterable","connection","Object","assign","acquirer","spanAttributes","entries","database","beginTransaction","config","param","dataType","value","fragment","clickhouseParam","asCommand","effect","provideService","insertQuery","getCurrent","insert","withQueryId","withClickhouseSettings","Reference","defaultValue","layerConfig","effectServices","asEffect","add","SqlClient","provide","layer","typeFromUnknown","isFragment","segments","isClickhouseParam","paramA","Array","isArray","Date","transform","dialect","placeholder","u","onIdentifier","withoutTransform","escape","onRecordUpdate","onCustom","type","paramB","defaultEscape","custom","isCustom"],"sources":["../src/ClickhouseClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,19 +1,15 @@
1
1
  /**
2
2
  * @since 1.0.0
3
3
  */
4
- import * as Migrator from "@effect/sql/Migrator";
5
- import type * as Client from "@effect/sql/SqlClient";
6
- import type { SqlError } from "@effect/sql/SqlError";
7
4
  import type * as Effect from "effect/Effect";
8
5
  import * as Layer from "effect/Layer";
6
+ import * as Migrator from "effect/unstable/sql/Migrator";
7
+ import type * as Client from "effect/unstable/sql/SqlClient";
8
+ import type { SqlError } from "effect/unstable/sql/SqlError";
9
9
  /**
10
10
  * @since 1.0.0
11
11
  */
12
- export * from "@effect/sql/Migrator";
13
- /**
14
- * @since 1.0.0
15
- */
16
- export * from "@effect/sql/Migrator/FileSystem";
12
+ export * from "effect/unstable/sql/Migrator";
17
13
  /**
18
14
  * @category constructor
19
15
  * @since 1.0.0
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ClickhouseMigrator.d.ts","sourceRoot":"","sources":["../src/ClickhouseMigrator.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D;;GAEG;AACH,cAAc,8BAA8B,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAC7D,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,MAAM,CAAC,SAAS,GAAG,EAAE,CACF,CAAA;AAErB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,EACrB,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACnC,KAAK,CAAC,KAAK,CACZ,KAAK,EACL,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,MAAM,CAAC,SAAS,GAAG,CAAC,CACgB,CAAA"}
@@ -1,16 +1,9 @@
1
- /**
2
- * @since 1.0.0
3
- */
4
- import * as Migrator from "@effect/sql/Migrator";
5
1
  import * as Layer from "effect/Layer";
2
+ import * as Migrator from "effect/unstable/sql/Migrator";
6
3
  /**
7
4
  * @since 1.0.0
8
5
  */
9
- export * from "@effect/sql/Migrator";
10
- /**
11
- * @since 1.0.0
12
- */
13
- export * from "@effect/sql/Migrator/FileSystem";
6
+ export * from "effect/unstable/sql/Migrator";
14
7
  /**
15
8
  * @category constructor
16
9
  * @since 1.0.0
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ClickhouseMigrator.js","names":["Layer","Migrator","run","make","layer","options","effectDiscard"],"sources":["../src/ClickhouseMigrator.ts"],"sourcesContent":[null],"mappings":"AAIA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,QAAQ,MAAM,8BAA8B;AAIxD;;;AAGA,cAAc,8BAA8B;AAE5C;;;;AAIA,OAAO,MAAMC,GAAG,gBAMZD,QAAQ,CAACE,IAAI,CAAC,EAAE,CAAC;AAErB;;;;AAIA,OAAO,MAAMC,KAAK,GAChBC,OAAoC,IAKjCL,KAAK,CAACM,aAAa,CAACJ,GAAG,CAACG,OAAO,CAAC,CAAC","ignoreList":[]}
@@ -0,0 +1,12 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ /**
5
+ * @since 1.0.0
6
+ */
7
+ export * as ClickhouseClient from "./ClickhouseClient.ts";
8
+ /**
9
+ * @since 1.0.0
10
+ */
11
+ export * as ClickhouseMigrator from "./ClickhouseMigrator.ts";
12
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;GAEG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AAEzD;;GAEG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA"}
@@ -1,3 +1,7 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ // @barrel: Auto-generated exports. Do not edit manually.
1
5
  /**
2
6
  * @since 1.0.0
3
7
  */
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","names":["ClickhouseClient","ClickhouseMigrator"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;AAEA;;;AAGA,OAAO,KAAKA,gBAAgB,MAAM,uBAAuB;AAEzD;;;AAGA,OAAO,KAAKC,kBAAkB,MAAM,yBAAyB","ignoreList":[]}
package/package.json CHANGED
@@ -1,65 +1,65 @@
1
1
  {
2
2
  "name": "@effect/sql-clickhouse",
3
- "version": "0.46.0",
4
- "description": "A Clickhouse toolkit for Effect",
3
+ "version": "4.0.0-beta.1",
4
+ "type": "module",
5
5
  "license": "MIT",
6
+ "description": "A Clickhouse toolkit for Effect",
7
+ "homepage": "https://effect.website",
6
8
  "repository": {
7
9
  "type": "git",
8
- "url": "https://github.com/Effect-TS/effect.git",
9
- "directory": "packages/sql-clickhouse"
10
+ "url": "https://github.com/Effect-TS/effect-smol.git",
11
+ "directory": "packages/sql/clickhouse"
10
12
  },
11
- "sideEffects": [],
12
- "homepage": "https://effect.website",
13
- "dependencies": {
14
- "@clickhouse/client": "^1.6.0"
13
+ "bugs": {
14
+ "url": "https://github.com/Effect-TS/effect-smol/issues"
15
15
  },
16
- "peerDependencies": {
17
- "@effect/experimental": "^0.58.0",
18
- "@effect/platform": "^0.94.0",
19
- "@effect/platform-node": "^0.104.0",
20
- "@effect/sql": "^0.49.0",
21
- "effect": "^3.19.13"
16
+ "tags": [
17
+ "typescript",
18
+ "sql",
19
+ "database"
20
+ ],
21
+ "keywords": [
22
+ "typescript",
23
+ "sql",
24
+ "database"
25
+ ],
26
+ "sideEffects": [],
27
+ "exports": {
28
+ "./package.json": "./package.json",
29
+ ".": "./dist/index.js",
30
+ "./*": "./dist/*.js",
31
+ "./internal/*": null,
32
+ "./*/index": null
22
33
  },
34
+ "files": [
35
+ "src/**/*.ts",
36
+ "dist/**/*.js",
37
+ "dist/**/*.js.map",
38
+ "dist/**/*.d.ts",
39
+ "dist/**/*.d.ts.map"
40
+ ],
23
41
  "publishConfig": {
42
+ "access": "public",
24
43
  "provenance": true
25
44
  },
26
- "main": "./dist/cjs/index.js",
27
- "module": "./dist/esm/index.js",
28
- "types": "./dist/dts/index.d.ts",
29
- "exports": {
30
- "./package.json": "./package.json",
31
- ".": {
32
- "types": "./dist/dts/index.d.ts",
33
- "import": "./dist/esm/index.js",
34
- "default": "./dist/cjs/index.js"
35
- },
36
- "./ClickhouseClient": {
37
- "types": "./dist/dts/ClickhouseClient.d.ts",
38
- "import": "./dist/esm/ClickhouseClient.js",
39
- "default": "./dist/cjs/ClickhouseClient.js"
40
- },
41
- "./ClickhouseMigrator": {
42
- "types": "./dist/dts/ClickhouseMigrator.d.ts",
43
- "import": "./dist/esm/ClickhouseMigrator.js",
44
- "default": "./dist/cjs/ClickhouseMigrator.js"
45
- },
46
- "./index": {
47
- "types": "./dist/dts/index.d.ts",
48
- "import": "./dist/esm/index.js",
49
- "default": "./dist/cjs/index.js"
50
- }
45
+ "devDependencies": {
46
+ "@effect/platform-node": "^4.0.0-beta.1",
47
+ "effect": "^4.0.0-beta.1"
48
+ },
49
+ "peerDependencies": {
50
+ "@effect/platform-node": "^4.0.0-beta.1",
51
+ "effect": "^4.0.0-beta.1"
52
+ },
53
+ "dependencies": {
54
+ "@clickhouse/client": "^1.16.0"
51
55
  },
52
- "typesVersions": {
53
- "*": {
54
- "ClickhouseClient": [
55
- "./dist/dts/ClickhouseClient.d.ts"
56
- ],
57
- "ClickhouseMigrator": [
58
- "./dist/dts/ClickhouseMigrator.d.ts"
59
- ],
60
- "index": [
61
- "./dist/dts/index.d.ts"
62
- ]
63
- }
56
+ "scripts": {
57
+ "codegen": "effect-utils codegen",
58
+ "build": "tsc -b tsconfig.json && pnpm babel",
59
+ "build:tsgo": "tsgo -b tsconfig.json && pnpm babel",
60
+ "babel": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
61
+ "check": "tsc -b tsconfig.json",
62
+ "test": "vitest",
63
+ "coverage": "vitest --coverage"
64
64
  }
65
65
  }