@haltcase/run 2.0.0 → 3.0.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/cli/bin.js +0 -1
- package/dist/cli/handler.js +36 -24
- package/dist/cli/handler.js.map +1 -1
- package/dist/cli/main.js +5 -1
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/parseOptions.js +0 -1
- package/dist/config.js +0 -1
- package/dist/index.js +0 -1
- package/dist/tasks/executeTask.js +2 -4
- package/dist/tasks/executeTask.js.map +1 -1
- package/dist/tasks/guards.d.ts +1 -1
- package/dist/tasks/guards.js +0 -1
- package/dist/tasks/guards.js.map +1 -1
- package/dist/tasks/task.d.ts +11 -4
- package/dist/tasks/task.js +33 -28
- package/dist/tasks/task.js.map +1 -1
- package/dist/tasks/types.d.ts +9 -17
- package/dist/tasks/types.js +0 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/util/getSchemaProperties.d.ts +2 -0
- package/dist/util/getSchemaProperties.js +40 -0
- package/dist/util/getSchemaProperties.js.map +1 -0
- package/dist/util/loadTaskFile.js +0 -1
- package/dist/util/resolveTaskFile.js +0 -1
- package/dist/util/result.d.ts +5 -5
- package/dist/util/result.js +0 -1
- package/package.json +76 -78
- package/readme.md +63 -31
- package/dist/cli/handler.test.d.ts +0 -1
- package/dist/cli/handler.test.js +0 -23
- package/dist/cli/handler.test.js.map +0 -1
- package/dist/cli/parseOptions.test.d.ts +0 -1
- package/dist/cli/parseOptions.test.js +0 -43
- package/dist/cli/parseOptions.test.js.map +0 -1
- package/dist/tasks/task.test.d.ts +0 -1
- package/dist/tasks/task.test.js +0 -90
- package/dist/tasks/task.test.js.map +0 -1
- package/dist/util/types.d.ts +0 -4
- package/dist/util/types.js +0 -2
- package/dist/util/types.js.map +0 -1
package/dist/cli/bin.js
CHANGED
package/dist/cli/handler.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { readdirSync } from "node:fs";
|
|
2
2
|
import { extname } from "node:path";
|
|
3
3
|
import { Spinner } from "@favware/colorette-spinner";
|
|
4
|
-
import
|
|
5
|
-
import { bold, yellow } from "colorette";
|
|
4
|
+
import cliuiCjs from "@isaacs/cliui";
|
|
5
|
+
import { bold, gray, yellow } from "colorette";
|
|
6
6
|
import { isBrandedTask } from "../tasks/guards.js";
|
|
7
|
+
import { getSchemaProperties } from "../util/getSchemaProperties.js";
|
|
7
8
|
import { extensions } from "../util/resolveTaskFile.js";
|
|
9
|
+
const cliui = cliuiCjs.default;
|
|
8
10
|
export const failWith = (spinner, message) => {
|
|
9
11
|
let text;
|
|
10
12
|
if (Array.isArray(message)) {
|
|
@@ -40,34 +42,45 @@ export const taskListHandler = (context) => {
|
|
|
40
42
|
wrap: true
|
|
41
43
|
});
|
|
42
44
|
const { config } = context.taskFile.data;
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
+
const baseUsage = usage.replace("<taskFile>", context.taskFile.name);
|
|
46
|
+
ui.div(`${baseUsage} <parameter> [...options]`);
|
|
47
|
+
ui.div({
|
|
48
|
+
text: "Available tasks:",
|
|
49
|
+
padding: [1, 0, 1, 0]
|
|
50
|
+
});
|
|
51
|
+
const taskListPaddingX = 2;
|
|
52
|
+
const nameColumnWidth = Object.keys(config).reduce((previous, current) => Math.max(previous, current.length), 1) +
|
|
53
|
+
2 +
|
|
54
|
+
taskListPaddingX * 2;
|
|
55
|
+
for (const [name, value] of Object.entries(config)) {
|
|
45
56
|
if (!value) {
|
|
46
|
-
|
|
57
|
+
continue;
|
|
47
58
|
}
|
|
48
59
|
const formattedName = bold(name);
|
|
49
60
|
if (isBrandedTask(value)) {
|
|
50
61
|
if (value.kind === "strictTask") {
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
62
|
+
const properties = getSchemaProperties(value.schema) || gray("not available");
|
|
63
|
+
ui.div({
|
|
64
|
+
text: formattedName,
|
|
65
|
+
width: nameColumnWidth,
|
|
66
|
+
padding: [0, taskListPaddingX, 0, taskListPaddingX]
|
|
67
|
+
}, properties);
|
|
68
|
+
continue;
|
|
56
69
|
}
|
|
57
|
-
|
|
70
|
+
ui.div({
|
|
71
|
+
text: formattedName,
|
|
72
|
+
width: nameColumnWidth,
|
|
73
|
+
padding: [0, taskListPaddingX, 0, taskListPaddingX]
|
|
74
|
+
});
|
|
75
|
+
continue;
|
|
58
76
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
});
|
|
67
|
-
ui.div({
|
|
68
|
-
text: taskInfo,
|
|
69
|
-
padding: [0, 2, 1, 2]
|
|
70
|
-
});
|
|
77
|
+
ui.div({
|
|
78
|
+
text: formattedName,
|
|
79
|
+
width: nameColumnWidth,
|
|
80
|
+
padding: [0, taskListPaddingX, 0, taskListPaddingX]
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
ui.div("");
|
|
71
84
|
return ui.toString();
|
|
72
85
|
};
|
|
73
86
|
export const help = (context) => {
|
|
@@ -91,4 +104,3 @@ export const createHandler = () => {
|
|
|
91
104
|
failWith: (message) => failWith(spinner, message)
|
|
92
105
|
};
|
|
93
106
|
};
|
|
94
|
-
//# sourceMappingURL=handler.js.map
|
package/dist/cli/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/cli/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,KAAK,MAAM,eAAe,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/cli/handler.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/main.js
CHANGED
|
@@ -33,6 +33,11 @@ export const main = async (props) => {
|
|
|
33
33
|
resolutions.map((it) => ` ${it}`).join("\n")
|
|
34
34
|
]);
|
|
35
35
|
}
|
|
36
|
+
// update context with the fully resolved file path
|
|
37
|
+
context.taskFile = {
|
|
38
|
+
...parse(resolutions),
|
|
39
|
+
path: resolutions
|
|
40
|
+
};
|
|
36
41
|
const taskFileResult = await loadTaskFile(context);
|
|
37
42
|
if (!taskFileResult.ok) {
|
|
38
43
|
props.handler.failWith(taskFileResult.error);
|
|
@@ -57,4 +62,3 @@ export const main = async (props) => {
|
|
|
57
62
|
props.handler.failWith([`Failed to execute task`, String(error)]);
|
|
58
63
|
}
|
|
59
64
|
};
|
|
60
|
-
//# sourceMappingURL=main.js.map
|
package/dist/cli/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAoBjD,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,KAAgB,EAAE,EAAE;IAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,EAAE,CAAC;IAExC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAEvC,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,KAAK,CAAC,OAAO,CAAC,KAAK,CAClB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAClB,YAAY,EAAE,IAAI;YAClB,MAAM;SACN,CAAC,CACF,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG;QACf,GAAG,KAAK;QACR,MAAM;QACN,QAAQ,EAAE;YACT,GAAG,KAAK,CAAC,YAAY,CAAC;YACtB,IAAI,EAAE,YAAY;SAClB;QACD,QAAQ;KACc,CAAC;IAExB,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACtB,4CAA4C,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG;YACpE,kEAAkE;YAClE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7C,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;QACxB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,eAAe,GAAG;QACvB,GAAG,OAAO;QACV,QAAQ,EAAE;YACT,GAAG,OAAO,CAAC,QAAQ;YACnB,IAAI,EAAE,cAAc,CAAC,KAAK;SAC1B;KAC6B,CAAC;IAEhC,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7B,IAAI,EAAE,SAAS;aACf,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;AACF,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/parseOptions.js
CHANGED
package/dist/config.js
CHANGED
package/dist/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { join } from "node:path";
|
|
2
1
|
import { $, execa } from "execa";
|
|
3
2
|
const execaInherited = execa({
|
|
4
3
|
stdin: "inherit",
|
|
@@ -22,8 +21,8 @@ export const executeTask = async (context, options) => {
|
|
|
22
21
|
context.handler.failWith(`Task name is required.`);
|
|
23
22
|
}
|
|
24
23
|
context.handler.failWith([
|
|
25
|
-
`Task file '${context.taskFile.
|
|
26
|
-
`Resolved to: ${
|
|
24
|
+
`Task file '${context.taskFile.name}' does not export '${context.taskName}'`,
|
|
25
|
+
`Resolved to: ${context.taskFile.path}`
|
|
27
26
|
]);
|
|
28
27
|
}
|
|
29
28
|
try {
|
|
@@ -44,4 +43,3 @@ export const executeTask = async (context, options) => {
|
|
|
44
43
|
context.handler.failWith([`Failed to execute ${specifier}`, message]);
|
|
45
44
|
}
|
|
46
45
|
};
|
|
47
|
-
//# sourceMappingURL=executeTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTask.js","sourceRoot":"","sources":["../../src/tasks/executeTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"executeTask.js","sourceRoot":"","sources":["../../src/tasks/executeTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAMjC,MAAM,cAAc,GAAG,KAAK,CAAC;IAC5B,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;CACjB,CAAiC,CAAC;AAEnC,MAAM,CAAC,MAAM,aAAa,GAAG;IAC5B,OAAO,EAAE,KAAK;IACd,CAAC;IACD,IAAI,EAAE,cAAc;CACI,CAAC;AAE1B,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC/B,OAA4B,EAC5B,OAAsB,EACrB,EAAE;IACH,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;IAElE,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QAC1B,OAAO,CAAC,OAAO,CAAC,KAAK,CACpB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YACpB,QAAQ,EAAE,IAAI;YACd,GAAG,OAAO;SACV,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;YACxB,cAAc,OAAO,CAAC,QAAQ,CAAC,IAAI,sBAAsB,OAAO,CAAC,QAAQ,GAAG;YAC5E,gBAAgB,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;SACvC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,sBAAsB,GAAG;YAC9B,GAAG,OAAO;YACV,GAAG,EAAE,OAAO,CAAC,GAAG;SAChB,CAAC;QAEF,MAAM,YAAY,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvE,IAAI,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACxB,qBAAqB,SAAS,EAAE;gBAChC,mBAAmB,OAAO,CAAC,QAAQ,qBAAqB;aACxD,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,qBAAqB,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IACvE,CAAC;AACF,CAAC,CAAC"}
|
package/dist/tasks/guards.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { BrandedTask, BrandedTaskStrict, Task } from "./types.js";
|
|
2
2
|
export declare const isBrandedTask: (task: Task) => task is BrandedTask;
|
|
3
|
-
export declare const isBrandedTaskStrict: (task: Task) => task is BrandedTaskStrict
|
|
3
|
+
export declare const isBrandedTaskStrict: <T>(task: Task<T>) => task is BrandedTaskStrict<T>;
|
package/dist/tasks/guards.js
CHANGED
package/dist/tasks/guards.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../src/tasks/guards.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAU,EAAuB,EAAE,CAChE,MAAM,IAAI,IAAI,CAAC;AAEhB,MAAM,CAAC,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../src/tasks/guards.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAU,EAAuB,EAAE,CAChE,MAAM,IAAI,IAAI,CAAC;AAEhB,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAClC,IAAa,EACkB,EAAE,CAAC,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC"}
|
package/dist/tasks/task.d.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import type { BrandedTask, BrandedTaskStrict, DefaultOptionsInput,
|
|
1
|
+
import type { Type } from "arktype";
|
|
2
|
+
import { type } from "arktype";
|
|
3
|
+
import type { BrandedTask, BrandedTaskStrict, DefaultOptionsInput, Task } from "./types.js";
|
|
4
4
|
export declare const task: {
|
|
5
5
|
<T = DefaultOptionsInput>(fn: Task<T>): BrandedTask<T>;
|
|
6
|
-
strict<
|
|
6
|
+
strict<const TShape>(shape: type.validate<TShape>, fn: Task<NoInfer<Type<type.infer<TShape>>["infer"]>>): BrandedTaskStrict<Type<type.infer<TShape>>["inferIn"]>;
|
|
7
7
|
};
|
|
8
|
+
/**
|
|
9
|
+
* Default schema for the options received by a {@link task}.
|
|
10
|
+
*/
|
|
11
|
+
export declare const defaultOptionsInput: import("arktype/internal/methods/object.ts").ObjectType<{
|
|
12
|
+
_: string[];
|
|
13
|
+
env: Record<string, string | undefined>;
|
|
14
|
+
}, {}>;
|
package/dist/tasks/task.js
CHANGED
|
@@ -1,50 +1,55 @@
|
|
|
1
|
+
import { type } from "arktype";
|
|
1
2
|
import { red } from "colorette";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
.
|
|
6
|
-
const propertyName = issue.path[0];
|
|
7
|
-
if (issue.code === "unrecognized_keys") {
|
|
8
|
-
const keyList = issue.keys.map((key) => `--${key}`).join(", ");
|
|
9
|
-
return `${red("Unrecognized options")}: ${keyList}`;
|
|
10
|
-
}
|
|
3
|
+
const formatValidationIssues = (errors) => errors
|
|
4
|
+
.map((error) => {
|
|
5
|
+
const propertyName = String(error.path[0]);
|
|
6
|
+
const dottedPath = error.path.join(".");
|
|
11
7
|
if (!propertyName) {
|
|
12
|
-
return
|
|
8
|
+
return error.message;
|
|
13
9
|
}
|
|
10
|
+
const messageWithoutProperty = error.message.startsWith(dottedPath)
|
|
11
|
+
? error.message.slice(dottedPath.length + 1)
|
|
12
|
+
: error.message;
|
|
14
13
|
if (propertyName === "env") {
|
|
15
|
-
const prefix = red(`Environment variable '${
|
|
16
|
-
return `${prefix}: ${
|
|
14
|
+
const prefix = red(`Environment variable '${String(error.path[1])}'`);
|
|
15
|
+
return `${prefix}: ${messageWithoutProperty}`;
|
|
17
16
|
}
|
|
18
17
|
const optionText = propertyName === "_" ? "Positionals" : `--${propertyName}`;
|
|
18
|
+
if (error.code === "predicate" && error.expected === "removed") {
|
|
19
|
+
return `${red(optionText)}: unknown option`;
|
|
20
|
+
}
|
|
19
21
|
// we currently assume there is only ever one path segment
|
|
20
|
-
return `${red(optionText)}: ${
|
|
22
|
+
return `${red(optionText)}: ${messageWithoutProperty}`;
|
|
21
23
|
})
|
|
22
24
|
.join("\n");
|
|
23
25
|
export const task = (fn) => {
|
|
24
26
|
fn.kind = "task";
|
|
25
27
|
return fn;
|
|
26
28
|
};
|
|
29
|
+
/**
|
|
30
|
+
* Default schema for the options received by a {@link task}.
|
|
31
|
+
*/
|
|
32
|
+
export const defaultOptionsInput = type({
|
|
33
|
+
_: "string[]",
|
|
34
|
+
env: "Record<string, string | undefined>"
|
|
35
|
+
});
|
|
36
|
+
/**
|
|
37
|
+
* Create a task that validates its input against a schema.
|
|
38
|
+
*/
|
|
27
39
|
task.strict = (shape, fn) => {
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
};
|
|
32
|
-
const schema = z.strictObject({
|
|
33
|
-
...defaultValidators,
|
|
34
|
-
...shape
|
|
35
|
-
});
|
|
40
|
+
const schema = defaultOptionsInput
|
|
41
|
+
.merge(type.raw(shape))
|
|
42
|
+
.onUndeclaredKey("reject");
|
|
36
43
|
const taskFunction = (options, utilities) => {
|
|
37
|
-
const
|
|
38
|
-
if (
|
|
39
|
-
throw new
|
|
40
|
-
cause:
|
|
44
|
+
const validationResult = schema(options);
|
|
45
|
+
if (validationResult instanceof type.errors) {
|
|
46
|
+
throw new TypeError(formatValidationIssues(validationResult), {
|
|
47
|
+
cause: validationResult
|
|
41
48
|
});
|
|
42
49
|
}
|
|
43
|
-
return fn(
|
|
50
|
+
return fn(validationResult, utilities);
|
|
44
51
|
};
|
|
45
52
|
taskFunction.kind = "strictTask";
|
|
46
53
|
taskFunction.schema = schema;
|
|
47
|
-
taskFunction.inputSchema = shape;
|
|
48
54
|
return taskFunction;
|
|
49
55
|
};
|
|
50
|
-
//# sourceMappingURL=task.js.map
|
package/dist/tasks/task.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/tasks/task.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/tasks/task.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAShC,MAAM,sBAAsB,GAAG,CAAC,MAAiB,EAAU,EAAE,CAC5D,MAAM;KACJ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;IACd,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAExC,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,sBAAsB,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAClE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5C,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;IAEjB,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,GAAG,CAAC,yBAAyB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtE,OAAO,GAAG,MAAM,KAAK,sBAAsB,EAAE,CAAC;IAC/C,CAAC;IAED,MAAM,UAAU,GACf,YAAY,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;IAE5D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChE,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC;IAC7C,CAAC;IAED,0DAA0D;IAC1D,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,sBAAsB,EAAE,CAAC;AACxD,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAEd,MAAM,CAAC,MAAM,IAAI,GAAG,CAA0B,EAAW,EAAkB,EAAE;IAC3E,EAAqB,CAAC,IAAI,GAAG,MAAM,CAAC;IACrC,OAAO,EAAoB,CAAC;AAC7B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;IACvC,CAAC,EAAE,UAAU;IACb,GAAG,EAAE,oCAAoC;CACzC,CAAC,CAAC;AAEH;;GAEG;AACH,IAAI,CAAC,MAAM,GAAG,CACb,KAA4B,EAC5B,EAAoD,EACK,EAAE;IAC3D,MAAM,MAAM,GAAG,mBAAmB;SAChC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtB,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE5B,MAAM,YAAY,GAA2C,CAC5D,OAAO,EACP,SAAS,EACR,EAAE;QACH,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAEzC,IAAI,gBAAgB,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE;gBAC7D,KAAK,EAAE,gBAAgB;aACvB,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,CAAC,gBAAyB,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC;IACjC,YAAY,CAAC,MAAM,GAAG,MAAe,CAAC;IAEtC,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC"}
|
package/dist/tasks/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { Type } from "arktype";
|
|
1
2
|
import type { ExecaMethod, ExecaScriptMethod } from "execa";
|
|
2
|
-
import type { z } from "zod";
|
|
3
3
|
import type { ParsedOptions } from "../cli/parseOptions.js";
|
|
4
4
|
export interface TaskUtilities {
|
|
5
5
|
/**
|
|
@@ -39,28 +39,20 @@ export interface TaskUtilities {
|
|
|
39
39
|
stderr: "inherit";
|
|
40
40
|
}>;
|
|
41
41
|
}
|
|
42
|
-
export type CustomShape = Record<string, z.ZodTypeAny>;
|
|
43
|
-
export interface SchemaInput {
|
|
44
|
-
_: z.ZodType<any, z.ZodTypeDef, string[]>;
|
|
45
|
-
env: z.ZodType<any, z.ZodTypeDef, Record<string, string | undefined>>;
|
|
46
|
-
[key: string]: z.ZodTypeAny;
|
|
47
|
-
}
|
|
48
|
-
export interface SchemaDefaults {
|
|
49
|
-
_: z.ZodArray<z.ZodString>;
|
|
50
|
-
env: z.ZodObject<Record<string, z.ZodOptional<z.ZodString>>>;
|
|
51
|
-
}
|
|
52
42
|
export type DefaultOptionsInput = ParsedOptions & {
|
|
53
43
|
env: Record<string, string | undefined>;
|
|
54
44
|
};
|
|
55
45
|
export type TaskCollection = Partial<Record<string, Task>>;
|
|
56
|
-
|
|
57
|
-
|
|
46
|
+
type MergePositionals<TOptions> = "_" extends keyof TOptions ? TOptions : TOptions & ParsedOptions;
|
|
47
|
+
type MergeEnvironment<TOptions> = "env" extends keyof TOptions ? TOptions : TOptions & Pick<DefaultOptionsInput, "env">;
|
|
48
|
+
export type Task<TOptions = unknown> = (options: MergePositionals<MergeEnvironment<TOptions>>, utilities: TaskUtilities) => unknown;
|
|
49
|
+
export type BrandedTaskStrict<TShape = DefaultOptionsInput> = Task<TShape> & {
|
|
58
50
|
kind: "strictTask";
|
|
59
|
-
|
|
60
|
-
schema: z.ZodType<TOptions>;
|
|
51
|
+
schema: Type<TShape>;
|
|
61
52
|
};
|
|
62
|
-
export type BrandedTaskLoose<TOptions =
|
|
53
|
+
export type BrandedTaskLoose<TOptions = unknown> = Task<TOptions> & {
|
|
63
54
|
kind: "task";
|
|
64
55
|
schema: never;
|
|
65
56
|
};
|
|
66
|
-
export type BrandedTask<TOptions =
|
|
57
|
+
export type BrandedTask<TOptions = unknown> = BrandedTaskLoose<TOptions> | BrandedTaskStrict<TOptions>;
|
|
58
|
+
export {};
|
package/dist/tasks/types.js
CHANGED