@effect/sql-mysql2 0.27.1 → 0.29.0

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.
@@ -24,6 +24,7 @@ Object.keys(Migrator).forEach(function (key) {
24
24
  });
25
25
  });
26
26
  var Effect = _interopRequireWildcard(require("effect/Effect"));
27
+ var _Function = require("effect/Function");
27
28
  var Layer = _interopRequireWildcard(require("effect/Layer"));
28
29
  var Redacted = _interopRequireWildcard(require("effect/Redacted"));
29
30
  var _MysqlClient = require("./MysqlClient.js");
@@ -59,9 +60,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
59
60
  */
60
61
  const run = exports.run = /*#__PURE__*/Migrator.make({
61
62
  dumpSchema(path, table) {
62
- const mysqlDump = args => Effect.gen(function* (_) {
63
+ const mysqlDump = args => Effect.gen(function* () {
63
64
  const sql = yield* _MysqlClient.MysqlClient;
64
- const dump = yield* _(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
65
+ const dump = yield* (0, _Function.pipe)(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
65
66
  PATH: globalThis.process?.env.PATH,
66
67
  MYSQL_HOST: sql.config.host,
67
68
  MYSQL_TCP_PORT: sql.config.port?.toString(),
@@ -77,14 +78,14 @@ const run = exports.run = /*#__PURE__*/Migrator.make({
77
78
  const dumpAll = Effect.map(Effect.all([dumpSchema, dumpMigrations], {
78
79
  concurrency: 2
79
80
  }), ([schema, migrations]) => schema + "\n\n" + migrations);
80
- const dumpFile = file => Effect.gen(function* (_) {
81
- const fs = yield* _(_FileSystem.FileSystem);
82
- const path = yield* _(_Path.Path);
83
- const dump = yield* _(dumpAll);
84
- yield* _(fs.makeDirectory(path.dirname(file), {
81
+ const dumpFile = file => Effect.gen(function* () {
82
+ const fs = yield* _FileSystem.FileSystem;
83
+ const path = yield* _Path.Path;
84
+ const dump = yield* dumpAll;
85
+ yield* fs.makeDirectory(path.dirname(file), {
85
86
  recursive: true
86
- }));
87
- yield* _(fs.writeFileString(file, dump));
87
+ });
88
+ yield* fs.writeFileString(file, dump);
88
89
  }).pipe(Effect.mapError(error => new Migrator.MigrationError({
89
90
  reason: "failed",
90
91
  message: error.message
@@ -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","Layer","Redacted","_MysqlClient","_FileSystem2","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","dumpSchema","path","table","mysqlDump","args","gen","_","sql","MysqlClient","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","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","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","MysqlClient","dump","pipe","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","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;AACvC,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,CAuDzE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,WACZ,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,CAuDzE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,WACZ,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"}
@@ -6,6 +6,7 @@ import { FileSystem } from "@effect/platform/FileSystem";
6
6
  import { Path } from "@effect/platform/Path";
7
7
  import * as Migrator from "@effect/sql/Migrator";
8
8
  import * as Effect from "effect/Effect";
9
+ import { pipe } from "effect/Function";
9
10
  import * as Layer from "effect/Layer";
10
11
  import * as Redacted from "effect/Redacted";
11
12
  import { MysqlClient } from "./MysqlClient.js";
@@ -23,9 +24,9 @@ export * from "@effect/sql/Migrator/FileSystem";
23
24
  */
24
25
  export const run = /*#__PURE__*/Migrator.make({
25
26
  dumpSchema(path, table) {
26
- const mysqlDump = args => Effect.gen(function* (_) {
27
+ const mysqlDump = args => Effect.gen(function* () {
27
28
  const sql = yield* MysqlClient;
28
- const dump = yield* _(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
29
+ const dump = yield* pipe(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
29
30
  PATH: globalThis.process?.env.PATH,
30
31
  MYSQL_HOST: sql.config.host,
31
32
  MYSQL_TCP_PORT: sql.config.port?.toString(),
@@ -41,14 +42,14 @@ export const run = /*#__PURE__*/Migrator.make({
41
42
  const dumpAll = Effect.map(Effect.all([dumpSchema, dumpMigrations], {
42
43
  concurrency: 2
43
44
  }), ([schema, migrations]) => schema + "\n\n" + migrations);
44
- const dumpFile = file => Effect.gen(function* (_) {
45
- const fs = yield* _(FileSystem);
46
- const path = yield* _(Path);
47
- const dump = yield* _(dumpAll);
48
- yield* _(fs.makeDirectory(path.dirname(file), {
45
+ const dumpFile = file => Effect.gen(function* () {
46
+ const fs = yield* FileSystem;
47
+ const path = yield* Path;
48
+ const dump = yield* dumpAll;
49
+ yield* fs.makeDirectory(path.dirname(file), {
49
50
  recursive: true
50
- }));
51
- yield* _(fs.writeFileString(file, dump));
51
+ });
52
+ yield* fs.writeFileString(file, dump);
52
53
  }).pipe(Effect.mapError(error => new Migrator.MigrationError({
53
54
  reason: "failed",
54
55
  message: error.message
@@ -1 +1 @@
1
- {"version":3,"file":"MysqlMigrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","Redacted","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","_","sql","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","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","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","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.27.1",
3
+ "version": "0.29.0",
4
4
  "description": "A MySQL toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -14,10 +14,10 @@
14
14
  "mysql2": "^3.11.0"
15
15
  },
16
16
  "peerDependencies": {
17
- "@effect/experimental": "^0.37.1",
18
- "@effect/platform": "^0.73.1",
19
- "@effect/sql": "^0.26.1",
20
- "effect": "^3.12.4"
17
+ "@effect/experimental": "^0.39.0",
18
+ "@effect/platform": "^0.75.0",
19
+ "@effect/sql": "^0.28.0",
20
+ "effect": "^3.12.6"
21
21
  },
22
22
  "publishConfig": {
23
23
  "provenance": true
@@ -9,6 +9,7 @@ import * as Migrator from "@effect/sql/Migrator"
9
9
  import type * as Client from "@effect/sql/SqlClient"
10
10
  import type { SqlError } from "@effect/sql/SqlError"
11
11
  import * as Effect from "effect/Effect"
12
+ import { pipe } from "effect/Function"
12
13
  import * as Layer from "effect/Layer"
13
14
  import * as Redacted from "effect/Redacted"
14
15
  import { MysqlClient } from "./MysqlClient.js"
@@ -36,9 +37,9 @@ export const run: <R2 = never>(
36
37
  > = Migrator.make({
37
38
  dumpSchema(path, table) {
38
39
  const mysqlDump = (args: Array<string>) =>
39
- Effect.gen(function*(_) {
40
+ Effect.gen(function*() {
40
41
  const sql = yield* MysqlClient
41
- const dump = yield* _(
42
+ const dump = yield* pipe(
42
43
  Command.make(
43
44
  "mysqldump",
44
45
  ...(sql.config.username ? ["-u", sql.config.username] : []),
@@ -75,12 +76,12 @@ export const run: <R2 = never>(
75
76
  )
76
77
 
77
78
  const dumpFile = (file: string) =>
78
- Effect.gen(function*(_) {
79
- const fs = yield* _(FileSystem)
80
- const path = yield* _(Path)
81
- const dump = yield* _(dumpAll)
82
- yield* _(fs.makeDirectory(path.dirname(file), { recursive: true }))
83
- yield* _(fs.writeFileString(file, dump))
79
+ Effect.gen(function*() {
80
+ const fs = yield* FileSystem
81
+ const path = yield* Path
82
+ const dump = yield* dumpAll
83
+ yield* fs.makeDirectory(path.dirname(file), { recursive: true })
84
+ yield* fs.writeFileString(file, dump)
84
85
  }).pipe(
85
86
  Effect.mapError((error) => new Migrator.MigrationError({ reason: "failed", message: error.message }))
86
87
  )