@devbie/newbie-cli 1.11.0 ā 1.12.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/dist/assemble/deploy.js +2 -1
- package/dist/assemble/deploy.js.map +1 -1
- package/dist/assemble/module-source-drift.js +2 -1
- package/dist/assemble/module-source-drift.js.map +1 -1
- package/dist/assemble/modules-copy.js +6 -6
- package/dist/assemble/modules-copy.js.map +1 -1
- package/dist/assemble/pipeline.js +12 -12
- package/dist/assemble/pipeline.js.map +1 -1
- package/dist/assemble/schema.js +2 -1
- package/dist/assemble/schema.js.map +1 -1
- package/dist/assemble/types.d.ts +1 -1
- package/dist/commands/doctor.js +5 -5
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/modules/add.js +1 -1
- package/dist/commands/modules/add.js.map +1 -1
- package/dist/commands/modules/apply.js +1 -1
- package/dist/commands/modules/apply.js.map +1 -1
- package/dist/commands/modules/default.js +1 -1
- package/dist/commands/modules/default.js.map +1 -1
- package/dist/commands/modules/remove.js +1 -1
- package/dist/commands/modules/remove.js.map +1 -1
- package/dist/commands/modules/update.js +2 -3
- package/dist/commands/modules/update.js.map +1 -1
- package/dist/commands/modules/watch.js +5 -4
- package/dist/commands/modules/watch.js.map +1 -1
- package/dist/commands/status.js +2 -3
- package/dist/commands/status.js.map +1 -1
- package/dist/constants/paths.d.ts +0 -3
- package/dist/constants/paths.js +1 -4
- package/dist/constants/paths.js.map +1 -1
- package/dist/core/modules-state.d.ts +1 -18
- package/dist/core/modules-state.js +0 -45
- package/dist/core/modules-state.js.map +1 -1
- package/dist/lib/module-cli.js +5 -5
- package/dist/lib/module-cli.js.map +1 -1
- package/dist/lib/module-install.js +4 -4
- package/dist/lib/module-install.js.map +1 -1
- package/dist/lib/modules-state.d.ts +1 -1
- package/dist/lib/modules-state.js +7 -16
- package/dist/lib/modules-state.js.map +1 -1
- package/dist/lib/registry.js +3 -2
- package/dist/lib/registry.js.map +1 -1
- package/dist/program.d.ts +1 -0
- package/dist/program.js +7 -0
- package/dist/program.js.map +1 -1
- package/package.json +2 -1
- package/dist/commands/modules/install.d.ts +0 -7
- package/dist/commands/modules/install.js +0 -121
- package/dist/commands/modules/install.js.map +0 -1
- package/dist/commands/template/sync.d.ts +0 -7
- package/dist/commands/template/sync.js +0 -142
- package/dist/commands/template/sync.js.map +0 -1
- package/dist/core/template-sync.d.ts +0 -38
- package/dist/core/template-sync.js +0 -218
- package/dist/core/template-sync.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../src/commands/modules/watch.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../src/commands/modules/watch.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/status.js
CHANGED
|
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.collectStatus = collectStatus;
|
|
7
7
|
exports.runStatus = runStatus;
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
-
const
|
|
9
|
+
const modules_state_1 = require("@devbie/modules-state");
|
|
10
10
|
const drift_1 = require("../core/drift");
|
|
11
|
-
const modules_state_1 = require("../core/modules-state");
|
|
12
11
|
const check_1 = require("../lib/check");
|
|
13
12
|
const drift_2 = require("../lib/drift");
|
|
14
13
|
const fs_util_1 = require("../lib/fs-util");
|
|
@@ -23,7 +22,7 @@ async function collectStatus(cwd, options) {
|
|
|
23
22
|
const modules = [];
|
|
24
23
|
for (const record of state.modules) {
|
|
25
24
|
const key = record.key;
|
|
26
|
-
const installed = await (0, fs_util_1.fileExists)(cwd, `${
|
|
25
|
+
const installed = await (0, fs_util_1.fileExists)(cwd, `${modules_state_1.MODULES_DIR}/${key}`);
|
|
27
26
|
const manifest = installed ? await (0, module_install_1.readInstalledManifest)(cwd, key) : null;
|
|
28
27
|
const entry = {
|
|
29
28
|
key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":";;;;;AAsCA,sCA8CC;AAMD,8BAGC;AA7FD,0DAA6B;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":";;;;;AAsCA,sCA8CC;AAMD,8BAGC;AA7FD,0DAA6B;AAE7B,yDAAgE;AAGhE,yCAA8C;AAC9C,wCAAiD;AACjD,wCAA+E;AAC/E,4CAA4C;AAC5C,0DAA8D;AAC9D,wDAAwD;AACxD,8CAAkD;AA2B3C,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,OAA6B;IAC5E,MAAM,KAAK,GAAG,MAAM,IAAA,gCAAgB,EAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,IAAA,0BAAU,EAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACtD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACvB,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAU,EAAC,GAAG,EAAE,GAAG,2BAAW,IAAI,GAAG,EAAE,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,IAAA,sCAAqB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1E,MAAM,KAAK,GAAsB;YAC/B,GAAG;YACH,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS;YACT,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC;YACpC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE;YACjC,eAAe,EAAE,OAAO,CACtB,QAAQ,EAAE,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CAC/F;SACF,CAAC;QAEF,IAAI,OAAO,EAAE,KAAK,IAAI,SAAS,IAAI,QAAQ,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACnE,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAsB,EAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YAClF,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,KAAK,GAAG,IAAA,qBAAa,EAAC,MAAM,IAAA,+BAAuB,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IAED,OAAO;QACL,GAAG;QACH,QAAQ,EAAE,QAAQ;YAChB,CAAC,CAAC;gBACE,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;aACpC;YACH,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;QACxB,OAAO;KACR,CAAC;AACJ,CAAC;AAMM,KAAK,UAAU,SAAS,CAAC,OAA4C;IAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACxF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
export declare const MODULES_JSON = "modules.json";
|
|
2
|
-
export declare const MODULES_DIR = "src/modules";
|
|
3
1
|
export declare const MODULES_MODULE_TS = "src/modules/modules.module.ts";
|
|
4
2
|
export declare const MODULES_CONFIG_TS = "src/modules/modules.config.ts";
|
|
5
|
-
export declare const MODULE_MANIFEST_FILE = "newbie.module.json";
|
|
6
3
|
export declare const PRISMA_SCHEMA_MAIN = "prisma/schema.prisma";
|
|
7
4
|
export declare const PRISMA_SCHEMA_MODELS_DIR = "prisma/models";
|
|
8
5
|
export declare const PRISMA_ADDITIONS_DIR = "prisma-additions";
|
package/dist/constants/paths.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ENV_TOOL_CONFIG_CANDIDATES = exports.REGISTRY_MODULES_DIR = exports.DEPLOY_CADDYFILE_TMPL = exports.DEPLOY_COMPOSE_MODULES = exports.PACKAGE_JSON_PATH = exports.NEST_CLI_JSON = exports.ENV_EXAMPLE_PATH = exports.ENV_PATH = exports.PRISMA_ADDITIONS_DIR = exports.PRISMA_SCHEMA_MODELS_DIR = exports.PRISMA_SCHEMA_MAIN = exports.
|
|
4
|
-
exports.MODULES_JSON = "modules.json";
|
|
5
|
-
exports.MODULES_DIR = "src/modules";
|
|
3
|
+
exports.ENV_TOOL_CONFIG_CANDIDATES = exports.REGISTRY_MODULES_DIR = exports.DEPLOY_CADDYFILE_TMPL = exports.DEPLOY_COMPOSE_MODULES = exports.PACKAGE_JSON_PATH = exports.NEST_CLI_JSON = exports.ENV_EXAMPLE_PATH = exports.ENV_PATH = exports.PRISMA_ADDITIONS_DIR = exports.PRISMA_SCHEMA_MODELS_DIR = exports.PRISMA_SCHEMA_MAIN = exports.MODULES_CONFIG_TS = exports.MODULES_MODULE_TS = void 0;
|
|
6
4
|
exports.MODULES_MODULE_TS = "src/modules/modules.module.ts";
|
|
7
5
|
exports.MODULES_CONFIG_TS = "src/modules/modules.config.ts";
|
|
8
|
-
exports.MODULE_MANIFEST_FILE = "newbie.module.json";
|
|
9
6
|
exports.PRISMA_SCHEMA_MAIN = "prisma/schema.prisma";
|
|
10
7
|
exports.PRISMA_SCHEMA_MODELS_DIR = "prisma/models";
|
|
11
8
|
exports.PRISMA_ADDITIONS_DIR = "prisma-additions";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/constants/paths.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/constants/paths.ts"],"names":[],"mappings":";;;AASa,QAAA,iBAAiB,GAAG,+BAA+B,CAAC;AACpD,QAAA,iBAAiB,GAAG,+BAA+B,CAAC;AAEpD,QAAA,kBAAkB,GAAG,sBAAsB,CAAC;AAC5C,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAM3C,QAAA,oBAAoB,GAAG,kBAAkB,CAAC;AAE1C,QAAA,QAAQ,GAAG,MAAM,CAAC;AAClB,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAClC,QAAA,aAAa,GAAG,eAAe,CAAC;AAChC,QAAA,iBAAiB,GAAG,cAAc,CAAC;AAGnC,QAAA,sBAAsB,GAAG,4BAA4B,CAAC;AAEtD,QAAA,qBAAqB,GAAG,uBAAuB,CAAC;AAGhD,QAAA,oBAAoB,GAAG,kBAAkB,CAAC;AAG1C,QAAA,0BAA0B,GAAG,CAAC,yBAAyB,EAAE,sCAAsC,CAAC,CAAC"}
|
|
@@ -1,21 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
key: string;
|
|
3
|
-
version: string | null;
|
|
4
|
-
sourceCommit: string | null;
|
|
5
|
-
localPatches: string[];
|
|
6
|
-
}
|
|
7
|
-
export interface ModulesState {
|
|
8
|
-
registry: {
|
|
9
|
-
url?: string;
|
|
10
|
-
ref?: string | null;
|
|
11
|
-
sourceCommit?: string | null;
|
|
12
|
-
} | null;
|
|
13
|
-
modules: ModuleRecord[];
|
|
14
|
-
[key: string]: unknown;
|
|
15
|
-
}
|
|
16
|
-
export declare function createEmptyModulesState(): ModulesState;
|
|
17
|
-
export declare function normalizeModulesState(raw: unknown): ModulesState;
|
|
18
|
-
export declare function moduleKeys(state: ModulesState): string[];
|
|
1
|
+
import { ModulesState } from "@devbie/modules-state";
|
|
19
2
|
export interface EnabledDiff {
|
|
20
3
|
added: string[];
|
|
21
4
|
removed: string[];
|
|
@@ -1,52 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createEmptyModulesState = createEmptyModulesState;
|
|
4
|
-
exports.normalizeModulesState = normalizeModulesState;
|
|
5
|
-
exports.moduleKeys = moduleKeys;
|
|
6
3
|
exports.diffModuleKeys = diffModuleKeys;
|
|
7
4
|
exports.withModuleKeys = withModuleKeys;
|
|
8
|
-
function createEmptyModulesState() {
|
|
9
|
-
return { registry: null, modules: [] };
|
|
10
|
-
}
|
|
11
|
-
function normalizeRecord(raw) {
|
|
12
|
-
if (!raw || typeof raw !== "object")
|
|
13
|
-
return null;
|
|
14
|
-
const record = raw;
|
|
15
|
-
if (typeof record.key !== "string" || record.key.length === 0)
|
|
16
|
-
return null;
|
|
17
|
-
const sourceCommit = typeof record.sourceCommit === "string" ? record.sourceCommit : null;
|
|
18
|
-
const version = typeof record.version === "string" ? record.version : null;
|
|
19
|
-
const localPatches = Array.isArray(record.localPatches)
|
|
20
|
-
? record.localPatches.filter((patch) => typeof patch === "string")
|
|
21
|
-
: [];
|
|
22
|
-
return { key: record.key, version, sourceCommit, localPatches };
|
|
23
|
-
}
|
|
24
|
-
function normalizeModulesState(raw) {
|
|
25
|
-
const data = (raw && typeof raw === "object" ? raw : {});
|
|
26
|
-
const registryData = data.registry && typeof data.registry === "object" ? data.registry : null;
|
|
27
|
-
const registry = registryData
|
|
28
|
-
? {
|
|
29
|
-
url: typeof registryData.url === "string" ? registryData.url : undefined,
|
|
30
|
-
ref: typeof registryData.ref === "string" ? registryData.ref : null,
|
|
31
|
-
sourceCommit: typeof registryData.sourceCommit === "string" ? registryData.sourceCommit : null,
|
|
32
|
-
}
|
|
33
|
-
: null;
|
|
34
|
-
const records = Array.isArray(data.modules)
|
|
35
|
-
? data.modules.map(normalizeRecord).filter((record) => record !== null)
|
|
36
|
-
: [];
|
|
37
|
-
const seen = new Set();
|
|
38
|
-
const modules = [];
|
|
39
|
-
for (const record of records) {
|
|
40
|
-
if (seen.has(record.key))
|
|
41
|
-
continue;
|
|
42
|
-
seen.add(record.key);
|
|
43
|
-
modules.push(record);
|
|
44
|
-
}
|
|
45
|
-
return { ...data, registry, modules };
|
|
46
|
-
}
|
|
47
|
-
function moduleKeys(state) {
|
|
48
|
-
return state.modules.map((record) => record.key);
|
|
49
|
-
}
|
|
50
5
|
function diffModuleKeys(current, next) {
|
|
51
6
|
const currentSet = new Set(current);
|
|
52
7
|
const nextSet = new Set(next);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules-state.js","sourceRoot":"","sources":["../../src/core/modules-state.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"modules-state.js","sourceRoot":"","sources":["../../src/core/modules-state.ts"],"names":[],"mappings":";;AAgBA,wCAOC;AAQD,wCAiBC;AAhCD,SAAgB,cAAc,CAAC,OAAiB,EAAE,IAAc;IAC9D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACpD,CAAC;AACJ,CAAC;AAQD,SAAgB,cAAc,CAAC,KAAmB,EAAE,QAAkB;IACpE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI;YAChB,GAAG;YACH,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,EAAE;SACjB,CACF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC"}
|
package/dist/lib/module-cli.js
CHANGED
|
@@ -9,11 +9,11 @@ const promises_1 = __importDefault(require("node:fs/promises"));
|
|
|
9
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
10
|
const colorette_1 = require("colorette");
|
|
11
11
|
const commander_1 = require("commander");
|
|
12
|
+
const modules_state_1 = require("@devbie/modules-state");
|
|
12
13
|
const module_install_1 = require("./module-install");
|
|
13
14
|
const module_install_2 = require("./module-install");
|
|
14
15
|
const errors_1 = require("./errors");
|
|
15
|
-
const
|
|
16
|
-
const modules_state_2 = require("../core/modules-state");
|
|
16
|
+
const modules_state_2 = require("./modules-state");
|
|
17
17
|
const CLI_ENTRY_RELATIVE = node_path_1.default.posix.join("cli", "index.ts");
|
|
18
18
|
let tsxRegistered = false;
|
|
19
19
|
function ensureTsxRegistered() {
|
|
@@ -50,10 +50,10 @@ async function loadModuleCliEntry(cwd, key, manifest) {
|
|
|
50
50
|
return { namespace: manifest.cli, entry: { register: mod.register } };
|
|
51
51
|
}
|
|
52
52
|
async function registerModuleCommands(program, options) {
|
|
53
|
-
if (!(await (0,
|
|
53
|
+
if (!(await (0, modules_state_2.stateExists)(options.cwd)))
|
|
54
54
|
return;
|
|
55
|
-
const state = await (0,
|
|
56
|
-
for (const key of (0,
|
|
55
|
+
const state = await (0, modules_state_2.readModulesState)(options.cwd);
|
|
56
|
+
for (const key of (0, modules_state_1.moduleKeys)(state)) {
|
|
57
57
|
let manifest = null;
|
|
58
58
|
try {
|
|
59
59
|
manifest = await (0, module_install_2.readInstalledManifest)(options.cwd, key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-cli.js","sourceRoot":"","sources":["../../src/lib/module-cli.ts"],"names":[],"mappings":";;;;;AAuEA,gDA2BC;AAeD,wDA+BC;AAhJD,gEAAkC;AAClC,0DAA6B;AAE7B,yCAAmC;AACnC,yCAAoC;
|
|
1
|
+
{"version":3,"file":"module-cli.js","sourceRoot":"","sources":["../../src/lib/module-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,14 @@ exports.installedSchemaPath = installedSchemaPath;
|
|
|
9
9
|
exports.readInstalledSchema = readInstalledSchema;
|
|
10
10
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
11
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
-
const
|
|
12
|
+
const modules_state_1 = require("@devbie/modules-state");
|
|
13
13
|
const module_manifest_1 = require("../core/module-manifest");
|
|
14
14
|
const errors_1 = require("./errors");
|
|
15
15
|
function installedModuleDir(cwd, key) {
|
|
16
|
-
return node_path_1.default.resolve(cwd,
|
|
16
|
+
return node_path_1.default.resolve(cwd, modules_state_1.MODULES_DIR, key);
|
|
17
17
|
}
|
|
18
18
|
async function readInstalledManifest(cwd, key) {
|
|
19
|
-
const file = node_path_1.default.join(installedModuleDir(cwd, key),
|
|
19
|
+
const file = node_path_1.default.join(installedModuleDir(cwd, key), modules_state_1.MODULE_MANIFEST_FILE);
|
|
20
20
|
let raw;
|
|
21
21
|
try {
|
|
22
22
|
raw = await promises_1.default.readFile(file, "utf8");
|
|
@@ -30,7 +30,7 @@ async function readInstalledManifest(cwd, key) {
|
|
|
30
30
|
return (0, module_manifest_1.normalizeModuleManifest)(JSON.parse(raw), key);
|
|
31
31
|
}
|
|
32
32
|
catch (error) {
|
|
33
|
-
throw new errors_1.CliError(`Invalid ${node_path_1.default.posix.join(
|
|
33
|
+
throw new errors_1.CliError(`Invalid ${node_path_1.default.posix.join(modules_state_1.MODULES_DIR, key, modules_state_1.MODULE_MANIFEST_FILE)}: ${error.message}`);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
function installedSchemaPath(cwd, key, manifest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-install.js","sourceRoot":"","sources":["../../src/lib/module-install.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"module-install.js","sourceRoot":"","sources":["../../src/lib/module-install.ts"],"names":[],"mappings":";;;;;AAQA,gDAEC;AAOD,sDAgBC;AAGD,kDAGC;AAGD,kDASC;AAnDD,gEAAkC;AAClC,0DAA6B;AAE7B,yDAA0E;AAE1E,6DAAkF;AAClF,qCAAoC;AAEpC,SAAgB,kBAAkB,CAAC,GAAW,EAAE,GAAW;IACzD,OAAO,mBAAI,CAAC,OAAO,CAAC,GAAG,EAAE,2BAAW,EAAE,GAAG,CAAC,CAAC;AAC7C,CAAC;AAOM,KAAK,UAAU,qBAAqB,CAAC,GAAW,EAAE,GAAW;IAClE,MAAM,IAAI,GAAG,mBAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,oCAAoB,CAAC,CAAC;IAC3E,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACpE,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,yCAAuB,EAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,iBAAQ,CAChB,WAAW,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,2BAAW,EAAE,GAAG,EAAE,oCAAoB,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CAClG,CAAC;IACJ,CAAC;AACH,CAAC;AAGD,SAAgB,mBAAmB,CAAC,GAAW,EAAE,GAAW,EAAE,QAAwB;IACpF,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAClC,OAAO,mBAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;AAClE,CAAC;AAGM,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,GAAW,EAAE,QAAwB;IAC1F,MAAM,IAAI,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,CAAC;QACH,OAAO,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACpE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModulesState } from "
|
|
1
|
+
import { ModulesState } from "@devbie/modules-state";
|
|
2
2
|
import { Sink } from "./sink";
|
|
3
3
|
export declare function stateExists(cwd: string): Promise<boolean>;
|
|
4
4
|
export declare function readModulesState(cwd: string): Promise<ModulesState>;
|
|
@@ -9,12 +9,11 @@ exports.ensureModulesState = ensureModulesState;
|
|
|
9
9
|
exports.writeModulesState = writeModulesState;
|
|
10
10
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
11
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
-
const
|
|
13
|
-
const modules_state_1 = require("../core/modules-state");
|
|
12
|
+
const modules_state_1 = require("@devbie/modules-state");
|
|
14
13
|
const errors_1 = require("./errors");
|
|
15
14
|
async function stateExists(cwd) {
|
|
16
15
|
try {
|
|
17
|
-
await promises_1.default.stat(node_path_1.default.resolve(cwd,
|
|
16
|
+
await promises_1.default.stat(node_path_1.default.resolve(cwd, modules_state_1.MODULES_JSON));
|
|
18
17
|
return true;
|
|
19
18
|
}
|
|
20
19
|
catch {
|
|
@@ -22,30 +21,22 @@ async function stateExists(cwd) {
|
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
23
|
async function readModulesState(cwd) {
|
|
25
|
-
const target = node_path_1.default.resolve(cwd, paths_1.MODULES_JSON);
|
|
26
|
-
let content;
|
|
27
24
|
try {
|
|
28
|
-
|
|
25
|
+
return await (0, modules_state_1.readModulesState)(cwd);
|
|
29
26
|
}
|
|
30
27
|
catch (error) {
|
|
31
|
-
if (error
|
|
32
|
-
|
|
28
|
+
if (error instanceof SyntaxError) {
|
|
29
|
+
throw new errors_1.CliError(`Invalid JSON in ${modules_state_1.MODULES_JSON}: ${error.message}`);
|
|
33
30
|
}
|
|
34
31
|
throw error;
|
|
35
32
|
}
|
|
36
|
-
try {
|
|
37
|
-
return (0, modules_state_1.normalizeModulesState)(JSON.parse(content));
|
|
38
|
-
}
|
|
39
|
-
catch (error) {
|
|
40
|
-
throw new errors_1.CliError(`Invalid JSON in ${paths_1.MODULES_JSON}: ${error.message}`);
|
|
41
|
-
}
|
|
42
33
|
}
|
|
43
34
|
async function ensureModulesState(cwd, sink) {
|
|
44
35
|
if (await stateExists(cwd))
|
|
45
36
|
return;
|
|
46
|
-
await sink.writeJson(
|
|
37
|
+
await sink.writeJson(modules_state_1.MODULES_JSON, (0, modules_state_1.createEmptyModulesState)());
|
|
47
38
|
}
|
|
48
39
|
async function writeModulesState(cwd, sink, state) {
|
|
49
|
-
await sink.writeJson(
|
|
40
|
+
await sink.writeJson(modules_state_1.MODULES_JSON, state);
|
|
50
41
|
}
|
|
51
42
|
//# sourceMappingURL=modules-state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules-state.js","sourceRoot":"","sources":["../../src/lib/modules-state.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"modules-state.js","sourceRoot":"","sources":["../../src/lib/modules-state.ts"],"names":[],"mappings":";;;;;AAaA,kCAOC;AAED,4CASC;AAGD,gDAGC;AAED,8CAEC;AAzCD,gEAAkC;AAClC,0DAA6B;AAE7B,yDAK+B;AAE/B,qCAAoC;AAG7B,KAAK,UAAU,WAAW,CAAC,GAAW;IAC3C,IAAI,CAAC;QACH,MAAM,kBAAE,CAAC,IAAI,CAAC,mBAAI,CAAC,OAAO,CAAC,GAAG,EAAE,4BAAY,CAAC,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,GAAW;IAChD,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,gCAAsB,EAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;YACjC,MAAM,IAAI,iBAAQ,CAAC,mBAAmB,4BAAY,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAGM,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAU;IAC9D,IAAI,MAAM,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO;IACnC,MAAM,IAAI,CAAC,SAAS,CAAC,4BAAY,EAAE,IAAA,uCAAuB,GAAE,CAAC,CAAC;AAChE,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,IAAU,EAAE,KAAmB;IAClF,MAAM,IAAI,CAAC,SAAS,CAAC,4BAAY,EAAE,KAAK,CAAC,CAAC;AAC5C,CAAC"}
|
package/dist/lib/registry.js
CHANGED
|
@@ -14,6 +14,7 @@ exports.readRegistryModule = readRegistryModule;
|
|
|
14
14
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
15
15
|
const node_os_1 = __importDefault(require("node:os"));
|
|
16
16
|
const node_path_1 = __importDefault(require("node:path"));
|
|
17
|
+
const modules_state_1 = require("@devbie/modules-state");
|
|
17
18
|
const paths_1 = require("../constants/paths");
|
|
18
19
|
const module_manifest_1 = require("../core/module-manifest");
|
|
19
20
|
const errors_1 = require("./errors");
|
|
@@ -118,7 +119,7 @@ async function listRegistryKeys(registryRoot) {
|
|
|
118
119
|
if (!dirent.isDirectory())
|
|
119
120
|
continue;
|
|
120
121
|
if (await promises_1.default
|
|
121
|
-
.stat(node_path_1.default.join(dir, dirent.name,
|
|
122
|
+
.stat(node_path_1.default.join(dir, dirent.name, modules_state_1.MODULE_MANIFEST_FILE))
|
|
122
123
|
.then(() => true)
|
|
123
124
|
.catch(() => false)) {
|
|
124
125
|
keys.push(dirent.name);
|
|
@@ -145,7 +146,7 @@ async function readRegistryModule(registryRoot, key) {
|
|
|
145
146
|
const dir = moduleRootInRegistry(registryRoot, key);
|
|
146
147
|
let raw;
|
|
147
148
|
try {
|
|
148
|
-
raw = await promises_1.default.readFile(node_path_1.default.join(dir,
|
|
149
|
+
raw = await promises_1.default.readFile(node_path_1.default.join(dir, modules_state_1.MODULE_MANIFEST_FILE), "utf8");
|
|
149
150
|
}
|
|
150
151
|
catch (error) {
|
|
151
152
|
if (error.code === "ENOENT")
|
package/dist/lib/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/lib/registry.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/lib/registry.ts"],"names":[],"mappings":"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"}
|
package/dist/program.d.ts
CHANGED
package/dist/program.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
|
+
exports.enforceStrictArguments = enforceStrictArguments;
|
|
7
8
|
exports.buildProgram = buildProgram;
|
|
8
9
|
const commander_1 = require("commander");
|
|
9
10
|
const package_json_1 = __importDefault(require("../package.json"));
|
|
@@ -21,6 +22,11 @@ const update_2 = require("./commands/template/update");
|
|
|
21
22
|
const cli_runner_1 = require("./lib/cli-runner");
|
|
22
23
|
const module_selector_1 = require("./lib/module-selector");
|
|
23
24
|
exports.VERSION = package_json_1.default.version;
|
|
25
|
+
function enforceStrictArguments(command) {
|
|
26
|
+
command.allowExcessArguments(false);
|
|
27
|
+
for (const child of command.commands)
|
|
28
|
+
enforceStrictArguments(child);
|
|
29
|
+
}
|
|
24
30
|
function buildProgram() {
|
|
25
31
|
const program = new commander_1.Command();
|
|
26
32
|
program
|
|
@@ -173,6 +179,7 @@ function buildProgram() {
|
|
|
173
179
|
program.outputHelp();
|
|
174
180
|
console.info(`\nnewbie v${exports.VERSION}`);
|
|
175
181
|
});
|
|
182
|
+
enforceStrictArguments(program);
|
|
176
183
|
return program;
|
|
177
184
|
}
|
|
178
185
|
//# sourceMappingURL=program.js.map
|
package/dist/program.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.js","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"program.js","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@devbie/newbie-cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.12.0",
|
|
4
4
|
"description": "newbie backend framework CLI",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "worldzhy",
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"prepublishOnly": "npm run build"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
+
"@devbie/modules-state": "^1.0.0",
|
|
27
28
|
"@inquirer/prompts": "^7.0.0",
|
|
28
29
|
"colorette": "^2.0.20",
|
|
29
30
|
"commander": "^12.1.0",
|
|
@@ -1,121 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runInstall = runInstall;
|
|
4
|
-
const prompts_1 = require("@inquirer/prompts");
|
|
5
|
-
const colorette_1 = require("colorette");
|
|
6
|
-
const pipeline_1 = require("../../assemble/pipeline");
|
|
7
|
-
const paths_1 = require("../../constants/paths");
|
|
8
|
-
const modules_state_1 = require("../../core/modules-state");
|
|
9
|
-
const errors_1 = require("../../lib/errors");
|
|
10
|
-
const registry_1 = require("../../lib/registry");
|
|
11
|
-
const shared_1 = require("../shared");
|
|
12
|
-
async function runInstall(options) {
|
|
13
|
-
const keys = options.keys ?? [];
|
|
14
|
-
if (options.check) {
|
|
15
|
-
if (keys.length > 0) {
|
|
16
|
-
throw new errors_1.CliError("`modules install --check` inspects the declared module set and does not accept module keys.");
|
|
17
|
-
}
|
|
18
|
-
await runInstallCheck(options);
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
if (keys.length > 0) {
|
|
22
|
-
await runInstallKeys(options, keys);
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
await runInstallReconcile(options);
|
|
26
|
-
}
|
|
27
|
-
async function runInstallCheck(options) {
|
|
28
|
-
const { ctx } = await (0, shared_1.createContext)(options, { check: true, fetch: false });
|
|
29
|
-
const plan = await (0, pipeline_1.planReconcile)(ctx);
|
|
30
|
-
if (plan.installed.length > 0 || plan.uninstalled.length > 0) {
|
|
31
|
-
const lines = [
|
|
32
|
-
...plan.installed.map((key) => ` - ${key}: copy missing from src/modules`),
|
|
33
|
-
...plan.uninstalled.map((key) => ` - ${key}: extra copy not declared in modules.json`),
|
|
34
|
-
];
|
|
35
|
-
throw new errors_1.CliError(`Module copies are out of sync with modules.json:\n${lines.join("\n")}\nRun \`newbie modules install\`.`);
|
|
36
|
-
}
|
|
37
|
-
const declared = (0, modules_state_1.moduleKeys)(ctx.state);
|
|
38
|
-
const undeclaredDependencies = plan.enabledKeys.filter((key) => !declared.includes(key));
|
|
39
|
-
if (undeclaredDependencies.length > 0) {
|
|
40
|
-
throw new errors_1.CliError(`modules.json is missing module(s) required by the enabled set: ${undeclaredDependencies.join(", ")}. ` +
|
|
41
|
-
"Run `newbie modules install` to declare them.");
|
|
42
|
-
}
|
|
43
|
-
await (0, pipeline_1.applyPlanned)(ctx, plan);
|
|
44
|
-
const findings = ctx.sink.findings.filter(isCountedFinding);
|
|
45
|
-
if (findings.length === 0) {
|
|
46
|
-
console.info((0, colorette_1.green)((0, colorette_1.bold)("ā Module copies and generated wiring match modules.json.")));
|
|
47
|
-
return;
|
|
48
|
-
}
|
|
49
|
-
for (const finding of findings) {
|
|
50
|
-
const detail = finding.kind === "action" ? finding.detail : finding.kind;
|
|
51
|
-
console.info(` - ${finding.path}: ${detail}`);
|
|
52
|
-
}
|
|
53
|
-
throw new errors_1.CliError(`${findings.length} generated file(s) drift from the installed module set. ` +
|
|
54
|
-
"Run `newbie modules install` to regenerate them.");
|
|
55
|
-
}
|
|
56
|
-
function isCountedFinding(finding) {
|
|
57
|
-
if (finding.path === paths_1.ENV_PATH)
|
|
58
|
-
return false;
|
|
59
|
-
if (finding.kind === "action" && finding.detail === "prisma generate")
|
|
60
|
-
return false;
|
|
61
|
-
return true;
|
|
62
|
-
}
|
|
63
|
-
async function runInstallKeys(options, keys) {
|
|
64
|
-
const { ctx } = await (0, shared_1.createContext)(options, { fetch: true });
|
|
65
|
-
const registryModules = await (0, registry_1.listRegistryModules)(ctx.registry.root);
|
|
66
|
-
const known = new Set(registryModules.map((entry) => entry.key));
|
|
67
|
-
const unknown = keys.filter((key) => !known.has(key));
|
|
68
|
-
if (unknown.length > 0) {
|
|
69
|
-
throw new errors_1.CliError(`Unknown module(s): ${unknown.join(", ")}. Available modules: ${[...known].join(", ")}`);
|
|
70
|
-
}
|
|
71
|
-
const deprecated = (0, registry_1.deprecatedNoticesOf)(registryModules);
|
|
72
|
-
const blocked = keys.filter((key) => deprecated.has(key));
|
|
73
|
-
if (blocked.length > 0) {
|
|
74
|
-
throw new errors_1.CliError(`Cannot install deprecated module(s): ${blocked.map((key) => `'${key}' (${deprecated.get(key)})`).join(", ")}`);
|
|
75
|
-
}
|
|
76
|
-
const next = [...new Set([...(0, modules_state_1.moduleKeys)(ctx.state), ...keys])];
|
|
77
|
-
await (0, pipeline_1.applyModuleKeys)(ctx, next);
|
|
78
|
-
ctx.issues.assertEmpty();
|
|
79
|
-
console.info((0, colorette_1.bold)((0, colorette_1.green)("\nšŗ C O M P L E T E\n")));
|
|
80
|
-
}
|
|
81
|
-
async function runInstallReconcile(options) {
|
|
82
|
-
const { ctx } = await (0, shared_1.createContext)(options, { fetch: true });
|
|
83
|
-
const plan = await (0, pipeline_1.planReconcile)(ctx);
|
|
84
|
-
const { installed, uninstalled, closureAdded } = plan;
|
|
85
|
-
for (const addition of closureAdded ?? []) {
|
|
86
|
-
console.info((0, colorette_1.cyan)(`[info] ${addition.key} is required by ${addition.requiredBy.join(", ")} and will also be enabled.`));
|
|
87
|
-
}
|
|
88
|
-
if (installed.length === 0 && uninstalled.length === 0) {
|
|
89
|
-
await (0, pipeline_1.applyPlanned)(ctx, plan);
|
|
90
|
-
ctx.issues.assertEmpty();
|
|
91
|
-
console.info((0, colorette_1.green)("[info] Project is in sync with modules.json; wiring refreshed."));
|
|
92
|
-
return;
|
|
93
|
-
}
|
|
94
|
-
let message;
|
|
95
|
-
if (!uninstalled.length && installed.length) {
|
|
96
|
-
message = `Do you want to INSTALL ${(0, colorette_1.cyan)(installed.join(", "))}?`;
|
|
97
|
-
}
|
|
98
|
-
else if (uninstalled.length && !installed.length) {
|
|
99
|
-
message = `Do you want to UNINSTALL ${(0, colorette_1.inverse)(uninstalled.join(", "))}?`;
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
message = `Do you want to UNINSTALL ${(0, colorette_1.inverse)(uninstalled.join(", "))} and INSTALL ${(0, colorette_1.cyan)(installed.join(", "))}?`;
|
|
103
|
-
}
|
|
104
|
-
if (!options.yes && !options.dryRun) {
|
|
105
|
-
const confirmed = await (0, prompts_1.select)({
|
|
106
|
-
message,
|
|
107
|
-
choices: [
|
|
108
|
-
{ name: "Yes", value: "yes" },
|
|
109
|
-
{ name: "No", value: "no" },
|
|
110
|
-
],
|
|
111
|
-
});
|
|
112
|
-
if (confirmed !== "yes") {
|
|
113
|
-
console.info("[info] Cancelled.");
|
|
114
|
-
return;
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
await (0, pipeline_1.applyPlanned)(ctx, plan);
|
|
118
|
-
ctx.issues.assertEmpty();
|
|
119
|
-
console.info((0, colorette_1.bold)((0, colorette_1.green)("\nšŗ C O M P L E T E\n")));
|
|
120
|
-
}
|
|
121
|
-
//# sourceMappingURL=install.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/modules/install.ts"],"names":[],"mappings":"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"}
|