@effect/sql-mysql2 0.47.0 → 0.47.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.
@@ -61,7 +61,13 @@ const run = exports.run = /*#__PURE__*/Migrator.make({
61
61
  dumpSchema(path, table) {
62
62
  const mysqlDump = args => Effect.gen(function* () {
63
63
  const sql = yield* _MysqlClient.MysqlClient;
64
- const dump = yield* (0, _Function.pipe)(Command.make("mysqldump", ...(sql.config.host ? ["-h", sql.config.host] : []), ...(sql.config.port ? ["-P", sql.config.port.toString()] : []), ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
64
+ const url = sql.config.url ? new URL(Redacted.value(sql.config.url)) : undefined;
65
+ const host = url?.hostname ?? sql.config.host;
66
+ const port = url?.port ?? sql.config.port?.toString();
67
+ const username = url?.username ?? sql.config.username;
68
+ const password = url?.password ? Redacted.make(url.password) : sql.config.password;
69
+ const database = url?.pathname?.slice(1) ?? sql.config.database;
70
+ const dump = yield* (0, _Function.pipe)(Command.make("mysqldump", ...(host ? ["-h", host] : []), ...(port ? ["-P", port] : []), ...(username ? ["-u", username] : []), ...(password ? [`-p${Redacted.value(password)}`] : []), ...(database ? [database] : []), "--skip-comments", "--compact", ...args), Command.env({
65
71
  PATH: globalThis.process?.env.PATH
66
72
  }), Command.string);
67
73
  return dump.replace(/^\/\*.*$/gm, "").replace(/\n{2,}/gm, "\n\n").trim();
@@ -1 +1 @@
1
- {"version":3,"file":"MysqlMigrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","_Function","Layer","Redacted","_MysqlClient","_FileSystem2","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","MysqlClient","dump","pipe","config","host","port","toString","username","password","value","database","env","PATH","globalThis","process","string","replace","trim","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"MysqlMigrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","_Function","Layer","Redacted","_MysqlClient","_FileSystem2","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","MysqlClient","url","config","URL","value","undefined","host","hostname","port","toString","username","password","database","pathname","slice","dump","pipe","env","PATH","globalThis","process","string","replace","trim","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"MysqlMigrator.d.ts","sourceRoot":"","sources":["../../src/MysqlMigrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;GAEG;AACH,cAAc,iCAAiC,CAAA;AAE/C;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAClC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,UAAU,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,GAAG,EAAE,CAqDzE,CAAA;AAEF;;;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,WAAW,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC,CACpC,CAAA"}
1
+ {"version":3,"file":"MysqlMigrator.d.ts","sourceRoot":"","sources":["../../src/MysqlMigrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;GAEG;AACH,cAAc,iCAAiC,CAAA;AAE/C;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAClC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,UAAU,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,GAAG,EAAE,CA8DzE,CAAA;AAEF;;;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,WAAW,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC,CACpC,CAAA"}
@@ -26,7 +26,13 @@ export const run = /*#__PURE__*/Migrator.make({
26
26
  dumpSchema(path, table) {
27
27
  const mysqlDump = args => Effect.gen(function* () {
28
28
  const sql = yield* MysqlClient;
29
- const dump = yield* pipe(Command.make("mysqldump", ...(sql.config.host ? ["-h", sql.config.host] : []), ...(sql.config.port ? ["-P", sql.config.port.toString()] : []), ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
29
+ const url = sql.config.url ? new URL(Redacted.value(sql.config.url)) : undefined;
30
+ const host = url?.hostname ?? sql.config.host;
31
+ const port = url?.port ?? sql.config.port?.toString();
32
+ const username = url?.username ?? sql.config.username;
33
+ const password = url?.password ? Redacted.make(url.password) : sql.config.password;
34
+ const database = url?.pathname?.slice(1) ?? sql.config.database;
35
+ const dump = yield* pipe(Command.make("mysqldump", ...(host ? ["-h", host] : []), ...(port ? ["-P", port] : []), ...(username ? ["-u", username] : []), ...(password ? [`-p${Redacted.value(password)}`] : []), ...(database ? [database] : []), "--skip-comments", "--compact", ...args), Command.env({
30
36
  PATH: globalThis.process?.env.PATH
31
37
  }), Command.string);
32
38
  return dump.replace(/^\/\*.*$/gm, "").replace(/\n{2,}/gm, "\n\n").trim();
@@ -1 +1 @@
1
- {"version":3,"file":"MysqlMigrator.js","names":["Command","FileSystem","Path","Migrator","Effect","pipe","Layer","Redacted","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","dump","config","host","port","toString","username","password","value","database","env","PATH","globalThis","process","string","replace","trim","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"MysqlMigrator.js","names":["Command","FileSystem","Path","Migrator","Effect","pipe","Layer","Redacted","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","url","config","URL","value","undefined","host","hostname","port","toString","username","password","database","pathname","slice","dump","env","PATH","globalThis","process","string","replace","trim","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/sql-mysql2",
3
- "version": "0.47.0",
3
+ "version": "0.47.1",
4
4
  "description": "A MySQL toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -15,9 +15,9 @@
15
15
  },
16
16
  "peerDependencies": {
17
17
  "@effect/experimental": "^0.56.0",
18
- "@effect/platform": "^0.92.0",
18
+ "@effect/platform": "^0.92.1",
19
19
  "@effect/sql": "^0.46.0",
20
- "effect": "^3.18.0"
20
+ "effect": "^3.18.5"
21
21
  },
22
22
  "publishConfig": {
23
23
  "provenance": true
@@ -39,14 +39,23 @@ export const run: <R2 = never>(
39
39
  const mysqlDump = (args: Array<string>) =>
40
40
  Effect.gen(function*() {
41
41
  const sql = yield* MysqlClient
42
+
43
+ const url = sql.config.url ? new URL(Redacted.value(sql.config.url)) : undefined
44
+
45
+ const host = url?.hostname ?? sql.config.host
46
+ const port = url?.port ?? sql.config.port?.toString()
47
+ const username = url?.username ?? sql.config.username
48
+ const password = url?.password ? Redacted.make(url.password) : sql.config.password
49
+ const database = url?.pathname?.slice(1) ?? sql.config.database
50
+
42
51
  const dump = yield* pipe(
43
52
  Command.make(
44
53
  "mysqldump",
45
- ...(sql.config.host ? ["-h", sql.config.host] : []),
46
- ...(sql.config.port ? ["-P", sql.config.port.toString()] : []),
47
- ...(sql.config.username ? ["-u", sql.config.username] : []),
48
- ...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []),
49
- ...(sql.config.database ? [sql.config.database] : []),
54
+ ...(host ? ["-h", host] : []),
55
+ ...(port ? ["-P", port] : []),
56
+ ...(username ? ["-u", username] : []),
57
+ ...(password ? [`-p${Redacted.value(password)}`] : []),
58
+ ...(database ? [database] : []),
50
59
  "--skip-comments",
51
60
  "--compact",
52
61
  ...args