xs-dev 1.2.4 → 1.2.5

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.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xs-dev",
3
- "version": "1.2.4",
3
+ "version": "1.2.5",
4
4
  "description": "CLI for automating the setup and usage of Moddable XS tools",
5
5
  "types": "build/types/types.d.ts",
6
6
  "packageManager": "pnpm@10.29.2",
@@ -1,31 +1,16 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
24
4
  };
25
5
  Object.defineProperty(exports, "__esModule", { value: true });
26
6
  const node_os_1 = require("node:os");
7
+ const node_path_1 = require("node:path");
8
+ const ora_1 = __importDefault(require("ora"));
27
9
  const core_1 = require("@stricli/core");
10
+ const build_1 = __importDefault(require("../toolbox/build"));
28
11
  const devices_1 = require("../toolbox/prompt/devices");
12
+ const prompter_1 = require("../lib/prompter");
13
+ const renderer_1 = require("../lib/renderer");
29
14
  const command = (0, core_1.buildCommand)({
30
15
  docs: {
31
16
  brief: 'Build project for release to target device',
@@ -33,18 +18,21 @@ const command = (0, core_1.buildCommand)({
33
18
  async func(flags,
34
19
  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
35
20
  projectPath = '.') {
36
- const { filesystem } = this;
37
- const { build } = await Promise.resolve().then(() => __importStar(require('../toolbox/build/index')));
38
21
  const currentPlatform = (0, node_os_1.type)().toLowerCase();
39
22
  const { device = currentPlatform, deploy = false, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, mode = process.env.NODE_ENV ?? 'development', output, port, config = [], } = flags;
40
23
  const targetPlatform = devices_1.DEVICE_ALIAS[device] ?? device;
41
- projectPath = filesystem.resolve(projectPath);
24
+ projectPath = (0, node_path_1.resolve)(projectPath);
42
25
  const parsedConfig = config.reduce((result, setting) => {
43
26
  const [key, value] = setting.split('=');
44
27
  result[key] = value;
45
28
  return result;
46
29
  }, {});
47
- await build({
30
+ // Determine interactive mode
31
+ const prompter = (0, prompter_1.isInteractive)()
32
+ ? (0, prompter_1.createInteractivePrompter)()
33
+ : (0, prompter_1.createNonInteractivePrompter)();
34
+ const spinner = (0, ora_1.default)();
35
+ for await (const event of (0, build_1.default)({
48
36
  listExamples,
49
37
  listDevices,
50
38
  example,
@@ -55,7 +43,9 @@ const command = (0, core_1.buildCommand)({
55
43
  deployStatus: deploy ? 'push' : 'none',
56
44
  outputDir: output,
57
45
  config: parsedConfig,
58
- });
46
+ }, prompter)) {
47
+ (0, renderer_1.handleEvent)(event, spinner);
48
+ }
59
49
  },
60
50
  parameters: {
61
51
  positional: {
@@ -132,4 +122,4 @@ const command = (0, core_1.buildCommand)({
132
122
  },
133
123
  });
134
124
  exports.default = command;
135
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFDQUE4QztBQUM5Qyx3Q0FBNEM7QUFHNUMsdURBQXdEO0FBZ0J4RCxNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFZLEVBQUM7SUFDM0IsSUFBSSxFQUFFO1FBQ0osS0FBSyxFQUFFLDRDQUE0QztLQUNwRDtJQUNELEtBQUssQ0FBQyxJQUFJLENBRVIsS0FBbUI7SUFDbkIsa0VBQWtFO0lBQ2xFLGNBQXNCLEdBQUc7UUFFekIsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FBQTtRQUMzQixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsd0RBQWEsd0JBQXdCLEdBQUMsQ0FBQTtRQUN4RCxNQUFNLGVBQWUsR0FBVyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO1FBQ3RFLE1BQU0sRUFDSixNQUFNLEdBQUcsZUFBZSxFQUN4QixNQUFNLEdBQUcsS0FBSyxFQUNkLE9BQU8sRUFDUCxlQUFlLEVBQUUsWUFBWSxHQUFHLEtBQUssRUFDckMsY0FBYyxFQUFFLFdBQVcsR0FBRyxLQUFLLEVBQ25DLElBQUksR0FBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQWlCLElBQUksYUFBYSxFQUN0RCxNQUFNLEVBQ04sSUFBSSxFQUNKLE1BQU0sR0FBRyxFQUFFLEdBQ1osR0FBRyxLQUFLLENBQUE7UUFDVCxNQUFNLGNBQWMsR0FBVyxzQkFBWSxDQUFDLE1BQWdCLENBQUMsSUFBSSxNQUFNLENBQUE7UUFDdkUsV0FBVyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDN0MsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDaEMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDbEIsTUFBTSxD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
125
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvYnVpbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxQ0FBOEM7QUFDOUMseUNBQW1DO0FBQ25DLDhDQUFxQjtBQUNyQix3Q0FBNEM7QUFHNUMsNkRBQW9DO0FBQ3BDLHVEQUF3RDtBQUN4RCw4Q0FJd0I7QUFDeEIsOENBQTZDO0FBZ0I3QyxNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFZLEVBQUM7SUFDM0IsSUFBSSxFQUFFO1FBQ0osS0FBSyxFQUFFLDRDQUE0QztLQUNwRDtJQUNELEtBQUssQ0FBQyxJQUFJLENBRVIsS0FBbUI7SUFDbkIsa0VBQWtFO0lBQ2xFLGNBQXNCLEdBQUc7UUFFekIsTUFBTSxlQUFlLEdBQVcsSUFBQSxjQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxHQUFHLGVBQWUsRUFDeEIsTUFBTSxHQUFHLEtBQUssRUFDZCxPQUFPLEVBQ1AsZUFBZSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQ3JDLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxJQUFJLEdBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFpQixJQUFJLGFBQWEsRUFDdEQsTUFBTSxFQUNOLElBQUksRUFDSixNQUFNLEdBQUcsRUFBRSxHQUNaLEdBQUcsS0FBSyxDQUFBO1FBQ1QsTUFBTSxjQUFjLEdBQVcsc0JBQVksQ0FBQyxNQUFnQixDQUFDLElBQUksTUFBTSxDQUFBO1FBQ3ZFLFdBQVcsR0FBRyxJQUFBLG1CQUFPLEVBQUMsV0FBVyxDQUFDLENBQUE7UUFDbEMsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDaEMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDbEIsTUFBTSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcs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
@@ -1,31 +1,16 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
24
4
  };
25
5
  Object.defineProperty(exports, "__esModule", { value: true });
26
6
  const node_os_1 = require("node:os");
7
+ const node_path_1 = require("node:path");
8
+ const ora_1 = __importDefault(require("ora"));
27
9
  const core_1 = require("@stricli/core");
10
+ const build_1 = __importDefault(require("../toolbox/build"));
28
11
  const devices_1 = require("../toolbox/prompt/devices");
12
+ const prompter_1 = require("../lib/prompter");
13
+ const renderer_1 = require("../lib/renderer");
29
14
  const command = (0, core_1.buildCommand)({
30
15
  docs: {
31
16
  brief: 'Remove build artifacts for project',
@@ -33,18 +18,21 @@ const command = (0, core_1.buildCommand)({
33
18
  async func(flags,
34
19
  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
35
20
  projectPath = '.') {
36
- const { filesystem } = this;
37
- const { build } = await Promise.resolve().then(() => __importStar(require('../toolbox/build/index')));
38
21
  const currentPlatform = (0, node_os_1.type)().toLowerCase();
39
22
  const { device = currentPlatform, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, mode = process.env.NODE_ENV ?? 'development', output, config = [], } = flags;
40
23
  const targetPlatform = devices_1.DEVICE_ALIAS[device] ?? device;
41
- projectPath = filesystem.resolve(projectPath);
24
+ projectPath = (0, node_path_1.resolve)(projectPath);
42
25
  const parsedConfig = config.reduce((result, setting) => {
43
26
  const [key, value] = setting.split('=');
44
27
  result[key] = value;
45
28
  return result;
46
29
  }, {});
47
- await build({
30
+ // Determine interactive mode
31
+ const prompter = (0, prompter_1.isInteractive)()
32
+ ? (0, prompter_1.createInteractivePrompter)()
33
+ : (0, prompter_1.createNonInteractivePrompter)();
34
+ const spinner = (0, ora_1.default)();
35
+ for await (const event of (0, build_1.default)({
48
36
  listExamples,
49
37
  listDevices,
50
38
  example,
@@ -54,7 +42,9 @@ const command = (0, core_1.buildCommand)({
54
42
  deployStatus: 'clean',
55
43
  outputDir: output,
56
44
  config: parsedConfig,
57
- });
45
+ }, prompter)) {
46
+ (0, renderer_1.handleEvent)(event, spinner);
47
+ }
58
48
  },
59
49
  parameters: {
60
50
  positional: {
@@ -120,4 +110,4 @@ const command = (0, core_1.buildCommand)({
120
110
  },
121
111
  });
122
112
  exports.default = command;
123
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvY2xlYW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFDQUE4QztBQUM5Qyx3Q0FBNEM7QUFHNUMsdURBQXdEO0FBY3hELE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsb0NBQW9DO0tBQzVDO0lBQ0QsS0FBSyxDQUFDLElBQUksQ0FFUixLQUFtQjtJQUNuQixrRUFBa0U7SUFDbEUsY0FBc0IsR0FBRztRQUV6QixNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzNCLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyx3REFBYSx3QkFBd0IsR0FBQyxDQUFBO1FBQ3hELE1BQU0sZUFBZSxHQUFXLElBQUEsY0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7UUFDdEUsTUFBTSxFQUNKLE1BQU0sR0FBRyxlQUFlLEVBQ3hCLE9BQU8sRUFDUCxlQUFlLEVBQUUsWUFBWSxHQUFHLEtBQUssRUFDckMsY0FBYyxFQUFFLFdBQVcsR0FBRyxLQUFLLEVBQ25DLElBQUksR0FBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQWlCLElBQUksYUFBYSxFQUN0RCxNQUFNLEVBQ04sTUFBTSxHQUFHLEVBQUUsR0FDWixHQUFHLEtBQUssQ0FBQTtRQUNULE1BQU0sY0FBYyxHQUFXLHNCQUFZLENBQUMsTUFBZ0IsQ0FBQyxJQUFJLE1BQU0sQ0FBQTtRQUN2RSxXQUFXLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUM3QyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNoQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNsQixNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDdkMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQTtZQUNuQixPQUFPLE1BQU0sQ0FBQTtRQUNmLENBQUMsRUFDRCxFQUFFLENBQ0gsQ0FBQTtRQUVELE1BQU0sS0FBSyxDQUFDO1lBQ1YsWUFBWTtZQUNaLFdBQVc7WUFDWCxPQUFPO1lBQ1AsY0FBYztZQUNkLFdBQVc7WUFDWCxJQUFJO1lBQ0osWUFBWSxFQUFFLE9BQU87WUFDckIsU0FBUyxFQUFFLE1BQU07WUFDakIsTUFBTSxFQUFFLFlBQVk7U0FDckIsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFVBQVUsRUFBRTtZQUNWLElBQUksRUFBRSxPQUFPO1lBQ2IsVUFBVSxFQUFFO2dCQUNWO29CQUNFLFdBQVcsRUFBRSxhQUFhO29CQUMxQixLQUFLLEVBQUUsZ0RBQWdEO29CQUN2RCxLQUFLLEVBQUUsTUFBTTtvQkFDYixPQUFPLEVBQUUsR0FBRztvQkFDWixRQUFRLEVBQUUsSUFBSTtpQkFDZjthQUNGO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsS0FBSyxFQUFFLE1BQU07Z0JBQ2IsS0FBSyxFQUNILGlJQUFpSTtnQkFDbkksUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELE9BQU8sRUFBRTtnQkFDUCxJQUFJLEVBQUUsUUFBUTtnQkFDZCxLQUFLLEVBQUUsTUFBTTtnQkFDYixLQUFLLEVBQ0gsd0ZBQXdGO2dCQUMxRixRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsZUFBZSxFQUFFO2dCQUNmLElBQUksRUFBRSxTQUFTO2dCQUNmLEtBQUssRUFBRSxvREFBb0Q7Z0JBQzNELFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxjQUFjLEVBQUU7Z0JBQ2QsSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsS0FBSyxFQUFFLDZEQUE2RDtnQkFDcEUsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELElBQUksRUFBRTtnQkFDSixJQUFJLEVBQUUsTUFBTTtnQkFDWixNQUFNLEVBQUUsQ0FBQyxhQUFhLEVBQUUsWUFBWSxDQUFDO2dCQUNyQyxLQUFLLEVBQUUsd0RBQXdEO2dCQUMvRCxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxNQUFNO2dCQUNiLEtBQUssRUFDSCwrRkFBK0Y7Z0JBQ2pHLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsS0FBSyxFQUFFLE1BQU07Z0JBQ2IsS0FBSyxFQUFFLGlEQUFpRDtnQkFDeEQsUUFBUSxFQUFFLElBQUk7Z0JBQ2QsUUFBUSxFQUFFLElBQUk7YUFDZjtTQUNGO1FBQ0QsT0FBTyxFQUFFO1lBQ1AsQ0FBQyxFQUFFLFFBQVE7WUFDWCxDQUFDLEVBQUUsTUFBTTtZQUNULENBQUMsRUFBRSxRQUFRO1NBQ1o7S0FDRjtDQUNGLENBQUMsQ0FBQTtBQUVGLGtCQUFlLE9BQU8sQ0FBQSJ9
113
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvY2xlYW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxQ0FBOEM7QUFDOUMseUNBQW1DO0FBQ25DLDhDQUFxQjtBQUNyQix3Q0FBNEM7QUFHNUMsNkRBQW9DO0FBQ3BDLHVEQUF3RDtBQUN4RCw4Q0FJd0I7QUFDeEIsOENBQTZDO0FBYzdDLE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsb0NBQW9DO0tBQzVDO0lBQ0QsS0FBSyxDQUFDLElBQUksQ0FFUixLQUFtQjtJQUNuQixrRUFBa0U7SUFDbEUsY0FBc0IsR0FBRztRQUV6QixNQUFNLGVBQWUsR0FBVyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO1FBQ3RFLE1BQU0sRUFDSixNQUFNLEdBQUcsZUFBZSxFQUN4QixPQUFPLEVBQ1AsZUFBZSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQ3JDLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxJQUFJLEdBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFpQixJQUFJLGFBQWEsRUFDdEQsTUFBTSxFQUNOLE1BQU0sR0FBRyxFQUFFLEdBQ1osR0FBRyxLQUFLLENBQUE7UUFDVCxNQUFNLGNBQWMsR0FBVyxzQkFBWSxDQUFDLE1BQWdCLENBQUMsSUFBSSxNQUFNLENBQUE7UUFDdkUsV0FBVyxHQUFHLElBQUEsbUJBQU8sRUFBQyxXQUFXLENBQUMsQ0FBQTtRQUNsQyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNoQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNsQixNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDdkMsTUFBTSxDQUFDLEdBQUcs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
@@ -1,31 +1,16 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
24
4
  };
25
5
  Object.defineProperty(exports, "__esModule", { value: true });
26
6
  const node_os_1 = require("node:os");
7
+ const node_path_1 = require("node:path");
8
+ const ora_1 = __importDefault(require("ora"));
27
9
  const core_1 = require("@stricli/core");
10
+ const build_1 = __importDefault(require("../toolbox/build"));
28
11
  const devices_1 = require("../toolbox/prompt/devices");
12
+ const prompter_1 = require("../lib/prompter");
13
+ const renderer_1 = require("../lib/renderer");
29
14
  const command = (0, core_1.buildCommand)({
30
15
  docs: {
31
16
  brief: 'Connect to running debugging session on target device or simulator',
@@ -33,13 +18,16 @@ const command = (0, core_1.buildCommand)({
33
18
  async func(flags,
34
19
  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
35
20
  projectPath = '.') {
36
- const { filesystem } = this;
37
21
  const currentPlatform = (0, node_os_1.type)().toLowerCase();
38
22
  const { device = currentPlatform, port, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, log = false, mode = process.env.NODE_ENV ?? 'development', output, } = flags;
39
- const { build } = await Promise.resolve().then(() => __importStar(require('../toolbox/build/index')));
40
23
  const targetPlatform = devices_1.DEVICE_ALIAS[device] ?? device;
41
- projectPath = filesystem.resolve(projectPath);
42
- await build({
24
+ projectPath = (0, node_path_1.resolve)(projectPath);
25
+ // Determine interactive mode
26
+ const prompter = (0, prompter_1.isInteractive)()
27
+ ? (0, prompter_1.createInteractivePrompter)()
28
+ : (0, prompter_1.createNonInteractivePrompter)();
29
+ const spinner = (0, ora_1.default)();
30
+ for await (const event of (0, build_1.default)({
43
31
  port,
44
32
  listExamples,
45
33
  listDevices,
@@ -50,7 +38,9 @@ const command = (0, core_1.buildCommand)({
50
38
  mode,
51
39
  deployStatus: 'debug',
52
40
  outputDir: output,
53
- });
41
+ }, prompter)) {
42
+ (0, renderer_1.handleEvent)(event, spinner);
43
+ }
54
44
  },
55
45
  parameters: {
56
46
  positional: {
@@ -109,4 +99,4 @@ const command = (0, core_1.buildCommand)({
109
99
  },
110
100
  });
111
101
  exports.default = command;
112
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvZGVidWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFDQUE4QztBQUM5Qyx3Q0FBNEM7QUFHNUMsdURBQXdEO0FBZXhELE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsb0VBQW9FO0tBQzVFO0lBQ0QsS0FBSyxDQUFDLElBQUksQ0FFUixLQUFtQjtJQUNuQixrRUFBa0U7SUFDbEUsY0FBc0IsR0FBRztRQUV6QixNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzNCLE1BQU0sZUFBZSxHQUFXLElBQUEsY0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7UUFDdEUsTUFBTSxFQUNKLE1BQU0sR0FBRyxlQUFlLEVBQ3hCLElBQUksRUFDSixPQUFPLEVBQ1AsZUFBZSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQ3JDLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxHQUFHLEdBQUcsS0FBSyxFQUNYLElBQUksR0FBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQWlCLElBQUksYUFBYSxFQUN0RCxNQUFNLEdBQ1AsR0FBRyxLQUFLLENBQUE7UUFDVCxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsd0RBQWEsd0JBQXdCLEdBQUMsQ0FBQTtRQUN4RCxNQUFNLGNBQWMsR0FBVyxzQkFBWSxDQUFDLE1BQWdCLENBQUMsSUFBSSxNQUFNLENBQUE7UUFDdkUsV0FBVyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUE7UUFFN0MsTUFBTSxLQUFLLENBQUM7WUFDVixJQUFJO1lBQ0osWUFBWTtZQUNaLFdBQVc7WUFDWCxHQUFHO1lBQ0gsT0FBTztZQUNQLGNBQWM7WUFDZCxXQUFXO1lBQ1gsSUFBSTtZQUNKLFlBQVksRUFBRSxPQUFPO1lBQ3JCLFNBQVMsRUFBRSxNQUFNO1NBQ2xCLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxVQUFVLEVBQUU7UUFDVixVQUFVLEVBQUU7WUFDVixJQUFJLEVBQUUsT0FBTztZQUNiLFVBQVUsRUFBRTtnQkFDVjtvQkFDRSxXQUFXLEVBQUUsYUFBYTtvQkFDMUIsS0FBSyxFQUFFLGdEQUFnRDtvQkFDdkQsS0FBSyxFQUFFLE1BQU07b0JBQ2IsT0FBTyxFQUFFLEdBQUc7b0JBQ1osUUFBUSxFQUFFLElBQUk7aUJBQ2Y7YUFDRjtTQUNGO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsTUFBTSxFQUFFO2dCQUNOLElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxNQUFNO2dCQUNiLEtBQUssRUFDSCxpSUFBaUk7Z0JBQ25JLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxPQUFPLEVBQUU7Z0JBQ1AsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsS0FBSyxFQUFFLE1BQU07Z0JBQ2IsS0FBSyxFQUNILHdGQUF3RjtnQkFDMUYsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELGVBQWUsRUFBRTtnQkFDZixJQUFJLEVBQUUsU0FBUztnQkFDZixLQUFLLEVBQUUsb0RBQW9EO2dCQUMzRCxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsY0FBYyxFQUFFO2dCQUNkLElBQUksRUFBRSxTQUFTO2dCQUNmLEtBQUssRUFBRSw2REFBNkQ7Z0JBQ3BFLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxJQUFJLEVBQUU7Z0JBQ0osSUFBSSxFQUFFLE1BQU07Z0JBQ1osTUFBTSxFQUFFLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQztnQkFDckMsS0FBSyxFQUFFLHdEQUF3RDtnQkFDL0QsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsUUFBUTtnQkFDZCxLQUFLLEVBQUUsTUFBTTtnQkFDYixLQUFLLEVBQ0gsK0ZBQStGO2dCQUNqRyxRQUFRLEVBQUUsSUFBSTthQUNmO1NBQ0Y7UUFDRCxPQUFPLEVBQUU7WUFDUCxDQUFDLEVBQUUsUUFBUTtZQUNYLENBQUMsRUFBRSxNQUFNO1lBQ1QsQ0FBQyxFQUFFLFFBQVE7U0FDWjtLQUNGO0NBQ0YsQ0FBQyxDQUFBO0FBRUYsa0JBQWUsT0FBTyxDQUFBIn0=
102
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvZGVidWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxQ0FBOEM7QUFDOUMseUNBQW1DO0FBQ25DLDhDQUFxQjtBQUNyQix3Q0FBNEM7QUFHNUMsNkRBQW9DO0FBQ3BDLHVEQUF3RDtBQUN4RCw4Q0FJd0I7QUFDeEIsOENBQTZDO0FBZTdDLE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsb0VBQW9FO0tBQzVFO0lBQ0QsS0FBSyxDQUFDLElBQUksQ0FFUixLQUFtQjtJQUNuQixrRUFBa0U7SUFDbEUsY0FBc0IsR0FBRztRQUV6QixNQUFNLGVBQWUsR0FBVyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO1FBQ3RFLE1BQU0sRUFDSixNQUFNLEdBQUcsZUFBZSxFQUN4QixJQUFJLEVBQ0osT0FBTyxFQUNQLGVBQWUsRUFBRSxZQUFZLEdBQUcsS0FBSyxFQUNyQyxjQUFjLEVBQUUsV0FBVyxHQUFHLEtBQUssRUFDbkMsR0FBRyxHQUFHLEtBQUssRUFDWCxJQUFJLEdBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFpQixJQUFJLGFBQWEsRUFDdEQsTUFBTSxHQUNQLEdBQUcsS0FBSyxDQUFBO1FBQ1QsTUFBTSxjQUFjLEdBQVcsc0JBQVksQ0FBQyxNQUFnQixDQUFDLElBQUksTUFBTSxDQUFBO1FBQ3ZFLFdBQVcsR0FBRyxJQUFBLG1CQUFPLEVBQUMsV0FBVyxDQUFDLENBQUE7UUFFbEMsNkJBQTZCO1FBQzdCLE1BQU0sUUFBUSxHQUFHLElBQUEsd0JBQWEsR0FBRTtZQUM5QixDQUFDLENBQUMsSUFBQSxvQ0FBeUIsR0FBRTtZQUM3QixDQUFDLENBQUMsSUFBQSx1Q0FBNEIsR0FBRSxDQUFBO1FBRWxDLE1BQU0sT0FBTyxHQUFHLElBQUEsYUFBRyxHQUFFLENBQUE7UUFFckIsSUFBSSxLQUFLLEVBQUUsTUFBTSxLQUFLLElBQUksSUFBQSxlQUFLLEVBQzdCO1lBQ0UsSUFBSTtZQUNKLFlBQVk7WUFDWixXQUFXO1lBQ1gsR0FBRztZQUNILE9BQU87WUFDUCxjQUFjO1lBQ2QsV0FBVztZQUNYLElBQUk7WUFDSixZQUFZLEVBQUUsT0FBTztZQUNyQixTQUFTLEVBQUUsTUFBTTtTQUNsQixFQUNELFFBQVEsQ0FDVCxFQUFFLENBQUM7WUFDRixJQUFBLHNCQUFXLEVBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQzdCLENBQUM7SUFDSCxDQUFDO0lBQ0QsVUFBVSxFQUFFO1FBQ1YsVUFBVSxFQUFFO1lBQ1YsSUFBSSxFQUFFLE9BQU87WUFDYixVQUFVLEVBQUU7Z0JBQ1Y7b0JBQ0UsV0FBVyxFQUFFLGFBQWE7b0JBQzFCLEtBQUssRUFBRSxnREFBZ0Q7b0JBQ3ZELEtBQUssRUFBRSxNQUFNO29CQUNiLE9BQU8sRUFBRSxHQUFHO29CQUNaLFFBQVEsRUFBRSxJQUFJO2lCQUNmO2FBQ0Y7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsUUFBUTtnQkFDZCxLQUFLLEVBQUUsTUFBTTtnQkFDYixLQUFLLEVBQ0gsaUlBQWlJO2dCQUNuSSxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsT0FBTyxFQUFFO2dCQUNQLElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxNQUFNO2dCQUNiLEtBQUssRUFDSCx3RkFBd0Y7Z0JBQzFGLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxlQUFlLEVBQUU7Z0JBQ2YsSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsS0FBSyxFQUFFLG9EQUFvRDtnQkFDM0QsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELGNBQWMsRUFBRTtnQkFDZCxJQUFJLEVBQUUsU0FBUztnQkFDZixLQUFLLEVBQUUsNkRBQTZEO2dCQUNwRSxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsSUFBSSxFQUFFO2dCQUNKLElBQUksRUFBRSxNQUFNO2dCQUNaLE1BQU0sRUFBRSxDQUFDLGFBQWEsRUFBRSxZQUFZLENBQUM7Z0JBQ3JDLEtBQUssRUFBRSx3REFBd0Q7Z0JBQy9ELFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsS0FBSyxFQUFFLE1BQU07Z0JBQ2IsS0FBSyxFQUNILCtGQUErRjtnQkFDakcsUUFBUSxFQUFFLElBQUk7YUFDZjtTQUNGO1FBQ0QsT0FBTyxFQUFFO1lBQ1AsQ0FBQyxFQUFFLFFBQVE7WUFDWCxDQUFDLEVBQUUsTUFBTTtZQUNULENBQUMsRUFBRSxRQUFRO1NBQ1o7S0FDRjtDQUNGLENBQUMsQ0FBQTtBQUVGLGtCQUFlLE9BQU8sQ0FBQSJ9
@@ -1,49 +1,36 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
24
4
  };
25
5
  Object.defineProperty(exports, "__esModule", { value: true });
26
6
  const node_os_1 = require("node:os");
7
+ const node_path_1 = require("node:path");
8
+ const ora_1 = __importDefault(require("ora"));
27
9
  const core_1 = require("@stricli/core");
10
+ const build_1 = __importDefault(require("../toolbox/build"));
28
11
  const devices_1 = require("../toolbox/prompt/devices");
12
+ const prompter_1 = require("../lib/prompter");
13
+ const renderer_1 = require("../lib/renderer");
29
14
  const command = (0, core_1.buildCommand)({
30
15
  docs: {
31
16
  brief: 'Build and launch project on target device or simulator',
32
17
  },
33
18
  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
34
19
  async func(flags, projectPath = '.') {
35
- const { filesystem } = this;
36
- const { build } = await Promise.resolve().then(() => __importStar(require('../toolbox/build/index')));
37
20
  const currentPlatform = (0, node_os_1.type)().toLowerCase();
38
21
  const { device = currentPlatform, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, log = false, mode = process.env.NODE_ENV ?? 'development', output, port, config = [], } = flags;
39
22
  const targetPlatform = devices_1.DEVICE_ALIAS[device] ?? device;
40
- projectPath = filesystem.resolve(projectPath);
23
+ projectPath = (0, node_path_1.resolve)(projectPath);
41
24
  const parsedConfig = config.reduce((result, setting) => {
42
25
  const [key, value] = setting.split('=');
43
26
  result[key] = value;
44
27
  return result;
45
28
  }, {});
46
- await build({
29
+ const prompter = (0, prompter_1.isInteractive)()
30
+ ? (0, prompter_1.createInteractivePrompter)()
31
+ : (0, prompter_1.createNonInteractivePrompter)();
32
+ const spinner = (0, ora_1.default)();
33
+ for await (const event of (0, build_1.default)({
47
34
  listExamples,
48
35
  listDevices,
49
36
  log,
@@ -55,7 +42,9 @@ const command = (0, core_1.buildCommand)({
55
42
  deployStatus: 'run',
56
43
  outputDir: output,
57
44
  config: parsedConfig,
58
- });
45
+ }, prompter)) {
46
+ (0, renderer_1.handleEvent)(event, spinner);
47
+ }
59
48
  },
60
49
  parameters: {
61
50
  positional: {
@@ -132,4 +121,4 @@ const command = (0, core_1.buildCommand)({
132
121
  },
133
122
  });
134
123
  exports.default = command;
135
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3J1bi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBQThDO0FBQzlDLHdDQUE0QztBQUc1Qyx1REFBd0Q7QUFnQnhELE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsd0RBQXdEO0tBQ2hFO0lBQ0Qsa0VBQWtFO0lBQ2xFLEtBQUssQ0FBQyxJQUFJLENBQXFCLEtBQWlCLEVBQUUsY0FBc0IsR0FBRztRQUN6RSxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzNCLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyx3REFBYSx3QkFBd0IsR0FBQyxDQUFBO1FBQ3hELE1BQU0sZUFBZSxHQUFXLElBQUEsY0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7UUFDdEUsTUFBTSxFQUNKLE1BQU0sR0FBRyxlQUFlLEVBQ3hCLE9BQU8sRUFDUCxlQUFlLEVBQUUsWUFBWSxHQUFHLEtBQUssRUFDckMsY0FBYyxFQUFFLFdBQVcsR0FBRyxLQUFLLEVBQ25DLEdBQUcsR0FBRyxLQUFLLEVBQ1gsSUFBSSxHQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBaUIsSUFBSSxhQUFhLEVBQ3RELE1BQU0sRUFDTixJQUFJLEVBQ0osTUFBTSxHQUFHLEVBQUUsR0FDWixHQUFHLEtBQUssQ0FBQTtRQUNULE1BQU0sY0FBYyxHQUFXLHNCQUFZLENBQUMsTUFBZ0IsQ0FBQyxJQUFJLE1BQU0sQ0FBQTtRQUN2RSxXQUFXLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUM3QyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNoQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNsQixNQUFNLENBQUMs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
124
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3J1bi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFDQUE4QztBQUM5Qyx5Q0FBbUM7QUFDbkMsOENBQXFCO0FBQ3JCLHdDQUE0QztBQUc1Qyw2REFBb0M7QUFDcEMsdURBQXdEO0FBQ3hELDhDQUl3QjtBQUN4Qiw4Q0FBNkM7QUFnQjdDLE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsd0RBQXdEO0tBQ2hFO0lBQ0Qsa0VBQWtFO0lBQ2xFLEtBQUssQ0FBQyxJQUFJLENBQXFCLEtBQWlCLEVBQUUsY0FBc0IsR0FBRztRQUN6RSxNQUFNLGVBQWUsR0FBVyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO1FBQ3RFLE1BQU0sRUFDSixNQUFNLEdBQUcsZUFBZSxFQUN4QixPQUFPLEVBQ1AsZUFBZSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQ3JDLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxHQUFHLEdBQUcsS0FBSyxFQUNYLElBQUksR0FBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQWlCLElBQUksYUFBYSxFQUN0RCxNQUFNLEVBQ04sSUFBSSxFQUNKLE1BQU0sR0FBRyxFQUFFLEdBQ1osR0FBRyxLQUFLLENBQUE7UUFDVCxNQUFNLGNBQWMsR0FBVyxzQkFBWSxDQUFDLE1BQWdCLENBQUMsSUFBSSxNQUFNLENBQUE7UUFDdkUsV0FBVyxHQUFHLElBQUEsbUJBQU8sRUFBQyxXQUFXLENBQUMsQ0FBQTtRQUNsQyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNoQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNsQixNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFD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
@@ -3,12 +3,13 @@ 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.build = build;
7
- const node_child_process_1 = require("node:child_process");
6
+ exports.default = build;
8
7
  const node_os_1 = require("node:os");
9
- const serve_handler_1 = __importDefault(require("serve-handler"));
10
8
  const http_1 = require("http");
11
- const gluegun_1 = require("gluegun");
9
+ const promises_1 = require("node:fs/promises");
10
+ const node_path_1 = require("node:path");
11
+ const serve_handler_1 = __importDefault(require("serve-handler"));
12
+ const execa_js_1 = require("../system/execa.js");
12
13
  const choices_1 = require("../prompt/choices");
13
14
  const moddable_1 = require("../setup/moddable");
14
15
  const devices_1 = require("../prompt/devices");
@@ -20,160 +21,237 @@ const DEPLOY_TARGET = Object.freeze({
20
21
  push: 'build',
21
22
  run: 'all',
22
23
  });
23
- async function build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {}, }) {
24
+ async function* inspectTree(dirPath) {
25
+ try {
26
+ const entries = await (0, promises_1.readdir)(dirPath, { withFileTypes: true });
27
+ const results = await Promise.all(entries.map(async (entry) => {
28
+ const stats = await (0, promises_1.stat)((0, node_path_1.resolve)(dirPath, entry.name));
29
+ const childNodes = [];
30
+ if (stats.isDirectory()) {
31
+ for await (const children of inspectTree((0, node_path_1.resolve)(dirPath, entry.name))) {
32
+ childNodes.push(...children);
33
+ }
34
+ }
35
+ const nodeType = stats.isDirectory()
36
+ ? 'dir'
37
+ : stats.isSymbolicLink()
38
+ ? 'symlink'
39
+ : 'file';
40
+ return {
41
+ name: entry.name,
42
+ type: nodeType,
43
+ children: childNodes,
44
+ };
45
+ }));
46
+ yield results.flat();
47
+ }
48
+ catch {
49
+ yield [];
50
+ }
51
+ }
52
+ async function* build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {}, }, prompter) {
24
53
  const OS = (0, node_os_1.type)().toLowerCase();
25
54
  await (0, exec_1.sourceEnvironment)();
26
55
  if (!(0, moddable_1.moddableExists)()) {
27
- gluegun_1.print.error(`Moddable tooling required. Run 'xs-dev setup --device ${devices_1.DEVICE_ALIAS[OS]}' before trying again.`);
28
- process.exit(1);
56
+ yield {
57
+ type: 'step:fail',
58
+ message: `Moddable tooling required. Run 'xs-dev setup --device ${devices_1.DEVICE_ALIAS[OS]}' before trying again.`,
59
+ };
60
+ return;
29
61
  }
30
- outputDir ??= gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build');
62
+ outputDir ??= (0, node_path_1.resolve)(String(process.env.MODDABLE), 'build');
31
63
  if (listDevices) {
32
- const deviceTargetsPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build', 'devices');
33
- const simulatorsPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build', 'simulators');
34
- const devices = gluegun_1.filesystem.inspectTree(deviceTargetsPath)?.children ?? [];
35
- const deviceTargets = devices.flatMap((dev) => {
36
- const targets = dev.children
37
- .filter((c) => c.name === 'targets')
38
- .flatMap((c) => c.children.flatMap((dir) => (0, choices_1.collectChoicesFromTree)(dir, [], `${dev.name}/`)));
39
- return [dev.name].concat(targets);
40
- });
41
- const simulators = gluegun_1.filesystem
42
- .inspectTree(simulatorsPath)
43
- ?.children?.flatMap((sim) => (0, choices_1.collectChoicesFromTree)(sim, [], `simulator/`)) ?? [];
44
- const choices = deviceTargets.concat(simulators, 'wasm', devices_1.DEVICE_ALIAS[OS]);
45
- const { device: selectedDevice } = await gluegun_1.prompt.ask([
46
- {
47
- type: 'autocomplete',
48
- name: 'device',
49
- message: 'Here are the available target devices:',
50
- choices,
51
- },
52
- ]);
64
+ const deviceTargetsPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'build', 'devices');
65
+ const simulatorsPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'build', 'simulators');
66
+ let deviceTargets = [];
67
+ for await (const devices of inspectTree(deviceTargetsPath)) {
68
+ deviceTargets = devices.flatMap((dev) => {
69
+ const targets = dev.children
70
+ .filter((c) => c.name === 'targets')
71
+ .flatMap((c) => c.children.flatMap((dir) => {
72
+ return (0, choices_1.collectChoicesFromTree)(dir, [], `${dev.name}/`);
73
+ }));
74
+ return [dev.name].concat(targets);
75
+ });
76
+ }
77
+ let simulators = [];
78
+ for await (const simDirs of inspectTree(simulatorsPath)) {
79
+ simulators = simDirs.flatMap((sim) => (0, choices_1.collectChoicesFromTree)(sim, [], `simulator/`));
80
+ }
81
+ const choices = deviceTargets
82
+ .concat(simulators, 'wasm', devices_1.DEVICE_ALIAS[OS])
83
+ .map((c) => ({ label: c, value: c }));
84
+ const selectedDevice = await prompter.select('Here are the available target devices:', choices);
53
85
  if (selectedDevice !== '' && selectedDevice !== undefined) {
54
86
  targetPlatform = selectedDevice;
55
87
  }
56
88
  else {
57
- gluegun_1.print.warning('Please select a target device to run');
58
- process.exit(0);
89
+ yield { type: 'warning', message: 'Please select a target device to run' };
90
+ return;
59
91
  }
60
92
  }
61
93
  if (targetPlatform !== '') {
62
94
  const startsWithSimulator = targetPlatform.startsWith('simulator');
63
95
  if (targetPlatform.includes('esp32') && !startsWithSimulator) {
64
- if (typeof process.env.IDF_PATH !== 'string' ||
65
- gluegun_1.filesystem.exists(process.env.IDF_PATH) !== 'dir') {
66
- gluegun_1.print.error('The current environment does not appear to be set up for the ESP32 build target. Please run `xs-dev setup --device esp32` before trying again.');
67
- process.exit(1);
68
- }
69
- else {
70
- await (0, exec_1.sourceIdfPythonEnv)();
96
+ if (!(typeof process.env.IDF_PATH === 'string')) {
97
+ yield {
98
+ type: 'step:fail',
99
+ message: 'The current environment does not appear to be set up for the ESP32 build target. Please run `xs-dev setup --device esp32` before trying again.',
100
+ };
101
+ return;
71
102
  }
103
+ await (0, exec_1.sourceIdfPythonEnv)();
72
104
  }
73
105
  else if (targetPlatform.includes('esp') && !startsWithSimulator) {
74
- if (typeof process.env.ESP_BASE !== 'string' ||
75
- gluegun_1.filesystem.exists(process.env.ESP_BASE) !== 'dir') {
76
- gluegun_1.print.error('The current environment does not appear to be set up for the ESP8266 build target. Please run `xs-dev setup --device esp8266` before trying again.');
77
- process.exit(1);
106
+ if (!(typeof process.env.ESP_BASE === 'string')) {
107
+ yield {
108
+ type: 'step:fail',
109
+ message: 'The current environment does not appear to be set up for the ESP8266 build target. Please run `xs-dev setup --device esp8266` before trying again.',
110
+ };
111
+ return;
78
112
  }
79
113
  }
80
114
  if (targetPlatform.includes('wasm') && !startsWithSimulator) {
81
115
  if (!(process.env.PATH ?? '').includes('binaryen') ||
82
- gluegun_1.filesystem.exists(process.env.EMSDK ?? '') !== 'dir' ||
83
- gluegun_1.filesystem.exists(process.env.EMSDK_NODE ?? '') !== 'file' ||
84
- gluegun_1.filesystem.exists(process.env.EMSDK_PYTHON ?? '') !== 'file') {
85
- gluegun_1.print.error('The current environment does not appear to be set up for the wasm build target. Please run `xs-dev setup --device wasm` before trying again.');
86
- process.exit(1);
116
+ typeof process.env.EMSDK !== 'string' ||
117
+ typeof process.env.EMSDK_NODE !== 'string' ||
118
+ typeof process.env.EMSDK_PYTHON !== 'string') {
119
+ yield {
120
+ type: 'step:fail',
121
+ message: 'The current environment does not appear to be set up for the wasm build target. Please run `xs-dev setup --device wasm` before trying again.',
122
+ };
123
+ return;
87
124
  }
88
125
  }
89
126
  if (targetPlatform.includes('pico') && !startsWithSimulator) {
90
- if (typeof process.env.PICO_SDK_PATH !== 'string' ||
91
- gluegun_1.filesystem.exists(process.env.PICO_SDK_PATH) !== 'dir' ||
92
- gluegun_1.system.which('picotool') === null ||
93
- gluegun_1.filesystem.exists(process.env.PIOASM ?? '') !== 'file') {
94
- gluegun_1.print.error('The current environment does not appear to be set up for the pico build target. Please run `xs-dev setup --device pico` before trying again.');
95
- process.exit(1);
127
+ if (!(typeof process.env.PICO_SDK_PATH === 'string') ||
128
+ typeof process.env.PIOASM !== 'string') {
129
+ yield {
130
+ type: 'step:fail',
131
+ message: 'The current environment does not appear to be set up for the pico build target. Please run `xs-dev setup --device pico` before trying again.',
132
+ };
133
+ return;
96
134
  }
97
135
  }
98
136
  if (targetPlatform.includes('nrf52') && !startsWithSimulator) {
99
137
  if (typeof process.env.NRF_ROOT !== 'string' ||
100
- typeof process.env.NRF_SDK_DIR !== 'string' ||
101
- gluegun_1.filesystem.exists(process.env.NRF_ROOT) !== 'dir' ||
102
- gluegun_1.filesystem.exists(process.env.NRF_SDK_DIR) !== 'dir') {
103
- gluegun_1.print.error('The current environment does not appear to be set up for the nrf52 build target. Please run `xs-dev setup --device nrf52` before trying again.');
104
- process.exit(1);
138
+ typeof process.env.NRF_SDK_DIR !== 'string') {
139
+ yield {
140
+ type: 'step:fail',
141
+ message: 'The current environment does not appear to be set up for the nrf52 build target. Please run `xs-dev setup --device nrf52` before trying again.',
142
+ };
143
+ return;
105
144
  }
106
145
  }
107
146
  if (targetPlatform.includes('zephyr') && !startsWithSimulator) {
108
- if (typeof process.env.ZEPHYR_BASE !== 'string' ||
109
- gluegun_1.filesystem.exists(process.env.ZEPHYR_BASE) !== 'dir') {
110
- gluegun_1.print.error('The current environment does not appear to be set up for the zephyr build target. Please run `xs-dev setup --device zephyr` before trying again.');
111
- process.exit(1);
147
+ if (typeof process.env.ZEPHYR_BASE !== 'string') {
148
+ yield {
149
+ type: 'step:fail',
150
+ message: 'The current environment does not appear to be set up for the zephyr build target. Please run `xs-dev setup --device zephyr` before trying again.',
151
+ };
152
+ return;
112
153
  }
113
154
  }
114
155
  }
115
156
  if (listExamples) {
116
- const exampleProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'examples');
117
- const contributedProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'contributed');
118
- const examples = gluegun_1.filesystem.inspectTree(exampleProjectPath)?.children;
119
- const contributed = gluegun_1.filesystem.inspectTree(contributedProjectPath)?.children;
120
- const choices = examples !== undefined
121
- ? examples.map((example) => (0, choices_1.collectChoicesFromTree)(example)).flat()
122
- : [];
123
- if (contributed !== undefined) {
124
- choices.push(...contributed.flatMap((project) => (0, choices_1.collectChoicesFromTree)(project)));
125
- }
126
- const { example: selectedExample } = await gluegun_1.prompt.ask([
127
- {
128
- type: 'autocomplete',
129
- name: 'example',
130
- message: 'Here are the available examples:',
131
- choices,
132
- },
133
- ]);
157
+ const exampleProjectPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'examples');
158
+ const contributedProjectPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'contributed');
159
+ const choicesList = [];
160
+ for await (const examples of inspectTree(exampleProjectPath)) {
161
+ choicesList.push(...examples.flatMap((example) => (0, choices_1.collectChoicesFromTree)(example)));
162
+ }
163
+ for await (const contributed of inspectTree(contributedProjectPath)) {
164
+ choicesList.push(...contributed.flatMap((project) => (0, choices_1.collectChoicesFromTree)(project)));
165
+ }
166
+ const choices = choicesList.map((c) => ({
167
+ label: c,
168
+ value: c,
169
+ }));
170
+ const selectedExample = await prompter.select('Here are the available examples:', choices);
134
171
  if (selectedExample !== '' && selectedExample !== undefined) {
135
- gluegun_1.print.info(`Running the example: xs-dev run --example ${selectedExample}`);
136
- projectPath = gluegun_1.filesystem.resolve(exampleProjectPath, selectedExample);
172
+ yield {
173
+ type: 'info',
174
+ message: `Running the example: xs-dev run --example ${selectedExample}`,
175
+ };
176
+ projectPath = (0, node_path_1.resolve)(exampleProjectPath, selectedExample);
137
177
  }
138
178
  else {
139
- gluegun_1.print.warning('Please select an example to run.');
140
- process.exit(0);
179
+ yield { type: 'warning', message: 'Please select an example to run.' };
180
+ return;
141
181
  }
142
182
  }
143
183
  if (example !== undefined) {
144
- const exampleProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'examples', example);
145
- const contributedProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'contributed', example);
146
- if (gluegun_1.filesystem.exists(exampleProjectPath) === false &&
147
- gluegun_1.filesystem.exists(contributedProjectPath) === false) {
148
- gluegun_1.print.error('Example project does not exist.');
149
- gluegun_1.print.info(`Lookup the available examples: xs-dev run --list-examples`);
150
- process.exit(1);
151
- }
152
- if (gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(exampleProjectPath, 'manifest.json')) === false &&
153
- gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(contributedProjectPath, 'manifest.json')) === false) {
154
- gluegun_1.print.error('Example project must contain a manifest.json.');
155
- gluegun_1.print.info(`Lookup the available examples: xs-dev run --list-examples`);
156
- process.exit(1);
157
- }
158
- projectPath =
159
- gluegun_1.filesystem.exists(exampleProjectPath) === 'dir'
160
- ? exampleProjectPath
161
- : contributedProjectPath;
184
+ const exampleProjectPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'examples', example);
185
+ const contributedProjectPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'contributed', example);
186
+ let exampleExists = false;
187
+ let exampleHasManifest = false;
188
+ let isExampleDir = false;
189
+ try {
190
+ const exampleStat = await (0, promises_1.stat)(exampleProjectPath);
191
+ exampleExists = true;
192
+ isExampleDir = exampleStat.isDirectory();
193
+ const manifestPath = (0, node_path_1.resolve)(exampleProjectPath, 'manifest.json');
194
+ try {
195
+ const manifestStat = await (0, promises_1.stat)(manifestPath);
196
+ exampleHasManifest = manifestStat.isFile();
197
+ }
198
+ catch {
199
+ // manifest doesn't exist
200
+ }
201
+ }
202
+ catch {
203
+ // example path doesn't exist
204
+ }
205
+ if (!exampleExists) {
206
+ try {
207
+ await (0, promises_1.stat)(contributedProjectPath);
208
+ }
209
+ catch {
210
+ yield {
211
+ type: 'step:fail',
212
+ message: 'Example project does not exist.',
213
+ };
214
+ yield {
215
+ type: 'info',
216
+ message: 'Lookup the available examples: xs-dev run --list-examples',
217
+ };
218
+ return;
219
+ }
220
+ }
221
+ if (!exampleHasManifest) {
222
+ try {
223
+ const manifestPath = (0, node_path_1.resolve)(contributedProjectPath, 'manifest.json');
224
+ await (0, promises_1.stat)(manifestPath);
225
+ }
226
+ catch {
227
+ yield {
228
+ type: 'step:fail',
229
+ message: 'Example project must contain a manifest.json.',
230
+ };
231
+ yield {
232
+ type: 'info',
233
+ message: 'Lookup the available examples: xs-dev run --list-examples',
234
+ };
235
+ return;
236
+ }
237
+ }
238
+ projectPath = isExampleDir ? exampleProjectPath : contributedProjectPath;
162
239
  }
163
240
  if (port !== undefined) {
164
241
  process.env.UPLOAD_PORT = port;
165
242
  }
166
- const spinner = gluegun_1.print.spin();
243
+ let statusMessage = '';
167
244
  switch (deployStatus) {
168
245
  case 'clean':
169
- spinner.start(`Cleaning up build artifacts for project ${projectPath} on ${targetPlatform}\n`);
246
+ statusMessage = `Cleaning up build artifacts for project ${projectPath} on ${targetPlatform}`;
170
247
  break;
171
248
  case 'debug':
172
- spinner.start(`Connecting to running debug session for ${projectPath} on ${targetPlatform}\n`);
249
+ statusMessage = `Connecting to running debug session for ${projectPath} on ${targetPlatform}`;
173
250
  break;
174
251
  default:
175
- spinner.start(`Building${deployStatus !== 'none' ? ' and deploying project' : ''} ${projectPath} on ${targetPlatform}\n`);
252
+ statusMessage = `Building${deployStatus !== 'none' ? ' and deploying project' : ''} ${projectPath} on ${targetPlatform}`;
176
253
  }
254
+ yield { type: 'step:start', message: statusMessage };
177
255
  const configArgs = [
178
256
  '-m',
179
257
  `-p ${targetPlatform}`,
@@ -192,61 +270,62 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
192
270
  Object.entries(config).forEach(([element, value]) => {
193
271
  configArgs.push(`${element}="${value}"`);
194
272
  });
195
- const canUseMCPack = gluegun_1.system.which('mcpack') !== null &&
196
- gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(projectPath, 'package.json')) ===
197
- 'file';
273
+ let canUseMCPack = false;
274
+ if ((0, exec_1.which)('mcpack') !== null) {
275
+ try {
276
+ await (0, promises_1.stat)((0, node_path_1.resolve)(projectPath, 'package.json'));
277
+ canUseMCPack = true;
278
+ }
279
+ catch {
280
+ canUseMCPack = false;
281
+ }
282
+ }
198
283
  let rootCommand = 'mcconfig';
199
284
  if (canUseMCPack) {
200
285
  rootCommand = 'mcpack';
201
286
  configArgs.unshift('mcconfig');
202
287
  }
203
- if (log) {
204
- const logOutput = (0, node_child_process_1.spawn)(rootCommand, configArgs, {
288
+ try {
289
+ const command = `${rootCommand} ${configArgs.join(' ')}`;
290
+ await (0, execa_js_1.execaCommand)(command, {
205
291
  cwd: projectPath,
206
292
  stdio: 'inherit',
207
293
  shell: true,
208
294
  });
209
- logOutput.on('close', (exitCode) => {
210
- if (exitCode !== null) {
211
- process.exit(exitCode);
212
- }
213
- });
214
295
  }
215
- else {
216
- process.on('SIGINT', () => {
217
- void gluegun_1.system.exec(`pkill serial2xsbug`);
218
- });
296
+ catch (error) {
297
+ if (error instanceof Error && !error.message.includes('exit code 2')) {
298
+ yield { type: 'step:fail', message: String(error) };
299
+ return;
300
+ }
301
+ }
302
+ if (deployStatus === 'push') {
219
303
  try {
220
- await gluegun_1.system.exec(`${rootCommand} ${configArgs.join(' ')}`, {
304
+ const deployCommand = `mcconfig -t deploy -p ${targetPlatform} -o ${outputDir}`;
305
+ await (0, execa_js_1.execaCommand)(deployCommand, {
221
306
  cwd: projectPath,
222
307
  stdio: 'inherit',
223
308
  shell: true,
224
309
  });
225
310
  }
226
311
  catch (error) {
227
- if (error instanceof Error && !error.message.includes('exit code 2')) {
228
- gluegun_1.print.error(error);
312
+ if (error instanceof Error) {
313
+ yield { type: 'step:fail', message: String(error) };
314
+ return;
229
315
  }
230
316
  }
231
- if (deployStatus === 'push') {
232
- await gluegun_1.system.exec(`mcconfig -t deploy -p ${targetPlatform} -o ${outputDir}`, {
233
- cwd: projectPath,
234
- process,
235
- });
236
- }
237
317
  }
238
- spinner.stop();
318
+ yield { type: 'step:done', message: 'Build completed' };
239
319
  if (deployStatus !== 'none' && targetPlatform === 'wasm') {
240
320
  const buildName = String(projectPath.split('/').pop());
241
- const debugPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build', 'bin', 'wasm', 'debug', buildName);
321
+ const debugPath = (0, node_path_1.resolve)(String(process.env.MODDABLE), 'build', 'bin', 'wasm', 'debug', buildName);
322
+ yield {
323
+ type: 'info',
324
+ message: 'Started server on port 8080, go to http://localhost:8080 in your browser to view the simulator',
325
+ };
242
326
  (0, http_1.createServer)((req, res) => {
243
327
  void (0, serve_handler_1.default)(req, res, { public: debugPath });
244
- }).listen(8080, () => {
245
- gluegun_1.print.info('Started server on port 8080, go to http://localhost:8080 in your browser to view the simulator');
246
- });
247
- }
248
- else if (!log) {
249
- process.exit(0);
328
+ }).listen(8080);
250
329
  }
251
330
  }
252
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
331
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
@@ -5,52 +5,57 @@ exports.moddableExists = moddableExists;
5
5
  exports.getModdableVersion = getModdableVersion;
6
6
  exports.fetchRelease = fetchRelease;
7
7
  exports.downloadReleaseTools = downloadReleaseTools;
8
- const os_1 = require("os");
9
- const stream_1 = require("stream");
10
- const util_1 = require("util");
11
- const gluegun_1 = require("gluegun");
8
+ const node_os_1 = require("node:os");
9
+ const node_stream_1 = require("node:stream");
10
+ const node_util_1 = require("node:util");
11
+ const node_fs_1 = require("node:fs");
12
+ const node_path_1 = require("node:path");
13
+ const execa_js_1 = require("../system/execa.js");
12
14
  const rest_1 = require("@octokit/rest");
13
15
  const unzip_stream_1 = require("unzip-stream");
14
16
  const constants_1 = require("./constants");
15
17
  const devices_1 = require("../prompt/devices");
16
- const errors_1 = require("../system/errors");
17
18
  const fetch_1 = require("../system/fetch");
18
- const finishedPromise = (0, util_1.promisify)(stream_1.finished);
19
+ const errors_1 = require("../system/errors");
20
+ const finishedPromise = (0, node_util_1.promisify)(node_stream_1.finished);
19
21
  function moddableExists() {
20
- const OS = (0, os_1.type)().toLowerCase();
21
- const platformDir = devices_1.DEVICE_ALIAS[OS].substr(0, 3);
22
- const releaseTools = gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(constants_1.INSTALL_PATH, 'build', 'bin', platformDir, 'release'));
23
- const debugTools = gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(constants_1.INSTALL_PATH, 'build', 'bin', platformDir, 'debug'));
22
+ const OS = (0, node_os_1.type)().toLowerCase();
23
+ const platformDir = devices_1.DEVICE_ALIAS[OS].substring(0, 3);
24
+ const releaseToolsPath = (0, node_path_1.resolve)(constants_1.INSTALL_PATH, 'build', 'bin', platformDir, 'release');
25
+ const debugToolsPath = (0, node_path_1.resolve)(constants_1.INSTALL_PATH, 'build', 'bin', platformDir, 'debug');
26
+ const releaseTools = (0, node_fs_1.existsSync)(releaseToolsPath);
27
+ const debugTools = (0, node_fs_1.existsSync)(debugToolsPath);
24
28
  return (process.env.MODDABLE !== undefined &&
25
- gluegun_1.filesystem.exists(process.env.MODDABLE) === 'dir' &&
26
- (releaseTools === 'dir' || debugTools === 'dir'));
29
+ (0, node_fs_1.existsSync)(process.env.MODDABLE) &&
30
+ (releaseTools || debugTools));
27
31
  }
28
32
  function isGitRepo(path) {
29
- return gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(path, '.git')) === 'dir';
33
+ return (0, node_fs_1.existsSync)((0, node_path_1.resolve)(path, '.git'));
30
34
  }
31
35
  async function getModdableVersion() {
32
36
  if (!moddableExists() || !isGitRepo(process.env.MODDABLE ?? '')) {
33
- return (0, errors_1.failure)('Moddable not available on this system.');
37
+ return (0, errors_1.failure)('Moddable SDK not found or not a git repository');
34
38
  }
35
39
  return await (0, errors_1.wrapAsync)(async () => {
36
- const tags = await gluegun_1.system.run('git tag -l --sort=-taggerdate', {
40
+ const tagsResult = await (0, execa_js_1.execaCommand)('git tag -l --sort=-taggerdate', {
37
41
  cwd: process.env.MODDABLE,
38
42
  });
39
- const tag = tags.split('\n').shift();
40
- const latestCommit = await gluegun_1.system.run(`git rev-parse HEAD`, {
43
+ const tag = String(tagsResult.stdout).split('\n').shift();
44
+ const latestCommitResult = await (0, execa_js_1.execaCommand)('git rev-parse HEAD', {
41
45
  cwd: process.env.MODDABLE,
42
46
  });
47
+ const latestCommit = String(latestCommitResult.stdout);
43
48
  if (tag !== undefined && tag.length > 0) {
44
- const tagCommit = await gluegun_1.system.run(`git rev-list -n 1 ${tag}`, {
49
+ const tagCommitResult = await (0, execa_js_1.execaCommand)(`git rev-list -n 1 ${tag}`, {
45
50
  cwd: process.env.MODDABLE,
46
51
  });
47
- if (tagCommit === latestCommit)
52
+ if (String(tagCommitResult.stdout) === latestCommit)
48
53
  return tag;
49
54
  }
50
- const currentBranch = await gluegun_1.system.run(`git branch --show-current`, {
55
+ const currentBranchResult = await (0, execa_js_1.execaCommand)('git branch --show-current', {
51
56
  cwd: process.env.MODDABLE,
52
57
  });
53
- return `branch: ${currentBranch.trim()}, commit: ${latestCommit}`;
58
+ return `branch: ${String(currentBranchResult.stdout).trim()}, commit: ${String(latestCommit)}`;
54
59
  });
55
60
  }
56
61
  async function fetchRelease(release) {
@@ -82,15 +87,13 @@ exports.MissingReleaseAssetError = MissingReleaseAssetError;
82
87
  async function downloadReleaseTools({ writePath, assetName, release, }) {
83
88
  const moddableTools = release.assets.find(({ name }) => name === assetName);
84
89
  if (moddableTools === undefined) {
85
- return (0, errors_1.failure)(`Unable to find release asset matching ${assetName}`);
90
+ throw new MissingReleaseAssetError(assetName);
86
91
  }
87
- return await (0, errors_1.wrapAsync)(async () => {
88
- const zipWriter = (0, unzip_stream_1.Extract)({
89
- path: writePath,
90
- });
91
- const download = await (0, fetch_1.fetchStream)(moddableTools.browser_download_url);
92
- download.pipe(zipWriter);
93
- await finishedPromise(zipWriter);
92
+ const zipWriter = (0, unzip_stream_1.Extract)({
93
+ path: writePath,
94
94
  });
95
+ const download = await (0, fetch_1.fetchStream)(moddableTools.browser_download_url);
96
+ download.pipe(zipWriter);
97
+ await finishedPromise(zipWriter);
95
98
  }
96
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9tb2RkYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFjQSx3Q0FjQztBQU1ELGdEQTBCQztBQVFELG9DQXNCQztBQWNELG9EQW1CQztBQTNIRCwyQkFBeUM7QUFDekMsbUNBQWlDO0FBQ2pDLCtCQUFnQztBQUNoQyxxQ0FBNEM7QUFDNUMsd0NBQXFFO0FBQ3JFLCtDQUFvRDtBQUNwRCwyQ0FBMEM7QUFFMUMsK0NBQWdEO0FBQ2hELDZDQUFxRDtBQUNyRCwyQ0FBNkM7QUFFN0MsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxTQUFnQixjQUFjO0lBQzVCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7SUFDakQsTUFBTSxXQUFXLEdBQUcsc0JBQVksQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ2pELE1BQU0sWUFBWSxHQUFHLG9CQUFVLENBQUMsTUFBTSxDQUNwQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx3QkFBWSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUN6RSxDQUFBO0lBQ0QsTUFBTSxVQUFVLEdBQUcsb0JBQVUsQ0FBQyxNQUFNLENBQ2xDLG9CQUFVLENBQUMsT0FBTyxDQUFDLHdCQUFZLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQ3ZFLENBQUE7SUFDRCxPQUFPLENBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUztRQUNsQyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUs7UUFDakQsQ0FBQyxZQUFZ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
99
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9tb2RkYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFnQkEsd0NBMEJDO0FBTUQsZ0RBK0JDO0FBUUQsb0NBc0JDO0FBY0Qsb0RBaUJDO0FBNUlELHFDQUE4QztBQUM5Qyw2Q0FBc0M7QUFDdEMseUNBQXFDO0FBQ3JDLHFDQUFvQztBQUNwQyx5Q0FBbUM7QUFDbkMsaURBQWlEO0FBQ2pELHdDQUFxRTtBQUNyRSwrQ0FBb0Q7QUFDcEQsMkNBQTBDO0FBRTFDLCtDQUFnRDtBQUNoRCwyQ0FBNkM7QUFDN0MsNkNBQXFEO0FBRXJELE1BQU0sZUFBZSxHQUFHLElBQUEscUJBQVMsRUFBQyxzQkFBUSxDQUFDLENBQUE7QUFFM0MsU0FBZ0IsY0FBYztJQUM1QixNQUFNLEVBQUUsR0FBRyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sV0FBVyxHQUFHLHNCQUFZLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUNwRCxNQUFNLGdCQUFnQixHQUFHLElBQUEsbUJBQU8sRUFDOUIsd0JBQVksRUFDWixPQUFPLEVBQ1AsS0FBSyxFQUNMLFdBQVcsRUFDWCxTQUFTLENBQ1YsQ0FBQTtJQUNELE1BQU0sY0FBYyxHQUFHLElBQUEsbUJBQU8sRUFDNUIsd0JBQVksRUFDWixPQUFPLEVBQ1AsS0FBSyxFQUNMLFdBQVcsRUFDWCxPQUFPLENBQ1IsQ0FBQTtJQUVELE1BQU0sWUFBWSxHQUFHLElBQUEsb0JBQVUsRUFBQyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQ2pELE1BQU0sVUFBVSxHQUFHLElBQUEsb0JBQVUsRUFBQyxjQUFjLENBQUMsQ0FBQTtJQUU3QyxPQUFPLENBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUztRQUNsQyxJQUFB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
@@ -1,3 +1,5 @@
1
+ import type { OperationEvent } from '../../lib/events';
2
+ import type { Prompter } from '../../lib/prompter';
1
3
  export type DeployStatus = 'none' | 'run' | 'push' | 'clean' | 'debug';
2
4
  export interface BuildArgs {
3
5
  port?: string;
@@ -12,4 +14,4 @@ export interface BuildArgs {
12
14
  outputDir?: string;
13
15
  config?: Record<string, string>;
14
16
  }
15
- export declare function build({ listDevices, port, example, listExamples, log, projectPath, targetPlatform, mode, deployStatus, outputDir, config, }: BuildArgs): Promise<void>;
17
+ export default function build({ listDevices, port, example, listExamples, log, projectPath, targetPlatform, mode, deployStatus, outputDir, config, }: BuildArgs, prompter: Prompter): AsyncGenerator<OperationEvent>;
@@ -13,5 +13,5 @@ interface DownloadToolsArgs {
13
13
  assetName: string;
14
14
  release: GitHubRelease;
15
15
  }
16
- export declare function downloadReleaseTools({ writePath, assetName, release, }: DownloadToolsArgs): Promise<Result<void>>;
16
+ export declare function downloadReleaseTools({ writePath, assetName, release, }: DownloadToolsArgs): Promise<void>;
17
17
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xs-dev",
3
- "version": "1.2.4",
3
+ "version": "1.2.5",
4
4
  "description": "CLI for automating the setup and usage of Moddable XS tools",
5
5
  "types": "build/types/types.d.ts",
6
6
  "packageManager": "pnpm@10.29.2",