chkit 0.1.0-beta.22 → 0.1.0-beta.24
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/bin/chkit.js +61 -29
- package/dist/bin/chkit.js.map +1 -1
- package/dist/commands/check/command.d.ts +2 -2
- package/dist/commands/check/command.d.ts.map +1 -1
- package/dist/commands/check/command.js +85 -84
- package/dist/commands/check/command.js.map +1 -1
- package/dist/commands/drift/command.d.ts +2 -2
- package/dist/commands/drift/command.d.ts.map +1 -1
- package/dist/commands/drift/command.js +109 -108
- package/dist/commands/drift/command.js.map +1 -1
- package/dist/commands/generate/command.d.ts +2 -2
- package/dist/commands/generate/command.d.ts.map +1 -1
- package/dist/commands/generate/command.js +8 -6
- package/dist/commands/generate/command.js.map +1 -1
- package/dist/commands/init.js +1 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/migrate/command.d.ts +2 -2
- package/dist/commands/migrate/command.d.ts.map +1 -1
- package/dist/commands/migrate/command.js +14 -15
- package/dist/commands/migrate/command.js.map +1 -1
- package/dist/commands/plugin.d.ts +2 -2
- package/dist/commands/plugin.d.ts.map +1 -1
- package/dist/commands/plugin.js +12 -15
- package/dist/commands/plugin.js.map +1 -1
- package/dist/commands/query.d.ts +2 -2
- package/dist/commands/query.d.ts.map +1 -1
- package/dist/commands/query.js +24 -24
- package/dist/commands/query.js.map +1 -1
- package/dist/commands/status.d.ts +2 -2
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +53 -52
- package/dist/commands/status.js.map +1 -1
- package/dist/internal-plugins/core/plugin.d.ts +2 -0
- package/dist/internal-plugins/core/plugin.d.ts.map +1 -0
- package/dist/internal-plugins/core/plugin.js +21 -0
- package/dist/internal-plugins/core/plugin.js.map +1 -0
- package/dist/internal-plugins/index.d.ts.map +1 -1
- package/dist/internal-plugins/index.js +2 -1
- package/dist/internal-plugins/index.js.map +1 -1
- package/dist/plugins.d.ts +16 -32
- package/dist/plugins.d.ts.map +1 -1
- package/dist/plugins.js +0 -6
- package/dist/plugins.js.map +1 -1
- package/dist/runtime/command-dispatch.d.ts.map +1 -1
- package/dist/runtime/command-dispatch.js +78 -88
- package/dist/runtime/command-dispatch.js.map +1 -1
- package/dist/runtime/command-registry.d.ts +1 -4
- package/dist/runtime/command-registry.d.ts.map +1 -1
- package/dist/runtime/command-registry.js +33 -46
- package/dist/runtime/command-registry.js.map +1 -1
- package/dist/runtime/config-merge.d.ts +4 -0
- package/dist/runtime/config-merge.d.ts.map +1 -0
- package/dist/runtime/config-merge.js +72 -0
- package/dist/runtime/config-merge.js.map +1 -0
- package/dist/runtime/config.d.ts +11 -2
- package/dist/runtime/config.d.ts.map +1 -1
- package/dist/runtime/config.js +89 -12
- package/dist/runtime/config.js.map +1 -1
- package/dist/runtime/extract-config-path.d.ts +2 -0
- package/dist/runtime/extract-config-path.d.ts.map +1 -0
- package/dist/runtime/extract-config-path.js +13 -0
- package/dist/runtime/extract-config-path.js.map +1 -0
- package/dist/runtime/help.js +2 -2
- package/dist/runtime/help.js.map +1 -1
- package/dist/runtime/plugin-runtime/index.d.ts +1 -1
- package/dist/runtime/plugin-runtime/index.d.ts.map +1 -1
- package/dist/runtime/plugin-runtime/index.js +50 -16
- package/dist/runtime/plugin-runtime/index.js.map +1 -1
- package/dist/runtime/plugin-runtime/loader.d.ts +3 -6
- package/dist/runtime/plugin-runtime/loader.d.ts.map +1 -1
- package/dist/runtime/plugin-runtime/loader.js +6 -39
- package/dist/runtime/plugin-runtime/loader.js.map +1 -1
- package/dist/runtime/user-config.d.ts +4 -0
- package/dist/runtime/user-config.d.ts.map +1 -0
- package/dist/runtime/user-config.js +11 -0
- package/dist/runtime/user-config.js.map +1 -0
- package/package.json +7 -4
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { MissingFlagValueError, parseFlags, UnknownFlagError, } from '@chkit/core';
|
|
2
2
|
import { typedFlags } from '../plugins.js';
|
|
3
|
-
import { resolveDirs } from './config.js';
|
|
4
3
|
import { debug } from './debug.js';
|
|
5
4
|
import { GLOBAL_FLAGS } from './global-flags.js';
|
|
6
5
|
import { printOutput } from './json-output.js';
|
|
@@ -19,9 +18,10 @@ function extractPositionals(argv, flagDefs) {
|
|
|
19
18
|
positionals.push(token);
|
|
20
19
|
continue;
|
|
21
20
|
}
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
const eqIdx = token.indexOf('=');
|
|
22
|
+
const name = eqIdx === -1 ? token : token.slice(0, eqIdx);
|
|
23
|
+
const def = byName.get(name);
|
|
24
|
+
if (def && def.type !== 'boolean' && eqIdx === -1) {
|
|
25
25
|
i += 1;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
@@ -41,13 +41,15 @@ function splitQueryArgs(argv, flagDefs) {
|
|
|
41
41
|
positionals.push(...argv.slice(i + 1));
|
|
42
42
|
break;
|
|
43
43
|
}
|
|
44
|
-
const
|
|
44
|
+
const eqIdx = token.startsWith('--') ? token.indexOf('=') : -1;
|
|
45
|
+
const name = eqIdx === -1 ? token : token.slice(0, eqIdx);
|
|
46
|
+
const def = byName.get(name);
|
|
45
47
|
if (!def) {
|
|
46
48
|
positionals.push(token);
|
|
47
49
|
continue;
|
|
48
50
|
}
|
|
49
51
|
flagArgs.push(token);
|
|
50
|
-
if (def.type !== 'boolean') {
|
|
52
|
+
if (def.type !== 'boolean' && eqIdx === -1) {
|
|
51
53
|
const next = argv[i + 1];
|
|
52
54
|
if (next !== undefined) {
|
|
53
55
|
flagArgs.push(next);
|
|
@@ -84,11 +86,18 @@ function stripGlobalFlags(argv) {
|
|
|
84
86
|
i++;
|
|
85
87
|
continue;
|
|
86
88
|
}
|
|
89
|
+
if (token.startsWith('--config=')) {
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
87
92
|
if (token === '--table' && i + 1 < argv.length) {
|
|
88
93
|
tableSelector = argv[i + 1];
|
|
89
94
|
i++;
|
|
90
95
|
continue;
|
|
91
96
|
}
|
|
97
|
+
if (token.startsWith('--table=')) {
|
|
98
|
+
tableSelector = token.slice('--table='.length);
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
92
101
|
rest.push(token);
|
|
93
102
|
}
|
|
94
103
|
return { jsonMode, tableSelector, rest };
|
|
@@ -116,11 +125,17 @@ async function resolvePluginTableScope(input) {
|
|
|
116
125
|
return resolveTableScope(input.tableSelector, []);
|
|
117
126
|
}
|
|
118
127
|
}
|
|
119
|
-
async function
|
|
128
|
+
export async function runResolvedCommand(input) {
|
|
129
|
+
debug('dispatch', `routing to plugin command "${input.commandName}"`);
|
|
120
130
|
const argsAfterCommand = input.argv.slice(1);
|
|
121
131
|
let subcommandName;
|
|
122
132
|
if (input.resolved.subcommands) {
|
|
123
|
-
const
|
|
133
|
+
const commandPositionals = extractPositionals(argsAfterCommand, [
|
|
134
|
+
...input.registry.globalFlags,
|
|
135
|
+
...input.resolved.flags,
|
|
136
|
+
]);
|
|
137
|
+
const commandToken = commandPositionals[0];
|
|
138
|
+
const matchedSub = input.resolved.subcommands.find((s) => s.name === commandToken);
|
|
124
139
|
if (matchedSub) {
|
|
125
140
|
subcommandName = matchedSub.name;
|
|
126
141
|
}
|
|
@@ -132,44 +147,75 @@ async function runPluginCommand(input) {
|
|
|
132
147
|
return;
|
|
133
148
|
}
|
|
134
149
|
}
|
|
135
|
-
const
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
150
|
+
const isPluginCommandForwarder = input.commandName === 'plugin';
|
|
151
|
+
const isQuery = input.commandName === 'query';
|
|
152
|
+
let flags;
|
|
153
|
+
let positionals = [];
|
|
154
|
+
if (isPluginCommandForwarder) {
|
|
155
|
+
// The plugin command forwards unparsed args to a target plugin command,
|
|
156
|
+
// so we only strip known global flags and pass the rest through.
|
|
157
|
+
const { jsonMode, tableSelector, rest } = stripGlobalFlags(argsAfterCommand);
|
|
158
|
+
const parsed = {};
|
|
159
|
+
if (jsonMode)
|
|
160
|
+
parsed['--json'] = true;
|
|
161
|
+
if (tableSelector)
|
|
162
|
+
parsed['--table'] = tableSelector;
|
|
163
|
+
flags = parsed;
|
|
164
|
+
positionals = rest;
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
const allFlags = input.registry.resolveFlags(input.commandName, subcommandName);
|
|
168
|
+
if (isQuery) {
|
|
169
|
+
const parsed = parseCommandArgs(input.commandName, argsAfterCommand, allFlags);
|
|
170
|
+
if (!parsed)
|
|
171
|
+
return;
|
|
172
|
+
flags = parsed.flags;
|
|
173
|
+
positionals = parsed.positionals;
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
const parsedFlags = parseFlagsOrReport(argsAfterCommand, allFlags);
|
|
177
|
+
if (!parsedFlags)
|
|
178
|
+
return;
|
|
179
|
+
flags = parsedFlags;
|
|
180
|
+
positionals = extractPositionals(argsAfterCommand, allFlags);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
139
183
|
const gf = typedFlags(flags, GLOBAL_FLAGS);
|
|
140
184
|
const jsonMode = gf['--json'] === true;
|
|
141
185
|
const tableScope = await resolvePluginTableScope({
|
|
142
186
|
schemaGlobs: input.config.schema,
|
|
143
187
|
tableSelector: gf['--table'],
|
|
144
188
|
});
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
if (jsonMode) {
|
|
157
|
-
console.log(JSON.stringify({ ok: false, error: message }));
|
|
189
|
+
const pluginName = input.resolved.pluginName ?? input.commandName;
|
|
190
|
+
const pluginCommandName = subcommandName ?? input.commandName;
|
|
191
|
+
if (pluginName !== 'core') {
|
|
192
|
+
try {
|
|
193
|
+
await input.pluginRuntime.runOnConfigLoaded({
|
|
194
|
+
command: input.commandName,
|
|
195
|
+
config: input.config,
|
|
196
|
+
configPath: input.configPath,
|
|
197
|
+
tableScope,
|
|
198
|
+
flags,
|
|
199
|
+
});
|
|
158
200
|
}
|
|
159
|
-
|
|
160
|
-
|
|
201
|
+
catch (error) {
|
|
202
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
203
|
+
if (jsonMode) {
|
|
204
|
+
console.log(JSON.stringify({ ok: false, error: message }));
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
console.error(message);
|
|
208
|
+
}
|
|
209
|
+
process.exitCode = 2;
|
|
210
|
+
return;
|
|
161
211
|
}
|
|
162
|
-
process.exitCode = 2;
|
|
163
|
-
return;
|
|
164
212
|
}
|
|
165
|
-
const pluginName = input.resolved.pluginName ?? input.commandName;
|
|
166
|
-
const pluginCommandName = subcommandName ?? input.commandName;
|
|
167
213
|
const exitCode = await input.pluginRuntime.runPluginCommand(pluginName, pluginCommandName, {
|
|
168
214
|
config: input.config,
|
|
169
215
|
configPath: input.configPath,
|
|
170
216
|
jsonMode,
|
|
171
217
|
tableScope,
|
|
172
|
-
args:
|
|
218
|
+
args: positionals,
|
|
173
219
|
flags,
|
|
174
220
|
print(value) {
|
|
175
221
|
printOutput(value, jsonMode);
|
|
@@ -178,60 +224,4 @@ async function runPluginCommand(input) {
|
|
|
178
224
|
if (exitCode !== 0)
|
|
179
225
|
process.exitCode = exitCode;
|
|
180
226
|
}
|
|
181
|
-
function parseArgsForCoreCommand(input) {
|
|
182
|
-
const argsAfterCommand = input.argv.slice(1);
|
|
183
|
-
if (input.commandName === 'plugin') {
|
|
184
|
-
// The `plugin` command forwards unparsed args to a target plugin command,
|
|
185
|
-
// so we can't use parseFlags here — only strip the known global flags
|
|
186
|
-
// and pass the rest through as positionals.
|
|
187
|
-
const { jsonMode, tableSelector, rest } = stripGlobalFlags(argsAfterCommand);
|
|
188
|
-
const flags = {};
|
|
189
|
-
if (jsonMode)
|
|
190
|
-
flags['--json'] = true;
|
|
191
|
-
if (tableSelector)
|
|
192
|
-
flags['--table'] = tableSelector;
|
|
193
|
-
return { flags, positionals: rest };
|
|
194
|
-
}
|
|
195
|
-
const allFlags = input.registry.resolveFlags(input.commandName);
|
|
196
|
-
return parseCommandArgs(input.commandName, argsAfterCommand, allFlags);
|
|
197
|
-
}
|
|
198
|
-
async function runCoreOrBuiltinCommand(input) {
|
|
199
|
-
const parsed = parseArgsForCoreCommand(input);
|
|
200
|
-
if (!parsed)
|
|
201
|
-
return;
|
|
202
|
-
const { flags, positionals } = parsed;
|
|
203
|
-
if (!input.resolved.run)
|
|
204
|
-
throw new Error(`Command '${input.commandName}' has no run handler`);
|
|
205
|
-
const dirs = resolveDirs(input.config);
|
|
206
|
-
const ctx = await input.pluginRuntime.resolveContext({
|
|
207
|
-
config: input.config,
|
|
208
|
-
configPath: input.configPath,
|
|
209
|
-
command: input.commandName,
|
|
210
|
-
flags,
|
|
211
|
-
});
|
|
212
|
-
try {
|
|
213
|
-
await input.resolved.run({
|
|
214
|
-
command: input.commandName,
|
|
215
|
-
flags,
|
|
216
|
-
positionals,
|
|
217
|
-
config: input.config,
|
|
218
|
-
configPath: input.configPath,
|
|
219
|
-
dirs,
|
|
220
|
-
pluginRuntime: input.pluginRuntime,
|
|
221
|
-
ctx,
|
|
222
|
-
});
|
|
223
|
-
}
|
|
224
|
-
finally {
|
|
225
|
-
await input.pluginRuntime.disposeContext(ctx);
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
export async function runResolvedCommand(input) {
|
|
229
|
-
if (input.resolved.isPlugin && !input.resolved.run) {
|
|
230
|
-
debug('dispatch', `routing to plugin command "${input.commandName}"`);
|
|
231
|
-
await runPluginCommand(input);
|
|
232
|
-
return;
|
|
233
|
-
}
|
|
234
|
-
debug('dispatch', `routing to core command "${input.commandName}"`);
|
|
235
|
-
await runCoreOrBuiltinCommand(input);
|
|
236
|
-
}
|
|
237
227
|
//# sourceMappingURL=command-dispatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-dispatch.js","sourceRoot":"","sources":["../../src/runtime/command-dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,qBAAqB,EAErB,UAAU,EACV,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAEpB,OAAO,
|
|
1
|
+
{"version":3,"file":"command-dispatch.js","sourceRoot":"","sources":["../../src/runtime/command-dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ChxPluginCommand,
|
|
1
|
+
import type { ChxPluginCommand, CommandExtension, FlagDef } from '../plugins.js';
|
|
2
2
|
export interface RegisteredCommand {
|
|
3
3
|
name: string;
|
|
4
4
|
description: string;
|
|
@@ -7,10 +7,8 @@ export interface RegisteredCommand {
|
|
|
7
7
|
pluginName: string;
|
|
8
8
|
flags: readonly FlagDef[];
|
|
9
9
|
}>;
|
|
10
|
-
isPlugin: boolean;
|
|
11
10
|
pluginName?: string;
|
|
12
11
|
subcommands?: RegisteredCommand[];
|
|
13
|
-
run: CommandDef['run'] | null;
|
|
14
12
|
}
|
|
15
13
|
export interface CommandRegistry {
|
|
16
14
|
commands: RegisteredCommand[];
|
|
@@ -19,7 +17,6 @@ export interface CommandRegistry {
|
|
|
19
17
|
resolveFlags(name: string, subcommand?: string): FlagDef[];
|
|
20
18
|
}
|
|
21
19
|
export declare function createCommandRegistry(input: {
|
|
22
|
-
coreCommands: CommandDef[];
|
|
23
20
|
globalFlags: readonly FlagDef[];
|
|
24
21
|
pluginExtensions: Array<{
|
|
25
22
|
pluginName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-registry.d.ts","sourceRoot":"","sources":["../../src/runtime/command-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"command-registry.d.ts","sourceRoot":"","sources":["../../src/runtime/command-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEhF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,SAAS,OAAO,EAAE,CAAA;IACzB,WAAW,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,SAAS,OAAO,EAAE,CAAA;KAAE,CAAC,CAAA;IACrE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAA;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,iBAAiB,EAAE,CAAA;IAC7B,WAAW,EAAE,SAAS,OAAO,EAAE,CAAA;IAC/B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAAA;IAChD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,CAAA;CAC3D;AAID,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,WAAW,EAAE,SAAS,OAAO,EAAE,CAAA;IAC/B,gBAAgB,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,gBAAgB,EAAE,CAAA;KAAE,CAAC,CAAA;IAC/E,cAAc,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,gBAAgB,EAAE,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAClG,GAAG,eAAe,CA6ElB"}
|
|
@@ -1,17 +1,43 @@
|
|
|
1
|
+
const FLATTEN_PLUGIN_NAMES = new Set(['core']);
|
|
1
2
|
export function createCommandRegistry(input) {
|
|
2
3
|
const commands = [];
|
|
3
4
|
const byName = new Map();
|
|
4
|
-
for (const
|
|
5
|
-
|
|
5
|
+
for (const { pluginName, commands: pluginCmds, manifestName } of input.pluginCommands) {
|
|
6
|
+
if (pluginCmds.length === 0)
|
|
7
|
+
continue;
|
|
8
|
+
const flatten = FLATTEN_PLUGIN_NAMES.has(manifestName) ||
|
|
9
|
+
(pluginCmds.length === 1 && pluginCmds[0]?.name === manifestName);
|
|
10
|
+
if (flatten) {
|
|
11
|
+
for (const cmd of pluginCmds) {
|
|
12
|
+
const registered = {
|
|
13
|
+
name: cmd.name,
|
|
14
|
+
description: cmd.description ?? '',
|
|
15
|
+
flags: cmd.flags ?? [],
|
|
16
|
+
pluginFlags: [],
|
|
17
|
+
pluginName,
|
|
18
|
+
};
|
|
19
|
+
commands.push(registered);
|
|
20
|
+
byName.set(cmd.name, registered);
|
|
21
|
+
}
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
const subcommands = pluginCmds.map((cmd) => ({
|
|
6
25
|
name: cmd.name,
|
|
7
|
-
description: cmd.description,
|
|
8
|
-
flags: cmd.flags,
|
|
26
|
+
description: cmd.description ?? '',
|
|
27
|
+
flags: cmd.flags ?? [],
|
|
28
|
+
pluginFlags: [],
|
|
29
|
+
pluginName,
|
|
30
|
+
}));
|
|
31
|
+
const registered = {
|
|
32
|
+
name: pluginName,
|
|
33
|
+
description: `Plugin: ${pluginName}`,
|
|
34
|
+
flags: [],
|
|
9
35
|
pluginFlags: [],
|
|
10
|
-
|
|
11
|
-
|
|
36
|
+
pluginName,
|
|
37
|
+
subcommands,
|
|
12
38
|
};
|
|
13
39
|
commands.push(registered);
|
|
14
|
-
byName.set(
|
|
40
|
+
byName.set(pluginName, registered);
|
|
15
41
|
}
|
|
16
42
|
for (const { pluginName, extensions } of input.pluginExtensions) {
|
|
17
43
|
for (const ext of extensions) {
|
|
@@ -24,45 +50,6 @@ export function createCommandRegistry(input) {
|
|
|
24
50
|
}
|
|
25
51
|
}
|
|
26
52
|
}
|
|
27
|
-
for (const { pluginName, commands: pluginCmds, manifestName } of input.pluginCommands) {
|
|
28
|
-
if (pluginCmds.length === 1 && pluginCmds[0]?.name === manifestName) {
|
|
29
|
-
const cmd = pluginCmds[0];
|
|
30
|
-
const registered = {
|
|
31
|
-
name: manifestName,
|
|
32
|
-
description: cmd.description ?? '',
|
|
33
|
-
flags: cmd.flags ?? [],
|
|
34
|
-
pluginFlags: [],
|
|
35
|
-
isPlugin: true,
|
|
36
|
-
pluginName,
|
|
37
|
-
run: null,
|
|
38
|
-
};
|
|
39
|
-
commands.push(registered);
|
|
40
|
-
byName.set(manifestName, registered);
|
|
41
|
-
}
|
|
42
|
-
else if (pluginCmds.length > 0) {
|
|
43
|
-
const subcommands = pluginCmds.map((cmd) => ({
|
|
44
|
-
name: cmd.name,
|
|
45
|
-
description: cmd.description ?? '',
|
|
46
|
-
flags: cmd.flags ?? [],
|
|
47
|
-
pluginFlags: [],
|
|
48
|
-
isPlugin: true,
|
|
49
|
-
pluginName,
|
|
50
|
-
run: null,
|
|
51
|
-
}));
|
|
52
|
-
const registered = {
|
|
53
|
-
name: pluginName,
|
|
54
|
-
description: `Plugin: ${pluginName}`,
|
|
55
|
-
flags: [],
|
|
56
|
-
pluginFlags: [],
|
|
57
|
-
isPlugin: true,
|
|
58
|
-
pluginName,
|
|
59
|
-
subcommands,
|
|
60
|
-
run: null,
|
|
61
|
-
};
|
|
62
|
-
commands.push(registered);
|
|
63
|
-
byName.set(pluginName, registered);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
53
|
return {
|
|
67
54
|
commands,
|
|
68
55
|
globalFlags: input.globalFlags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-registry.js","sourceRoot":"","sources":["../../src/runtime/command-registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"command-registry.js","sourceRoot":"","sources":["../../src/runtime/command-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { ChxPluginRegistration, ChxUserConfig } from '@chkit/core';
|
|
2
|
+
export declare function pluginNameOf(reg: ChxPluginRegistration): string | undefined;
|
|
3
|
+
export declare function mergeUserConfig(base: ChxUserConfig, overlay: ChxUserConfig): ChxUserConfig;
|
|
4
|
+
//# sourceMappingURL=config-merge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-merge.d.ts","sourceRoot":"","sources":["../../src/runtime/config-merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EAErB,aAAa,EACd,MAAM,aAAa,CAAA;AAMpB,wBAAgB,YAAY,CAAC,GAAG,EAAE,qBAAqB,GAAG,MAAM,GAAG,SAAS,CAW3E;AA8CD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,aAAa,GACrB,aAAa,CAWf"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
function isObject(value) {
|
|
2
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
3
|
+
}
|
|
4
|
+
export function pluginNameOf(reg) {
|
|
5
|
+
if (!isObject(reg))
|
|
6
|
+
return undefined;
|
|
7
|
+
if (typeof reg.name === 'string' && reg.name.length > 0)
|
|
8
|
+
return reg.name;
|
|
9
|
+
const plugin = reg.plugin;
|
|
10
|
+
if (isObject(plugin)) {
|
|
11
|
+
const manifest = plugin.manifest;
|
|
12
|
+
if (isObject(manifest) && typeof manifest.name === 'string' && manifest.name.length > 0) {
|
|
13
|
+
return manifest.name;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
function mergePlugins(base, overlay) {
|
|
19
|
+
if (!base && !overlay)
|
|
20
|
+
return undefined;
|
|
21
|
+
if (!base)
|
|
22
|
+
return overlay;
|
|
23
|
+
if (!overlay)
|
|
24
|
+
return base;
|
|
25
|
+
const overlayNames = new Set();
|
|
26
|
+
for (const reg of overlay) {
|
|
27
|
+
const name = pluginNameOf(reg);
|
|
28
|
+
if (name)
|
|
29
|
+
overlayNames.add(name);
|
|
30
|
+
}
|
|
31
|
+
const result = [];
|
|
32
|
+
for (const reg of base) {
|
|
33
|
+
const name = pluginNameOf(reg);
|
|
34
|
+
if (name && overlayNames.has(name))
|
|
35
|
+
continue;
|
|
36
|
+
result.push(reg);
|
|
37
|
+
}
|
|
38
|
+
for (const reg of overlay)
|
|
39
|
+
result.push(reg);
|
|
40
|
+
return result;
|
|
41
|
+
}
|
|
42
|
+
function mergeClickhouse(base, overlay) {
|
|
43
|
+
if (!base && !overlay)
|
|
44
|
+
return undefined;
|
|
45
|
+
if (!base)
|
|
46
|
+
return overlay;
|
|
47
|
+
if (!overlay)
|
|
48
|
+
return base;
|
|
49
|
+
return { ...base, ...overlay };
|
|
50
|
+
}
|
|
51
|
+
function mergeShallow(base, overlay) {
|
|
52
|
+
if (!base && !overlay)
|
|
53
|
+
return undefined;
|
|
54
|
+
if (!base)
|
|
55
|
+
return overlay;
|
|
56
|
+
if (!overlay)
|
|
57
|
+
return base;
|
|
58
|
+
return { ...base, ...overlay };
|
|
59
|
+
}
|
|
60
|
+
export function mergeUserConfig(base, overlay) {
|
|
61
|
+
return {
|
|
62
|
+
schema: overlay.schema ?? base.schema,
|
|
63
|
+
outDir: overlay.outDir ?? base.outDir,
|
|
64
|
+
migrationsDir: overlay.migrationsDir ?? base.migrationsDir,
|
|
65
|
+
metaDir: overlay.metaDir ?? base.metaDir,
|
|
66
|
+
plugins: mergePlugins(base.plugins, overlay.plugins),
|
|
67
|
+
check: mergeShallow(base.check, overlay.check),
|
|
68
|
+
safety: mergeShallow(base.safety, overlay.safety),
|
|
69
|
+
clickhouse: mergeClickhouse(base.clickhouse, overlay.clickhouse),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=config-merge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-merge.js","sourceRoot":"","sources":["../../src/runtime/config-merge.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/config.d.ts
CHANGED
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import { type ChxConfigEnv, type ResolvedChxConfig } from '@chkit/core';
|
|
2
2
|
export declare const DEFAULT_CONFIG_FILE = "clickhouse.config.ts";
|
|
3
|
-
export
|
|
3
|
+
export type ConfigSource = 'project' | 'profile';
|
|
4
|
+
export interface LoadedConfig {
|
|
4
5
|
config: ResolvedChxConfig;
|
|
5
6
|
path: string;
|
|
6
|
-
|
|
7
|
+
source: ConfigSource;
|
|
8
|
+
profileLayered: boolean;
|
|
9
|
+
}
|
|
10
|
+
export declare function loadConfig(configPathArg?: string, env?: ChxConfigEnv, options?: {
|
|
11
|
+
command?: string;
|
|
12
|
+
cwd?: string;
|
|
13
|
+
userConfigDir?: string;
|
|
14
|
+
allowSynthesizedProfileConfig?: boolean;
|
|
15
|
+
}): Promise<LoadedConfig>;
|
|
7
16
|
export declare function writeIfMissing(filePath: string, content: string): Promise<boolean>;
|
|
8
17
|
export declare function resolveDirs(config: ResolvedChxConfig): {
|
|
9
18
|
outDir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/runtime/config.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/runtime/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,YAAY,EAKjB,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAA;AAUpB,eAAO,MAAM,mBAAmB,yBAAyB,CAAA;AAEzD,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,SAAS,CAAA;AAGhD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,iBAAiB,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,YAAY,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;CACxB;AAgBD,wBAAsB,UAAU,CAC9B,aAAa,CAAC,EAAE,MAAM,EACtB,GAAG,GAAE,YAAiB,EACtB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAA;CACnC,GACL,OAAO,CAAC,YAAY,CAAC,CA8CvB;AAuFD,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAKxF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAKjH"}
|