zcatalyst-cli 1.25.3 → 1.26.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api-timer.d.ts +0 -1
- package/lib/apig-utils.d.ts +1 -1
- package/lib/apig-utils.js +1 -1
- package/lib/appsail-utils.js +6 -7
- package/lib/archiver.d.ts +0 -4
- package/lib/archiver.js +21 -11
- package/lib/authentication/constants/auth.js +1 -1
- package/lib/authentication/credential.js +3 -3
- package/lib/authentication/index.js +25 -14
- package/lib/authentication/login.d.ts +0 -2
- package/lib/authentication/login.js +23 -10
- package/lib/bin/catalyst.js +17 -7
- package/lib/client-utils.d.ts +3 -3
- package/lib/client-utils.js +2 -2
- package/lib/client.js +19 -9
- package/lib/code-deck.d.ts +0 -2
- package/lib/code-deck.js +4 -4
- package/lib/command_needs/config.js +1 -1
- package/lib/command_needs/rc.js +5 -2
- package/lib/commands/appsail/add.js +17 -7
- package/lib/commands/client/setup.js +17 -7
- package/lib/commands/config/set.js +5 -3
- package/lib/commands/deploy/appsail.js +37 -14
- package/lib/commands/deploy/index.js +88 -66
- package/lib/commands/deploy/slate.js +37 -14
- package/lib/commands/event/generate/integ.js +18 -9
- package/lib/commands/functions/add.js +17 -7
- package/lib/commands/functions/execute.js +17 -7
- package/lib/commands/functions/setup.js +17 -7
- package/lib/commands/functions/shell.js +17 -7
- package/lib/commands/iac/import.js +18 -8
- package/lib/commands/iac/pack.js +17 -7
- package/lib/commands/iac/status.js +17 -7
- package/lib/commands/index.js +20 -12
- package/lib/commands/init.js +17 -7
- package/lib/commands/login.js +17 -7
- package/lib/commands/logout.js +17 -7
- package/lib/commands/project/list.js +17 -7
- package/lib/commands/project/use.js +1 -0
- package/lib/commands/pull.js +17 -7
- package/lib/commands/run.js +17 -7
- package/lib/commands/serve.js +17 -7
- package/lib/commands/signals/generate/index.js +1 -1
- package/lib/commands/slate/create.js +17 -7
- package/lib/commands/slate/link.js +17 -7
- package/lib/commands/token/generate.js +17 -7
- package/lib/commands/token/list.js +17 -7
- package/lib/commands/token/revoke.js +17 -7
- package/lib/commands/zest/generate/index.js +21 -11
- package/lib/deploy/features/appsail/index.js +2 -3
- package/lib/deploy/features/appsail/pack.d.ts +0 -1
- package/lib/deploy/features/appsail/pack.js +2 -3
- package/lib/deploy/features/appsail/utils.js +7 -8
- package/lib/deploy/features/functions/languages/index.js +3 -4
- package/lib/deploy/features/index.js +17 -7
- package/lib/deploy/features/slate.js +11 -8
- package/lib/deploy/index.js +2 -2
- package/lib/deploy/util.d.ts +2 -0
- package/lib/deploy/util.js +3 -1
- package/lib/docs/commands/signals/generate/generate.toml +19 -0
- package/lib/docs/commands/slate/unlink.toml +9 -0
- package/lib/docs/fn-utils/lib/node.toml +4 -0
- package/lib/docs/init/dependencies/python/ensure-python.toml +4 -0
- package/lib/docs/serve/server/lib/slate/index.toml +20 -0
- package/lib/docs/slate-utils.toml +9 -0
- package/lib/endpoints/index.d.ts +2 -1
- package/lib/endpoints/index.js +88 -79
- package/lib/endpoints/lib/apig.d.ts +0 -1
- package/lib/endpoints/lib/apig.js +2 -2
- package/lib/endpoints/lib/applogic.d.ts +0 -1
- package/lib/endpoints/lib/applogic.js +2 -2
- package/lib/endpoints/lib/appsail.d.ts +1 -4
- package/lib/endpoints/lib/appsail.js +7 -7
- package/lib/endpoints/lib/client.d.ts +0 -1
- package/lib/endpoints/lib/code-deck.js +1 -1
- package/lib/endpoints/lib/common.d.ts +0 -2
- package/lib/endpoints/lib/ds-bulk.js +2 -2
- package/lib/endpoints/lib/env.js +2 -2
- package/lib/endpoints/lib/filestore.d.ts +0 -1
- package/lib/endpoints/lib/functions.d.ts +0 -1
- package/lib/endpoints/lib/functions.js +2 -2
- package/lib/endpoints/lib/git-hub.d.ts +0 -2
- package/lib/endpoints/lib/iac.d.ts +0 -3
- package/lib/endpoints/lib/iac.js +2 -2
- package/lib/endpoints/lib/project.d.ts +0 -1
- package/lib/endpoints/lib/project.js +2 -2
- package/lib/endpoints/lib/sdk.d.ts +0 -2
- package/lib/endpoints/lib/sdk.js +1 -1
- package/lib/endpoints/lib/slate.d.ts +0 -1
- package/lib/endpoints/lib/stratus.d.ts +0 -1
- package/lib/endpoints/lib/user.d.ts +0 -2
- package/lib/endpoints/lib/user.js +2 -1
- package/lib/error/context-help.js +1 -1
- package/lib/error/index.js +2 -2
- package/lib/event_generate/cache.js +4 -4
- package/lib/event_generate/custom.js +1 -2
- package/lib/event_generate/datastore.js +4 -4
- package/lib/event_generate/filestore.js +4 -4
- package/lib/event_generate/github.js +2 -2
- package/lib/event_generate/index.js +19 -11
- package/lib/event_generate/stratus.js +2 -2
- package/lib/event_generate/user.js +2 -2
- package/lib/event_generate/webapp.js +2 -2
- package/lib/execute/caller.d.ts +0 -1
- package/lib/execute/caller.js +20 -7
- package/lib/execute/index.js +27 -4
- package/lib/execute-script.js +22 -13
- package/lib/express_middlewares/auth-checker.js +2 -3
- package/lib/express_middlewares/project.d.ts +1 -1
- package/lib/fn-utils/index.js +17 -7
- package/lib/fn-utils/lib/browserLogic.js +4 -5
- package/lib/fn-utils/lib/common.d.ts +0 -1
- package/lib/fn-utils/lib/common.js +25 -26
- package/lib/fn-utils/lib/integ.js +2 -3
- package/lib/fn-utils/lib/java/classpath.js +2 -3
- package/lib/fn-utils/lib/java/compile.js +4 -4
- package/lib/fn-utils/lib/java/ensure-java-userconfig.d.ts +10 -0
- package/lib/fn-utils/lib/java/ensure-java-userconfig.js +45 -23
- package/lib/fn-utils/lib/java/index.d.ts +0 -1
- package/lib/fn-utils/lib/java/index.js +11 -11
- package/lib/fn-utils/lib/java/keywords.js +2 -2
- package/lib/fn-utils/lib/node.d.ts +1 -1
- package/lib/fn-utils/lib/node.js +67 -15
- package/lib/fn-utils/lib/python.js +29 -19
- package/lib/iac/status/util/index.d.ts +1 -1
- package/lib/init/dependencies/npm-install.js +2 -2
- package/lib/init/dependencies/python/ensure-python.d.ts +2 -2
- package/lib/init/dependencies/python/ensure-python.js +65 -58
- package/lib/init/dependencies/python/pip-install.d.ts +3 -5
- package/lib/init/dependencies/python/pip-install.js +14 -53
- package/lib/init/features/appsail/utils.js +21 -12
- package/lib/init/features/client/index.js +18 -9
- package/lib/init/features/client/initializers/angular.js +17 -7
- package/lib/init/features/client/initializers/basic.js +17 -7
- package/lib/init/features/client/initializers/lyte.js +17 -7
- package/lib/init/features/client/initializers/react.js +17 -7
- package/lib/init/features/index.js +29 -20
- package/lib/init/features/project.js +5 -5
- package/lib/init/features/slate/index.js +23 -11
- package/lib/init/util/client.js +23 -13
- package/lib/init/util/common.js +5 -6
- package/lib/init/util/project.js +1 -1
- package/lib/internal/api.d.ts +0 -3
- package/lib/internal/api.js +19 -9
- package/lib/internal/command.js +18 -9
- package/lib/migration/global/1.25.0.d.ts +2 -0
- package/lib/migration/global/1.25.0.js +28 -0
- package/lib/migration/index.js +20 -12
- package/lib/option-filter.js +19 -10
- package/lib/optional-import.js +19 -10
- package/lib/plugin-loader.d.ts +0 -2
- package/lib/plugin-loader.js +18 -8
- package/lib/port-resolver.js +10 -10
- package/lib/prompt/index.d.ts +3 -3
- package/lib/prompt/index.js +17 -7
- package/lib/prompt/types/file-path.d.ts +0 -1
- package/lib/prompt/types/search-box.d.ts +0 -1
- package/lib/prompt/types/tree.d.ts +1 -2
- package/lib/prompt/types/tree.js +10 -10
- package/lib/prompt/types/with-description.d.ts +0 -1
- package/lib/pull/features/functions/index.js +71 -52
- package/lib/pull/features/functions/languages.js +3 -4
- package/lib/pull/features/index.js +17 -7
- package/lib/repl-server.d.ts +0 -1
- package/lib/repl-server.js +9 -1
- package/lib/serve/features/apig.js +7 -1
- package/lib/serve/features/appsail.d.ts +1 -0
- package/lib/serve/features/appsail.js +51 -7
- package/lib/serve/features/index.js +22 -13
- package/lib/serve/index.js +17 -7
- package/lib/serve/server/index.d.ts +0 -2
- package/lib/serve/server/index.js +26 -12
- package/lib/serve/server/lib/appsail/index.js +27 -34
- package/lib/serve/server/lib/appsail/util.d.ts +11 -0
- package/lib/serve/server/lib/appsail/util.js +69 -0
- package/lib/serve/server/lib/java/index.js +18 -7
- package/lib/serve/server/lib/master/appsail.js +3 -4
- package/lib/serve/server/lib/master/functions.js +1 -2
- package/lib/serve/server/lib/master/index.d.ts +0 -1
- package/lib/serve/server/lib/master/index.js +5 -5
- package/lib/serve/server/lib/master/slate.js +1 -2
- package/lib/serve/server/lib/master/unknown-req-proxy.js +5 -2
- package/lib/serve/server/lib/master/utils.d.ts +4 -8
- package/lib/serve/server/lib/master/utils.js +4 -6
- package/lib/serve/server/lib/master/web-client.js +1 -2
- package/lib/serve/server/lib/node/index.js +22 -11
- package/lib/serve/server/lib/node/server/browserlogic/utils/playwright-handler.js +1 -1
- package/lib/serve/server/lib/node/server/browserlogic/utils/puppeteer-handler.js +1 -1
- package/lib/serve/server/lib/node/server/browserlogic/utils/selenium-handler.js +2 -0
- package/lib/serve/server/lib/python/index.js +23 -14
- package/lib/serve/server/lib/slate/index.js +7 -0
- package/lib/serve/server/lib/slate/static-server.d.ts +0 -1
- package/lib/serve/server/lib/slate/static-server.js +5 -4
- package/lib/serve/server/lib/web_client/server.d.ts +0 -1
- package/lib/serve/server/lib/web_client/server.js +5 -4
- package/lib/shell/dependencies/http-functions.d.ts +0 -2
- package/lib/shell/dependencies/http-functions.js +7 -7
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.d.ts +0 -2
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.js +55 -24
- package/lib/shell/dependencies/non-http-function/fn-handler.d.ts +3 -3
- package/lib/shell/dependencies/non-http-function/fn-handler.js +54 -20
- package/lib/shell/dependencies/non-http-function/node.js +4 -4
- package/lib/shell/dependencies/non-http-function/python.d.ts +1 -1
- package/lib/shell/dependencies/non-http-function/python.js +11 -13
- package/lib/shell/dependencies/non-http-function/slave-manager.d.ts +0 -2
- package/lib/shell/dependencies/non-http-function/slave-manager.js +11 -7
- package/lib/shell/dependencies/tunnel-server.js +4 -4
- package/lib/shell/index.js +50 -3
- package/lib/shell/prepare/index.js +4 -3
- package/lib/shell/prepare/languages/index.js +18 -9
- package/lib/shell/prepare/languages/node.js +29 -19
- package/lib/shell/prepare/languages/python.js +6 -12
- package/lib/signals/index.js +19 -11
- package/lib/slate-utils.js +25 -16
- package/lib/throbber/index.d.ts +1 -2
- package/lib/throbber/index.js +5 -2
- package/lib/throbber/utils.d.ts +0 -1
- package/lib/throbber/utils.js +4 -5
- package/lib/userConfig.d.ts +14 -0
- package/lib/userConfig.js +15 -1
- package/lib/util_modules/config/index.js +17 -7
- package/lib/util_modules/config/lib/apig.d.ts +1 -0
- package/lib/util_modules/config/lib/apig.js +10 -5
- package/lib/util_modules/config/lib/appsail.js +7 -7
- package/lib/util_modules/config/lib/client.js +5 -6
- package/lib/util_modules/config/lib/functions.js +5 -6
- package/lib/util_modules/config/lib/slate.d.ts +2 -1
- package/lib/util_modules/config/lib/slate.js +27 -13
- package/lib/util_modules/config-store.d.ts +1 -1
- package/lib/util_modules/config-store.js +30 -13
- package/lib/util_modules/constants/lib/apig-rules.d.ts +1 -1
- package/lib/util_modules/constants/lib/dc-type.js +3 -3
- package/lib/util_modules/constants/lib/placeholders.d.ts +1 -1
- package/lib/util_modules/constants/lib/placeholders.js +1 -1
- package/lib/util_modules/constants/lib/urls.js +2 -9
- package/lib/util_modules/container.js +23 -14
- package/lib/util_modules/dc.js +3 -4
- package/lib/util_modules/env.d.ts +3 -0
- package/lib/util_modules/env.js +64 -4
- package/lib/util_modules/event-emitter.d.ts +9 -0
- package/lib/util_modules/event-emitter.js +68 -0
- package/lib/util_modules/fs/index.js +17 -7
- package/lib/util_modules/fs/lib/async.d.ts +0 -4
- package/lib/util_modules/fs/lib/async.js +46 -46
- package/lib/util_modules/fs/lib/sync.d.ts +1 -3
- package/lib/util_modules/fs/lib/sync.js +40 -30
- package/lib/util_modules/logger/index.js +12 -12
- package/lib/util_modules/logger/utils.d.ts +0 -4
- package/lib/util_modules/logger/utils.js +1 -1
- package/lib/util_modules/logger/winston.js +2 -2
- package/lib/util_modules/option.js +5 -6
- package/lib/util_modules/project.js +22 -23
- package/lib/util_modules/runtime-store.d.ts +2 -2
- package/lib/util_modules/server.d.ts +1 -2
- package/lib/util_modules/server.js +54 -15
- package/lib/util_modules/shell.d.ts +0 -3
- package/lib/util_modules/shell.js +5 -6
- package/lib/util_modules/toml.js +2 -3
- package/package.json +13 -13
- package/templates/init/functions/java/event/sample.java +5 -2
- package/templates/web-socket.txt +1 -1
- /package/lib/docs/{commands/event/generate → event_generate}/index.toml +0 -0
- /package/templates/init/functions/java/integ/convokraft/{Sample.java → sample.java} +0 -0
package/lib/init/util/common.js
CHANGED
|
@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.getRuntimeDetails = getRuntimeDetails;
|
|
16
|
+
exports.getRuntimeChoices = getRuntimeChoices;
|
|
17
|
+
exports.getRuntimePromptAnswer = getRuntimePromptAnswer;
|
|
16
18
|
const catalyst_details_js_1 = __importDefault(require("../../endpoints/lib/catalyst-details.js"));
|
|
17
19
|
const index_js_1 = __importDefault(require("../../error/index.js"));
|
|
18
20
|
const index_js_2 = __importDefault(require("../../prompt/index.js"));
|
|
@@ -23,9 +25,8 @@ function getRuntimeDetails(fnType) {
|
|
|
23
25
|
const catalystDetailsAPI = new catalyst_details_js_1.default();
|
|
24
26
|
return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_3.REMOTE_REF.functions.type[fnType] : undefined);
|
|
25
27
|
}
|
|
26
|
-
|
|
27
|
-
function
|
|
28
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
function getRuntimeChoices(_a) {
|
|
29
|
+
return __awaiter(this, arguments, void 0, function* ({ fnType, runtimeDetails }) {
|
|
29
30
|
if (runtimeDetails === undefined) {
|
|
30
31
|
runtimeDetails = yield getRuntimeDetails(fnType);
|
|
31
32
|
}
|
|
@@ -84,7 +85,6 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
|
|
|
84
85
|
return [...runtimeChoices.java, ...runtimeChoices.node, ...runtimeChoices.python];
|
|
85
86
|
});
|
|
86
87
|
}
|
|
87
|
-
exports.getRuntimeChoices = getRuntimeChoices;
|
|
88
88
|
function getRuntimePromptAnswer(question, fnType) {
|
|
89
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
90
|
const runtimeChoices = yield getRuntimeChoices({ fnType });
|
|
@@ -101,4 +101,3 @@ function getRuntimePromptAnswer(question, fnType) {
|
|
|
101
101
|
return runtimeAns.runtime;
|
|
102
102
|
});
|
|
103
103
|
}
|
|
104
|
-
exports.getRuntimePromptAnswer = getRuntimePromptAnswer;
|
package/lib/init/util/project.js
CHANGED
|
@@ -18,7 +18,7 @@ const error_1 = __importDefault(require("../../error"));
|
|
|
18
18
|
const runtime_store_1 = __importDefault(require("../../runtime-store"));
|
|
19
19
|
const constants_1 = require("../../util_modules/constants");
|
|
20
20
|
const project_1 = require("../../util_modules/project");
|
|
21
|
-
const fillProjectPayload = (
|
|
21
|
+
const fillProjectPayload = (selectedOrg_1, selectedProject_1, ...args_1) => __awaiter(void 0, [selectedOrg_1, selectedProject_1, ...args_1], void 0, function* (selectedOrg, selectedProject, isNew = false, isImport = false) {
|
|
22
22
|
runtime_store_1.default.set('context.payload.project', selectedProject);
|
|
23
23
|
runtime_store_1.default.set('project', (0, project_1.transformProject)(selectedProject));
|
|
24
24
|
const envAPI = yield (0, endpoints_1.envAPI)({ auth: true, org: selectedOrg.id });
|
package/lib/internal/api.d.ts
CHANGED
package/lib/internal/api.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -188,8 +198,8 @@ class API {
|
|
|
188
198
|
return this._request(true);
|
|
189
199
|
});
|
|
190
200
|
}
|
|
191
|
-
_request(
|
|
192
|
-
return __awaiter(this,
|
|
201
|
+
_request() {
|
|
202
|
+
return __awaiter(this, arguments, void 0, function* (retry = false) {
|
|
193
203
|
if (!retry) {
|
|
194
204
|
this._logReq();
|
|
195
205
|
}
|
package/lib/internal/command.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -249,8 +259,7 @@ class Command {
|
|
|
249
259
|
(0, index_1.debug)(e);
|
|
250
260
|
}
|
|
251
261
|
yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
|
|
252
|
-
|
|
253
|
-
const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
|
|
262
|
+
const beforeModule = (yield Promise.resolve(`${'../command_needs/' + before.fn}`).then(s => __importStar(require(s)))).default;
|
|
254
263
|
return beforeModule.call(this, before.args);
|
|
255
264
|
})));
|
|
256
265
|
return this.cmdAction.call(this, ...args);
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrate = exports.isRequire = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const fs_1 = require("../../util_modules/fs");
|
|
6
|
+
const constants_1 = require("../../util_modules/constants");
|
|
7
|
+
const logger_1 = require("../../util_modules/logger");
|
|
8
|
+
const isRequire = () => {
|
|
9
|
+
return fs_1.SYNC.fileExists((0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty', 'start.jar'));
|
|
10
|
+
};
|
|
11
|
+
exports.isRequire = isRequire;
|
|
12
|
+
const migrate = () => {
|
|
13
|
+
try {
|
|
14
|
+
const parent = constants_1.ENVPATH.runtimes.data;
|
|
15
|
+
const jettyDir = (0, path_1.join)(parent, 'jetty');
|
|
16
|
+
const jettyV1Dir = (0, path_1.join)(jettyDir, 'v1');
|
|
17
|
+
const tempDir = (0, path_1.join)(parent, 'v1');
|
|
18
|
+
fs_1.SYNC.renameDir(jettyDir, tempDir);
|
|
19
|
+
fs_1.SYNC.ensureDir(jettyDir);
|
|
20
|
+
fs_1.SYNC.renameDir(tempDir, jettyV1Dir);
|
|
21
|
+
(0, logger_1.debug)('jetty migration is success');
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
(0, logger_1.error)('jetty migration failed');
|
|
25
|
+
throw e;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
exports.migrate = migrate;
|
package/lib/migration/index.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -43,8 +53,7 @@ const config_store_js_1 = __importDefault(require("../util_modules/config-store.
|
|
|
43
53
|
const rc_1 = __importDefault(require("../internal/rc"));
|
|
44
54
|
const fs_1 = require("../util_modules/fs");
|
|
45
55
|
const index_1 = require("../util_modules/logger/index");
|
|
46
|
-
const runMigration = (
|
|
47
|
-
var _a;
|
|
56
|
+
const runMigration = (rc_2, migFiles_1, ...args_1) => __awaiter(void 0, [rc_2, migFiles_1, ...args_1], void 0, function* (rc, migFiles, idx = 0) {
|
|
48
57
|
if (migFiles.length <= idx) {
|
|
49
58
|
return Promise.resolve();
|
|
50
59
|
}
|
|
@@ -55,7 +64,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
|
|
|
55
64
|
return runMigration(rc, migFiles, ++idx);
|
|
56
65
|
}
|
|
57
66
|
try {
|
|
58
|
-
const migModule = yield
|
|
67
|
+
const migModule = yield Promise.resolve(`${migFile}`).then(s => __importStar(require(s)));
|
|
59
68
|
if (migModule.isRequire()) {
|
|
60
69
|
(0, index_1.debug)('migration started for v' + currentMigFileVersion);
|
|
61
70
|
migModule.migrate();
|
|
@@ -84,7 +93,6 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
|
|
|
84
93
|
return runMigration(rc, migFiles, ++idx);
|
|
85
94
|
});
|
|
86
95
|
const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
-
var _b;
|
|
88
96
|
if (migFiles.length === 0) {
|
|
89
97
|
return;
|
|
90
98
|
}
|
|
@@ -98,7 +106,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
|
|
|
98
106
|
return runGlobalMigration(migFiles);
|
|
99
107
|
}
|
|
100
108
|
try {
|
|
101
|
-
const migModule = yield
|
|
109
|
+
const migModule = yield Promise.resolve(`${migFile}`).then(s => __importStar(require(s)));
|
|
102
110
|
if (migModule.isRequire()) {
|
|
103
111
|
(0, index_1.debug)('migration started for v' + currentMigFileVersion);
|
|
104
112
|
migModule.migrate();
|
package/lib/option-filter.js
CHANGED
|
@@ -15,18 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
|
28
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
39
|
+
exports.filterPorts = filterPorts;
|
|
40
|
+
exports.filterTargets = filterTargets;
|
|
30
41
|
const ansi_colors_1 = require("ansi-colors");
|
|
31
42
|
const index_js_1 = __importDefault(require("./error/index.js"));
|
|
32
43
|
const runtime_store_1 = __importDefault(require("./runtime-store"));
|
|
@@ -238,7 +249,6 @@ function filterPorts() {
|
|
|
238
249
|
runtime_store_1.default.set(`context.port.debug.${res.target.target}.${res.filter}`, res.specific);
|
|
239
250
|
});
|
|
240
251
|
}
|
|
241
|
-
exports.filterPorts = filterPorts;
|
|
242
252
|
function filterTargets({ pathSense = true, target } = {}) {
|
|
243
253
|
const validTargetResultants = validateTargets(target);
|
|
244
254
|
const config = runtime_store_1.default.get('config');
|
|
@@ -303,4 +313,3 @@ function filterTargets({ pathSense = true, target } = {}) {
|
|
|
303
313
|
runtime_store_1.default.set('context.targets', targets);
|
|
304
314
|
return targets;
|
|
305
315
|
}
|
|
306
|
-
exports.filterTargets = filterTargets;
|
package/lib/optional-import.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -42,7 +52,6 @@ const async_js_1 = require("./util_modules/fs/lib/async.js");
|
|
|
42
52
|
const index_js_1 = __importDefault(require("./error/index.js"));
|
|
43
53
|
const ansi_colors_1 = require("ansi-colors");
|
|
44
54
|
exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
-
var _a, _b;
|
|
46
55
|
if (name === (0, path_1.basename)(name)) {
|
|
47
56
|
const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
|
|
48
57
|
const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
|
|
@@ -54,7 +63,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
|
|
|
54
63
|
});
|
|
55
64
|
}
|
|
56
65
|
app_module_path_1.default.addPath(projectModulePath);
|
|
57
|
-
return
|
|
66
|
+
return Promise.resolve(`${projectModulePath}`).then(s => __importStar(require(s)));
|
|
58
67
|
}
|
|
59
68
|
const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
|
|
60
69
|
const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
|
|
@@ -66,5 +75,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
|
|
|
66
75
|
});
|
|
67
76
|
}
|
|
68
77
|
app_module_path_1.default.addPath(projectModulePath);
|
|
69
|
-
return
|
|
78
|
+
return Promise.resolve(`${projectModulePath}`).then(s => __importStar(require(s)));
|
|
70
79
|
});
|
package/lib/plugin-loader.d.ts
CHANGED
package/lib/plugin-loader.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,6 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
46
|
};
|
|
37
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
+
exports.default = pluginLoader;
|
|
38
49
|
const ansi_colors_1 = require("ansi-colors");
|
|
39
50
|
const index_js_1 = __importDefault(require("./error/index.js"));
|
|
40
51
|
const optional_import_js_1 = __importDefault(require("./optional-import.js"));
|
|
@@ -95,4 +106,3 @@ function pluginLoader(feature, name, source) {
|
|
|
95
106
|
return;
|
|
96
107
|
});
|
|
97
108
|
}
|
|
98
|
-
exports.default = pluginLoader;
|
package/lib/port-resolver.js
CHANGED
|
@@ -37,8 +37,8 @@ class PortResolver {
|
|
|
37
37
|
static freePort(port) {
|
|
38
38
|
__classPrivateFieldGet(this, _a, "f", _PortResolver_takenPorts).delete(port);
|
|
39
39
|
}
|
|
40
|
-
static getFreePort(
|
|
41
|
-
return __awaiter(this,
|
|
40
|
+
static getFreePort(startPort_1) {
|
|
41
|
+
return __awaiter(this, arguments, void 0, function* (startPort, searchSpan = 0, dupCheck = false) {
|
|
42
42
|
if (searchSpan < 0) {
|
|
43
43
|
throw new Error('unable to find port. searchSpan has reached the bottom line');
|
|
44
44
|
}
|
|
@@ -46,18 +46,18 @@ class PortResolver {
|
|
|
46
46
|
port: startPort,
|
|
47
47
|
stopPort: startPort + searchSpan
|
|
48
48
|
});
|
|
49
|
-
if (__classPrivateFieldGet(
|
|
49
|
+
if (__classPrivateFieldGet(_a, _a, "m", _PortResolver_isPortTaken).call(_a, port)) {
|
|
50
50
|
if (dupCheck) {
|
|
51
|
-
return
|
|
51
|
+
return _a.getFreePort(port + 1, searchSpan - (port - startPort), dupCheck);
|
|
52
52
|
}
|
|
53
53
|
return port;
|
|
54
54
|
}
|
|
55
|
-
__classPrivateFieldGet(
|
|
55
|
+
__classPrivateFieldGet(_a, _a, "f", _PortResolver_takenPorts).add(port);
|
|
56
56
|
return port;
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
|
-
static getPort(
|
|
60
|
-
return __awaiter(this,
|
|
59
|
+
static getPort(feature_1, type_1) {
|
|
60
|
+
return __awaiter(this, arguments, void 0, function* (feature, type, { name = '', duplicateCheck = true, searchSpan = 20, fallbackNeeded = true, server } = {}) {
|
|
61
61
|
let port = parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}.${name}`), 10);
|
|
62
62
|
port = isNaN(port) ? parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}`), 10) : port;
|
|
63
63
|
if (isNaN(port)) {
|
|
@@ -93,7 +93,7 @@ class PortResolver {
|
|
|
93
93
|
}
|
|
94
94
|
let finalPort = port;
|
|
95
95
|
try {
|
|
96
|
-
finalPort = yield
|
|
96
|
+
finalPort = yield _a.getFreePort(port, searchSpan, duplicateCheck);
|
|
97
97
|
}
|
|
98
98
|
catch (e) {
|
|
99
99
|
if (searchSpan === 0) {
|
|
@@ -126,8 +126,8 @@ class PortResolver {
|
|
|
126
126
|
});
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
|
-
exports.default = PortResolver;
|
|
130
129
|
_a = PortResolver, _PortResolver_isPortTaken = function _PortResolver_isPortTaken(port) {
|
|
131
|
-
return __classPrivateFieldGet(
|
|
130
|
+
return __classPrivateFieldGet(_a, _a, "f", _PortResolver_takenPorts).has(port);
|
|
132
131
|
};
|
|
133
132
|
_PortResolver_takenPorts = { value: new Set() };
|
|
133
|
+
exports.default = PortResolver;
|
package/lib/prompt/index.d.ts
CHANGED
|
@@ -22,13 +22,13 @@ export interface IQuestion extends inquirer.Question, inquirer.ListQuestionOptio
|
|
|
22
22
|
}
|
|
23
23
|
export type TSeparator = Separator;
|
|
24
24
|
declare const _default: {
|
|
25
|
-
register: (type:
|
|
26
|
-
deregister: (type:
|
|
25
|
+
register: (type: "file-path" | "tree" | "search-box" | "with-desc") => Promise<void>;
|
|
26
|
+
deregister: (type: "file-path" | "tree" | "search-box") => void;
|
|
27
27
|
separator: (line: string) => TSeparator;
|
|
28
28
|
choice: (name: string, { id, value, short, disabled, checked, ...otherOpts }?: IChoice) => IChoice;
|
|
29
29
|
ask: (...questions: Array<IQuestion>) => (Promise<inquirer.Answers> & {
|
|
30
30
|
ui: PromptUI;
|
|
31
31
|
}) | Promise<inquirer.Answers>;
|
|
32
|
-
question: (name: string, question: string, { type, defaultAns, choices, validate, filter, when, prefix, suffix, ...otheropts }?: Omit<IQuestion,
|
|
32
|
+
question: (name: string, question: string, { type, defaultAns, choices, validate, filter, when, prefix, suffix, ...otheropts }?: Omit<IQuestion, "name">) => IQuestion;
|
|
33
33
|
};
|
|
34
34
|
export default _default;
|
package/lib/prompt/index.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { Answers } from 'inquirer';
|
|
3
2
|
import BasePrompt from 'inquirer/lib/prompts/base.js';
|
|
4
3
|
import Paginator from 'inquirer/lib/utils/paginator.js';
|
|
@@ -23,7 +22,7 @@ export declare class TreeNode {
|
|
|
23
22
|
}) | TreeNode>;
|
|
24
23
|
activeIdx: number;
|
|
25
24
|
prevActiveIdx: number;
|
|
26
|
-
nodes: string
|
|
25
|
+
nodes: Array<string>;
|
|
27
26
|
level: number;
|
|
28
27
|
get indent(): number;
|
|
29
28
|
constructor(root?: string);
|
package/lib/prompt/types/tree.js
CHANGED
|
@@ -7,7 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
7
7
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
8
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
9
|
};
|
|
10
|
-
var _TreeNode_instances, _TreeNode_constructNodes;
|
|
10
|
+
var _TreeNode_instances, _a, _TreeNode_constructNodes;
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TreeNode = void 0;
|
|
13
13
|
const ansi_colors_1 = require("ansi-colors");
|
|
@@ -40,7 +40,7 @@ class TreeNode {
|
|
|
40
40
|
this.root = root;
|
|
41
41
|
}
|
|
42
42
|
addNode(node) {
|
|
43
|
-
if (node instanceof
|
|
43
|
+
if (node instanceof _a) {
|
|
44
44
|
this.leaves.push(node);
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
@@ -73,7 +73,7 @@ class TreeNode {
|
|
|
73
73
|
}
|
|
74
74
|
openTree(strict = false) {
|
|
75
75
|
const activeLeaf = this.leaves[this.activeIdx];
|
|
76
|
-
if (!(activeLeaf instanceof
|
|
76
|
+
if (!(activeLeaf instanceof _a)) {
|
|
77
77
|
if (!activeLeaf.expand || strict) {
|
|
78
78
|
return ETreeState.CLOSED;
|
|
79
79
|
}
|
|
@@ -107,16 +107,16 @@ class TreeNode {
|
|
|
107
107
|
}
|
|
108
108
|
closeTree() {
|
|
109
109
|
const activeLeaf = this.leaves[this.activeIdx];
|
|
110
|
-
if (!(activeLeaf instanceof
|
|
110
|
+
if (!(activeLeaf instanceof _a) || !activeLeaf.open) {
|
|
111
111
|
return;
|
|
112
112
|
}
|
|
113
113
|
const subActive = activeLeaf.leaves[activeLeaf.activeIdx];
|
|
114
|
-
if (subActive instanceof
|
|
114
|
+
if (subActive instanceof _a && subActive.open) {
|
|
115
115
|
activeLeaf.closeTree();
|
|
116
116
|
this.nodes[this.activeIdx] = this.nodes[this.activeIdx].replace(/\n{1}[\s\S]*/m, '\n' + activeLeaf.buildTree({ force: true }));
|
|
117
117
|
return;
|
|
118
118
|
}
|
|
119
|
-
else if (!(subActive instanceof
|
|
119
|
+
else if (!(subActive instanceof _a) && subActive.expand && subActive.isExpanded) {
|
|
120
120
|
activeLeaf.nodes[activeLeaf.activeIdx] = this.wrapLine('+ ' + subActive.display, activeLeaf.indent - 2);
|
|
121
121
|
this.nodes[this.activeIdx] =
|
|
122
122
|
this.nodes[this.activeIdx].split('\n')[0] + '\n' + activeLeaf.buildTree();
|
|
@@ -130,7 +130,7 @@ class TreeNode {
|
|
|
130
130
|
}
|
|
131
131
|
moveActive(distance = 0) {
|
|
132
132
|
const activeLeaf = this.leaves[this.activeIdx];
|
|
133
|
-
if (activeLeaf instanceof
|
|
133
|
+
if (activeLeaf instanceof _a && activeLeaf.open) {
|
|
134
134
|
activeLeaf.moveActive(distance);
|
|
135
135
|
const subTree = activeLeaf.buildTree();
|
|
136
136
|
this.nodes[this.activeIdx] =
|
|
@@ -158,7 +158,7 @@ class TreeNode {
|
|
|
158
158
|
}
|
|
159
159
|
getValue() {
|
|
160
160
|
const activeLeaf = this.leaves[this.activeIdx];
|
|
161
|
-
if (activeLeaf instanceof
|
|
161
|
+
if (activeLeaf instanceof _a) {
|
|
162
162
|
return activeLeaf.getValue();
|
|
163
163
|
}
|
|
164
164
|
return activeLeaf;
|
|
@@ -174,9 +174,9 @@ class TreeNode {
|
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
exports.TreeNode = TreeNode;
|
|
177
|
-
_TreeNode_instances = new WeakSet(), _TreeNode_constructNodes = function _TreeNode_constructNodes() {
|
|
177
|
+
_a = TreeNode, _TreeNode_instances = new WeakSet(), _TreeNode_constructNodes = function _TreeNode_constructNodes() {
|
|
178
178
|
const nodes = this.leaves.map((leaf) => {
|
|
179
|
-
if (leaf instanceof
|
|
179
|
+
if (leaf instanceof _a) {
|
|
180
180
|
const rootNode = this.wrapLine((leaf.open ? figures.arrowDown : figures.arrowRight) + ' ' + leaf.root, this.indent - 2);
|
|
181
181
|
const subNodes = leaf.open ? '\n' + leaf.nodes.join('\n') : '';
|
|
182
182
|
return rootNode + subNodes;
|