@devbie/newbie-cli 0.1.0-stage.1 → 0.1.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.
- package/README.md +244 -0
- package/dist/assemble/assets.js.map +1 -1
- package/dist/assemble/dependencies.js.map +1 -1
- package/dist/assemble/env.js.map +1 -1
- package/dist/assemble/module-graph.d.ts +14 -0
- package/dist/assemble/module-graph.js +51 -0
- package/dist/assemble/module-graph.js.map +1 -0
- package/dist/assemble/modules-copy.js +1 -3
- package/dist/assemble/modules-copy.js.map +1 -1
- package/dist/assemble/modules.js +2 -6
- package/dist/assemble/modules.js.map +1 -1
- package/dist/assemble/pipeline.d.ts +5 -0
- package/dist/assemble/pipeline.js +58 -12
- package/dist/assemble/pipeline.js.map +1 -1
- package/dist/assemble/schema.js.map +1 -1
- package/dist/commands/agent.d.ts +5 -1
- package/dist/commands/agent.js +214 -7
- package/dist/commands/agent.js.map +1 -1
- package/dist/commands/apply.d.ts +1 -0
- package/dist/commands/apply.js +1 -0
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/config.js +39 -13
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/create.js +1 -7
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/default.js +1 -2
- package/dist/commands/default.js.map +1 -1
- package/dist/commands/dev/lint.d.ts +3 -0
- package/dist/commands/dev/lint.js +82 -0
- package/dist/commands/dev/lint.js.map +1 -0
- package/dist/commands/doctor.js +11 -14
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/install.js +4 -1
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/status.d.ts +27 -0
- package/dist/commands/status.js +9 -8
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/update-template.js.map +1 -1
- package/dist/commands/update.d.ts +2 -0
- package/dist/commands/update.js +51 -6
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/watch.d.ts +5 -0
- package/dist/commands/watch.js +128 -0
- package/dist/commands/watch.js.map +1 -0
- package/dist/constants/paths.js +1 -4
- package/dist/constants/paths.js.map +1 -1
- package/dist/core/assets.js.map +1 -1
- package/dist/core/dependency-plan.js +1 -4
- package/dist/core/dependency-plan.js.map +1 -1
- package/dist/core/drift.js.map +1 -1
- package/dist/core/env-file.js +2 -5
- package/dist/core/env-file.js.map +1 -1
- package/dist/core/layer-lint.d.ts +15 -0
- package/dist/core/layer-lint.js +165 -0
- package/dist/core/layer-lint.js.map +1 -0
- package/dist/core/module-closure.d.ts +18 -0
- package/dist/core/module-closure.js +71 -0
- package/dist/core/module-closure.js.map +1 -0
- package/dist/core/module-manifest.d.ts +4 -0
- package/dist/core/module-manifest.js +24 -0
- package/dist/core/module-manifest.js.map +1 -1
- package/dist/core/modules-state.js +3 -9
- package/dist/core/modules-state.js.map +1 -1
- package/dist/core/prisma-schema.js +1 -4
- package/dist/core/prisma-schema.js.map +1 -1
- package/dist/core/semver.js +1 -3
- package/dist/core/semver.js.map +1 -1
- package/dist/core/template-sync.js +1 -2
- package/dist/core/template-sync.js.map +1 -1
- package/dist/core/unified-diff.js +1 -4
- package/dist/core/unified-diff.js.map +1 -1
- package/dist/index.js +71 -61
- package/dist/index.js.map +1 -1
- package/dist/lib/check.js.map +1 -1
- package/dist/lib/cli-runner.d.ts +1 -0
- package/dist/lib/cli-runner.js +26 -0
- package/dist/lib/cli-runner.js.map +1 -0
- package/dist/lib/drift.js +1 -8
- package/dist/lib/drift.js.map +1 -1
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/fs-util.js.map +1 -1
- package/dist/lib/issues.js.map +1 -1
- package/dist/lib/loading.js.map +1 -1
- package/dist/lib/module-cli.d.ts +13 -0
- package/dist/lib/module-cli.js +65 -0
- package/dist/lib/module-cli.js.map +1 -0
- package/dist/lib/module-install.js.map +1 -1
- package/dist/lib/modules-state.js.map +1 -1
- package/dist/lib/registry.js +1 -3
- package/dist/lib/registry.js.map +1 -1
- package/dist/lib/version.d.ts +1 -0
- package/dist/lib/version.js +5 -0
- package/dist/lib/version.js.map +1 -0
- package/dist/public.d.ts +9 -0
- package/dist/public.js +21 -0
- package/dist/public.js.map +1 -0
- package/package.json +7 -5
- package/dist/commands/check.d.ts +0 -2
- package/dist/commands/check.js +0 -37
- package/dist/commands/check.js.map +0 -1
- package/dist/commands/env.d.ts +0 -7
- package/dist/commands/env.js +0 -324
- package/dist/commands/env.js.map +0 -1
- package/dist/lib/env-tool-config.d.ts +0 -17
- package/dist/lib/env-tool-config.js +0 -32
- package/dist/lib/env-tool-config.js.map +0 -1
package/dist/commands/agent.js
CHANGED
|
@@ -1,16 +1,223 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.runAgent = runAgent;
|
|
7
|
+
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
8
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
9
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
4
10
|
const colorette_1 = require("colorette");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
11
|
+
const modules_state_1 = require("../core/modules-state");
|
|
12
|
+
const errors_1 = require("../lib/errors");
|
|
13
|
+
const exec_1 = require("../lib/exec");
|
|
14
|
+
const modules_state_2 = require("../lib/modules-state");
|
|
15
|
+
const registry_1 = require("../lib/registry");
|
|
16
|
+
const version_1 = require("../lib/version");
|
|
17
|
+
const apply_1 = require("./apply");
|
|
18
|
+
const status_1 = require("./status");
|
|
19
|
+
const update_1 = require("./update");
|
|
20
|
+
const ENDPOINT_ENV = "MODULE_HUB_ENDPOINT";
|
|
21
|
+
const TOKEN_ENV = "MODULE_HUB_TOKEN";
|
|
22
|
+
const DEFAULT_POLL_INTERVAL_SECONDS = 60;
|
|
23
|
+
class HubHttpError extends Error {
|
|
24
|
+
status;
|
|
25
|
+
constructor(status, message) {
|
|
26
|
+
super(message);
|
|
27
|
+
this.status = status;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function sleep(ms) {
|
|
31
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
32
|
+
}
|
|
33
|
+
async function postPoll(endpoint, token, body) {
|
|
34
|
+
const url = `${endpoint}/module-hub/agent/poll`;
|
|
35
|
+
let response;
|
|
36
|
+
try {
|
|
37
|
+
response = await fetch(url, {
|
|
38
|
+
method: "POST",
|
|
39
|
+
headers: {
|
|
40
|
+
"content-type": "application/json",
|
|
41
|
+
"x-module-hub-token": token,
|
|
42
|
+
},
|
|
43
|
+
body: JSON.stringify(body),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
throw new errors_1.CliError(`Cannot reach module hub at ${url}: ${error.message}`);
|
|
48
|
+
}
|
|
49
|
+
const text = await response.text();
|
|
50
|
+
if (!response.ok) {
|
|
51
|
+
throw new HubHttpError(response.status, `Hub poll failed with HTTP ${response.status}: ${text.slice(0, 500)}`);
|
|
52
|
+
}
|
|
53
|
+
let parsed;
|
|
54
|
+
try {
|
|
55
|
+
parsed = JSON.parse(text);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
throw new errors_1.CliError(`Hub poll returned invalid JSON: ${text.slice(0, 500)}`);
|
|
59
|
+
}
|
|
60
|
+
const payload = parsed && typeof parsed === "object" && "data" in parsed && "code" in parsed
|
|
61
|
+
? parsed.data
|
|
62
|
+
: parsed;
|
|
63
|
+
return payload;
|
|
64
|
+
}
|
|
65
|
+
async function workingTreeSummary(cwd) {
|
|
66
|
+
try {
|
|
67
|
+
const result = await (0, exec_1.execCapture)("git", ["status", "--porcelain"], { cwd });
|
|
68
|
+
return result.stdout.trim() || null;
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async function collectReceiptSummary(cwd) {
|
|
75
|
+
return {
|
|
76
|
+
changedFiles: await workingTreeSummary(cwd),
|
|
77
|
+
status: await (0, status_1.collectStatus)(cwd),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
async function executeSetChange(change, options) {
|
|
81
|
+
const state = await (0, modules_state_2.readModulesState)(options.cwd);
|
|
82
|
+
const current = (0, modules_state_1.moduleKeys)(state);
|
|
83
|
+
const next = change.type === "ADD"
|
|
84
|
+
? [...new Set([...current, change.moduleKey])]
|
|
85
|
+
: current.filter((key) => key !== change.moduleKey);
|
|
86
|
+
const specPath = node_path_1.default.join(node_os_1.default.tmpdir(), `newbie-agent-apply-${change.id}.json`);
|
|
87
|
+
await promises_1.default.writeFile(specPath, JSON.stringify({ modules: next }, null, 2), "utf8");
|
|
88
|
+
try {
|
|
89
|
+
await (0, apply_1.runApply)({ ...options, config: specPath, ci: true });
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
await promises_1.default.rm(specPath, { force: true });
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
async function executeUpgrade(change, options) {
|
|
96
|
+
const previousRef = process.env[registry_1.REGISTRY_REF_ENV];
|
|
97
|
+
if (change.targetSourceCommit) {
|
|
98
|
+
process.env[registry_1.REGISTRY_REF_ENV] = change.targetSourceCommit;
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
delete process.env[registry_1.REGISTRY_REF_ENV];
|
|
102
|
+
}
|
|
103
|
+
try {
|
|
104
|
+
await (0, update_1.runUpdate)({
|
|
105
|
+
...options,
|
|
106
|
+
yes: true,
|
|
107
|
+
force: change.driftPolicy === "force",
|
|
108
|
+
keys: [change.moduleKey],
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
if (previousRef === undefined) {
|
|
113
|
+
delete process.env[registry_1.REGISTRY_REF_ENV];
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
process.env[registry_1.REGISTRY_REF_ENV] = previousRef;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
async function executeChange(change, status, options) {
|
|
121
|
+
console.info((0, colorette_1.cyan)(`\n[agent] Executing ${change.type} ${change.moduleKey} (${change.id})`));
|
|
122
|
+
if (change.driftPolicy !== "force") {
|
|
123
|
+
const entry = status.modules.find((module) => module.key === change.moduleKey);
|
|
124
|
+
if (entry?.drift && !entry.drift.clean) {
|
|
125
|
+
return {
|
|
126
|
+
changeRequestId: change.id,
|
|
127
|
+
outcome: "FAILED",
|
|
128
|
+
error: `local drift detected on '${change.moduleKey}' (driftPolicy=reject)`,
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
try {
|
|
133
|
+
if (change.type === "UPGRADE") {
|
|
134
|
+
await executeUpgrade(change, options);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
await executeSetChange(change, options);
|
|
138
|
+
}
|
|
139
|
+
console.info((0, colorette_1.green)(`[agent] ${change.type} ${change.moduleKey} completed.`));
|
|
140
|
+
return {
|
|
141
|
+
changeRequestId: change.id,
|
|
142
|
+
outcome: "DONE",
|
|
143
|
+
summary: await collectReceiptSummary(options.cwd),
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
catch (error) {
|
|
147
|
+
console.error((0, colorette_1.red)(`[agent] ${change.type} ${change.moduleKey} failed: ${error.message}`));
|
|
148
|
+
return {
|
|
149
|
+
changeRequestId: change.id,
|
|
150
|
+
outcome: "FAILED",
|
|
151
|
+
error: error.message,
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
async function runAgent(options) {
|
|
156
|
+
const endpoint = process.env[ENDPOINT_ENV]?.replace(/\/+$/, "");
|
|
9
157
|
const token = process.env[TOKEN_ENV];
|
|
10
158
|
if (!endpoint || !token) {
|
|
11
|
-
|
|
12
|
-
|
|
159
|
+
throw new errors_1.CliError(`Agent requires ${ENDPOINT_ENV} and ${TOKEN_ENV} to be set.`);
|
|
160
|
+
}
|
|
161
|
+
const cwd = node_path_1.default.resolve(options.cwd);
|
|
162
|
+
const agentOptions = { ...options, cwd };
|
|
163
|
+
let pollInterval = DEFAULT_POLL_INTERVAL_SECONDS;
|
|
164
|
+
let receipts = [];
|
|
165
|
+
let stopped = false;
|
|
166
|
+
const stop = () => {
|
|
167
|
+
stopped = true;
|
|
168
|
+
};
|
|
169
|
+
process.on("SIGINT", stop);
|
|
170
|
+
process.on("SIGTERM", stop);
|
|
171
|
+
console.info((0, colorette_1.cyan)(`[agent] Module hub: ${endpoint}`));
|
|
172
|
+
console.info((0, colorette_1.cyan)(`[agent] Mode: ${options.once ? "single pass (--once)" : `daemon (${pollInterval}s interval)`}`));
|
|
173
|
+
while (!stopped) {
|
|
174
|
+
const status = await (0, status_1.collectStatus)(cwd, { drift: true });
|
|
175
|
+
let response;
|
|
176
|
+
try {
|
|
177
|
+
response = await postPoll(endpoint, token, {
|
|
178
|
+
cliVersion: version_1.CLI_VERSION,
|
|
179
|
+
status,
|
|
180
|
+
results: receipts,
|
|
181
|
+
});
|
|
182
|
+
receipts = [];
|
|
183
|
+
}
|
|
184
|
+
catch (error) {
|
|
185
|
+
if (error instanceof HubHttpError && (error.status === 401 || error.status === 403)) {
|
|
186
|
+
throw new errors_1.CliError(`Hub rejected the installation token (HTTP ${error.status}). The token may be revoked.`);
|
|
187
|
+
}
|
|
188
|
+
if (options.once)
|
|
189
|
+
throw error;
|
|
190
|
+
console.error((0, colorette_1.red)(`[agent] Poll failed: ${error.message}; retrying in ${pollInterval}s.`));
|
|
191
|
+
await sleep(pollInterval * 1000);
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
pollInterval = response.pollIntervalSeconds ?? DEFAULT_POLL_INTERVAL_SECONDS;
|
|
195
|
+
const pending = response.pendingChanges ?? [];
|
|
196
|
+
if (pending.length === 0) {
|
|
197
|
+
if (options.once) {
|
|
198
|
+
console.info((0, colorette_1.green)("\n[agent] No pending changes; single pass complete.\n"));
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
console.info(`[agent] ${new Date().toISOString()} idle (registry HEAD: ${response.latestRegistrySourceCommit ?? "unknown"})`);
|
|
202
|
+
await sleep(pollInterval * 1000);
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
console.info((0, colorette_1.yellow)(`[agent] Received ${pending.length} change request(s).`));
|
|
206
|
+
for (const change of pending) {
|
|
207
|
+
if (change.delivery && change.delivery !== "worktree") {
|
|
208
|
+
receipts.push({
|
|
209
|
+
changeRequestId: change.id,
|
|
210
|
+
outcome: "FAILED",
|
|
211
|
+
error: `delivery '${change.delivery}' is not supported by this CLI version`,
|
|
212
|
+
});
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
receipts.push(await executeChange(change, status, agentOptions));
|
|
216
|
+
}
|
|
217
|
+
if (options.once && pending.length > 0) {
|
|
218
|
+
console.info((0, colorette_1.cyan)("[agent] Delivering receipts with a final poll..."));
|
|
219
|
+
}
|
|
13
220
|
}
|
|
14
|
-
console.info((0, colorette_1.
|
|
221
|
+
console.info((0, colorette_1.yellow)("\n[agent] Stopped.\n"));
|
|
15
222
|
}
|
|
16
223
|
//# sourceMappingURL=agent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/apply.d.ts
CHANGED
package/dist/commands/apply.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.readSpec = readSpec;
|
|
6
7
|
exports.runApply = runApply;
|
|
7
8
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
8
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":";;;;;AAuBA,4BAoBC;AAED,4BAoBC;AAjED,gEAAkC;AAClC,0DAA6B;AAC7B,yCAAwC;AAExC,mDAAuD;AACvD,0CAAyC;AACzC,8CAAmD;AAEnD,qCAAwD;AAejD,KAAK,UAAU,QAAQ,CAAC,IAAY;IACzC,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,iBAAQ,CAAC,0BAA0B,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI,IAAe,CAAC;IACpB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAc,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,iBAAQ,CAAC,8BAA8B,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,iBAAQ,CAAC,cAAc,IAAI,yCAAyC,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,IAAI,CAAC,OAAmB,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,OAAqB;IAClD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE;QAC3C,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,IAAA,2BAAgB,EAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,iBAAQ,CAChB,wBAAwB,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7G,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;IAE9B,MAAM,IAAA,0BAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,IAAA,iBAAK,EAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC"}
|
package/dist/commands/config.js
CHANGED
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runConfig = runConfig;
|
|
4
4
|
const prompts_1 = require("@inquirer/prompts");
|
|
5
5
|
const colorette_1 = require("colorette");
|
|
6
|
+
const module_graph_1 = require("../assemble/module-graph");
|
|
7
|
+
const module_closure_1 = require("../core/module-closure");
|
|
6
8
|
const modules_state_1 = require("../core/modules-state");
|
|
7
9
|
const registry_1 = require("../lib/registry");
|
|
8
10
|
const modules_state_2 = require("../lib/modules-state");
|
|
@@ -41,16 +43,29 @@ async function runConfig(options) {
|
|
|
41
43
|
if (addNames.length > 0 || removeNames.length > 0) {
|
|
42
44
|
assertKnown(addNames, known);
|
|
43
45
|
assertKnown(removeNames, known);
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (index !== -1)
|
|
51
|
-
next.splice(index, 1);
|
|
46
|
+
const current = (0, modules_state_1.moduleKeys)(ctx.state);
|
|
47
|
+
const rootsWithAdds = [...new Set([...current, ...addNames])];
|
|
48
|
+
const preClosure = await (0, module_graph_1.expandRegistryClosure)(ctx.registry.root, rootsWithAdds);
|
|
49
|
+
const missing = (0, module_graph_1.describeMissingDependencies)(preClosure);
|
|
50
|
+
if (missing.length > 0) {
|
|
51
|
+
throw new errors_1.CliError(`Cannot resolve module dependencies:\n - ${missing.join("\n - ")}`);
|
|
52
52
|
}
|
|
53
|
+
const keptRoots = rootsWithAdds.filter((name) => !removeNames.includes(name));
|
|
54
|
+
const blocks = (0, module_closure_1.findRemovalBlocks)(removeNames, keptRoots, preClosure.graph);
|
|
55
|
+
if (blocks.length > 0) {
|
|
56
|
+
const lines = blocks.map((block) => `cannot remove '${block.key}': still required by ${block.requiredBy.join(", ")}`);
|
|
57
|
+
throw new errors_1.CliError(`${lines.join("\n")}. Remove the dependent modules first.`);
|
|
58
|
+
}
|
|
59
|
+
const next = (0, module_closure_1.expandModuleClosure)(keptRoots, preClosure.graph).keys;
|
|
60
|
+
const nextSet = new Set(next);
|
|
61
|
+
const currentSet = new Set(current);
|
|
53
62
|
await (0, modules_state_2.writeModulesState)(cwd, sink, (0, modules_state_1.withModuleKeys)(ctx.state, next));
|
|
63
|
+
for (const name of next.filter((key) => !currentSet.has(key))) {
|
|
64
|
+
const requiredBy = (0, module_closure_1.directDependents)(name, preClosure.graph, nextSet);
|
|
65
|
+
console.info((0, colorette_1.cyan)(`+ ${name}${requiredBy.length ? ` (required by: ${requiredBy.join(", ")})` : ""}`));
|
|
66
|
+
}
|
|
67
|
+
for (const name of current.filter((key) => !nextSet.has(key)))
|
|
68
|
+
console.info((0, colorette_1.cyan)(`- ${name}`));
|
|
54
69
|
console.info((0, colorette_1.green)(`[info] enabled modules: ${next.join(", ") || "(none)"}`));
|
|
55
70
|
return;
|
|
56
71
|
}
|
|
@@ -68,15 +83,26 @@ async function runConfig(options) {
|
|
|
68
83
|
pageSize: 100,
|
|
69
84
|
loop: true,
|
|
70
85
|
});
|
|
71
|
-
|
|
72
|
-
|
|
86
|
+
const closure = await (0, module_graph_1.expandRegistryClosure)(ctx.registry.root, chosen);
|
|
87
|
+
const missing = (0, module_graph_1.describeMissingDependencies)(closure);
|
|
88
|
+
if (missing.length > 0) {
|
|
89
|
+
throw new errors_1.CliError(`Cannot resolve module dependencies:\n - ${missing.join("\n - ")}`);
|
|
90
|
+
}
|
|
91
|
+
const next = closure.keys;
|
|
92
|
+
const currentSet = new Set(current);
|
|
93
|
+
const nextSet = new Set(next);
|
|
94
|
+
if (next.length === current.length && next.every((name) => current.includes(name))) {
|
|
73
95
|
console.info("\n[info] You did not make any changes to the configuration.\n");
|
|
74
96
|
return;
|
|
75
97
|
}
|
|
76
|
-
|
|
77
|
-
|
|
98
|
+
for (const name of closure.added.filter((key) => currentSet.has(key))) {
|
|
99
|
+
const requiredBy = (0, module_closure_1.directDependents)(name, closure.graph, nextSet);
|
|
100
|
+
console.info((0, colorette_1.cyan)(`= ${name} kept enabled (required by: ${requiredBy.join(", ") || "?"})`));
|
|
101
|
+
}
|
|
102
|
+
await (0, modules_state_2.writeModulesState)(cwd, sink, (0, modules_state_1.withModuleKeys)(ctx.state, next));
|
|
103
|
+
for (const name of next.filter((n) => !currentSet.has(n)))
|
|
78
104
|
console.info((0, colorette_1.cyan)(`+ ${name}`));
|
|
79
|
-
for (const name of current.filter((n) => !
|
|
105
|
+
for (const name of current.filter((n) => !nextSet.has(n)))
|
|
80
106
|
console.info((0, colorette_1.cyan)(`- ${name}`));
|
|
81
107
|
}
|
|
82
108
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":";;AAkCA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/create.js
CHANGED
|
@@ -15,13 +15,7 @@ const TEMPLATE_REPOSITORY_URL = "https://github.com/worldzhy/newbie.git";
|
|
|
15
15
|
const TEMPLATE_SUBDIR = "templates/basic";
|
|
16
16
|
const TEMPLATE_PATH_ENV = "NEWBIE_TEMPLATE_PATH";
|
|
17
17
|
const PACKAGE_NAME_RE = /^(?:@[a-z0-9][a-z0-9-._]*\/)?[a-z0-9][a-z0-9-._]*$/;
|
|
18
|
-
const COPY_IGNORE = new Set([
|
|
19
|
-
"node_modules",
|
|
20
|
-
"dist",
|
|
21
|
-
"generated",
|
|
22
|
-
".git",
|
|
23
|
-
".env",
|
|
24
|
-
]);
|
|
18
|
+
const COPY_IGNORE = new Set(["node_modules", "dist", "generated", ".git", ".env"]);
|
|
25
19
|
async function resolveTemplate(options) {
|
|
26
20
|
const explicit = options.templatePath ?? process.env[TEMPLATE_PATH_ENV];
|
|
27
21
|
if (explicit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/default.js
CHANGED
|
@@ -34,8 +34,7 @@ async function runInteractive(options) {
|
|
|
34
34
|
pageSize: 100,
|
|
35
35
|
loop: true,
|
|
36
36
|
});
|
|
37
|
-
if (chosen.length === enabled.length &&
|
|
38
|
-
chosen.every((name) => enabled.includes(name))) {
|
|
37
|
+
if (chosen.length === enabled.length && chosen.every((name) => enabled.includes(name))) {
|
|
39
38
|
console.info("\n[info] You did not make any changes to the modules.\n");
|
|
40
39
|
return;
|
|
41
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/commands/default.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/commands/default.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.runDevLint = runDevLint;
|
|
7
|
+
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
8
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const colorette_1 = require("colorette");
|
|
10
|
+
const layer_lint_1 = require("../../core/layer-lint");
|
|
11
|
+
const paths_1 = require("../../constants/paths");
|
|
12
|
+
const errors_1 = require("../../lib/errors");
|
|
13
|
+
const registry_1 = require("../../lib/registry");
|
|
14
|
+
const IMPORT_PATTERN = /@modules\/([a-z0-9-]+)/g;
|
|
15
|
+
async function moduleDependencies(dir, selfKey) {
|
|
16
|
+
const dependencies = new Set();
|
|
17
|
+
const stack = [dir];
|
|
18
|
+
while (stack.length > 0) {
|
|
19
|
+
const current = stack.pop();
|
|
20
|
+
const entries = await promises_1.default.readdir(current, { withFileTypes: true }).catch(() => []);
|
|
21
|
+
for (const entry of entries) {
|
|
22
|
+
const full = node_path_1.default.join(current, entry.name);
|
|
23
|
+
if (entry.isDirectory()) {
|
|
24
|
+
if (entry.name === "node_modules" || entry.name.startsWith("."))
|
|
25
|
+
continue;
|
|
26
|
+
stack.push(full);
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (!entry.name.endsWith(".ts"))
|
|
30
|
+
continue;
|
|
31
|
+
const content = await promises_1.default.readFile(full, "utf8");
|
|
32
|
+
for (const match of content.matchAll(IMPORT_PATTERN)) {
|
|
33
|
+
if (match[1] !== selfKey)
|
|
34
|
+
dependencies.add(match[1]);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return [...dependencies].sort();
|
|
39
|
+
}
|
|
40
|
+
async function resolveLintTarget(cwd) {
|
|
41
|
+
try {
|
|
42
|
+
await promises_1.default.stat(node_path_1.default.join(cwd, paths_1.REGISTRY_MODULES_DIR));
|
|
43
|
+
return { root: cwd, url: "", sourceCommit: null, local: true };
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return (0, registry_1.requireRegistry)({ fetch: false });
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async function runDevLint(options) {
|
|
50
|
+
const registry = await resolveLintTarget(node_path_1.default.resolve(options.cwd));
|
|
51
|
+
const keys = await (0, registry_1.listRegistryKeys)(registry.root);
|
|
52
|
+
const modules = [];
|
|
53
|
+
for (const key of keys) {
|
|
54
|
+
const mod = await (0, registry_1.readRegistryModule)(registry.root, key);
|
|
55
|
+
if (!mod)
|
|
56
|
+
continue;
|
|
57
|
+
modules.push({
|
|
58
|
+
key,
|
|
59
|
+
layer: typeof mod.manifest.layer === "string" ? mod.manifest.layer : undefined,
|
|
60
|
+
dependencies: await moduleDependencies(mod.dir, key),
|
|
61
|
+
declaredDependencies: mod.manifest.moduleDependencies ?? [],
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
console.info(`Linted ${modules.length} registry module(s) in ${registry.root}\n`);
|
|
65
|
+
const findings = (0, layer_lint_1.lintModuleLayers)(modules);
|
|
66
|
+
const errors = findings.filter((finding) => finding.level === "error");
|
|
67
|
+
const warnings = findings.filter((finding) => finding.level === "warning");
|
|
68
|
+
for (const finding of errors)
|
|
69
|
+
console.info((0, colorette_1.red)(` x [${finding.module}] ${finding.message}`));
|
|
70
|
+
for (const finding of warnings)
|
|
71
|
+
console.info((0, colorette_1.yellow)(` ! [${finding.module}] ${finding.message}`));
|
|
72
|
+
if (findings.length === 0) {
|
|
73
|
+
console.info((0, colorette_1.green)("Layering rules satisfied."));
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
console.info((0, colorette_1.gray)(`\n${errors.length} error(s), ${warnings.length} warning(s).`));
|
|
77
|
+
}
|
|
78
|
+
if (errors.length > 0) {
|
|
79
|
+
throw new errors_1.CliError(`Layer lint found ${errors.length} problem(s).`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=lint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/commands/dev/lint.ts"],"names":[],"mappings":";;;;;AA8CA,gCAiCC;AA/ED,gEAAkC;AAClC,0DAA6B;AAC7B,yCAAqD;AAErD,sDAAwE;AACxE,iDAA6D;AAC7D,6CAA4C;AAC5C,iDAA6G;AAG7G,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAGjD,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,OAAe;IAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,KAAK,GAAa,CAAC,GAAG,CAAC,CAAC;IAC9B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAgC,CAAC,CAAC;QACjH,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAC1E,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,SAAS;YACX,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC1C,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAChD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACrD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO;oBAAE,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC;AAGD,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC1C,IAAI,CAAC;QACH,MAAM,kBAAE,CAAC,IAAI,CAAC,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,4BAAoB,CAAC,CAAC,CAAC;QACpD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,OAAwB;IACvD,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAgB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAkB,EAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,OAAO,CAAC,IAAI,CAAC;YACX,GAAG;YACH,KAAK,EAAE,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAC9E,YAAY,EAAE,MAAM,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;YACpD,oBAAoB,EAAE,GAAG,CAAC,QAAQ,CAAC,kBAAkB,IAAI,EAAE;SAC5D,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,MAAM,0BAA0B,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;IAElF,MAAM,QAAQ,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAE3E,KAAK,MAAM,OAAO,IAAI,MAAM;QAAE,OAAO,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,QAAQ,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9F,KAAK,MAAM,OAAO,IAAI,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,IAAA,kBAAM,EAAC,QAAQ,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnG,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,IAAA,iBAAK,EAAC,2BAA2B,CAAC,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,KAAK,MAAM,CAAC,MAAM,cAAc,QAAQ,CAAC,MAAM,cAAc,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,iBAAQ,CAAC,oBAAoB,MAAM,CAAC,MAAM,cAAc,CAAC,CAAC;IACtE,CAAC;AACH,CAAC"}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -10,6 +10,7 @@ const figlet_1 = __importDefault(require("figlet"));
|
|
|
10
10
|
const colorette_1 = require("colorette");
|
|
11
11
|
const paths_1 = require("../constants/paths");
|
|
12
12
|
const drift_1 = require("../core/drift");
|
|
13
|
+
const module_closure_1 = require("../core/module-closure");
|
|
13
14
|
const modules_state_1 = require("../core/modules-state");
|
|
14
15
|
const prisma_schema_1 = require("../core/prisma-schema");
|
|
15
16
|
const check_1 = require("../lib/check");
|
|
@@ -56,13 +57,10 @@ async function runDoctor(options) {
|
|
|
56
57
|
if (!(await (0, fs_util_1.fileExists)(cwd, paths_1.MODULES_CONFIG_TS))) {
|
|
57
58
|
error(`Generated ${paths_1.MODULES_CONFIG_TS} is missing; run 'newbie install'.`);
|
|
58
59
|
}
|
|
60
|
+
const moduleGraph = new Map();
|
|
59
61
|
const missingEnv = await (0, check_1.collectMissingEnv)(cwd, keys);
|
|
60
|
-
const datasourceContent = await promises_1.default
|
|
61
|
-
|
|
62
|
-
.catch(() => null);
|
|
63
|
-
const datasourceSchemas = datasourceContent
|
|
64
|
-
? (0, prisma_schema_1.readDatasourceSchemas)(datasourceContent)
|
|
65
|
-
: null;
|
|
62
|
+
const datasourceContent = await promises_1.default.readFile(node_path_1.default.resolve(cwd, paths_1.PRISMA_SCHEMA_MAIN), "utf8").catch(() => null);
|
|
63
|
+
const datasourceSchemas = datasourceContent ? (0, prisma_schema_1.readDatasourceSchemas)(datasourceContent) : null;
|
|
66
64
|
if (datasourceContent && datasourceSchemas === null) {
|
|
67
65
|
notice(`Cannot parse schemas array in ${paths_1.PRISMA_SCHEMA_MAIN}.`);
|
|
68
66
|
}
|
|
@@ -77,12 +75,12 @@ async function runDoctor(options) {
|
|
|
77
75
|
error(`${label}: newbie.module.json missing or unreadable.`);
|
|
78
76
|
continue;
|
|
79
77
|
}
|
|
78
|
+
moduleGraph.set(key, manifest.moduleDependencies ?? []);
|
|
80
79
|
if (manifest.schema) {
|
|
81
80
|
if (!(await (0, fs_util_1.fileExists)(cwd, node_path_1.default.posix.join(paths_1.PRISMA_SCHEMA_MODELS_DIR, `${key}.prisma`)))) {
|
|
82
81
|
error(`${label}: ${paths_1.PRISMA_SCHEMA_MODELS_DIR}/${key}.prisma missing; run 'newbie install'.`);
|
|
83
82
|
}
|
|
84
|
-
if (datasourceSchemas &&
|
|
85
|
-
!datasourceSchemas.includes((0, prisma_schema_1.moduleSchemaNamespace)(key))) {
|
|
83
|
+
if (datasourceSchemas && !datasourceSchemas.includes((0, prisma_schema_1.moduleSchemaNamespace)(key))) {
|
|
86
84
|
error(`${label}: datasource schemas lacks '${(0, prisma_schema_1.moduleSchemaNamespace)(key)}'.`);
|
|
87
85
|
}
|
|
88
86
|
}
|
|
@@ -90,9 +88,7 @@ async function runDoctor(options) {
|
|
|
90
88
|
error(`${label}: missing env ${missingEnv[key].join(", ")}`);
|
|
91
89
|
}
|
|
92
90
|
const record = state.modules.find((entry) => entry.key === key);
|
|
93
|
-
if (registry?.sourceCommit &&
|
|
94
|
-
record?.sourceCommit &&
|
|
95
|
-
record.sourceCommit !== registry.sourceCommit) {
|
|
91
|
+
if (registry?.sourceCommit && record?.sourceCommit && record.sourceCommit !== registry.sourceCommit) {
|
|
96
92
|
notice(`${label}: update available (${record.sourceCommit.slice(0, 7)} -> ${registry.sourceCommit.slice(0, 7)}); run 'newbie update'.`);
|
|
97
93
|
}
|
|
98
94
|
if (registry && record?.sourceCommit) {
|
|
@@ -110,6 +106,9 @@ async function runDoctor(options) {
|
|
|
110
106
|
}
|
|
111
107
|
}
|
|
112
108
|
}
|
|
109
|
+
for (const { module, dependency } of (0, module_closure_1.findMissingEnabledModules)(keys, moduleGraph)) {
|
|
110
|
+
error(`'${dependency}' must be enabled because module '${module}' declares it as a module dependency; run 'newbie install'.`);
|
|
111
|
+
}
|
|
113
112
|
const copied = new Set((await promises_1.default
|
|
114
113
|
.readdir(node_path_1.default.resolve(cwd, paths_1.MODULES_DIR), { withFileTypes: true })
|
|
115
114
|
.catch(() => []))
|
|
@@ -117,9 +116,7 @@ async function runDoctor(options) {
|
|
|
117
116
|
.map((dirent) => dirent.name));
|
|
118
117
|
for (const dir of copied) {
|
|
119
118
|
if (!keys.includes(dir)) {
|
|
120
|
-
const isRegistryModule = registry
|
|
121
|
-
? (await (0, registry_1.readRegistryModule)(registry.root, dir)) !== null
|
|
122
|
-
: false;
|
|
119
|
+
const isRegistryModule = registry ? (await (0, registry_1.readRegistryModule)(registry.root, dir)) !== null : false;
|
|
123
120
|
if (isRegistryModule) {
|
|
124
121
|
notice(`Extra module directory '${dir}' not declared in ${paths_1.MODULES_JSON}; run 'newbie install' to remove it.`);
|
|
125
122
|
}
|