@danielfgray/pg-sourcerer 0.1.5 → 0.1.8
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/dist/cli.js +48 -2
- package/dist/cli.js.map +1 -1
- package/package.json +14 -14
package/dist/cli.js
CHANGED
|
@@ -14,6 +14,7 @@ import { NodeContext, NodeRuntime } from "@effect/platform-node";
|
|
|
14
14
|
import { Console, Effect } from "effect";
|
|
15
15
|
import { runGenerate } from "./generate.js";
|
|
16
16
|
import { runInit } from "./init.js";
|
|
17
|
+
import packageJson from "../package.json" with { type: "json" };
|
|
17
18
|
// ============================================================================
|
|
18
19
|
// Options
|
|
19
20
|
// ============================================================================
|
|
@@ -91,13 +92,58 @@ const initCommand = Command.make("init", {}, () => runInit);
|
|
|
91
92
|
// ============================================================================
|
|
92
93
|
// Root Command
|
|
93
94
|
// ============================================================================
|
|
94
|
-
|
|
95
|
+
// Root command runs generate by default (which triggers init if no config)
|
|
96
|
+
const rootCommand = Command.make("pgsourcerer", { configPath, outputDir, dryRun }, args => {
|
|
97
|
+
const opts = {
|
|
98
|
+
dryRun: args.dryRun,
|
|
99
|
+
};
|
|
100
|
+
if (args.configPath._tag === "Some") {
|
|
101
|
+
opts.configPath = args.configPath.value;
|
|
102
|
+
}
|
|
103
|
+
if (args.outputDir._tag === "Some") {
|
|
104
|
+
opts.outputDir = args.outputDir.value;
|
|
105
|
+
}
|
|
106
|
+
const logSuccess = (result) => {
|
|
107
|
+
const written = result.writeResults.filter(r => r.written).length;
|
|
108
|
+
const total = result.writeResults.length;
|
|
109
|
+
const suffix = args.dryRun ? " (dry run)" : "";
|
|
110
|
+
return Console.log(`\n✓ Generated ${args.dryRun ? total : written} files${suffix}`);
|
|
111
|
+
};
|
|
112
|
+
return Effect.gen(function* () {
|
|
113
|
+
const result = yield* runGenerate(opts);
|
|
114
|
+
yield* logSuccess(result);
|
|
115
|
+
}).pipe(Effect.catchTag("ConfigNotFound", error => Effect.gen(function* () {
|
|
116
|
+
yield* Console.error(`\n✗ No config file found`);
|
|
117
|
+
yield* Console.error(` Searched: ${error.searchPaths.join(", ")}`);
|
|
118
|
+
const initResult = yield* runInit.pipe(Effect.map(() => true), Effect.catchAll(() => Effect.succeed(false)));
|
|
119
|
+
if (!initResult) {
|
|
120
|
+
return yield* Effect.fail(error);
|
|
121
|
+
}
|
|
122
|
+
})), Effect.catchAll((error) => Effect.gen(function* () {
|
|
123
|
+
yield* Console.error(`\n✗ Error: ${error._tag}`);
|
|
124
|
+
yield* Console.error(` ${error.message}`);
|
|
125
|
+
if (error._tag === "ConfigInvalid") {
|
|
126
|
+
for (const e of error.errors) {
|
|
127
|
+
yield* Console.error(` - ${e}`);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
else if (error._tag === "PluginConfigInvalid") {
|
|
131
|
+
for (const e of error.errors) {
|
|
132
|
+
yield* Console.error(` - ${e}`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
else if (error._tag === "CapabilityCycle") {
|
|
136
|
+
yield* Console.error(` Cycle: ${error.cycle.join(" → ")}`);
|
|
137
|
+
}
|
|
138
|
+
yield* Effect.fail(error);
|
|
139
|
+
})));
|
|
140
|
+
}).pipe(Command.withSubcommands([generateCommand, initCommand]));
|
|
95
141
|
// ============================================================================
|
|
96
142
|
// CLI App
|
|
97
143
|
// ============================================================================
|
|
98
144
|
const cli = Command.run(rootCommand, {
|
|
99
145
|
name: "pgsourcerer",
|
|
100
|
-
version:
|
|
146
|
+
version: packageJson.version,
|
|
101
147
|
});
|
|
102
148
|
// Run with Node.js platform
|
|
103
149
|
cli(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;GASG;AACH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAU,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAsB,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@danielfgray/pg-sourcerer",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.8",
|
|
4
4
|
"description": "PostgreSQL code generation framework with a plugin ecosystem",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"LICENSE"
|
|
25
25
|
],
|
|
26
26
|
"scripts": {
|
|
27
|
-
"build": "tsc",
|
|
27
|
+
"build": "tsc && chmod +x dist/cli.js",
|
|
28
28
|
"build:watch": "tsc --watch",
|
|
29
29
|
"clean": "rm -rf dist",
|
|
30
30
|
"prepublishOnly": "bun run clean && bun run build",
|
|
@@ -53,22 +53,22 @@
|
|
|
53
53
|
"license": "MIT",
|
|
54
54
|
"author": "Daniel Gray",
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@effect/cli": "
|
|
57
|
-
"@effect/platform": "
|
|
58
|
-
"@effect/platform-node": "
|
|
59
|
-
"effect": "
|
|
56
|
+
"@effect/cli": "^0.73.0",
|
|
57
|
+
"@effect/platform": "^0.94.1",
|
|
58
|
+
"@effect/platform-node": "^0.104.0",
|
|
59
|
+
"effect": "^3.19.14",
|
|
60
60
|
"lilconfig": "^3.1.3",
|
|
61
|
-
"pg": "
|
|
62
|
-
"postgres": "
|
|
63
|
-
"@danielfgray/pg-introspection": "
|
|
61
|
+
"pg": "^8.16.0",
|
|
62
|
+
"postgres": "^3.4.7",
|
|
63
|
+
"@danielfgray/pg-introspection": "1.0.0",
|
|
64
64
|
"recast": "^0.23.11"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@effect/vitest": "
|
|
68
|
-
"@types/bun": "
|
|
69
|
-
"@types/pg": "
|
|
67
|
+
"@effect/vitest": "^0.27.0",
|
|
68
|
+
"@types/bun": "^1.1.14",
|
|
69
|
+
"@types/pg": "^8.15.4",
|
|
70
70
|
"@vitest/coverage-v8": "3.2.4",
|
|
71
|
-
"typescript": "
|
|
72
|
-
"vitest": "
|
|
71
|
+
"typescript": "^5.7.2",
|
|
72
|
+
"vitest": "^3.2.4"
|
|
73
73
|
}
|
|
74
74
|
}
|