@executor-js/cli 0.2.5 → 0.2.6
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/README.md +3 -1
- package/dist/index.js +9 -56
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -4,4 +4,6 @@ Minimal command-line entrypoint for Executor projects.
|
|
|
4
4
|
|
|
5
5
|
Schema generation and migrations are owned by FumaDB now. Hosts should build a
|
|
6
6
|
FumaDB client from `collectTables(plugins)` and use FumaDB's adapter/migrator
|
|
7
|
-
APIs directly instead of generating Executor-specific storage adapters.
|
|
7
|
+
APIs directly instead of generating Executor-specific storage adapters. Plugins
|
|
8
|
+
persist through Executor's host-owned storage facades rather than contributing
|
|
9
|
+
tables.
|
package/dist/index.js
CHANGED
|
@@ -4,64 +4,17 @@
|
|
|
4
4
|
import { Command as Command2 } from "commander";
|
|
5
5
|
|
|
6
6
|
// src/commands/schema.ts
|
|
7
|
-
import { existsSync
|
|
7
|
+
import { existsSync } from "fs";
|
|
8
8
|
import fs from "fs/promises";
|
|
9
|
-
import
|
|
9
|
+
import path from "path";
|
|
10
10
|
import { Command } from "commander";
|
|
11
11
|
import { collectTables } from "@executor-js/sdk/core";
|
|
12
|
-
|
|
13
|
-
// src/utils/get-config.ts
|
|
14
|
-
import { existsSync } from "fs";
|
|
15
|
-
import path from "path";
|
|
16
|
-
import { createJiti } from "jiti";
|
|
17
|
-
var defaultPaths = [
|
|
18
|
-
"executor.config.ts",
|
|
19
|
-
"executor.config.js",
|
|
20
|
-
"src/executor.config.ts",
|
|
21
|
-
"src/executor.config.js"
|
|
22
|
-
];
|
|
23
|
-
var getConfig = async (opts) => {
|
|
24
|
-
const { cwd, configPath } = opts;
|
|
25
|
-
let resolvedPath;
|
|
26
|
-
if (configPath) {
|
|
27
|
-
resolvedPath = path.resolve(cwd, configPath);
|
|
28
|
-
if (!existsSync(resolvedPath)) {
|
|
29
|
-
console.error(`Config file not found: ${resolvedPath}`);
|
|
30
|
-
return null;
|
|
31
|
-
}
|
|
32
|
-
} else {
|
|
33
|
-
for (const p of defaultPaths) {
|
|
34
|
-
const candidate = path.resolve(cwd, p);
|
|
35
|
-
if (existsSync(candidate)) {
|
|
36
|
-
resolvedPath = candidate;
|
|
37
|
-
break;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
if (!resolvedPath) return null;
|
|
42
|
-
const jiti = createJiti(cwd, {
|
|
43
|
-
interopDefault: true,
|
|
44
|
-
moduleCache: false
|
|
45
|
-
});
|
|
46
|
-
const mod = await jiti.import(resolvedPath);
|
|
47
|
-
const config = mod.default ?? mod;
|
|
48
|
-
return config;
|
|
49
|
-
};
|
|
50
|
-
|
|
51
|
-
// src/commands/schema.ts
|
|
52
12
|
var schemaGenerateAction = async (opts) => {
|
|
53
|
-
const cwd =
|
|
54
|
-
if (!
|
|
13
|
+
const cwd = path.resolve(opts.cwd);
|
|
14
|
+
if (!existsSync(cwd)) {
|
|
55
15
|
console.error(`The directory "${cwd}" does not exist.`);
|
|
56
16
|
process.exit(1);
|
|
57
17
|
}
|
|
58
|
-
const config = await getConfig({ cwd, configPath: opts.config });
|
|
59
|
-
if (!config) {
|
|
60
|
-
console.error(
|
|
61
|
-
"No configuration file found. Add an `executor.config.ts` file to your project or pass the path using the `--config` flag."
|
|
62
|
-
);
|
|
63
|
-
process.exit(1);
|
|
64
|
-
}
|
|
65
18
|
if (opts.adapter !== "drizzle") {
|
|
66
19
|
console.error(`Unsupported schema adapter "${opts.adapter}". Supported adapters: drizzle.`);
|
|
67
20
|
process.exit(1);
|
|
@@ -79,7 +32,7 @@ var schemaGenerateAction = async (opts) => {
|
|
|
79
32
|
]);
|
|
80
33
|
const schema2 = fumaSchema({
|
|
81
34
|
version: opts.version,
|
|
82
|
-
tables: collectTables(
|
|
35
|
+
tables: collectTables()
|
|
83
36
|
});
|
|
84
37
|
const factory = fumadb({
|
|
85
38
|
namespace: opts.namespace,
|
|
@@ -92,13 +45,13 @@ var schemaGenerateAction = async (opts) => {
|
|
|
92
45
|
})
|
|
93
46
|
).generateSchema("latest", opts.namespace);
|
|
94
47
|
const output = opts.output ?? generated.path;
|
|
95
|
-
const outPath =
|
|
96
|
-
await fs.mkdir(
|
|
48
|
+
const outPath = path.resolve(cwd, output);
|
|
49
|
+
await fs.mkdir(path.dirname(outPath), { recursive: true });
|
|
97
50
|
await fs.writeFile(outPath, generated.code);
|
|
98
|
-
console.log(`Schema generated: ${
|
|
51
|
+
console.log(`Schema generated: ${path.relative(cwd, outPath)}`);
|
|
99
52
|
};
|
|
100
53
|
var schema = new Command("schema").description("Database schema utilities").addCommand(
|
|
101
|
-
new Command("generate").description("Generate
|
|
54
|
+
new Command("generate").description("Generate the ORM schema file for the executor's fixed table set").option("-c, --cwd <cwd>", "the working directory", process.cwd()).option("--output <output>", "output file path for the generated schema").option("--namespace <namespace>", "FumaDB namespace", "executor").option("--adapter <adapter>", "FumaDB adapter", "drizzle").option("--provider <provider>", "database provider", "postgresql").option("--version <version>", "FumaDB schema version", "1.0.0").action(schemaGenerateAction)
|
|
102
55
|
);
|
|
103
56
|
|
|
104
57
|
// src/index.ts
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/commands/schema.ts"
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/commands/schema.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { Command } from \"commander\";\nimport { schema } from \"./commands/schema.js\";\n\nprocess.on(\"SIGINT\", () => process.exit(0));\nprocess.on(\"SIGTERM\", () => process.exit(0));\n\nconst program = new Command(\"executor-sdk\")\n .version(\"0.0.1\")\n .description(\"Executor SDK CLI\")\n .addCommand(schema)\n .action(() => program.help());\n\nawait program.parseAsync();\n","import { existsSync } from \"node:fs\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { Command } from \"commander\";\nimport { collectTables } from \"@executor-js/sdk/core\";\n\n// The executor's table set is fixed and plugin-independent (`collectTables()`),\n// so schema generation needs no `executor.config.ts` — only the target ORM\n// namespace/adapter/provider. The same tables render per database via flags.\n\ntype SchemaGenerateOptions = {\n readonly cwd: string;\n readonly output?: string;\n readonly namespace: string;\n readonly adapter: string;\n readonly provider: string;\n readonly version: string;\n};\n\nconst schemaGenerateAction = async (opts: SchemaGenerateOptions) => {\n const cwd = path.resolve(opts.cwd);\n if (!existsSync(cwd)) {\n console.error(`The directory \"${cwd}\" does not exist.`);\n process.exit(1);\n }\n\n if (opts.adapter !== \"drizzle\") {\n console.error(`Unsupported schema adapter \"${opts.adapter}\". Supported adapters: drizzle.`);\n process.exit(1);\n }\n if (opts.provider !== \"mysql\" && opts.provider !== \"postgresql\" && opts.provider !== \"sqlite\") {\n console.error(\n `Unsupported drizzle provider \"${opts.provider}\". Supported providers: mysql, postgresql, sqlite.`,\n );\n process.exit(1);\n }\n\n const [{ fumadb }, { drizzleAdapter }, { schema: fumaSchema }] = await Promise.all([\n import(\"fumadb\"),\n import(\"fumadb/adapters/drizzle\"),\n import(\"fumadb/schema\"),\n ]);\n\n const schema = fumaSchema({\n version: opts.version,\n tables: collectTables(),\n });\n const factory = fumadb({\n namespace: opts.namespace,\n schemas: [schema],\n });\n const generated = factory\n .client(\n drizzleAdapter({\n db: {},\n provider: opts.provider,\n }),\n )\n .generateSchema(\"latest\", opts.namespace);\n\n const output = opts.output ?? generated.path;\n const outPath = path.resolve(cwd, output);\n await fs.mkdir(path.dirname(outPath), { recursive: true });\n await fs.writeFile(outPath, generated.code);\n console.log(`Schema generated: ${path.relative(cwd, outPath)}`);\n};\n\nexport const schema = new Command(\"schema\")\n .description(\"Database schema utilities\")\n .addCommand(\n new Command(\"generate\")\n .description(\"Generate the ORM schema file for the executor's fixed table set\")\n .option(\"-c, --cwd <cwd>\", \"the working directory\", process.cwd())\n .option(\"--output <output>\", \"output file path for the generated schema\")\n .option(\"--namespace <namespace>\", \"FumaDB namespace\", \"executor\")\n .option(\"--adapter <adapter>\", \"FumaDB adapter\", \"drizzle\")\n .option(\"--provider <provider>\", \"database provider\", \"postgresql\")\n .option(\"--version <version>\", \"FumaDB schema version\", \"1.0.0\")\n .action(schemaGenerateAction),\n );\n"],"mappings":";;;AAEA,SAAS,WAAAA,gBAAe;;;ACFxB,SAAS,kBAAkB;AAC3B,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,eAAe;AACxB,SAAS,qBAAqB;AAe9B,IAAM,uBAAuB,OAAO,SAAgC;AAClE,QAAM,MAAM,KAAK,QAAQ,KAAK,GAAG;AACjC,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,YAAQ,MAAM,kBAAkB,GAAG,mBAAmB;AACtD,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,MAAI,KAAK,YAAY,WAAW;AAC9B,YAAQ,MAAM,+BAA+B,KAAK,OAAO,iCAAiC;AAC1F,YAAQ,KAAK,CAAC;AAAA,EAChB;AACA,MAAI,KAAK,aAAa,WAAW,KAAK,aAAa,gBAAgB,KAAK,aAAa,UAAU;AAC7F,YAAQ;AAAA,MACN,iCAAiC,KAAK,QAAQ;AAAA,IAChD;AACA,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,CAAC,EAAE,OAAO,GAAG,EAAE,eAAe,GAAG,EAAE,QAAQ,WAAW,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACjF,OAAO,QAAQ;AAAA,IACf,OAAO,yBAAyB;AAAA,IAChC,OAAO,eAAe;AAAA,EACxB,CAAC;AAED,QAAMC,UAAS,WAAW;AAAA,IACxB,SAAS,KAAK;AAAA,IACd,QAAQ,cAAc;AAAA,EACxB,CAAC;AACD,QAAM,UAAU,OAAO;AAAA,IACrB,WAAW,KAAK;AAAA,IAChB,SAAS,CAACA,OAAM;AAAA,EAClB,CAAC;AACD,QAAM,YAAY,QACf;AAAA,IACC,eAAe;AAAA,MACb,IAAI,CAAC;AAAA,MACL,UAAU,KAAK;AAAA,IACjB,CAAC;AAAA,EACH,EACC,eAAe,UAAU,KAAK,SAAS;AAE1C,QAAM,SAAS,KAAK,UAAU,UAAU;AACxC,QAAM,UAAU,KAAK,QAAQ,KAAK,MAAM;AACxC,QAAM,GAAG,MAAM,KAAK,QAAQ,OAAO,GAAG,EAAE,WAAW,KAAK,CAAC;AACzD,QAAM,GAAG,UAAU,SAAS,UAAU,IAAI;AAC1C,UAAQ,IAAI,qBAAqB,KAAK,SAAS,KAAK,OAAO,CAAC,EAAE;AAChE;AAEO,IAAM,SAAS,IAAI,QAAQ,QAAQ,EACvC,YAAY,2BAA2B,EACvC;AAAA,EACC,IAAI,QAAQ,UAAU,EACnB,YAAY,iEAAiE,EAC7E,OAAO,mBAAmB,yBAAyB,QAAQ,IAAI,CAAC,EAChE,OAAO,qBAAqB,2CAA2C,EACvE,OAAO,2BAA2B,oBAAoB,UAAU,EAChE,OAAO,uBAAuB,kBAAkB,SAAS,EACzD,OAAO,yBAAyB,qBAAqB,YAAY,EACjE,OAAO,uBAAuB,yBAAyB,OAAO,EAC9D,OAAO,oBAAoB;AAChC;;;AD1EF,QAAQ,GAAG,UAAU,MAAM,QAAQ,KAAK,CAAC,CAAC;AAC1C,QAAQ,GAAG,WAAW,MAAM,QAAQ,KAAK,CAAC,CAAC;AAE3C,IAAM,UAAU,IAAIC,SAAQ,cAAc,EACvC,QAAQ,OAAO,EACf,YAAY,kBAAkB,EAC9B,WAAW,MAAM,EACjB,OAAO,MAAM,QAAQ,KAAK,CAAC;AAE9B,MAAM,QAAQ,WAAW;","names":["Command","schema","Command"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@executor-js/cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.6",
|
|
4
4
|
"description": "CLI for the executor SDK — schema generation, migrations",
|
|
5
5
|
"homepage": "https://github.com/RhysSullivan/executor/tree/main/packages/core/cli",
|
|
6
6
|
"bugs": {
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"typecheck": "tsc --noEmit"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@executor-js/sdk": "1.
|
|
40
|
+
"@executor-js/sdk": "1.5.0",
|
|
41
41
|
"commander": "^12.1.0",
|
|
42
42
|
"effect": "4.0.0-beta.59",
|
|
43
43
|
"fumadb": "0.3.0",
|