zcatalyst-cli 1.25.2 → 1.26.0

package/lib/migration/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,8 +53,7 @@ const config_store_js_1 = __importDefault(require("../util_modules/config-store.
 const rc_1 = __importDefault(require("../internal/rc"));
 const fs_1 = require("../util_modules/fs");
 const index_1 = require("../util_modules/logger/index");
-const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const runMigration = (rc_2, migFiles_1, ...args_1) => __awaiter(void 0, [rc_2, migFiles_1, ...args_1], void 0, function* (rc, migFiles, idx = 0) {
     if (migFiles.length <= idx) {
         return Promise.resolve();
     }
@@ -55,7 +64,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
+        const migModule = yield Promise.resolve(`${migFile}`).then(s => __importStar(require(s)));
         if (migModule.isRequire()) {
             (0, index_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -84,7 +93,6 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
     return runMigration(rc, migFiles, ++idx);
 });
 const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
     if (migFiles.length === 0) {
         return;
     }
@@ -98,7 +106,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
+        const migModule = yield Promise.resolve(`${migFile}`).then(s => __importStar(require(s)));
         if (migModule.isRequire()) {
             (0, index_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/option-filter.js

@@ -15,18 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterTargets = exports.filterPorts = void 0;
+exports.filterPorts = filterPorts;
+exports.filterTargets = filterTargets;
 const ansi_colors_1 = require("ansi-colors");
 const index_js_1 = __importDefault(require("./error/index.js"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
@@ -238,7 +249,6 @@ function filterPorts() {
         runtime_store_1.default.set(`context.port.debug.${res.target.target}.${res.filter}`, res.specific);
     });
 }
-exports.filterPorts = filterPorts;
 function filterTargets({ pathSense = true, target } = {}) {
     const validTargetResultants = validateTargets(target);
     const config = runtime_store_1.default.get('config');
@@ -303,4 +313,3 @@ function filterTargets({ pathSense = true, target } = {}) {
     runtime_store_1.default.set('context.targets', targets);
     return targets;
 }
-exports.filterTargets = filterTargets;

package/lib/optional-import.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,7 +52,6 @@ const async_js_1 = require("./util_modules/fs/lib/async.js");
 const index_js_1 = __importDefault(require("./error/index.js"));
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
     if (name === (0, path_1.basename)(name)) {
         const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
         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*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
+        return Promise.resolve(`${projectModulePath}`).then(s => __importStar(require(s)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     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*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
+    return Promise.resolve(`${projectModulePath}`).then(s => __importStar(require(s)));
 });

package/lib/plugin-loader.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import type { Stream } from 'stream';
 export type IPlugin = (...args: Array<unknown>) => Promise<ChildProcess | EventListener | boolean | string | Stream>;

package/lib/plugin-loader.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,6 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = pluginLoader;
 const ansi_colors_1 = require("ansi-colors");
 const index_js_1 = __importDefault(require("./error/index.js"));
 const optional_import_js_1 = __importDefault(require("./optional-import.js"));
@@ -95,4 +106,3 @@ function pluginLoader(feature, name, source) {
         return;
     });
 }
-exports.default = pluginLoader;

package/lib/port-resolver.js

@@ -37,8 +37,8 @@ class PortResolver {
     static freePort(port) {
         __classPrivateFieldGet(this, _a, "f", _PortResolver_takenPorts).delete(port);
     }
-    static getFreePort(startPort, searchSpan = 0, dupCheck = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static getFreePort(startPort_1) {
+        return __awaiter(this, arguments, void 0, function* (startPort, searchSpan = 0, dupCheck = false) {
             if (searchSpan < 0) {
                 throw new Error('unable to find port. searchSpan has reached the bottom line');
             }
@@ -46,18 +46,18 @@ class PortResolver {
                 port: startPort,
                 stopPort: startPort + searchSpan
             });
-            if (__classPrivateFieldGet(PortResolver, _a, "m", _PortResolver_isPortTaken).call(PortResolver, port)) {
+            if (__classPrivateFieldGet(_a, _a, "m", _PortResolver_isPortTaken).call(_a, port)) {
                 if (dupCheck) {
-                    return PortResolver.getFreePort(port + 1, searchSpan - (port - startPort), dupCheck);
+                    return _a.getFreePort(port + 1, searchSpan - (port - startPort), dupCheck);
                 }
                 return port;
             }
-            __classPrivateFieldGet(PortResolver, _a, "f", _PortResolver_takenPorts).add(port);
+            __classPrivateFieldGet(_a, _a, "f", _PortResolver_takenPorts).add(port);
             return port;
         });
     }
-    static getPort(feature, type, { name = '', duplicateCheck = true, searchSpan = 20, fallbackNeeded = true, server } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static getPort(feature_1, type_1) {
+        return __awaiter(this, arguments, void 0, function* (feature, type, { name = '', duplicateCheck = true, searchSpan = 20, fallbackNeeded = true, server } = {}) {
             let port = parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}.${name}`), 10);
             port = isNaN(port) ? parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}`), 10) : port;
             if (isNaN(port)) {
@@ -93,7 +93,7 @@ class PortResolver {
             }
             let finalPort = port;
             try {
-                finalPort = yield PortResolver.getFreePort(port, searchSpan, duplicateCheck);
+                finalPort = yield _a.getFreePort(port, searchSpan, duplicateCheck);
             }
             catch (e) {
                 if (searchSpan === 0) {
@@ -126,8 +126,8 @@ class PortResolver {
         });
     }
 }
-exports.default = PortResolver;
 _a = PortResolver, _PortResolver_isPortTaken = function _PortResolver_isPortTaken(port) {
-    return __classPrivateFieldGet(PortResolver, _a, "f", _PortResolver_takenPorts).has(port);
+    return __classPrivateFieldGet(_a, _a, "f", _PortResolver_takenPorts).has(port);
 };
 _PortResolver_takenPorts = { value: new Set() };
+exports.default = PortResolver;

package/lib/prompt/index.d.ts

@@ -22,13 +22,13 @@ export interface IQuestion extends inquirer.Question, inquirer.ListQuestionOptio
 }
 export type TSeparator = Separator;
 declare const _default: {
-    register: (type: 'file-path' | 'tree' | 'search-box' | 'with-desc') => Promise<void>;
-    deregister: (type: 'file-path' | 'tree' | 'search-box') => void;
+    register: (type: "file-path" | "tree" | "search-box" | "with-desc") => Promise<void>;
+    deregister: (type: "file-path" | "tree" | "search-box") => void;
     separator: (line: string) => TSeparator;
     choice: (name: string, { id, value, short, disabled, checked, ...otherOpts }?: IChoice) => IChoice;
     ask: (...questions: Array<IQuestion>) => (Promise<inquirer.Answers> & {
         ui: PromptUI;
     }) | Promise<inquirer.Answers>;
-    question: (name: string, question: string, { type, defaultAns, choices, validate, filter, when, prefix, suffix, ...otheropts }?: Omit<IQuestion, 'name'>) => IQuestion;
+    question: (name: string, question: string, { type, defaultAns, choices, validate, filter, when, prefix, suffix, ...otheropts }?: Omit<IQuestion, "name">) => IQuestion;
 };
 export default _default;

package/lib/prompt/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/lib/prompt/types/file-path.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import InquirerAutocomplete from 'inquirer-autocomplete-prompt';
 import { Answers } from 'inquirer';
 import { Interface } from 'readline';

package/lib/prompt/types/search-box.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import inquirer, { Answers, Question } from 'inquirer';
 import Choice from 'inquirer/lib/objects/choice';
 import Choices from 'inquirer/lib/objects/choices';

package/lib/prompt/types/tree.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Answers } from 'inquirer';
 import BasePrompt from 'inquirer/lib/prompts/base.js';
 import Paginator from 'inquirer/lib/utils/paginator.js';
@@ -23,7 +22,7 @@ export declare class TreeNode {
     }) | TreeNode>;
     activeIdx: number;
     prevActiveIdx: number;
-    nodes: string[];
+    nodes: Array<string>;
     level: number;
     get indent(): number;
     constructor(root?: string);

package/lib/prompt/types/tree.js

@@ -7,7 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TreeNode_instances, _TreeNode_constructNodes;
+var _TreeNode_instances, _a, _TreeNode_constructNodes;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeNode = void 0;
 const ansi_colors_1 = require("ansi-colors");
@@ -40,7 +40,7 @@ class TreeNode {
         this.root = root;
     }
     addNode(node) {
-        if (node instanceof TreeNode) {
+        if (node instanceof _a) {
             this.leaves.push(node);
         }
         else {
@@ -73,7 +73,7 @@ class TreeNode {
     }
     openTree(strict = false) {
         const activeLeaf = this.leaves[this.activeIdx];
-        if (!(activeLeaf instanceof TreeNode)) {
+        if (!(activeLeaf instanceof _a)) {
             if (!activeLeaf.expand || strict) {
                 return ETreeState.CLOSED;
             }
@@ -107,16 +107,16 @@ class TreeNode {
     }
     closeTree() {
         const activeLeaf = this.leaves[this.activeIdx];
-        if (!(activeLeaf instanceof TreeNode) || !activeLeaf.open) {
+        if (!(activeLeaf instanceof _a) || !activeLeaf.open) {
             return;
         }
         const subActive = activeLeaf.leaves[activeLeaf.activeIdx];
-        if (subActive instanceof TreeNode && subActive.open) {
+        if (subActive instanceof _a && subActive.open) {
             activeLeaf.closeTree();
             this.nodes[this.activeIdx] = this.nodes[this.activeIdx].replace(/\n{1}[\s\S]*/m, '\n' + activeLeaf.buildTree({ force: true }));
             return;
         }
-        else if (!(subActive instanceof TreeNode) && subActive.expand && subActive.isExpanded) {
+        else if (!(subActive instanceof _a) && subActive.expand && subActive.isExpanded) {
             activeLeaf.nodes[activeLeaf.activeIdx] = this.wrapLine('+ ' + subActive.display, activeLeaf.indent - 2);
             this.nodes[this.activeIdx] =
                 this.nodes[this.activeIdx].split('\n')[0] + '\n' + activeLeaf.buildTree();
@@ -130,7 +130,7 @@ class TreeNode {
     }
     moveActive(distance = 0) {
         const activeLeaf = this.leaves[this.activeIdx];
-        if (activeLeaf instanceof TreeNode && activeLeaf.open) {
+        if (activeLeaf instanceof _a && activeLeaf.open) {
             activeLeaf.moveActive(distance);
             const subTree = activeLeaf.buildTree();
             this.nodes[this.activeIdx] =
@@ -158,7 +158,7 @@ class TreeNode {
     }
     getValue() {
         const activeLeaf = this.leaves[this.activeIdx];
-        if (activeLeaf instanceof TreeNode) {
+        if (activeLeaf instanceof _a) {
             return activeLeaf.getValue();
         }
         return activeLeaf;
@@ -174,9 +174,9 @@ class TreeNode {
     }
 }
 exports.TreeNode = TreeNode;
-_TreeNode_instances = new WeakSet(), _TreeNode_constructNodes = function _TreeNode_constructNodes() {
+_a = TreeNode, _TreeNode_instances = new WeakSet(), _TreeNode_constructNodes = function _TreeNode_constructNodes() {
     const nodes = this.leaves.map((leaf) => {
-        if (leaf instanceof TreeNode) {
+        if (leaf instanceof _a) {
             const rootNode = this.wrapLine((leaf.open ? figures.arrowDown : figures.arrowRight) + ' ' + leaf.root, this.indent - 2);
             const subNodes = leaf.open ? '\n' + leaf.nodes.join('\n') : '';
             return rootNode + subNodes;

package/lib/prompt/types/with-description.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Answers, ListQuestionOptions } from 'inquirer';
 import Choices from 'inquirer/lib/objects/choices';
 import ListPrompt from 'inquirer/lib/prompts/list.js';

package/lib/pull/features/functions/index.js

@@ -115,7 +115,7 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         }
     })));
     const dirOverwriteAns = yield prompt_1.default.ask(...dirOverwriteQns);
-    let targets = fns.filter((fn) => {
+    const targets = fns.filter((fn) => {
         if (dirOverwriteAns[fn.name] === undefined || dirOverwriteAns[fn.name]) {
             return true;
         }
@@ -131,66 +131,85 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
             yield fs_1.ASYNC.deleteDir(fn.source);
         }
         throbber.add('function_pull_' + fn.name, {
-            text: `extracting function [${fn.name}]`
+            text: `pulling function [${fn.name}]`
         });
     }));
     runtime_store_1.default.set('context.functions.targets', targets);
-    let isFnPulled = false;
     let isFnPulledFailed = false;
-    targets = yield Promise.all(targets.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
-        try {
-            yield fs_1.ASYNC.ensureDir(fn.source);
-            const buffer = (yield fnAPI.download(fn.id));
-            yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
-            if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
-                yield (0, languages_1.node)(fn);
-            }
-            else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
-                const binPath = yield (0, ensure_java_userconfig_1.ensureJava)(fn.stack);
-                if (binPath) {
-                    yield (0, languages_1.java)(fn);
-                }
-                else {
-                    fn.valid = false;
-                    fn.failure_reason = 'unable to detect the java bin path';
+    let pulledFns = [];
+    const batchSize = 5;
+    while (targets.length > 0) {
+        (0, index_1.debug)('Pulling a batch of functions. Remaining functions: ' + targets.length);
+        const limit = targets.length > batchSize ? batchSize : targets.length;
+        const targetBatch = targets.splice(0, limit);
+        const _targets = yield Promise.all(targetBatch.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b, _c;
+            try {
+                const spinnerName = 'function_pull_' + fn.name;
+                yield fs_1.ASYNC.ensureDir(fn.source);
+                throbber.hasSpinner(spinnerName) &&
+                    throbber.update(spinnerName, {
+                        text: `downloading function [${fn.name}]`
+                    });
+                const buffer = (yield fnAPI.download(fn.id));
+                throbber.hasSpinner(spinnerName) &&
+                    throbber.update(spinnerName, {
+                        text: `extracting function [${fn.name}]`
+                    });
+                yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
+                throbber.hasSpinner(spinnerName) &&
+                    throbber.update(spinnerName, {
+                        text: `finishing pull of function [${fn.name}]`
+                    });
+                if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
+                    yield (0, languages_1.node)(fn);
                 }
-            }
-            else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
-                yield (0, languages_1.python)(fn);
-                const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
-                const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
-                if (requirementsExists && fn.valid) {
-                    try {
-                        yield (0, python_1.removeRequirements)(reqFile, fn);
+                else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
+                    const binPath = yield (0, ensure_java_userconfig_1.ensureJava)(fn.stack);
+                    if (binPath) {
+                        yield (0, languages_1.java)(fn);
                     }
-                    catch (e) {
-                        const err = error_1.default.getErrorInstance(e);
-                        (fn.valid = false), (fn.failure_reason = err.message);
+                    else {
+                        fn.valid = false;
+                        fn.failure_reason = 'unable to detect the java bin path';
+                    }
+                }
+                else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
+                    yield (0, languages_1.python)(fn);
+                    const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
+                    const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
+                    if (requirementsExists && fn.valid) {
+                        try {
+                            yield (0, python_1.removeRequirements)(reqFile, fn);
+                        }
+                        catch (e) {
+                            const err = error_1.default.getErrorInstance(e);
+                            (fn.valid = false), (fn.failure_reason = err.message);
+                        }
                     }
                 }
+                const catalystJsonPth = (0, path_1.join)(fn.source, constants_1.FILENAME.catalyst_config);
+                const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth);
+                const fnDetails = (yield fnAPI.getFunction(fn.id));
+                const envVariables = js_1.JS.get(fnDetails, 'configuration.environment.variables', false);
+                if (catalystJson && envVariables) {
+                    catalystJson.deployment.env_variables = envVariables;
+                    yield fs_1.ASYNC.writeJSONFile(catalystJsonPth, catalystJson);
+                }
             }
-            const catalystJsonPth = (0, path_1.join)(fn.source, constants_1.FILENAME.catalyst_config);
-            const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth);
-            const fnDetails = (yield fnAPI.getFunction(fn.id));
-            const envVariables = js_1.JS.get(fnDetails, 'configuration.environment.variables', false);
-            if (catalystJson && envVariables) {
-                catalystJson.deployment.env_variables = envVariables;
-                yield fs_1.ASYNC.writeJSONFile(catalystJsonPth, catalystJson);
+            catch (err) {
+                const error = err;
+                throbber.remove('function_pull_' + fn.name);
+                (0, index_1.warning)(`Skipping pull of function(${fn.name}). ${error.message}`);
+                fn.failure_reason = `there was an error while pulling function [${fn.name}]. ${error.message}`;
+                isFnPulledFailed = true;
             }
-            isFnPulled = true;
-        }
-        catch (err) {
-            const error = err;
             throbber.remove('function_pull_' + fn.name);
-            (0, index_1.warning)(`Skipping pull of function(${fn.name}). ${error.message}`);
-            fn.failure_reason = `there was an error while pulling function [${fn.name}]. ${error.message}`;
-            isFnPulledFailed = true;
-        }
-        throbber.remove('function_pull_' + fn.name);
-        return fn;
-    })));
-    targets = targets.filter((target) => {
+            return fn;
+        })));
+        pulledFns.push(..._targets);
+    }
+    pulledFns = pulledFns.filter((target) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if (!target.valid &&
             !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.toString().startsWith('unable to locate python')) &&
@@ -214,8 +233,8 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         });
         return target.valid;
     });
-    if (isFnPulled) {
-        runtime_store_1.default.set('context.payload.functions.targets', targets);
+    if (pulledFns.length > 0) {
+        runtime_store_1.default.set('context.payload.functions.targets', pulledFns);
         runtime_store_1.default.set('context.payload.functions.source', (0, path_1.basename)(config_1.functionsConfig.source()));
         if (isFnPulledFailed) {
             runtime_store_1.default.set('context.payload.functions.status', 1);

package/lib/pull/features/functions/languages.js

@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.python = exports.java = exports.node = void 0;
+exports.node = node;
+exports.java = java;
+exports.python = python;
 const fn_utils_1 = require("../../../fn-utils");
 const js_1 = require("../../../util_modules/js");
 function node(target) {
@@ -18,18 +20,15 @@ function node(target) {
         yield fn_utils_1.fnUtils.node.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
-exports.node = node;
 function java(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
         yield fn_utils_1.fnUtils.java.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
-exports.java = java;
 function python(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
         yield fn_utils_1.fnUtils.python.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
-exports.python = python;