mthds 0.0.8 → 0.0.9
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 +10 -10
- package/dist/agent/commands/install.js +7 -6
- package/dist/agent/commands/install.js.map +1 -1
- package/dist/agent/output.js +5 -3
- package/dist/agent/output.js.map +1 -1
- package/dist/agent-cli.js +2 -2
- package/dist/agent-cli.js.map +1 -1
- package/dist/cli/commands/config.js +5 -2
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/index.js +17 -24
- package/dist/cli/commands/index.js.map +1 -1
- package/dist/cli/commands/install.js +12 -11
- package/dist/cli/commands/install.js.map +1 -1
- package/dist/cli/commands/setup.js +1 -5
- package/dist/cli/commands/setup.js.map +1 -1
- package/dist/cli/commands/utils.d.ts +1 -0
- package/dist/cli/commands/utils.js +7 -0
- package/dist/cli/commands/utils.js.map +1 -1
- package/dist/cli.js +2 -38
- package/dist/cli.js.map +1 -1
- package/dist/installer/agents/registry.d.ts +2 -2
- package/dist/installer/agents/registry.js +7 -7
- package/dist/installer/resolver/address.js +6 -4
- package/dist/installer/resolver/address.js.map +1 -1
- package/dist/installer/resolver/github.js +43 -26
- package/dist/installer/resolver/github.js.map +1 -1
- package/dist/installer/resolver/index.d.ts +2 -2
- package/dist/installer/resolver/index.js +1 -1
- package/dist/installer/resolver/index.js.map +1 -1
- package/dist/installer/resolver/local.js +11 -18
- package/dist/installer/resolver/local.js.map +1 -1
- package/dist/installer/telemetry/posthog.d.ts +2 -1
- package/dist/installer/telemetry/posthog.js +3 -2
- package/dist/installer/telemetry/posthog.js.map +1 -1
- package/dist/package/manifest/convert.js +2 -2
- package/dist/package/manifest/convert.js.map +1 -1
- package/dist/package/manifest/types.d.ts +3 -3
- package/dist/package/manifest/validate.d.ts +0 -5
- package/dist/package/manifest/validate.js +9 -27
- package/dist/package/manifest/validate.js.map +1 -1
- package/package.json +1 -1
- package/dist/cli/commands/package/add.d.ts +0 -6
- package/dist/cli/commands/package/add.js +0 -9
- package/dist/cli/commands/package/add.js.map +0 -1
- package/dist/cli/commands/package/install.d.ts +0 -3
- package/dist/cli/commands/package/install.js +0 -97
- package/dist/cli/commands/package/install.js.map +0 -1
- package/dist/cli/commands/package/lock.d.ts +0 -3
- package/dist/cli/commands/package/lock.js +0 -37
- package/dist/cli/commands/package/lock.js.map +0 -1
- package/dist/cli/commands/package/update.d.ts +0 -3
- package/dist/cli/commands/package/update.js +0 -35
- package/dist/cli/commands/package/update.js.map +0 -1
|
@@ -3,23 +3,7 @@ import { METHOD_NAME_RE } from "./schema.js";
|
|
|
3
3
|
import { isPipeCodeValid } from "./validation.js";
|
|
4
4
|
const SEMVER_RE = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
|
|
5
5
|
const SNAKE_CASE_RE = /^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/;
|
|
6
|
-
const SLUG_RE = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
|
|
7
6
|
const RESERVED_PREFIXES = ["native", "mthds", "pipelex"];
|
|
8
|
-
export function validateSlug(name) {
|
|
9
|
-
if (!name) {
|
|
10
|
-
return { valid: false, error: "Slug cannot be empty." };
|
|
11
|
-
}
|
|
12
|
-
if (name.length > 64) {
|
|
13
|
-
return { valid: false, error: `Slug must be at most 64 characters (got ${name.length}).` };
|
|
14
|
-
}
|
|
15
|
-
if (!SLUG_RE.test(name)) {
|
|
16
|
-
return {
|
|
17
|
-
valid: false,
|
|
18
|
-
error: `Slug "${name}" is invalid: must be lowercase alphanumeric with hyphens, starting with a letter.`,
|
|
19
|
-
};
|
|
20
|
-
}
|
|
21
|
-
return { valid: true };
|
|
22
|
-
}
|
|
23
7
|
function validateExportNode(node, path, errors) {
|
|
24
8
|
if (!node || typeof node !== "object" || Array.isArray(node)) {
|
|
25
9
|
errors.push(`[exports.${path}] must be a table.`);
|
|
@@ -94,8 +78,8 @@ export function validateManifest(raw) {
|
|
|
94
78
|
if (typeof pkg["display_name"] !== "string") {
|
|
95
79
|
errors.push('[package.display_name] must be a string.');
|
|
96
80
|
}
|
|
97
|
-
else if (pkg["display_name"].length >
|
|
98
|
-
errors.push('[package.display_name] must be at most
|
|
81
|
+
else if (pkg["display_name"].length > 25) {
|
|
82
|
+
errors.push('[package.display_name] must be at most 25 characters.');
|
|
99
83
|
}
|
|
100
84
|
}
|
|
101
85
|
// package.authors (optional)
|
|
@@ -124,14 +108,12 @@ export function validateManifest(raw) {
|
|
|
124
108
|
errors.push('[package.mthds_version] must be a string.');
|
|
125
109
|
}
|
|
126
110
|
}
|
|
127
|
-
// package.name (
|
|
128
|
-
if (pkg["name"] !==
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
errors.push(`[package.name] "${pkg["name"]}" is invalid: must be 2-25 lowercase chars (letters, digits, hyphens, underscores), starting with a letter.`);
|
|
134
|
-
}
|
|
111
|
+
// package.name (required)
|
|
112
|
+
if (typeof pkg["name"] !== "string" || !pkg["name"]) {
|
|
113
|
+
errors.push('[package.name] is required and must be a non-empty string.');
|
|
114
|
+
}
|
|
115
|
+
else if (!METHOD_NAME_RE.test(pkg["name"])) {
|
|
116
|
+
errors.push(`[package.name] "${pkg["name"]}" is invalid: must be 2-25 lowercase chars (letters, digits, hyphens, underscores), starting with a letter.`);
|
|
135
117
|
}
|
|
136
118
|
// package.main_pipe (optional)
|
|
137
119
|
if (pkg["main_pipe"] !== undefined) {
|
|
@@ -166,7 +148,7 @@ export function validateManifest(raw) {
|
|
|
166
148
|
address: pkg["address"],
|
|
167
149
|
version: pkg["version"],
|
|
168
150
|
description: pkg["description"],
|
|
169
|
-
|
|
151
|
+
name: pkg["name"],
|
|
170
152
|
...(pkg["display_name"] !== undefined ? { display_name: pkg["display_name"] } : {}),
|
|
171
153
|
...(pkg["authors"] !== undefined ? { authors: pkg["authors"] } : {}),
|
|
172
154
|
...(pkg["license"] !== undefined ? { license: pkg["license"] } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/package/manifest/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/package/manifest/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAQlD,MAAM,SAAS,GACb,qLAAqL,CAAC;AAExL,MAAM,aAAa,GAAG,iCAAiC,CAAC;AAExD,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAEzD,SAAS,kBAAkB,CACzB,IAAa,EACb,IAAY,EACZ,MAAgB;IAEhB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,oBAAoB,CAAC,CAAC;QAClD,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,IAA+B,CAAC;IAE5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,sCAAsC,CAAC,CAAC;gBACpE,SAAS;YACX,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,oCAAoC,CAAC,CAAC;oBAClE,MAAM;gBACR,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,MAAM,CAAC,IAAI,CACT,YAAY,IAAI,YAAY,IAAI,uBAAuB,CACxD,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,kBAAkB,CAAC,KAAK,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,MAA+B,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,GAAG,CAA4B,CAAC;IACjD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,CAAC,qBAAsB,GAAa,CAAC,OAAO,EAAE,CAAC;SACxD,CAAC;IACJ,CAAC;IAED,4BAA4B;IAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAwC,CAAC;IACrE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,kBAAkB;IAClB,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAW,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,IAAI,CACT,uDAAuD,QAAQ,kCAAkC,CAClG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;IAC/E,CAAC;SAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAW,CAAC,EAAE,CAAC;QACrD,MAAM,CAAC,IAAI,CACT,gDAAgD,GAAG,CAAC,SAAS,CAAC,KAAK,CACpE,CAAC;IACJ,CAAC;IAED,sBAAsB;IACtB,IAAI,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAClE,MAAM,CAAC,IAAI,CACT,mEAAmE,CACpE,CAAC;IACJ,CAAC;IAED,kCAAkC;IAClC,IAAI,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAK,GAAG,CAAC,cAAc,CAAY,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,CAAc,EAAE,CAAC;gBAC5C,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;oBAC5D,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,mCAAmC;IACnC,IAAI,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,OAAO,GAAG,CAAC,eAAe,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IAC5E,CAAC;SAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAW,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,CACT,mBAAmB,GAAG,CAAC,MAAM,CAAC,6GAA6G,CAC5I,CAAC;IACJ,CAAC;IAED,+BAA+B;IAC/B,IAAI,GAAG,CAAC,WAAW,CAAC,KAAK,SAAS,EAAE,CAAC;QACnC,IAAI,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACvD,CAAC;aAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAW,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CACT,wBAAwB,GAAG,CAAC,WAAW,CAAC,yCAAyC,CAClF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAwC,CAAC;IACzE,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACrD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACzF,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CACT,aAAa,MAAM,gDAAgD,aAAa,IAAI,CACrF,CAAC;YACJ,CAAC;YACD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,IAAI,MAAM,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,kGAAkG,CAAC,CAAC;IAClH,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,uBAAuB;IACvB,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,GAAG,CAAC,SAAS,CAAW;QACjC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAW;QACjC,WAAW,EAAE,GAAG,CAAC,aAAa,CAAW;QACzC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAW;QAC3B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,cAAc,CAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,CAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,CAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,eAAe,CAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChG,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,WAAW,CAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrF,CAAC;IAEF,MAAM,QAAQ,GAAoB;QAChC,OAAO,EAAE,WAAW;QACpB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD,CAAC;IAEF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;AAC/C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import * as p from "@clack/prompts";
|
|
2
|
-
import { printLogo } from "../index.js";
|
|
3
|
-
export function packageAdd(_dep, _options) {
|
|
4
|
-
printLogo();
|
|
5
|
-
p.intro("mthds package add");
|
|
6
|
-
p.log.error("Dependencies are not supported in this version.");
|
|
7
|
-
p.outro("");
|
|
8
|
-
}
|
|
9
|
-
//# sourceMappingURL=add.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/cli/commands/package/add.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,UAAU,UAAU,CACxB,IAAY,EACZ,QAAiF;IAEjF,SAAS,EAAE,CAAC;IACZ,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC7B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAC/D,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
|
|
@@ -1,97 +0,0 @@
|
|
|
1
|
-
import * as p from "@clack/prompts";
|
|
2
|
-
import { existsSync, readFileSync } from "node:fs";
|
|
3
|
-
import { join, resolve } from "node:path";
|
|
4
|
-
import { mkdtempSync, rmSync } from "node:fs";
|
|
5
|
-
import { tmpdir } from "node:os";
|
|
6
|
-
import { printLogo } from "../index.js";
|
|
7
|
-
import { parseLockFile, verifyLockFile, LOCK_FILENAME } from "../../../package/lock-file.js";
|
|
8
|
-
import { isCached, storeInCache } from "../../../package/package-cache.js";
|
|
9
|
-
import { addressToCloneUrl, cloneAtVersion, listRemoteVersionTags } from "../../../package/vcs-resolver.js";
|
|
10
|
-
import { LockFileError, IntegrityError, MthdsPackageError } from "../../../package/exceptions.js";
|
|
11
|
-
export async function packageInstall(options) {
|
|
12
|
-
printLogo();
|
|
13
|
-
p.intro("mthds package install");
|
|
14
|
-
const targetDir = resolve(options.directory ?? process.cwd());
|
|
15
|
-
const lockPath = join(targetDir, LOCK_FILENAME);
|
|
16
|
-
if (!existsSync(lockPath)) {
|
|
17
|
-
p.log.error(`No ${LOCK_FILENAME} found in ${targetDir}. Run 'mthds package lock' first.`);
|
|
18
|
-
p.outro("");
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
let lockFile;
|
|
22
|
-
try {
|
|
23
|
-
const content = readFileSync(lockPath, "utf-8");
|
|
24
|
-
lockFile = parseLockFile(content);
|
|
25
|
-
}
|
|
26
|
-
catch (err) {
|
|
27
|
-
if (err instanceof LockFileError) {
|
|
28
|
-
p.log.error(`Invalid ${LOCK_FILENAME}: ${err.message}`);
|
|
29
|
-
p.outro("");
|
|
30
|
-
return;
|
|
31
|
-
}
|
|
32
|
-
throw err;
|
|
33
|
-
}
|
|
34
|
-
const entries = Object.entries(lockFile.packages);
|
|
35
|
-
if (entries.length === 0) {
|
|
36
|
-
p.log.info("No packages to install.");
|
|
37
|
-
p.outro("");
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
const spinner = p.spinner();
|
|
41
|
-
spinner.start(`Installing ${entries.length} packages...`);
|
|
42
|
-
let installed = 0;
|
|
43
|
-
let cached = 0;
|
|
44
|
-
let spinnerStopped = false;
|
|
45
|
-
try {
|
|
46
|
-
for (const [address, locked] of entries) {
|
|
47
|
-
if (isCached(address, locked.version)) {
|
|
48
|
-
cached++;
|
|
49
|
-
continue;
|
|
50
|
-
}
|
|
51
|
-
// Fetch and cache
|
|
52
|
-
const cloneUrl = addressToCloneUrl(address);
|
|
53
|
-
const tmpDir = mkdtempSync(join(tmpdir(), "mthds_install_"));
|
|
54
|
-
try {
|
|
55
|
-
// Find the tag matching this version
|
|
56
|
-
const tags = await listRemoteVersionTags(cloneUrl);
|
|
57
|
-
const matchingTag = tags.find(([ver]) => ver.version === locked.version);
|
|
58
|
-
const tagName = matchingTag ? matchingTag[1] : `v${locked.version}`;
|
|
59
|
-
const cloneDest = join(tmpDir, "pkg");
|
|
60
|
-
await cloneAtVersion(cloneUrl, tagName, cloneDest);
|
|
61
|
-
storeInCache(cloneDest, address, locked.version);
|
|
62
|
-
installed++;
|
|
63
|
-
}
|
|
64
|
-
finally {
|
|
65
|
-
rmSync(tmpDir, { recursive: true, force: true });
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
spinner.stop(`Done. ${installed} installed, ${cached} already cached.`);
|
|
69
|
-
spinnerStopped = true;
|
|
70
|
-
// Verify integrity
|
|
71
|
-
try {
|
|
72
|
-
verifyLockFile(lockFile);
|
|
73
|
-
p.log.success("All packages verified.");
|
|
74
|
-
}
|
|
75
|
-
catch (err) {
|
|
76
|
-
if (err instanceof IntegrityError) {
|
|
77
|
-
p.log.error(`Integrity check failed: ${err.message}`);
|
|
78
|
-
p.outro("");
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
81
|
-
throw err;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
catch (err) {
|
|
85
|
-
if (!spinnerStopped) {
|
|
86
|
-
spinner.stop("Installation failed.");
|
|
87
|
-
}
|
|
88
|
-
if (err instanceof MthdsPackageError) {
|
|
89
|
-
p.log.error(err.message);
|
|
90
|
-
p.outro("");
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
throw err;
|
|
94
|
-
}
|
|
95
|
-
p.outro("");
|
|
96
|
-
}
|
|
97
|
-
//# sourceMappingURL=install.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../src/cli/commands/package/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import * as p from "@clack/prompts";
|
|
2
|
-
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
3
|
-
import { join, resolve } from "node:path";
|
|
4
|
-
import { printLogo } from "../index.js";
|
|
5
|
-
import { parseMethodsToml } from "../../../package/manifest/parser.js";
|
|
6
|
-
import { MANIFEST_FILENAME } from "../../../package/discovery.js";
|
|
7
|
-
import { LOCK_FILENAME } from "../../../package/lock-file.js";
|
|
8
|
-
import { ManifestError } from "../../../package/exceptions.js";
|
|
9
|
-
export async function packageLock(options) {
|
|
10
|
-
printLogo();
|
|
11
|
-
p.intro("mthds package lock");
|
|
12
|
-
const targetDir = resolve(options.directory ?? process.cwd());
|
|
13
|
-
const manifestPath = join(targetDir, MANIFEST_FILENAME);
|
|
14
|
-
if (!existsSync(manifestPath)) {
|
|
15
|
-
p.log.error(`No ${MANIFEST_FILENAME} found in ${targetDir}. Run 'mthds package init' first.`);
|
|
16
|
-
p.outro("");
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
try {
|
|
20
|
-
const content = readFileSync(manifestPath, "utf-8");
|
|
21
|
-
parseMethodsToml(content);
|
|
22
|
-
}
|
|
23
|
-
catch (err) {
|
|
24
|
-
if (err instanceof ManifestError) {
|
|
25
|
-
p.log.error(`Invalid ${MANIFEST_FILENAME}: ${err.message}`);
|
|
26
|
-
p.outro("");
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
throw err;
|
|
30
|
-
}
|
|
31
|
-
// Dependencies are not supported in this version — write empty lock file
|
|
32
|
-
p.log.info("No dependencies to resolve.");
|
|
33
|
-
writeFileSync(join(targetDir, LOCK_FILENAME), "", "utf-8");
|
|
34
|
-
p.log.success(`Wrote ${LOCK_FILENAME} (empty).`);
|
|
35
|
-
p.outro("");
|
|
36
|
-
}
|
|
37
|
-
//# sourceMappingURL=lock.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../../../src/cli/commands/package/lock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAA+B;IAC/D,SAAS,EAAE,CAAC;IACZ,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAE9B,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAExD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,iBAAiB,aAAa,SAAS,mCAAmC,CAAC,CAAC;QAC9F,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,iBAAiB,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,yEAAyE;IACzE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAC1C,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,aAAa,WAAW,CAAC,CAAC;IACjD,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
import * as p from "@clack/prompts";
|
|
2
|
-
import { existsSync, readFileSync } from "node:fs";
|
|
3
|
-
import { join, resolve } from "node:path";
|
|
4
|
-
import { printLogo } from "../index.js";
|
|
5
|
-
import { parseMethodsToml } from "../../../package/manifest/parser.js";
|
|
6
|
-
import { MANIFEST_FILENAME } from "../../../package/discovery.js";
|
|
7
|
-
import { ManifestError } from "../../../package/exceptions.js";
|
|
8
|
-
export async function packageUpdate(options) {
|
|
9
|
-
printLogo();
|
|
10
|
-
p.intro("mthds package update");
|
|
11
|
-
const targetDir = resolve(options.directory ?? process.cwd());
|
|
12
|
-
const manifestPath = join(targetDir, MANIFEST_FILENAME);
|
|
13
|
-
if (!existsSync(manifestPath)) {
|
|
14
|
-
p.log.error(`No ${MANIFEST_FILENAME} found in ${targetDir}. Run 'mthds package init' first.`);
|
|
15
|
-
p.outro("");
|
|
16
|
-
return;
|
|
17
|
-
}
|
|
18
|
-
try {
|
|
19
|
-
const content = readFileSync(manifestPath, "utf-8");
|
|
20
|
-
parseMethodsToml(content);
|
|
21
|
-
}
|
|
22
|
-
catch (err) {
|
|
23
|
-
if (err instanceof ManifestError) {
|
|
24
|
-
p.log.error(`Invalid ${MANIFEST_FILENAME}: ${err.message}`);
|
|
25
|
-
p.outro("");
|
|
26
|
-
process.exitCode = 1;
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
throw err;
|
|
30
|
-
}
|
|
31
|
-
// Dependencies are not supported in this version
|
|
32
|
-
p.log.info("No dependencies to update.");
|
|
33
|
-
p.outro("");
|
|
34
|
-
}
|
|
35
|
-
//# sourceMappingURL=update.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/package/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA+B;IACjE,SAAS,EAAE,CAAC;IACZ,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAEhC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAExD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,iBAAiB,aAAa,SAAS,mCAAmC,CAAC,CAAC;QAC9F,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,iBAAiB,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACZ,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,iDAAiD;IACjD,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACzC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
|