@devbie/newbie-cli 0.1.1 → 0.2.1
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/assemble/env.js +1 -0
- package/dist/assemble/env.js.map +1 -1
- package/dist/commands/watch.js +16 -0
- package/dist/commands/watch.js.map +1 -1
- package/dist/core/module-manifest.d.ts +4 -0
- package/dist/core/module-manifest.js +14 -0
- package/dist/core/module-manifest.js.map +1 -1
- package/dist/lib/module-cli.js +5 -4
- package/dist/lib/module-cli.js.map +1 -1
- package/package.json +1 -1
package/dist/assemble/env.js
CHANGED
|
@@ -21,6 +21,7 @@ async function assembleEnv(params) {
|
|
|
21
21
|
raw = await promises_1.default.readFile(node_path_1.default.resolve(cwd, paths_1.ENV_PATH), "utf8");
|
|
22
22
|
}
|
|
23
23
|
catch {
|
|
24
|
+
(0, issues_1.reportIssue)(issues, sink, `${paths_1.ENV_PATH} not found; a new file will be created with module variables only.`);
|
|
24
25
|
}
|
|
25
26
|
let lines = (0, env_file_1.parseEnv)(raw);
|
|
26
27
|
for (const key of added) {
|
package/dist/assemble/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/assemble/env.ts"],"names":[],"mappings":";;;;;AAyBA,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/assemble/env.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/watch.js
CHANGED
|
@@ -10,6 +10,7 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
10
10
|
const colorette_1 = require("colorette");
|
|
11
11
|
const paths_1 = require("../constants/paths");
|
|
12
12
|
const errors_1 = require("../lib/errors");
|
|
13
|
+
const exec_1 = require("../lib/exec");
|
|
13
14
|
const registry_1 = require("../lib/registry");
|
|
14
15
|
async function installedModuleKeys(projectRoot) {
|
|
15
16
|
const dir = node_path_1.default.join(projectRoot, paths_1.MODULES_DIR);
|
|
@@ -47,6 +48,15 @@ function debounce(fn, delay) {
|
|
|
47
48
|
timer = setTimeout(() => fn(...args), delay);
|
|
48
49
|
};
|
|
49
50
|
}
|
|
51
|
+
async function moduleHasUncommittedChanges(registryRoot, key) {
|
|
52
|
+
try {
|
|
53
|
+
const status = await (0, exec_1.execCapture)("git", ["status", "--porcelain", "--", node_path_1.default.join(paths_1.REGISTRY_MODULES_DIR, key)], { cwd: registryRoot });
|
|
54
|
+
return (0, exec_1.trim)(status).length > 0;
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
50
60
|
async function runWatch(options) {
|
|
51
61
|
const projectRoot = node_path_1.default.resolve(options.cwd);
|
|
52
62
|
const registry = await (0, registry_1.resolveRegistry)({ fetch: false });
|
|
@@ -69,6 +79,12 @@ async function runWatch(options) {
|
|
|
69
79
|
console.info((0, colorette_1.cyan)(`Watching ${watchKeys.length} module(s) for changes in ${registry.root}…`));
|
|
70
80
|
console.info(` ${watchKeys.join(", ")}`);
|
|
71
81
|
console.info("Press Ctrl+C to stop.\n");
|
|
82
|
+
const dirtyKeys = (await Promise.all(watchKeys.map(async (key) => ((await moduleHasUncommittedChanges(registry.root, key)) ? key : null)))).filter((key) => key !== null);
|
|
83
|
+
if (dirtyKeys.length > 0) {
|
|
84
|
+
console.warn((0, colorette_1.yellow)(`Uncommitted changes in: ${dirtyKeys.join(", ")}\n` +
|
|
85
|
+
" watch syncs straight from the working tree, so synced content has no matching\n" +
|
|
86
|
+
" registry commit and the assembled project will drift. Audit with `newbie doctor`.\n"));
|
|
87
|
+
}
|
|
72
88
|
const watchers = [];
|
|
73
89
|
for (const key of watchKeys) {
|
|
74
90
|
const sourceDir = (0, registry_1.moduleRootInRegistry)(registry.root, key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { NestAsset } from "./assets";
|
|
2
|
+
export type ModuleRole = "collector";
|
|
3
|
+
export declare const MODULE_ROLES: readonly ModuleRole[];
|
|
4
|
+
export declare function isModuleRole(value: string): value is ModuleRole;
|
|
2
5
|
export interface ModuleWiring {
|
|
3
6
|
file: string;
|
|
4
7
|
className: string;
|
|
@@ -6,6 +9,7 @@ export interface ModuleWiring {
|
|
|
6
9
|
export interface ModuleManifest {
|
|
7
10
|
key: string;
|
|
8
11
|
layer?: string;
|
|
12
|
+
role?: ModuleRole;
|
|
9
13
|
module: ModuleWiring;
|
|
10
14
|
schema?: string;
|
|
11
15
|
"config-service"?: Record<string, unknown>;
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MODULE_ROLES = void 0;
|
|
4
|
+
exports.isModuleRole = isModuleRole;
|
|
3
5
|
exports.normalizeModuleManifest = normalizeModuleManifest;
|
|
4
6
|
exports.moduleImportLine = moduleImportLine;
|
|
5
7
|
exports.sanitizeModuleNames = sanitizeModuleNames;
|
|
8
|
+
exports.MODULE_ROLES = ["collector"];
|
|
9
|
+
function isModuleRole(value) {
|
|
10
|
+
return exports.MODULE_ROLES.includes(value);
|
|
11
|
+
}
|
|
6
12
|
function normalizeModuleDependencies(raw, key) {
|
|
7
13
|
if (raw === undefined)
|
|
8
14
|
return undefined;
|
|
@@ -18,6 +24,13 @@ function assertOptionalString(value, field, key) {
|
|
|
18
24
|
throw new Error(`Invalid newbie.module.json for '${key}': '${field}' must be a non-empty string when declared.`);
|
|
19
25
|
}
|
|
20
26
|
}
|
|
27
|
+
function assertOptionalRole(value, key) {
|
|
28
|
+
if (value === undefined)
|
|
29
|
+
return;
|
|
30
|
+
if (typeof value !== "string" || !isModuleRole(value)) {
|
|
31
|
+
throw new Error(`Invalid newbie.module.json for '${key}': 'role' must be one of: ${exports.MODULE_ROLES.join(", ")} when declared.`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
21
34
|
function normalizeModuleManifest(raw, expectedKey) {
|
|
22
35
|
if (!raw || typeof raw !== "object") {
|
|
23
36
|
throw new Error("Invalid newbie.module.json: expected an object.");
|
|
@@ -40,6 +53,7 @@ function normalizeModuleManifest(raw, expectedKey) {
|
|
|
40
53
|
const moduleDependencies = normalizeModuleDependencies(data.moduleDependencies, data.key);
|
|
41
54
|
assertOptionalString(data.cli, "cli", data.key);
|
|
42
55
|
assertOptionalString(data.sdk, "sdk", data.key);
|
|
56
|
+
assertOptionalRole(data.role, data.key);
|
|
43
57
|
const manifest = {
|
|
44
58
|
...data,
|
|
45
59
|
key: data.key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-manifest.js","sourceRoot":"","sources":["../../src/core/module-manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-manifest.js","sourceRoot":"","sources":["../../src/core/module-manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/module-cli.js
CHANGED
|
@@ -54,10 +54,11 @@ async function registerModuleCommands(program, options) {
|
|
|
54
54
|
return;
|
|
55
55
|
const state = await (0, modules_state_1.readModulesState)(options.cwd);
|
|
56
56
|
for (const key of (0, modules_state_2.moduleKeys)(state)) {
|
|
57
|
-
|
|
58
|
-
if (!manifest)
|
|
59
|
-
continue;
|
|
57
|
+
let manifest = null;
|
|
60
58
|
try {
|
|
59
|
+
manifest = await (0, module_install_2.readInstalledManifest)(options.cwd, key);
|
|
60
|
+
if (!manifest)
|
|
61
|
+
continue;
|
|
61
62
|
const loaded = await loadModuleCliEntry(options.cwd, key, manifest);
|
|
62
63
|
if (!loaded)
|
|
63
64
|
continue;
|
|
@@ -66,7 +67,7 @@ async function registerModuleCommands(program, options) {
|
|
|
66
67
|
program.addCommand(detached);
|
|
67
68
|
}
|
|
68
69
|
catch (error) {
|
|
69
|
-
console.error((0, colorette_1.yellow)(`[warn] Skipped CLI namespace '${manifest
|
|
70
|
+
console.error((0, colorette_1.yellow)(`[warn] Skipped CLI namespace '${manifest?.cli ?? key}' of module '${key}': ${error.message}`));
|
|
70
71
|
if (process.env.NEWBIE_DEBUG && error.stack) {
|
|
71
72
|
console.error(error.stack);
|
|
72
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-cli.js","sourceRoot":"","sources":["../../src/lib/module-cli.ts"],"names":[],"mappings":";;;;;AAuEA,gDA2BC;AAeD,
|
|
1
|
+
{"version":3,"file":"module-cli.js","sourceRoot":"","sources":["../../src/lib/module-cli.ts"],"names":[],"mappings":"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"}
|