zcatalyst-cli 1.20.2 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -5
- package/lib/api-timer.d.ts +17 -0
- package/lib/api-timer.js +2 -2
- package/lib/apig-utils.d.ts +41 -0
- package/lib/apig-utils.js +32 -32
- package/lib/appsail-utils.d.ts +3 -0
- package/lib/appsail-utils.js +116 -12
- package/lib/archiver.d.ts +47 -0
- package/lib/archiver.js +6 -6
- package/lib/authentication/constants/auth.d.ts +21 -0
- package/lib/authentication/constants/auth.js +37 -0
- package/lib/authentication/constants/scopes.d.ts +81 -0
- package/lib/{util_modules/constants/lib → authentication/constants}/scopes.js +4 -1
- package/lib/authentication/credential.d.ts +39 -0
- package/lib/{internal → authentication}/credential.js +63 -46
- package/lib/authentication/crypt.d.ts +13 -0
- package/lib/authentication/error.d.ts +4 -0
- package/lib/authentication/error.js +14 -0
- package/lib/authentication/index.d.ts +5 -0
- package/lib/authentication/index.js +65 -63
- package/lib/authentication/login.d.ts +46 -0
- package/lib/authentication/login.js +147 -105
- package/lib/authentication/revoke.d.ts +9 -0
- package/lib/bin/catalyst.d.ts +2 -0
- package/lib/bin/catalyst.js +80 -36
- package/lib/cli_table/index.js +3 -2
- package/lib/client-utils.d.ts +16 -0
- package/lib/client-utils.js +57 -50
- package/lib/client.d.ts +21 -0
- package/lib/client.js +93 -6
- package/lib/code-deck.d.ts +21 -0
- package/lib/command_needs/auth.d.ts +2 -0
- package/lib/command_needs/auth.js +25 -24
- package/lib/command_needs/config.d.ts +4 -0
- package/lib/command_needs/rc.d.ts +8 -0
- package/lib/command_needs/rc.js +24 -24
- package/lib/commands/apig/disable.d.ts +3 -0
- package/lib/commands/apig/disable.js +8 -8
- package/lib/commands/apig/enable.d.ts +3 -0
- package/lib/commands/apig/enable.js +8 -8
- package/lib/commands/apig/status.d.ts +18 -0
- package/lib/commands/apig/status.js +12 -12
- package/lib/commands/appsail/add.d.ts +3 -0
- package/lib/commands/appsail/add.js +7 -6
- package/lib/commands/appsail/unlink.d.ts +3 -0
- package/lib/commands/appsail/unlink.js +43 -0
- package/lib/commands/client/delete.d.ts +3 -0
- package/lib/commands/client/delete.js +19 -19
- package/lib/commands/client/setup.d.ts +3 -0
- package/lib/commands/client/setup.js +6 -5
- package/lib/commands/codelib/install.d.ts +3 -0
- package/lib/commands/codelib/install.js +15 -15
- package/lib/commands/config/delete.d.ts +3 -0
- package/lib/commands/config/delete.js +2 -2
- package/lib/commands/config/get.d.ts +3 -0
- package/lib/commands/config/get.js +2 -2
- package/lib/commands/config/list.d.ts +3 -0
- package/lib/commands/config/list.js +2 -2
- package/lib/commands/config/set.d.ts +3 -0
- package/lib/commands/config/set.js +2 -2
- package/lib/commands/deploy/appsail.d.ts +3 -0
- package/lib/commands/deploy/appsail.js +11 -9
- package/lib/commands/deploy/index.d.ts +3 -0
- package/lib/commands/deploy/index.js +45 -26
- package/lib/commands/deploy/slate.d.ts +3 -0
- package/lib/commands/deploy/slate.js +2 -2
- package/lib/commands/ds/export.d.ts +3 -0
- package/lib/commands/ds/export.js +9 -9
- package/lib/commands/ds/import.d.ts +3 -0
- package/lib/commands/ds/import.js +13 -13
- package/lib/commands/ds/status.d.ts +23 -0
- package/lib/commands/ds/status.js +12 -11
- package/lib/commands/event/generate/index.d.ts +3 -0
- package/lib/commands/event/generate/index.js +5 -186
- package/lib/commands/event/generate/integ.d.ts +3 -0
- package/lib/commands/event/generate/integ.js +4 -4
- package/lib/commands/event/generate/job.d.ts +3 -0
- package/lib/commands/functions/add.d.ts +3 -0
- package/lib/commands/functions/add.js +6 -5
- package/lib/commands/functions/config.d.ts +3 -0
- package/lib/commands/functions/config.js +5 -5
- package/lib/commands/functions/delete.d.ts +3 -0
- package/lib/commands/functions/delete.js +19 -18
- package/lib/commands/functions/execute.d.ts +3 -0
- package/lib/commands/functions/execute.js +202 -0
- package/lib/commands/functions/setup.d.ts +3 -0
- package/lib/commands/functions/setup.js +6 -5
- package/lib/commands/functions/shell.d.ts +3 -0
- package/lib/commands/functions/shell.js +32 -28
- package/lib/commands/help.d.ts +3 -0
- package/lib/commands/help.js +4 -4
- package/lib/commands/iac/export.d.ts +3 -0
- package/lib/commands/iac/export.js +9 -8
- package/lib/commands/iac/import.d.ts +6 -0
- package/lib/commands/iac/import.js +23 -22
- package/lib/commands/iac/pack.d.ts +3 -0
- package/lib/commands/iac/pack.js +13 -13
- package/lib/commands/iac/status.d.ts +3 -0
- package/lib/commands/iac/status.js +4 -4
- package/lib/commands/index.d.ts +3 -0
- package/lib/commands/index.js +74 -61
- package/lib/commands/init.d.ts +3 -0
- package/lib/commands/init.js +17 -11
- package/lib/commands/login.d.ts +3 -0
- package/lib/commands/login.js +2 -2
- package/lib/commands/logout.d.ts +3 -0
- package/lib/commands/logout.js +1 -1
- package/lib/commands/project/list.d.ts +3 -0
- package/lib/commands/project/list.js +7 -6
- package/lib/commands/project/reset.d.ts +3 -0
- package/lib/commands/project/reset.js +5 -5
- package/lib/commands/project/use.d.ts +3 -0
- package/lib/commands/project/use.js +13 -11
- package/lib/commands/pull.d.ts +3 -0
- package/lib/commands/pull.js +16 -15
- package/lib/commands/run.d.ts +3 -0
- package/lib/commands/run.js +9 -9
- package/lib/commands/serve.d.ts +3 -0
- package/lib/commands/signals/generate/index.d.ts +3 -0
- package/lib/commands/slate/create.d.ts +3 -0
- package/lib/commands/slate/create.js +2 -2
- package/lib/commands/slate/link.d.ts +3 -0
- package/lib/commands/slate/link.js +5 -5
- package/lib/commands/slate/unlink.d.ts +3 -0
- package/lib/commands/slate/unlink.js +2 -2
- package/lib/commands/token/generate.d.ts +3 -0
- package/lib/commands/token/generate.js +4 -3
- package/lib/commands/token/list.d.ts +3 -0
- package/lib/commands/token/list.js +4 -3
- package/lib/commands/token/revoke.d.ts +3 -0
- package/lib/commands/token/revoke.js +3 -3
- package/lib/commands/whoami.d.ts +3 -0
- package/lib/commands/whoami.js +8 -8
- package/lib/commands/zest/generate/index.d.ts +14 -0
- package/lib/commands/zest/generate/index.js +1 -2
- package/lib/deploy/features/apig.d.ts +2 -0
- package/lib/deploy/features/apig.js +11 -11
- package/lib/deploy/features/appsail/index.d.ts +3 -0
- package/lib/deploy/features/appsail/index.js +82 -194
- package/lib/deploy/features/appsail/pack.d.ts +14 -0
- package/lib/deploy/features/appsail/pack.js +130 -0
- package/lib/deploy/features/appsail/utils.d.ts +15 -0
- package/lib/deploy/features/appsail/utils.js +163 -17
- package/lib/deploy/features/client.d.ts +2 -0
- package/lib/deploy/features/client.js +5 -4
- package/lib/deploy/features/functions/index.d.ts +2 -0
- package/lib/deploy/features/functions/index.js +41 -32
- package/lib/deploy/features/functions/languages/index.d.ts +4 -0
- package/lib/deploy/features/functions/languages/index.js +14 -1
- package/lib/deploy/features/functions/utils.d.ts +1 -0
- package/lib/deploy/features/functions/utils.js +136 -0
- package/lib/deploy/features/index.d.ts +8 -0
- package/lib/deploy/features/slate.d.ts +5 -0
- package/lib/deploy/features/slate.js +15 -8
- package/lib/deploy/index.d.ts +6 -0
- package/lib/deploy/index.js +12 -11
- package/lib/deploy/util.d.ts +7 -0
- package/lib/deploy/util.js +22 -0
- package/lib/docs/commands/functions/execute.toml +29 -0
- package/lib/docs/endpoints/lib/git-hub.toml +3 -0
- package/lib/docs/fn-utils/lib/java/classpath.toml +9 -0
- package/lib/docs/fn-utils/lib/java/ensure-java-userconfig.toml +24 -0
- package/lib/docs/fn-utils/lib/java/index.toml +15 -0
- package/{docs → lib/docs}/option-filter.toml +12 -3
- package/lib/docs/util_modules/container.toml +6 -0
- package/{docs → lib/docs}/util_modules/project.toml +1 -1
- package/lib/endpoints/index.d.ts +119 -0
- package/lib/endpoints/index.js +32 -25
- package/lib/endpoints/lib/apig.d.ts +17 -0
- package/lib/endpoints/lib/apig.js +12 -12
- package/lib/endpoints/lib/applogic.d.ts +21 -0
- package/lib/endpoints/lib/applogic.js +10 -10
- package/lib/endpoints/lib/appsail.d.ts +64 -0
- package/lib/endpoints/lib/appsail.js +94 -5
- package/lib/endpoints/lib/cache.d.ts +12 -0
- package/lib/endpoints/lib/cache.js +8 -8
- package/lib/endpoints/lib/catalyst-details.d.ts +8 -0
- package/lib/endpoints/lib/catalyst-details.js +2 -2
- package/lib/endpoints/lib/client.d.ts +16 -0
- package/lib/endpoints/lib/client.js +12 -12
- package/lib/endpoints/lib/code-deck.d.ts +10 -0
- package/lib/endpoints/lib/code-deck.js +3 -3
- package/lib/endpoints/lib/common.d.ts +5 -0
- package/lib/endpoints/lib/common.js +2 -2
- package/lib/endpoints/lib/datastore.d.ts +11 -0
- package/lib/endpoints/lib/datastore.js +6 -6
- package/lib/endpoints/lib/ds-bulk.d.ts +46 -0
- package/lib/endpoints/lib/ds-bulk.js +12 -12
- package/lib/endpoints/lib/env.d.ts +8 -0
- package/lib/endpoints/lib/env.js +5 -5
- package/lib/endpoints/lib/event-bus.d.ts +10 -0
- package/lib/endpoints/lib/event-bus.js +4 -4
- package/lib/endpoints/lib/filestore.d.ts +13 -0
- package/lib/endpoints/lib/filestore.js +6 -6
- package/lib/endpoints/lib/functions.d.ts +24 -0
- package/lib/endpoints/lib/functions.js +14 -14
- package/lib/endpoints/lib/git-hub.d.ts +16 -0
- package/lib/endpoints/lib/git-hub.js +15 -2
- package/lib/endpoints/lib/iac.d.ts +43 -0
- package/lib/endpoints/lib/iac.js +20 -20
- package/lib/endpoints/lib/job-scheduling.d.ts +43 -0
- package/lib/endpoints/lib/job-scheduling.js +2 -2
- package/lib/endpoints/lib/log.d.ts +10 -0
- package/lib/endpoints/lib/org.d.ts +13 -0
- package/lib/endpoints/lib/org.js +2 -2
- package/lib/endpoints/lib/project.d.ts +18 -0
- package/lib/endpoints/lib/project.js +11 -11
- package/lib/endpoints/lib/queue.d.ts +14 -0
- package/lib/endpoints/lib/queue.js +8 -8
- package/lib/endpoints/lib/sdk.d.ts +10 -0
- package/lib/endpoints/lib/sdk.js +5 -5
- package/lib/endpoints/lib/slate.d.ts +16 -0
- package/lib/endpoints/lib/slate.js +8 -24
- package/lib/endpoints/lib/stratus.d.ts +15 -0
- package/lib/endpoints/lib/tunnel.d.ts +38 -0
- package/lib/endpoints/lib/tunnel.js +5 -5
- package/lib/endpoints/lib/user.d.ts +8 -0
- package/lib/endpoints/lib/user.js +46 -0
- package/lib/endpoints/lib/zcql.d.ts +12 -0
- package/lib/endpoints/lib/zcql.js +4 -4
- package/lib/endpoints/lib/zest.d.ts +73 -0
- package/lib/error/context-help.d.ts +1 -0
- package/lib/{util_modules → error}/context-help.js +15 -18
- package/lib/error/index.d.ts +27 -0
- package/lib/{error.js → error/index.js} +18 -14
- package/lib/error/utils.d.ts +2 -0
- package/lib/error/utils.js +8 -0
- package/lib/errorOut.d.ts +3 -0
- package/lib/errorOut.js +10 -9
- package/lib/errorResponse.d.ts +4 -0
- package/lib/event_generate/cache.d.ts +2 -0
- package/lib/event_generate/cache.js +3 -3
- package/lib/event_generate/custom.d.ts +1 -0
- package/lib/event_generate/custom.js +2 -2
- package/lib/event_generate/datastore.d.ts +7 -0
- package/lib/event_generate/datastore.js +6 -6
- package/lib/event_generate/filestore.d.ts +2 -0
- package/lib/event_generate/filestore.js +2 -2
- package/lib/event_generate/github.d.ts +2 -0
- package/lib/event_generate/index.d.ts +2 -0
- package/lib/event_generate/index.js +196 -0
- package/lib/event_generate/integration/cliq.d.ts +2 -0
- package/lib/event_generate/integration/cliq.js +4 -4
- package/lib/event_generate/stratus.d.ts +2 -0
- package/lib/event_generate/user.d.ts +2 -0
- package/lib/event_generate/webapp.d.ts +2 -0
- package/lib/execute/caller.d.ts +14 -0
- package/lib/execute/caller.js +155 -0
- package/lib/execute/index.d.ts +3 -0
- package/lib/execute/index.js +87 -0
- package/lib/execute-script.d.ts +6 -0
- package/lib/execute-script.js +62 -32
- package/lib/express_middlewares/apig-matcher.d.ts +3 -0
- package/lib/express_middlewares/auth-checker.d.ts +3 -0
- package/lib/express_middlewares/authenticator.d.ts +3 -0
- package/lib/express_middlewares/authenticator.js +3 -2
- package/lib/express_middlewares/cookie-parser.d.ts +3 -0
- package/lib/express_middlewares/error-handler.d.ts +3 -0
- package/lib/express_middlewares/logger.d.ts +5 -0
- package/lib/express_middlewares/logger.js +3 -2
- package/lib/express_middlewares/project.d.ts +6 -0
- package/lib/express_middlewares/url-rewriter.d.ts +3 -0
- package/lib/fn-utils/index.d.ts +10 -0
- package/lib/fn-utils/lib/browserLogic.d.ts +2 -0
- package/lib/fn-utils/lib/browserLogic.js +7 -6
- package/lib/fn-utils/lib/common.d.ts +85 -0
- package/lib/fn-utils/lib/common.js +79 -90
- package/lib/fn-utils/lib/integ.d.ts +2 -0
- package/lib/fn-utils/lib/integ.js +10 -4
- package/lib/fn-utils/lib/java/classpath.d.ts +2 -0
- package/lib/fn-utils/lib/java/classpath.js +107 -0
- package/lib/fn-utils/lib/java/compile.d.ts +4 -0
- package/lib/fn-utils/lib/java/compile.js +222 -0
- package/lib/fn-utils/lib/java/ensure-java-userconfig.d.ts +22 -0
- package/lib/fn-utils/lib/java/ensure-java-userconfig.js +264 -0
- package/lib/fn-utils/lib/java/index.d.ts +16 -0
- package/lib/fn-utils/lib/java/index.js +254 -0
- package/lib/fn-utils/lib/java/keywords.d.ts +2 -0
- package/lib/fn-utils/lib/java/keywords.js +71 -0
- package/lib/fn-utils/lib/node.d.ts +5 -0
- package/lib/fn-utils/lib/node.js +30 -10
- package/lib/fn-utils/lib/python.d.ts +3 -0
- package/lib/fn-utils/lib/python.js +9 -4
- package/lib/fn-watcher.d.ts +8 -0
- package/lib/fn-watcher.js +18 -23
- package/lib/iac/status/bundle.d.ts +2 -0
- package/lib/iac/status/bundle.js +10 -7
- package/lib/iac/status/deploy.d.ts +2 -0
- package/lib/iac/status/deploy.js +10 -10
- package/lib/iac/status/util/index.d.ts +2 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.js +15 -4
- package/lib/init/dependencies/npm-install.d.ts +3 -0
- package/lib/init/dependencies/npm-install.js +4 -3
- package/lib/init/dependencies/package-json.d.ts +2 -0
- package/lib/init/dependencies/package-json.js +3 -3
- package/lib/init/dependencies/python/ensure-python.d.ts +2 -0
- package/lib/init/dependencies/python/pip-install.d.ts +7 -0
- package/lib/init/dependencies/python/pip-install.js +3 -3
- package/lib/init/features/appsail/index.d.ts +2 -0
- package/lib/init/features/appsail/index.js +48 -124
- package/lib/init/features/appsail/utils.d.ts +16 -0
- package/lib/init/features/appsail/utils.js +264 -0
- package/lib/init/features/client/index.d.ts +2 -0
- package/lib/init/features/client/index.js +1 -0
- package/lib/init/features/client/initializers/angular.d.ts +2 -0
- package/lib/init/features/client/initializers/angular.js +42 -12
- package/lib/init/features/client/initializers/basic.d.ts +2 -0
- package/lib/init/features/client/initializers/basic.js +2 -2
- package/lib/init/features/client/initializers/lyte.d.ts +2 -0
- package/lib/init/features/client/initializers/lyte.js +1 -1
- package/lib/init/features/client/initializers/react.d.ts +2 -0
- package/lib/init/features/client/initializers/react.js +5 -4
- package/lib/init/features/client/types.d.ts +10 -0
- package/lib/init/features/client/types.js +2 -0
- package/lib/init/features/functions/index.d.ts +17 -0
- package/lib/init/features/functions/index.js +60 -8
- package/lib/init/features/functions/languages/index.d.ts +6 -0
- package/lib/init/features/functions/languages/java.d.ts +2 -0
- package/lib/init/features/functions/languages/java.js +9 -7
- package/lib/init/features/functions/languages/node.d.ts +2 -0
- package/lib/init/features/functions/languages/node.js +6 -4
- package/lib/init/features/functions/languages/python.d.ts +2 -0
- package/lib/init/features/functions/languages/python.js +9 -7
- package/lib/init/features/index.d.ts +14 -0
- package/lib/init/features/index.js +15 -14
- package/lib/init/features/project.d.ts +2 -0
- package/lib/init/features/project.js +19 -22
- package/lib/init/features/slate/index.d.ts +2 -0
- package/lib/init/features/slate/index.js +109 -36
- package/lib/init/index.d.ts +2 -0
- package/lib/init/index.js +5 -5
- package/lib/init/util/client.d.ts +8 -0
- package/lib/init/util/client.js +10 -10
- package/lib/init/util/common.d.ts +12 -0
- package/lib/init/util/common.js +17 -16
- package/lib/init/util/functions.d.ts +7 -0
- package/lib/init/util/functions.js +3 -3
- package/lib/init/util/project.d.ts +3 -0
- package/lib/init/util/project.js +4 -4
- package/lib/internal/api.d.ts +78 -0
- package/lib/internal/api.js +32 -22
- package/lib/internal/command.d.ts +40 -0
- package/lib/internal/command.js +27 -11
- package/lib/internal/config.d.ts +19 -0
- package/lib/internal/config.js +4 -5
- package/lib/internal/rc.d.ts +44 -0
- package/lib/internal/rc.js +9 -9
- package/lib/migration/global/1.4.0.d.ts +2 -0
- package/lib/migration/global/1.4.0.js +4 -4
- package/lib/migration/global/1.6.2.d.ts +2 -0
- package/lib/migration/global/1.6.2.js +13 -13
- package/lib/migration/index.d.ts +6 -0
- package/lib/migration/index.js +19 -18
- package/lib/option-filter.d.ts +5 -0
- package/lib/option-filter.js +65 -32
- package/lib/optional-import.d.ts +2 -0
- package/lib/optional-import.js +3 -3
- package/lib/plugin-loader.d.ts +6 -0
- package/lib/plugin-loader.js +2 -2
- package/lib/port-resolver.d.ts +24 -0
- package/lib/port-resolver.js +14 -13
- package/lib/progress.d.ts +34 -0
- package/lib/prompt/index.d.ts +34 -0
- package/lib/prompt/index.js +49 -9
- package/lib/prompt/types/file-path.d.ts +25 -0
- package/lib/prompt/types/search-box.d.ts +56 -0
- package/lib/prompt/types/search-box.js +84 -46
- package/lib/prompt/types/tree.d.ts +65 -0
- package/lib/prompt/types/with-description.d.ts +15 -0
- package/lib/prompt/types/with-description.js +74 -0
- package/lib/pull/features/apig.d.ts +2 -0
- package/lib/pull/features/apig.js +10 -10
- package/lib/pull/features/client.d.ts +2 -0
- package/lib/pull/features/client.js +11 -10
- package/lib/pull/features/functions/index.d.ts +2 -0
- package/lib/pull/features/functions/index.js +38 -41
- package/lib/pull/features/functions/languages.d.ts +4 -0
- package/lib/pull/features/functions/languages.js +3 -3
- package/lib/pull/features/index.d.ts +6 -0
- package/lib/pull/index.d.ts +2 -0
- package/lib/pull/index.js +8 -8
- package/lib/repl-server.d.ts +32 -0
- package/lib/repl-server.js +8 -8
- package/lib/runtime-store.d.ts +3 -0
- package/lib/runtime-store.js +6 -12
- package/lib/serve/features/apig.d.ts +3 -0
- package/lib/serve/features/apig.js +3 -3
- package/lib/serve/features/appsail.d.ts +16 -0
- package/lib/serve/features/appsail.js +52 -10
- package/lib/serve/features/client.d.ts +2 -0
- package/lib/serve/features/client.js +1 -1
- package/lib/serve/features/index.d.ts +7 -0
- package/lib/serve/features/index.js +4 -4
- package/lib/serve/features/slate.d.ts +12 -0
- package/lib/serve/index.d.ts +2 -0
- package/lib/serve/index.js +82 -65
- package/lib/serve/server/index.d.ts +37 -0
- package/lib/serve/server/index.js +215 -121
- package/lib/serve/server/lib/appsail/index.d.ts +6 -0
- package/lib/serve/server/lib/appsail/index.js +214 -117
- package/lib/serve/server/lib/appsail/start.js +14 -5
- package/lib/serve/server/lib/java/index.d.ts +6 -0
- package/lib/serve/server/lib/java/index.js +52 -22
- package/lib/serve/server/lib/master/appsail.d.ts +5 -0
- package/lib/serve/server/lib/master/appsail.js +16 -5
- package/lib/serve/server/lib/master/functions.d.ts +5 -0
- package/lib/serve/server/lib/master/functions.js +27 -0
- package/lib/serve/server/lib/master/index.d.ts +10 -0
- package/lib/serve/server/lib/master/index.js +12 -4
- package/lib/serve/server/lib/master/slate.d.ts +5 -0
- package/lib/serve/server/lib/master/slate.js +4 -17
- package/lib/serve/server/lib/master/unknown-req-proxy.d.ts +4 -0
- package/lib/serve/server/lib/master/unknown-req-proxy.js +3 -5
- package/lib/serve/server/lib/master/utils.d.ts +24 -0
- package/lib/serve/server/lib/master/utils.js +12 -6
- package/lib/serve/server/lib/master/web-client.d.ts +5 -0
- package/lib/serve/server/lib/node/index.d.ts +6 -0
- package/lib/serve/server/lib/node/index.js +54 -43
- package/lib/serve/server/lib/node/server/bio.js +133 -0
- package/lib/serve/server/lib/node/server/browserlogic/browserlogic-puppeteer.js +1 -1
- package/lib/serve/server/lib/node/server/index.js +22 -1
- package/lib/serve/server/lib/python/index.d.ts +6 -0
- package/lib/serve/server/lib/python/index.js +63 -8
- package/lib/serve/server/lib/slate/index.d.ts +6 -0
- package/lib/serve/server/lib/slate/index.js +30 -33
- package/lib/serve/server/lib/slate/static-server.d.ts +7 -0
- package/lib/serve/server/lib/slate/static-server.js +24 -24
- package/lib/serve/server/lib/web_client/index.d.ts +5 -0
- package/lib/serve/server/lib/web_client/index.js +11 -8
- package/lib/serve/server/lib/web_client/server.d.ts +7 -0
- package/lib/serve/server/lib/web_client/server.js +22 -22
- package/lib/serve/server/lib/web_client/types.d.ts +15 -0
- package/lib/serve/server/lib/web_client/types.js +2 -0
- package/lib/shell/dependencies/http-functions.d.ts +35 -0
- package/lib/shell/dependencies/http-functions.js +59 -26
- package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java +1 -1
- package/lib/shell/dependencies/invoker/job/java/JavajobInvoker.java +51 -10
- package/lib/shell/dependencies/invoker/job/node.mjs +2 -2
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.d.ts +13 -0
- package/lib/shell/dependencies/non-http-function/fn-execution-handler.js +260 -0
- package/lib/shell/dependencies/non-http-function/fn-handler.d.ts +30 -0
- package/lib/shell/dependencies/non-http-function/fn-handler.js +258 -0
- package/lib/shell/dependencies/non-http-function/index.d.ts +20 -0
- package/lib/shell/dependencies/non-http-function/index.js +62 -0
- package/lib/shell/dependencies/non-http-function/java.d.ts +9 -0
- package/lib/shell/dependencies/non-http-function/java.js +42 -0
- package/lib/shell/dependencies/non-http-function/node.d.ts +8 -0
- package/lib/shell/dependencies/non-http-function/node.js +36 -0
- package/lib/shell/dependencies/non-http-function/python.d.ts +5 -0
- package/lib/shell/dependencies/non-http-function/python.js +47 -0
- package/lib/shell/dependencies/non-http-function/slave-manager.d.ts +23 -0
- package/lib/shell/dependencies/non-http-function/slave-manager.js +173 -0
- package/lib/shell/dependencies/tunnel-server.d.ts +23 -0
- package/lib/shell/dependencies/tunnel-server.js +4 -4
- package/lib/shell/index.d.ts +2 -0
- package/lib/shell/index.js +31 -25
- package/lib/shell/prepare/index.d.ts +4 -0
- package/lib/shell/prepare/index.js +9 -27
- package/lib/shell/prepare/languages/index.d.ts +6 -0
- package/lib/shell/prepare/languages/index.js +20 -5
- package/lib/shell/prepare/languages/java.d.ts +3 -0
- package/lib/shell/prepare/languages/java.js +6 -14
- package/lib/shell/prepare/languages/node.d.ts +3 -0
- package/lib/shell/prepare/languages/node.js +14 -1
- package/lib/shell/prepare/languages/python.d.ts +3 -0
- package/lib/shell/prepare/languages/python.js +13 -2
- package/lib/slate-utils.d.ts +12 -0
- package/lib/slate-utils.js +7 -1
- package/lib/throbber/index.d.ts +36 -0
- package/lib/throbber/index.js +11 -7
- package/lib/throbber/utils.d.ts +23 -0
- package/lib/track.d.ts +2 -0
- package/lib/track.js +13 -13
- package/lib/userConfig.d.ts +22 -0
- package/lib/userConfig.js +18 -8
- package/lib/util_modules/config/index.d.ts +6 -0
- package/lib/util_modules/config/lib/apig.d.ts +15 -0
- package/lib/util_modules/config/lib/apig.js +4 -4
- package/lib/util_modules/config/lib/appsail.d.ts +50 -0
- package/lib/util_modules/config/lib/appsail.js +96 -26
- package/lib/util_modules/config/lib/client.d.ts +20 -0
- package/lib/util_modules/config/lib/client.js +19 -6
- package/lib/util_modules/config/lib/functions.d.ts +48 -0
- package/lib/util_modules/config/lib/functions.js +27 -16
- package/lib/util_modules/config/lib/slate.d.ts +106 -0
- package/lib/util_modules/config/lib/slate.js +2 -6
- package/lib/util_modules/config-store.d.ts +12 -0
- package/lib/util_modules/config-store.js +55 -0
- package/lib/util_modules/constants/index.d.ts +24 -0
- package/lib/util_modules/constants/index.js +1 -5
- package/lib/util_modules/constants/lib/apig-rules.d.ts +3 -0
- package/lib/util_modules/constants/lib/apig-rules.js +1 -1
- package/lib/util_modules/constants/lib/browserLogic.d.ts +20 -0
- package/lib/util_modules/constants/lib/cliq-handlers.d.ts +32 -0
- package/lib/util_modules/constants/lib/dc-type.d.ts +59 -0
- package/lib/util_modules/constants/lib/default.d.ts +48 -0
- package/lib/util_modules/constants/lib/default.js +4 -0
- package/lib/util_modules/constants/lib/env-path.d.ts +6 -0
- package/lib/util_modules/constants/lib/event-action.d.ts +11 -0
- package/lib/util_modules/constants/lib/event-source.d.ts +11 -0
- package/lib/util_modules/constants/lib/file-names.d.ts +37 -0
- package/lib/util_modules/constants/lib/file-names.js +1 -0
- package/lib/util_modules/constants/lib/fn-type.d.ts +11 -0
- package/lib/util_modules/constants/lib/folder-names.d.ts +9 -0
- package/lib/util_modules/constants/lib/iac.d.ts +7 -0
- package/lib/util_modules/constants/lib/integ.d.ts +13 -0
- package/lib/util_modules/constants/lib/needed-scopes.d.ts +4 -0
- package/lib/util_modules/constants/lib/needed-scopes.js +3 -4
- package/lib/util_modules/constants/lib/placeholders.d.ts +65 -0
- package/lib/util_modules/constants/lib/placeholders.js +2 -1
- package/lib/util_modules/constants/lib/plugin.d.ts +27 -0
- package/lib/util_modules/constants/lib/ref-mapping.d.ts +15 -0
- package/lib/util_modules/constants/lib/regex.d.ts +20 -0
- package/lib/util_modules/constants/lib/regex.js +3 -0
- package/lib/util_modules/constants/lib/remote-mapping.d.ts +15 -0
- package/lib/util_modules/constants/lib/runtime.d.ts +18 -0
- package/lib/util_modules/constants/lib/signals-api-names.d.ts +9 -0
- package/lib/util_modules/constants/lib/signals-publishers-type.d.ts +7 -0
- package/lib/util_modules/constants/lib/signals-publishers.d.ts +9 -0
- package/lib/util_modules/constants/lib/template.d.ts +65 -0
- package/lib/util_modules/constants/lib/urls.d.ts +26 -0
- package/lib/util_modules/constants/lib/urls.js +37 -57
- package/lib/util_modules/constants/project.d.ts +4 -0
- package/lib/util_modules/container.d.ts +3 -0
- package/lib/util_modules/container.js +176 -0
- package/lib/util_modules/dc.d.ts +10 -0
- package/lib/{dc.js → util_modules/dc.js} +14 -18
- package/lib/util_modules/env.d.ts +7 -0
- package/lib/util_modules/env.js +3 -2
- package/lib/util_modules/fs/index.d.ts +3 -0
- package/lib/util_modules/fs/lib/async.d.ts +53 -0
- package/lib/util_modules/fs/lib/async.js +30 -1
- package/lib/util_modules/fs/lib/sync.d.ts +39 -0
- package/lib/util_modules/fs/lib/sync.js +24 -16
- package/lib/util_modules/fs/utils.d.ts +1 -0
- package/lib/util_modules/global-space.d.ts +1 -0
- package/lib/util_modules/js.d.ts +10 -0
- package/lib/util_modules/logger/index.d.ts +19 -0
- package/lib/util_modules/logger/index.js +80 -0
- package/lib/util_modules/logger/utils.d.ts +29 -0
- package/lib/util_modules/logger/utils.js +66 -0
- package/lib/util_modules/logger/winston.d.ts +9 -0
- package/lib/util_modules/logger/winston.js +90 -0
- package/lib/util_modules/option.d.ts +5 -0
- package/lib/util_modules/option.js +5 -5
- package/lib/util_modules/project.d.ts +70 -0
- package/lib/util_modules/project.js +26 -20
- package/lib/util_modules/runtime-store.d.ts +11 -0
- package/lib/util_modules/runtime-store.js +16 -0
- package/lib/util_modules/server.d.ts +13 -0
- package/lib/util_modules/server.js +78 -1
- package/lib/util_modules/shell.d.ts +21 -0
- package/lib/util_modules/shell.js +19 -4
- package/lib/util_modules/toml.d.ts +2 -0
- package/lib/util_modules/{parser/toml.js → toml.js} +3 -3
- package/package.json +6 -5
- package/scripts/send-notification.js +1 -1
- package/templates/event/integ/cliq/command/suggestion_handler.json +1 -1
- package/templates/event/integ/cliq/link_preview/action_handler.json +2 -2
- package/templates/event/integ/cliq/link_preview/after_send_handler.json +2 -2
- package/templates/event/integ/cliq/link_preview/menu_handler.json +2 -2
- package/templates/event/integ/cliq/link_preview/preview_handler.json +2 -2
- package/templates/init/functions/java/event/sample.java +5 -8
- package/templates/init/functions/java/integ/cliq/com/handlers/CommandHandler.java +3 -3
- package/templates/init/functions/java/integ/cliq/com/handlers/WidgetHandler.java +1 -1
- package/templates/init/functions/node/cron/types/cron.d.ts +1 -1
- package/templates/init/functions/node/event/sample.js +1 -12
- package/templates/init/functions/node/integ/cliq/handlers/command-handler.js +3 -3
- package/templates/init/functions/node/integ/cliq/handlers/widget-handler.js +1 -1
- package/templates/init/functions/python/event/sample.py +0 -9
- package/templates/init/functions/python/integ/cliq/handlers/command_handler.py +3 -3
- package/templates/init/functions/python/integ/cliq/handlers/widget_handler.py +1 -1
- package/templates/init/functions/python/integ/cliq/sample.py +1 -12
- package/docs/commands/signals/generate/index.toml +0 -19
- package/docs/commands/slate/unlink.toml +0 -9
- package/docs/commands/zest/generate/index.toml +0 -4
- package/docs/endpoints/lib/slate.toml +0 -3
- package/docs/fn-utils/lib/ensure-java-userconfig.toml +0 -15
- package/docs/fn-utils/lib/java.toml +0 -34
- package/docs/serve/server/lib/slate/index.toml +0 -14
- package/docs/slate-utils.toml +0 -4
- package/docs/util_modules/config/lib/slate.toml +0 -4
- package/lib/config-store.js +0 -10
- package/lib/fn-utils/lib/ensure-java-userconfig.js +0 -145
- package/lib/fn-utils/lib/java.js +0 -512
- package/lib/shell/dependencies/local-function.js +0 -483
- package/lib/util_modules/char.js +0 -12
- package/lib/util_modules/constants/lib/auth.js +0 -37
- package/lib/util_modules/logger.js +0 -51
- package/lib/winston.js +0 -75
- /package/lib/{internal → authentication}/crypt.js +0 -0
- /package/{docs/internal → lib/authentication/docs}/credential.toml +0 -0
- /package/{docs/authentication → lib/authentication/docs}/index.toml +0 -0
- /package/{docs/authentication → lib/authentication/docs}/login.toml +0 -0
- /package/{docs → lib/docs}/apig-utils.toml +0 -0
- /package/{docs → lib/docs}/client-utils.toml +0 -0
- /package/{docs → lib/docs}/command_needs/auth.toml +0 -0
- /package/{docs → lib/docs}/command_needs/rc.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/disable.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/enable.toml +0 -0
- /package/{docs → lib/docs}/commands/apig/status.toml +0 -0
- /package/{docs → lib/docs}/commands/client/delete.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/export.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/import.toml +0 -0
- /package/{docs → lib/docs}/commands/ds/status.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/index.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/integ.toml +0 -0
- /package/{docs → lib/docs}/commands/event/generate/job.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/config.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/delete.toml +0 -0
- /package/{docs → lib/docs}/commands/functions/shell.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/export.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/import.toml +0 -0
- /package/{docs → lib/docs}/commands/iac/status.toml +0 -0
- /package/{docs → lib/docs}/commands/project/use.toml +0 -0
- /package/{docs → lib/docs}/dc.toml +0 -0
- /package/{docs → lib/docs}/deploy/features/apig.toml +0 -0
- /package/{docs → lib/docs}/deploy/features/functions/index.toml +0 -0
- /package/{docs → lib/docs}/endpoints/lib/env.toml +0 -0
- /package/{docs → lib/docs}/endpoints/lib/job-scheduling.toml +0 -0
- /package/{docs → lib/docs}/event_generate/cache.toml +0 -0
- /package/{docs → lib/docs}/event_generate/custom.toml +0 -0
- /package/{docs → lib/docs}/event_generate/datastore.toml +0 -0
- /package/{docs → lib/docs}/event_generate/filestore.toml +0 -0
- /package/{docs → lib/docs}/event_generate/integration/cliq.toml +0 -0
- /package/{docs → lib/docs}/execute-script.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/common.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/node.toml +0 -0
- /package/{docs → lib/docs}/fn-utils/lib/python.toml +0 -0
- /package/{docs → lib/docs}/iac/status/bundle.toml +0 -0
- /package/{docs → lib/docs}/init/dependencies/python/ensure-python.toml +0 -0
- /package/{docs → lib/docs}/init/dependencies/python/pip-install.toml +0 -0
- /package/{docs → lib/docs}/init/index.toml +0 -0
- /package/{docs → lib/docs}/internal/command.toml +0 -0
- /package/{docs → lib/docs}/internal/config.toml +0 -0
- /package/{docs → lib/docs}/optional-import.toml +0 -0
- /package/{docs → lib/docs}/plugin-loader.toml +0 -0
- /package/{docs → lib/docs}/port-resolver.toml +0 -0
- /package/{docs → lib/docs}/pull/index.toml +0 -0
- /package/{docs → lib/docs}/serve/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/lib/appsail/index.toml +0 -0
- /package/{docs → lib/docs}/serve/server/lib/web_client/server.toml +0 -0
- /package/{docs → lib/docs}/shell/dependencies/tunnel-server.toml +0 -0
- /package/{docs → lib/docs}/shell/index.toml +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/.classpath +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/.project +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/catalyst-config.json +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/playwright/sample.java +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/.classpath +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/.project +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/catalyst-config.json +0 -0
- /package/templates/init/functions/java/{browserLogic → browserlogic}/selenium/sample.java +0 -0
package/lib/config-store.js
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const conf_1 = __importDefault(require("conf"));
|
|
7
|
-
const runtime_store_1 = __importDefault(require("./runtime-store"));
|
|
8
|
-
const name = runtime_store_1.default.get('context.cli.package.name');
|
|
9
|
-
const path = process.env['X_ZC_CREDENTIAL_PATH'];
|
|
10
|
-
exports.default = new conf_1.default({ configName: name, projectName: name, cwd: path });
|
|
@@ -1,145 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getJavaSpawnCommand = exports.ensureJava = exports.stackVsVersions = void 0;
|
|
16
|
-
const semver_1 = require("semver");
|
|
17
|
-
const error_1 = __importDefault(require("../../error"));
|
|
18
|
-
const runtime_store_1 = __importDefault(require("../../runtime-store"));
|
|
19
|
-
const userConfig_1 = __importDefault(require("../../userConfig"));
|
|
20
|
-
const shell_1 = require("../../util_modules/shell");
|
|
21
|
-
const java_1 = require("./java");
|
|
22
|
-
const path_1 = require("path");
|
|
23
|
-
exports.stackVsVersions = {
|
|
24
|
-
java8: {
|
|
25
|
-
version: '1.8.0',
|
|
26
|
-
target: '1.8'
|
|
27
|
-
},
|
|
28
|
-
java11: {
|
|
29
|
-
version: '11.0.0',
|
|
30
|
-
target: '11'
|
|
31
|
-
},
|
|
32
|
-
java17: {
|
|
33
|
-
version: '17.0.0',
|
|
34
|
-
target: '17'
|
|
35
|
-
}
|
|
36
|
-
};
|
|
37
|
-
function ensureJava(target) {
|
|
38
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
-
const configKey = `${target.stack}.bin`;
|
|
40
|
-
const spawnCommand = userConfig_1.default.get(configKey);
|
|
41
|
-
let usingJavaDefaultPath = false;
|
|
42
|
-
if (!spawnCommand) {
|
|
43
|
-
runtime_store_1.default.set(`context.java.isUsingJavaDefaultPath_${target.stack}`, true);
|
|
44
|
-
usingJavaDefaultPath = true;
|
|
45
|
-
}
|
|
46
|
-
let javacVersion = '';
|
|
47
|
-
const currentStackVersion = exports.stackVsVersions[target.stack].version;
|
|
48
|
-
try {
|
|
49
|
-
const javacSpawnCommand = getJavaSpawnCommand(spawnCommand, 'javac', target.stack);
|
|
50
|
-
javacVersion = yield validateJavaPath(javacSpawnCommand);
|
|
51
|
-
if (!javacVersion) {
|
|
52
|
-
if (spawnCommand) {
|
|
53
|
-
throw new error_1.default(`unable to check the javac version using the given binary path. Kindly re-check. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
|
|
54
|
-
exit: 0,
|
|
55
|
-
errorId: 'JAVACONFIG-1',
|
|
56
|
-
arg: [
|
|
57
|
-
target.stack,
|
|
58
|
-
target.name,
|
|
59
|
-
`jdk-${exports.stackVsVersions[target.stack]
|
|
60
|
-
.target}`
|
|
61
|
-
]
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
throw new error_1.default(`unable to locate the java binary path in your system. Kindly re-check. Please provide the valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
|
|
66
|
-
exit: 0,
|
|
67
|
-
errorId: 'JAVACONFIG-2',
|
|
68
|
-
arg: [`${target.stack}.bin`, target.name]
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
catch (_a) {
|
|
74
|
-
throw new error_1.default(`error while validating java binary path. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
|
|
75
|
-
exit: 0,
|
|
76
|
-
errorId: 'JAVACONFIG-4',
|
|
77
|
-
arg: [`${target.stack}.bin`, target.name]
|
|
78
|
-
});
|
|
79
|
-
}
|
|
80
|
-
if ((0, semver_1.satisfies)(currentStackVersion, `>${javacVersion}`)) {
|
|
81
|
-
if (usingJavaDefaultPath === false) {
|
|
82
|
-
throw new error_1.default(`provided JDK version[jdk-${javacVersion}] for the config key ${target.stack}.bin is lesser than the compatible JDK version[jdk-${exports.stackVsVersions[target.stack].target}]. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
|
|
83
|
-
exit: 0,
|
|
84
|
-
skipHelp: true,
|
|
85
|
-
errorId: 'JAVACONFIG-3',
|
|
86
|
-
arg: [
|
|
87
|
-
`jdk-${javacVersion}`,
|
|
88
|
-
target.stack,
|
|
89
|
-
`jdk-${exports.stackVsVersions[target.stack].target}`,
|
|
90
|
-
target.name
|
|
91
|
-
]
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
|
-
throw new error_1.default(`provided JDK version[jdk-${javacVersion}] is lesser than the compatible JDK version[jdk-${exports.stackVsVersions[target.stack].target}]. Please provide a valid java binary path for the config key ${target.stack}.bin to serve or deploy the function[${target.name}].`, {
|
|
95
|
-
exit: 0,
|
|
96
|
-
skipHelp: true,
|
|
97
|
-
errorId: 'JAVACONFIG-3',
|
|
98
|
-
arg: [
|
|
99
|
-
`jdk-${javacVersion}`,
|
|
100
|
-
target.stack,
|
|
101
|
-
`jdk-${exports.stackVsVersions[target.stack].target}`,
|
|
102
|
-
target.name
|
|
103
|
-
]
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
const majorVersion = target.stack === 'java8' ? '' : currentStackVersion.split('.')[0];
|
|
107
|
-
if (!(((0, semver_1.satisfies)(javacVersion, `>=${majorVersion}.0.0`) &&
|
|
108
|
-
(0, semver_1.satisfies)(javacVersion, `<=${majorVersion}.x.x`)) ||
|
|
109
|
-
(target.stack === 'java8' &&
|
|
110
|
-
(0, semver_1.satisfies)(javacVersion, '>=1.8.0') &&
|
|
111
|
-
(0, semver_1.satisfies)(javacVersion, '<=1.8.x')))) {
|
|
112
|
-
const warningMessage = [];
|
|
113
|
-
warningMessage.push(`Warning : Your function[${target.name}] stack is ${target.stack}. But you are using jdk ${javacVersion} to compile source files. Please use jdk ${exports.stackVsVersions[target.stack].target} for better compilation`);
|
|
114
|
-
target.compilationWarning = warningMessage;
|
|
115
|
-
}
|
|
116
|
-
if (!spawnCommand) {
|
|
117
|
-
runtime_store_1.default.set(`context.java.isUsingJavaDefaultPath_${target.stack}`, true);
|
|
118
|
-
}
|
|
119
|
-
});
|
|
120
|
-
}
|
|
121
|
-
exports.ensureJava = ensureJava;
|
|
122
|
-
function validateJavaPath(spawnCommand) {
|
|
123
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
124
|
-
const spawnOpts = ['-version'];
|
|
125
|
-
const javacVersionChild = (0, shell_1.spawn)(spawnCommand, spawnOpts, {
|
|
126
|
-
cwd: runtime_store_1.default.get('cwd'),
|
|
127
|
-
stdio: 'pipe'
|
|
128
|
-
}).RAW();
|
|
129
|
-
let javacVersionDetails = yield (0, java_1.extractAllData)(javacVersionChild, 'stdout');
|
|
130
|
-
javacVersionDetails =
|
|
131
|
-
javacVersionDetails === ''
|
|
132
|
-
? yield (0, java_1.extractAllData)(javacVersionChild, 'stderr')
|
|
133
|
-
: javacVersionDetails;
|
|
134
|
-
const javacVersion = (0, semver_1.valid)((0, semver_1.coerce)(javacVersionDetails.split(' ')[1]));
|
|
135
|
-
return javacVersion;
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
function getJavaSpawnCommand(spawnCommand, process, stack) {
|
|
139
|
-
const isUsingJavaDefaultPath = runtime_store_1.default.get(`context.java.isUsingJavaDefaultPath_${stack}`);
|
|
140
|
-
if (isUsingJavaDefaultPath === true) {
|
|
141
|
-
return process;
|
|
142
|
-
}
|
|
143
|
-
return (0, path_1.join)(spawnCommand, process);
|
|
144
|
-
}
|
|
145
|
-
exports.getJavaSpawnCommand = getJavaSpawnCommand;
|
package/lib/fn-utils/lib/java.js
DELETED
|
@@ -1,512 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getTargetVersion = exports.getTemplatePath = exports.validate = exports.extractAllData = exports.projectFileValidation = exports.ensureJavaInvoker = exports.compileTarget = exports.normaliseClasspath = exports.rewriteClasspath = exports.isValidClassName = exports.containsKeyWord = exports.classPathSep = exports.FN_TYPE = void 0;
|
|
16
|
-
const ansi_colors_1 = require("ansi-colors");
|
|
17
|
-
const path_1 = require("path");
|
|
18
|
-
const xml2js_1 = __importDefault(require("xml2js"));
|
|
19
|
-
const error_1 = __importDefault(require("../../error"));
|
|
20
|
-
const runtime_store_1 = __importDefault(require("../../runtime-store"));
|
|
21
|
-
const config_1 = require("../../util_modules/config");
|
|
22
|
-
const constants_1 = require("../../util_modules/constants");
|
|
23
|
-
const env_1 = require("../../util_modules/env");
|
|
24
|
-
const fs_1 = require("../../util_modules/fs");
|
|
25
|
-
const js_1 = require("../../util_modules/js");
|
|
26
|
-
const option_1 = require("../../util_modules/option");
|
|
27
|
-
const shell_1 = require("../../util_modules/shell");
|
|
28
|
-
const userConfig_1 = __importDefault(require("../../userConfig"));
|
|
29
|
-
const logger_1 = require("../../util_modules/logger");
|
|
30
|
-
const ensure_java_userconfig_1 = require("./ensure-java-userconfig");
|
|
31
|
-
var constants_2 = require("../../util_modules/constants");
|
|
32
|
-
Object.defineProperty(exports, "FN_TYPE", { enumerable: true, get: function () { return constants_2.FN_TYPE; } });
|
|
33
|
-
const keyWords = [
|
|
34
|
-
'abstract',
|
|
35
|
-
'assert',
|
|
36
|
-
'boolean',
|
|
37
|
-
'break',
|
|
38
|
-
'byte',
|
|
39
|
-
'case',
|
|
40
|
-
'catch',
|
|
41
|
-
'char',
|
|
42
|
-
'class',
|
|
43
|
-
'const',
|
|
44
|
-
'continue',
|
|
45
|
-
'default',
|
|
46
|
-
'do',
|
|
47
|
-
'double',
|
|
48
|
-
'else',
|
|
49
|
-
'enum',
|
|
50
|
-
'extends',
|
|
51
|
-
'false',
|
|
52
|
-
'final',
|
|
53
|
-
'finally',
|
|
54
|
-
'float',
|
|
55
|
-
'for',
|
|
56
|
-
'goto',
|
|
57
|
-
'if',
|
|
58
|
-
'implements',
|
|
59
|
-
'import',
|
|
60
|
-
'instanceof',
|
|
61
|
-
'int',
|
|
62
|
-
'interface',
|
|
63
|
-
'long',
|
|
64
|
-
'native',
|
|
65
|
-
'new',
|
|
66
|
-
'null',
|
|
67
|
-
'package',
|
|
68
|
-
'private',
|
|
69
|
-
'protected',
|
|
70
|
-
'public',
|
|
71
|
-
'return',
|
|
72
|
-
'short',
|
|
73
|
-
'static',
|
|
74
|
-
'strictfp',
|
|
75
|
-
'super',
|
|
76
|
-
'switch',
|
|
77
|
-
'synchronized',
|
|
78
|
-
'this',
|
|
79
|
-
'throw',
|
|
80
|
-
'throws',
|
|
81
|
-
'transient',
|
|
82
|
-
'true',
|
|
83
|
-
'try',
|
|
84
|
-
'void',
|
|
85
|
-
'volatile',
|
|
86
|
-
'while'
|
|
87
|
-
];
|
|
88
|
-
const warningMessages = [
|
|
89
|
-
'warning: [options] bootstrap class path not set in conjunction with -source 8',
|
|
90
|
-
'warning: [options] system modules path not set in conjunction with -source 11'
|
|
91
|
-
];
|
|
92
|
-
exports.classPathSep = env_1.isWindows ? ';' : ':';
|
|
93
|
-
function containsKeyWord(name) {
|
|
94
|
-
return keyWords.some((keyWord) => {
|
|
95
|
-
if (name === keyWord ||
|
|
96
|
-
js_1.JS.endsWith(name, '.' + keyWord) ||
|
|
97
|
-
js_1.JS.startsWith(name, keyWord + '.') ||
|
|
98
|
-
js_1.JS.includes(name, '.' + keyWord + '.')) {
|
|
99
|
-
return true;
|
|
100
|
-
}
|
|
101
|
-
return false;
|
|
102
|
-
});
|
|
103
|
-
}
|
|
104
|
-
exports.containsKeyWord = containsKeyWord;
|
|
105
|
-
function isValidClassName(name) {
|
|
106
|
-
if (name === '') {
|
|
107
|
-
return false;
|
|
108
|
-
}
|
|
109
|
-
if (js_1.JS.upperFirst(name) !== name) {
|
|
110
|
-
return false;
|
|
111
|
-
}
|
|
112
|
-
if (containsKeyWord(name)) {
|
|
113
|
-
return false;
|
|
114
|
-
}
|
|
115
|
-
return true;
|
|
116
|
-
}
|
|
117
|
-
exports.isValidClassName = isValidClassName;
|
|
118
|
-
function rewriteClasspath(pth, libPth) {
|
|
119
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
120
|
-
yield fs_1.ASYNC.ensureDir(libPth);
|
|
121
|
-
const content = yield fs_1.ASYNC.readFile(pth);
|
|
122
|
-
if (content === undefined) {
|
|
123
|
-
throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
|
|
124
|
-
}
|
|
125
|
-
const files = yield fs_1.ASYNC.walk((0, path_1.dirname)(libPth), {
|
|
126
|
-
filter: { exclude: ['**/.output'], excludeDir: true }
|
|
127
|
-
});
|
|
128
|
-
const result = yield xml2js_1.default.parseStringPromise(content);
|
|
129
|
-
const classPathEntries = js_1.JS.chain(files)
|
|
130
|
-
.filter((jar) => (0, path_1.extname)(jar.path) === '.jar')
|
|
131
|
-
.map((jar) => {
|
|
132
|
-
return {
|
|
133
|
-
$: {
|
|
134
|
-
kind: 'lib',
|
|
135
|
-
path: (0, path_1.basename)((0, path_1.dirname)(jar.path)) === 'lib'
|
|
136
|
-
? 'lib/' + (0, path_1.basename)(jar.path)
|
|
137
|
-
: (0, path_1.basename)(jar.path)
|
|
138
|
-
}
|
|
139
|
-
};
|
|
140
|
-
})
|
|
141
|
-
.concat(js_1.JS.get(result, 'classpath.classpathentry', []))
|
|
142
|
-
.uniq()
|
|
143
|
-
.value();
|
|
144
|
-
js_1.JS.set(result, 'classpath.classpathentry', classPathEntries);
|
|
145
|
-
const builder = new xml2js_1.default.Builder();
|
|
146
|
-
return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
exports.rewriteClasspath = rewriteClasspath;
|
|
150
|
-
function normaliseClasspath(pth, libFolder) {
|
|
151
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
152
|
-
const content = yield fs_1.ASYNC.readFile(pth);
|
|
153
|
-
if (content === undefined) {
|
|
154
|
-
throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
|
|
155
|
-
}
|
|
156
|
-
const result = yield xml2js_1.default.parseStringPromise(content);
|
|
157
|
-
const classPathEntries = js_1.JS.get(result, 'classpath.classpathentry', []);
|
|
158
|
-
const jarFilesList = [];
|
|
159
|
-
yield Promise.all(classPathEntries.map((entry) => __awaiter(this, void 0, void 0, function* () {
|
|
160
|
-
const row = entry.$;
|
|
161
|
-
if (row.kind && row.kind === 'lib' && row.path) {
|
|
162
|
-
const libPath = (0, path_1.resolve)((0, path_1.dirname)(pth), row.path);
|
|
163
|
-
const jarName = (0, path_1.basename)(libPath);
|
|
164
|
-
const jarExists = yield fs_1.ASYNC.fileExists((0, path_1.join)(libFolder, jarName));
|
|
165
|
-
if (!jarExists) {
|
|
166
|
-
try {
|
|
167
|
-
yield fs_1.ASYNC.copyFile(libPath, (0, path_1.join)(libFolder, jarName));
|
|
168
|
-
}
|
|
169
|
-
catch (err) {
|
|
170
|
-
throw new error_1.default(libPath + ' mentioned in .classpath file missing', {
|
|
171
|
-
exit: 1,
|
|
172
|
-
errorId: 'JAVA-1',
|
|
173
|
-
original: err,
|
|
174
|
-
arg: [(0, ansi_colors_1.bold)(libPath), (0, ansi_colors_1.bold)('.classpath')]
|
|
175
|
-
});
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
row.path = (0, path_1.basename)(libFolder) + '/' + jarName;
|
|
179
|
-
if ((0, path_1.dirname)(libPath) === (0, path_1.dirname)(libFolder)) {
|
|
180
|
-
try {
|
|
181
|
-
yield fs_1.ASYNC.deleteFile(libPath);
|
|
182
|
-
}
|
|
183
|
-
catch (err) {
|
|
184
|
-
throw new error_1.default(libPath +
|
|
185
|
-
' mentioned in .classpath file missing. The .classpath file in the target directory seems to be corrupted.', {
|
|
186
|
-
exit: 1,
|
|
187
|
-
errorId: 'JAVA-2',
|
|
188
|
-
original: err,
|
|
189
|
-
arg: [(0, ansi_colors_1.bold)('.classpath'), (0, ansi_colors_1.bold)((0, path_1.dirname)(pth))]
|
|
190
|
-
});
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
jarFilesList.push((0, path_1.join)(libFolder, jarName));
|
|
194
|
-
}
|
|
195
|
-
})));
|
|
196
|
-
js_1.JS.set(result, 'classpath.classpathentry', classPathEntries);
|
|
197
|
-
runtime_store_1.default.set('context.functions.java.libJarFiles', jarFilesList);
|
|
198
|
-
const builder = new xml2js_1.default.Builder();
|
|
199
|
-
return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
|
|
200
|
-
});
|
|
201
|
-
}
|
|
202
|
-
exports.normaliseClasspath = normaliseClasspath;
|
|
203
|
-
function compileTarget(target) {
|
|
204
|
-
var _a;
|
|
205
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
206
|
-
const targetSource = target.source;
|
|
207
|
-
const outputFolder = (0, path_1.join)(targetSource, constants_1.FOLDERNAME.output);
|
|
208
|
-
const integ = target.integ_config;
|
|
209
|
-
const entries = [(0, path_1.join)(targetSource, ((_a = target.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java')];
|
|
210
|
-
const configKey = `${target.stack}.bin`;
|
|
211
|
-
const userConfigCmd = userConfig_1.default.get(configKey);
|
|
212
|
-
const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'javac', target.stack);
|
|
213
|
-
if (integ && integ.length > 0) {
|
|
214
|
-
integ.forEach((integConf) => {
|
|
215
|
-
const handlers = integConf.handlers;
|
|
216
|
-
handlers &&
|
|
217
|
-
Object.keys(handlers).forEach((handler) => {
|
|
218
|
-
entries.push((0, path_1.join)(targetSource, handlers[handler].replace(/\./g, path_1.sep) + '.java'));
|
|
219
|
-
});
|
|
220
|
-
});
|
|
221
|
-
}
|
|
222
|
-
yield fs_1.ASYNC.ensureDir(outputFolder);
|
|
223
|
-
yield fs_1.ASYNC.emptyDir(outputFolder);
|
|
224
|
-
const ignore = config_1.functionsConfig.ignore(targetSource);
|
|
225
|
-
const allFiles = yield fs_1.ASYNC.walk(targetSource, {
|
|
226
|
-
filter: { exclude: ['**/.output', ...ignore], excludeDir: true }
|
|
227
|
-
});
|
|
228
|
-
const cleanUpFiles = allFiles.map((file) => file.path);
|
|
229
|
-
while (allFiles.length > 0) {
|
|
230
|
-
const limit = allFiles.length < 20 ? allFiles.length : 20;
|
|
231
|
-
yield Promise.all(allFiles.splice(0, limit).map((file) => {
|
|
232
|
-
const targetPth = file.path.includes(path_1.sep + 'lib' + path_1.sep)
|
|
233
|
-
? file.path.replace(targetSource + path_1.sep + 'lib', '')
|
|
234
|
-
: file.path.replace(targetSource, '');
|
|
235
|
-
return fs_1.ASYNC.copyFile(file.path, (0, path_1.join)(outputFolder, targetPth));
|
|
236
|
-
}));
|
|
237
|
-
}
|
|
238
|
-
const targetVersion = getTargetVersion(target.stack);
|
|
239
|
-
yield Promise.all(entries.map((file) => compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder)
|
|
240
|
-
.then((result) => {
|
|
241
|
-
const [_stdout, stderr, code] = result;
|
|
242
|
-
if (code === null || code >= 1) {
|
|
243
|
-
const error = [];
|
|
244
|
-
error === null || error === void 0 ? void 0 : error.push(stderr);
|
|
245
|
-
target.valid = false;
|
|
246
|
-
target.failure_reason = 'there was a Java compilation error';
|
|
247
|
-
target.compilationError = error;
|
|
248
|
-
}
|
|
249
|
-
else if (stderr) {
|
|
250
|
-
target.compilationWarning = [stderr];
|
|
251
|
-
}
|
|
252
|
-
})
|
|
253
|
-
.catch((error) => {
|
|
254
|
-
target.valid = false;
|
|
255
|
-
target.failure_reason = error.message;
|
|
256
|
-
})));
|
|
257
|
-
const currentCommand = (0, option_1.getCurrentCommand)();
|
|
258
|
-
switch (currentCommand) {
|
|
259
|
-
case 'pull':
|
|
260
|
-
case 'init':
|
|
261
|
-
yield cleanUp(cleanUpFiles);
|
|
262
|
-
break;
|
|
263
|
-
case 'deploy':
|
|
264
|
-
const classPath = (0, path_1.join)(outputFolder, constants_1.FILENAME.functions.java_classpath);
|
|
265
|
-
if (yield fs_1.ASYNC.fileExists(classPath)) {
|
|
266
|
-
const classPathFile = yield fs_1.ASYNC.readFile(classPath);
|
|
267
|
-
if (classPathFile) {
|
|
268
|
-
yield fs_1.ASYNC.writeFile(classPath, classPathFile.replace(/lib[\\|\/]/g, ''));
|
|
269
|
-
}
|
|
270
|
-
}
|
|
271
|
-
break;
|
|
272
|
-
}
|
|
273
|
-
});
|
|
274
|
-
}
|
|
275
|
-
exports.compileTarget = compileTarget;
|
|
276
|
-
function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder) {
|
|
277
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
278
|
-
(0, logger_1.info)('Compiling ' + file);
|
|
279
|
-
return new Promise((resolve, reject) => {
|
|
280
|
-
var _a, _b;
|
|
281
|
-
const child = (0, shell_1.spawn)(spawnCommand, [
|
|
282
|
-
'-target',
|
|
283
|
-
targetVersion,
|
|
284
|
-
'-source',
|
|
285
|
-
targetVersion,
|
|
286
|
-
'-cp',
|
|
287
|
-
'*' + module.exports.classPathSep + '.',
|
|
288
|
-
'-g',
|
|
289
|
-
'-Xprefer:source',
|
|
290
|
-
userConfig_1.default.get('javac.disable_warnings') === 'true' ? '-Xlint:none' : '-Xlint',
|
|
291
|
-
file.replace(targetSource, outputFolder)
|
|
292
|
-
], {
|
|
293
|
-
cwd: outputFolder,
|
|
294
|
-
stdio: 'pipe'
|
|
295
|
-
}).RAW();
|
|
296
|
-
let stdout = '';
|
|
297
|
-
let stderr = '';
|
|
298
|
-
(_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
|
|
299
|
-
stdout += data.toString();
|
|
300
|
-
});
|
|
301
|
-
(_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
|
|
302
|
-
const err = data.toString();
|
|
303
|
-
let newErr = '';
|
|
304
|
-
warningMessages.forEach((element) => {
|
|
305
|
-
if (err.includes(element)) {
|
|
306
|
-
newErr += err.replace(element, '');
|
|
307
|
-
}
|
|
308
|
-
});
|
|
309
|
-
if (!newErr) {
|
|
310
|
-
newErr += err;
|
|
311
|
-
}
|
|
312
|
-
stderr += newErr;
|
|
313
|
-
});
|
|
314
|
-
child.on('error', (error) => {
|
|
315
|
-
reject(error);
|
|
316
|
-
});
|
|
317
|
-
child.on('close', (code) => {
|
|
318
|
-
resolve([stdout, stderr, code]);
|
|
319
|
-
});
|
|
320
|
-
});
|
|
321
|
-
});
|
|
322
|
-
}
|
|
323
|
-
function ensureJavaInvoker(pth, invoker, target) {
|
|
324
|
-
const configKey = `${target.stack}.bin`;
|
|
325
|
-
const userConfigCmd = userConfig_1.default.get(configKey);
|
|
326
|
-
const spawnCommand = (0, ensure_java_userconfig_1.getJavaSpawnCommand)(userConfigCmd, 'javac', target.stack);
|
|
327
|
-
const classPth = pth + '.class';
|
|
328
|
-
const targetVersion = getTargetVersion(target.stack);
|
|
329
|
-
if (fs_1.SYNC.fileExists(classPth)) {
|
|
330
|
-
return true;
|
|
331
|
-
}
|
|
332
|
-
fs_1.SYNC.ensureDir((0, path_1.dirname)(classPth));
|
|
333
|
-
const child = (0, shell_1.spawn)(spawnCommand, [
|
|
334
|
-
'-target',
|
|
335
|
-
targetVersion,
|
|
336
|
-
'-source',
|
|
337
|
-
targetVersion,
|
|
338
|
-
'-cp',
|
|
339
|
-
(0, path_1.join)('lib', '*') + module.exports.classPathSep + '.',
|
|
340
|
-
'-g',
|
|
341
|
-
'-d',
|
|
342
|
-
(0, path_1.dirname)(classPth),
|
|
343
|
-
(0, path_1.basename)(invoker)
|
|
344
|
-
], { cwd: (0, path_1.dirname)(invoker), stdio: 'pipe' }).SYNC();
|
|
345
|
-
if (child.status === 1) {
|
|
346
|
-
const errorResponse = [];
|
|
347
|
-
const err = child.stderr.toString();
|
|
348
|
-
warningMessages.forEach((element) => {
|
|
349
|
-
if (err.includes(element)) {
|
|
350
|
-
errorResponse.push(err.replace(element, ''));
|
|
351
|
-
}
|
|
352
|
-
});
|
|
353
|
-
target.compilationError = errorResponse;
|
|
354
|
-
}
|
|
355
|
-
fs_1.SYNC.copyDir((0, path_1.join)((0, path_1.dirname)(invoker), 'lib'), (0, path_1.join)((0, path_1.dirname)(classPth), 'lib'));
|
|
356
|
-
return true;
|
|
357
|
-
}
|
|
358
|
-
exports.ensureJavaInvoker = ensureJavaInvoker;
|
|
359
|
-
function projectFileValidation(pth, target) {
|
|
360
|
-
var _a, _b;
|
|
361
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
362
|
-
const fileExists = yield fs_1.ASYNC.fileExists(pth);
|
|
363
|
-
if (!fileExists) {
|
|
364
|
-
const templatePath = getTemplatePath(target.type, (_b = (_a = target.integ_config) === null || _a === void 0 ? void 0 : _a.at(0)) === null || _b === void 0 ? void 0 : _b.service);
|
|
365
|
-
yield fs_1.ASYNC.copyFile((0, path_1.join)(templatePath, constants_1.FILENAME.functions.java_project), (0, path_1.join)(target.source, constants_1.FILENAME.functions.java_project));
|
|
366
|
-
yield fs_1.ASYNC.findAndReplace(pth)(constants_1.PLACEHOLDER.functions.java_name, target.name);
|
|
367
|
-
}
|
|
368
|
-
const content = yield fs_1.ASYNC.readFile(pth);
|
|
369
|
-
if (content === undefined) {
|
|
370
|
-
throw new error_1.default('Content of ' + pth + ' is undefined', { exit: 2 });
|
|
371
|
-
}
|
|
372
|
-
const result = yield xml2js_1.default.parseStringPromise(content);
|
|
373
|
-
const name = js_1.JS.get(result, 'projectDescription.name')[0];
|
|
374
|
-
if (name !== target.name) {
|
|
375
|
-
throw new error_1.default('project name mismatch in .project file for function ' + target.name, {
|
|
376
|
-
exit: 1,
|
|
377
|
-
errorId: 'JAVA-3',
|
|
378
|
-
arg: [(0, ansi_colors_1.bold)(name), (0, ansi_colors_1.bold)((0, path_1.basename)(pth)), (0, ansi_colors_1.bold)(target.name)]
|
|
379
|
-
});
|
|
380
|
-
}
|
|
381
|
-
});
|
|
382
|
-
}
|
|
383
|
-
exports.projectFileValidation = projectFileValidation;
|
|
384
|
-
function extractAllData(child, name) {
|
|
385
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
386
|
-
return new Promise((res, rej) => {
|
|
387
|
-
var _a, _b, _c;
|
|
388
|
-
let message = '';
|
|
389
|
-
(_a = child[name]) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
|
|
390
|
-
message += chunk;
|
|
391
|
-
});
|
|
392
|
-
(_b = child[name]) === null || _b === void 0 ? void 0 : _b.on('end', () => {
|
|
393
|
-
res(message);
|
|
394
|
-
});
|
|
395
|
-
(_c = child[name]) === null || _c === void 0 ? void 0 : _c.on('error', (err) => {
|
|
396
|
-
rej(err);
|
|
397
|
-
});
|
|
398
|
-
});
|
|
399
|
-
});
|
|
400
|
-
}
|
|
401
|
-
exports.extractAllData = extractAllData;
|
|
402
|
-
function validate(targets, idx) {
|
|
403
|
-
var _a;
|
|
404
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
405
|
-
if (targets.length < idx + 1) {
|
|
406
|
-
return;
|
|
407
|
-
}
|
|
408
|
-
const currentTarget = targets[idx];
|
|
409
|
-
try {
|
|
410
|
-
const targetSource = currentTarget.source;
|
|
411
|
-
const classpath = (0, path_1.join)(targetSource, constants_1.FILENAME.functions.java_classpath);
|
|
412
|
-
const projectPath = (0, path_1.join)(targetSource, constants_1.FILENAME.functions.java_project);
|
|
413
|
-
const libFolder = (0, path_1.join)(targetSource, 'lib');
|
|
414
|
-
const entry = (0, path_1.join)(targetSource, ((_a = currentTarget.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java');
|
|
415
|
-
const entryFileExists = yield fs_1.ASYNC.fileExists(entry);
|
|
416
|
-
const classPathExists = yield fs_1.ASYNC.fileExists(classpath);
|
|
417
|
-
if (!entryFileExists) {
|
|
418
|
-
throw new error_1.default((0, path_1.basename)(entry) + ' file is missing', {
|
|
419
|
-
exit: 1,
|
|
420
|
-
errorId: 'JAVA-6',
|
|
421
|
-
arg: [
|
|
422
|
-
(0, ansi_colors_1.bold)((0, path_1.basename)(entry)),
|
|
423
|
-
(0, ansi_colors_1.bold)(constants_1.FILENAME.catalyst_config),
|
|
424
|
-
(0, ansi_colors_1.bold)(currentTarget.name)
|
|
425
|
-
]
|
|
426
|
-
});
|
|
427
|
-
}
|
|
428
|
-
if (!classPathExists) {
|
|
429
|
-
const templatePath = getTemplatePath(currentTarget.type);
|
|
430
|
-
yield fs_1.ASYNC.copyFile((0, path_1.join)(templatePath, constants_1.FILENAME.functions.java_classpath), (0, path_1.join)(targetSource, constants_1.FILENAME.functions.java_classpath));
|
|
431
|
-
yield rewriteClasspath(classpath, libFolder);
|
|
432
|
-
}
|
|
433
|
-
yield normaliseClasspath(classpath, libFolder);
|
|
434
|
-
yield projectFileValidation(projectPath, currentTarget);
|
|
435
|
-
yield (0, ensure_java_userconfig_1.ensureJava)(currentTarget);
|
|
436
|
-
yield compileTarget(currentTarget).catch((err) => {
|
|
437
|
-
throw new error_1.default('there was a compilation error!', {
|
|
438
|
-
exit: 1,
|
|
439
|
-
errorId: 'JAVA-7',
|
|
440
|
-
original: err,
|
|
441
|
-
skipHelp: !!(0, option_1.getOptionValue)('watch', false)
|
|
442
|
-
});
|
|
443
|
-
});
|
|
444
|
-
return validate(targets, ++idx);
|
|
445
|
-
}
|
|
446
|
-
catch (err) {
|
|
447
|
-
currentTarget.valid = false;
|
|
448
|
-
currentTarget.failure_reason = err.message;
|
|
449
|
-
return validate(targets, ++idx);
|
|
450
|
-
}
|
|
451
|
-
});
|
|
452
|
-
}
|
|
453
|
-
exports.validate = validate;
|
|
454
|
-
function cleanUp(files) {
|
|
455
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
456
|
-
const promiseArr = [];
|
|
457
|
-
const deleteArr = [];
|
|
458
|
-
const hashes = {};
|
|
459
|
-
files.forEach((file, idx) => {
|
|
460
|
-
if (file.endsWith('.java')) {
|
|
461
|
-
const hash = hashes[file];
|
|
462
|
-
if (hash === undefined) {
|
|
463
|
-
hashes[file] = { found: true, acc: [] };
|
|
464
|
-
}
|
|
465
|
-
else {
|
|
466
|
-
hash.found = true;
|
|
467
|
-
deleteArr.push(...hash.acc);
|
|
468
|
-
}
|
|
469
|
-
}
|
|
470
|
-
else if (file.endsWith('.class')) {
|
|
471
|
-
const javaFile = file.replace(new RegExp('(\\$+[0-9]+)?\\.class$', 'g'), '.java');
|
|
472
|
-
const hashValue = hashes[javaFile];
|
|
473
|
-
if (hashValue === undefined) {
|
|
474
|
-
hashes[javaFile] = { found: false, acc: [file] };
|
|
475
|
-
}
|
|
476
|
-
else if (hashValue.found === true) {
|
|
477
|
-
files.splice(idx, 1);
|
|
478
|
-
promiseArr.push(fs_1.ASYNC.deleteFile(file));
|
|
479
|
-
}
|
|
480
|
-
else if (hashValue.found === false) {
|
|
481
|
-
hashValue.acc.push(file);
|
|
482
|
-
}
|
|
483
|
-
}
|
|
484
|
-
});
|
|
485
|
-
return Promise.all([...deleteArr.map((file) => fs_1.ASYNC.deleteFile(file)), ...promiseArr]);
|
|
486
|
-
});
|
|
487
|
-
}
|
|
488
|
-
function getTemplatePath(fnType, add) {
|
|
489
|
-
switch (fnType) {
|
|
490
|
-
case constants_1.FN_TYPE.browserLogic: {
|
|
491
|
-
if (Object.keys(constants_1.TEMPLATE.functions.java.browserlogic).includes('Selenium')) {
|
|
492
|
-
return constants_1.TEMPLATE.functions.java.browserlogic.Selenium;
|
|
493
|
-
}
|
|
494
|
-
throw new error_1.default('Invalid browserlogic type', { exit: 2 });
|
|
495
|
-
}
|
|
496
|
-
case constants_1.FN_TYPE.integration: {
|
|
497
|
-
if (!add) {
|
|
498
|
-
throw new error_1.default('Invalid additional parameter', { exit: 2 });
|
|
499
|
-
}
|
|
500
|
-
const temp = constants_1.TEMPLATE.functions.java[fnType];
|
|
501
|
-
return temp[add];
|
|
502
|
-
}
|
|
503
|
-
default: {
|
|
504
|
-
return constants_1.TEMPLATE.functions.java[fnType];
|
|
505
|
-
}
|
|
506
|
-
}
|
|
507
|
-
}
|
|
508
|
-
exports.getTemplatePath = getTemplatePath;
|
|
509
|
-
function getTargetVersion(stack) {
|
|
510
|
-
return ensure_java_userconfig_1.stackVsVersions[stack].target;
|
|
511
|
-
}
|
|
512
|
-
exports.getTargetVersion = getTargetVersion;
|