@deterministic-code/datasources-cli 0.1.15 → 0.1.16

package/dist/wireRegister.js

@@ -22,12 +22,21 @@ pub mod repositories;
 pub use repositories::${rustIdent(casing.convertFileName("repository_registry"))}::Repositories;
 `;
 };
-const cargoWithCtor = (cargo) => /^\s*ctor\s*=/m.test(cargo) ? void 0 : cargo.includes("[dependencies]") ? cargo.replace("[dependencies]", `[dependencies]
-ctor = "0.4"`) : `${cargo.trimEnd()}
+const rustCargoLine = (cargo, name, line) => new RegExp(`^\\s*${name}\\s*=`, "m").test(cargo) ? void 0 : line;
+const cargoWithCtor = (cargo) => {
+  const add = [
+    rustCargoLine(cargo, "ctor", 'ctor = "0.4"'),
+    rustCargoLine(cargo, "tokio", 'tokio = { version = "1", features = ["macros", "rt-multi-thread"] }')
+  ].filter((line) => line !== void 0);
+  if (add.length === 0) return void 0;
+  const block = add.join("\n");
+  return cargo.includes("[dependencies]") ? cargo.replace("[dependencies]", `[dependencies]
+${block}`) : `${cargo.trimEnd()}
 
 [dependencies]
-ctor = "0.4"
+${block}
 `;
+};
 const attached = (dialect, entry, entryPath, hook) => dialect === "typescript" ? entry.includes("datasources-register") ? void 0 : `import "${specFrom(entryPath, hook)}";
 ${entry}` : entry.includes("datasources_register") ? void 0 : `mod datasources_register;
 use datasources_register::Repositories;

package/dist/wireRustProviders.js

@@ -1,5 +1,18 @@
 import { dirname, join } from "node:path";
 import { catalog } from "./catalog.js";
+const rustDriver = {
+  json: "JsonDriver",
+  memory: "MemoryDriver",
+  sqlite: "SqliteDriver",
+  xml: "XmlDriver",
+  yaml: "YamlDriver",
+  mysql: "MysqlDriver",
+  sqlserver: "SqlServerDriver",
+  postgres: "PostgresDriver",
+  oracle: "OracleDriver",
+  mongodb: "MongoDbDriver",
+  dynamodb: "DynamoDbDriver"
+};
 const optional = async (fs, path) => {
   try {
     return await fs.readFile(path);
@@ -15,10 +28,25 @@ const firstFile = async (fs, cwd, names) => {
   }
   return void 0;
 };
-const rustBindContents = (names) => names.map((name) => `use ${catalog[name].cargo.replaceAll("-", "_")} as _;
-`).join("");
-const attachedProviders = (entry) => entry.includes("datasources_providers") ? void 0 : `mod datasources_providers;
+const rustBindContents = (names) => `pub fn register() {
+${names.map((name) => {
+  const crate = catalog[name].cargo.replaceAll("-", "_");
+  return `    datasources::register("${name}", std::sync::Arc::new(${crate}::${rustDriver[name]}));`;
+}).join("\n")}
+}
+`;
+const withMod = (entry) => entry.includes("datasources_providers") ? entry : `mod datasources_providers;
 ${entry}`;
+const withRegisterCall = (entry) => {
+  if (entry.includes("datasources_providers::register()")) return entry;
+  const main = /((?:async\s+)?fn\s+main\s*\([^)]*\)(?:\s*->\s*[^{]+)?\s*)\{(\s*)/;
+  return entry.replace(main, (_, sig, ws) => `${sig}{
+    datasources_providers::register();${ws === "" ? "\n" : ws}`);
+};
+const attachedProviders = (entry) => {
+  const next = withRegisterCall(withMod(entry));
+  return next === entry ? void 0 : next;
+};
 const wireRustProviders = async (cwd, names, dryRun, deps) => {
   const entry = await firstFile(deps.fs, cwd, ["src/lib.rs", "src/main.rs", "lib.rs", "main.rs"]);
   const bind = join(entry ? dirname(entry.path) : cwd, "datasources_providers.rs");

package/node_modules/@deterministic-code/datasources-code-generators/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-code-generators",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "bin": {
     "datasources": "./bin/datasources.mjs"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources-code-generators": "0.1.15",
+    "@deterministic-code/datasources-code-generators": "0.1.16",
     "@deterministic-code/generators-common": "0.0.1",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/typescript-generators": "0.0.1",