@ragestudio/scylla-odm 0.22.3 → 0.22.5
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/client.js +4 -5
- package/client.js.map +1 -1
- package/driver/client.js +1 -9
- package/driver/index.js +0 -4
- package/driver/requests.js +2 -3
- package/package.json +1 -1
package/client.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
//@ts-ignore
|
|
2
1
|
import path from "node:path";
|
|
3
|
-
|
|
4
|
-
import
|
|
2
|
+
import { Client as CassandraClient } from "./driver/index.js";
|
|
3
|
+
import { mapping } from "./driver/mapping/index.js";
|
|
5
4
|
import Model from "./model/index.js";
|
|
6
5
|
import Logger from "./logger/index.js";
|
|
7
6
|
import loadModels from "./utils/loadModels.js";
|
|
@@ -41,7 +40,7 @@ export class Client {
|
|
|
41
40
|
if (this.config.pooling) {
|
|
42
41
|
clientOptions.pooling = this.config.pooling;
|
|
43
42
|
}
|
|
44
|
-
this.driver = new
|
|
43
|
+
this.driver = new CassandraClient(clientOptions);
|
|
45
44
|
}
|
|
46
45
|
config;
|
|
47
46
|
driver;
|
|
@@ -60,7 +59,7 @@ export class Client {
|
|
|
60
59
|
throw new Error(`Failed to load models: ${error.message}`);
|
|
61
60
|
}
|
|
62
61
|
models = models.filter((schema) => schema instanceof Model);
|
|
63
|
-
this.mapper = new
|
|
62
|
+
this.mapper = new mapping.Mapper(this.driver, {
|
|
64
63
|
models: buildMapper(models),
|
|
65
64
|
});
|
|
66
65
|
globalThis.__scylla_client = this;
|
package/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAMA,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/driver/client.js
CHANGED
|
@@ -30,7 +30,6 @@ import ControlConnection from "./control-connection.js"
|
|
|
30
30
|
import RequestHandler from "./request-handler.js"
|
|
31
31
|
import PrepareHandler from "./prepare-handler.js"
|
|
32
32
|
import promiseUtils from "./promise-utils.js"
|
|
33
|
-
import { description, version } from "../../package.json" with { type: "json" }
|
|
34
33
|
|
|
35
34
|
/**
|
|
36
35
|
* Max amount of pools being warmup in parallel, when warmup is enabled
|
|
@@ -500,14 +499,7 @@ Client.prototype._connect = async function () {
|
|
|
500
499
|
}
|
|
501
500
|
|
|
502
501
|
this.connecting = true
|
|
503
|
-
this.log(
|
|
504
|
-
"info",
|
|
505
|
-
util.format(
|
|
506
|
-
"Connecting to cluster using '%s' version %s",
|
|
507
|
-
description,
|
|
508
|
-
version,
|
|
509
|
-
),
|
|
510
|
-
)
|
|
502
|
+
this.log("info", util.format("Connecting to cluster"))
|
|
511
503
|
|
|
512
504
|
try {
|
|
513
505
|
await this.controlConnection.init()
|
package/driver/index.js
CHANGED
|
@@ -28,7 +28,6 @@ import concurrent from "./concurrent/index.js"
|
|
|
28
28
|
import { Token, TokenRange } from "./token.js"
|
|
29
29
|
import Metadata from "./metadata/index.js"
|
|
30
30
|
import Encoder from "./encoder.js"
|
|
31
|
-
import { version as pkgVersion } from "../../package.json" with { type: "json" }
|
|
32
31
|
|
|
33
32
|
export {
|
|
34
33
|
Client,
|
|
@@ -59,8 +58,6 @@ export function defaultOptions() {
|
|
|
59
58
|
return clientOptions.defaultOptions()
|
|
60
59
|
}
|
|
61
60
|
|
|
62
|
-
export const version = pkgVersion
|
|
63
|
-
|
|
64
61
|
const _default = {
|
|
65
62
|
Client,
|
|
66
63
|
ExecutionProfile,
|
|
@@ -75,7 +72,6 @@ const _default = {
|
|
|
75
72
|
metadata,
|
|
76
73
|
Encoder,
|
|
77
74
|
defaultOptions,
|
|
78
|
-
version,
|
|
79
75
|
}
|
|
80
76
|
|
|
81
77
|
export default _default
|
package/driver/requests.js
CHANGED
|
@@ -22,7 +22,6 @@ import { FrameWriter } from "./writers.js"
|
|
|
22
22
|
import types from "./types/index.js"
|
|
23
23
|
import utils from "./utils.js"
|
|
24
24
|
import { ExecutionOptions } from "./execution-options.js"
|
|
25
|
-
import pkg from "../../package.json" with { type: "json" }
|
|
26
25
|
|
|
27
26
|
/**
|
|
28
27
|
* Options for the execution of the query / prepared statement
|
|
@@ -361,8 +360,8 @@ class StartupRequest extends Request {
|
|
|
361
360
|
|
|
362
361
|
const startupOptions = {
|
|
363
362
|
CQL_VERSION: this.options.cqlVersion || "3.0.0",
|
|
364
|
-
DRIVER_NAME:
|
|
365
|
-
DRIVER_VERSION:
|
|
363
|
+
DRIVER_NAME: "scylla-odm",
|
|
364
|
+
DRIVER_VERSION: "0.1.0",
|
|
366
365
|
}
|
|
367
366
|
|
|
368
367
|
if (this.options.noCompact) {
|