zcatalyst-cli 1.21.0 → 1.22.0

package/lib/execute-script.js

@@ -22,13 +22,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const error_1 = __importDefault(require("./error"));
+const index_js_1 = __importDefault(require("./error/index.js"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const config = __importStar(require("./util_modules/config"));
 const constants_1 = require("./util_modules/constants");
@@ -38,39 +47,60 @@ const logger_1 = require("./util_modules/logger");
 const project_1 = require("./util_modules/project");
 const shell_1 = require("./util_modules/shell");
 function executeCommand(exeCommand, { moduleSource, feature }) {
-    const cwd = moduleSource || runtime_store_1.default.get('project.root');
-    const exeDir = (0, project_1.resolveProjectPath)(cwd);
-    (0, logger_1.info)();
-    (0, logger_1.info)(`Executing ${(0, ansi_colors_1.cyan)(feature)} script in ${(0, ansi_colors_1.underline)(exeDir)}`);
-    (0, logger_1.debug)('Executing command > ' + exeCommand);
-    (0, logger_1.info)(`> ${exeCommand}`);
-    const exitListeners = process.listeners('exit');
-    process.removeAllListeners('exit');
-    const result = (0, shell_1.spawn)(exeCommand, [], {
-        cwd: exeDir,
-        shell: true,
-        stdio: 'inherit'
-    }).SYNC();
-    if ((0, env_1.isPrimaryShell)()) {
-        js_1.JS.forEach(exitListeners || [], (listener) => {
-            process.addListener('exit', listener);
-        });
-    }
-    if (result.status === null || result.status > 0 || result.error) {
-        throw new error_1.default('The script exited with code greater than 0 or an error', {
-            exit: 0,
-            original: new Error(JSON.stringify(result)),
-            errorId: 'EXEC-SCRIPT-4',
-            arg: [(0, ansi_colors_1.bold)(feature), ansi_colors_1.italic.red(JSON.stringify(result, null, '  '))]
-        });
-    }
-    return result;
+    return __awaiter(this, void 0, void 0, function* () {
+        const cwd = moduleSource || runtime_store_1.default.get('project.root');
+        const exeDir = (0, project_1.resolveProjectPath)(cwd);
+        (0, logger_1.info)();
+        (0, logger_1.info)(`Executing ${(0, ansi_colors_1.cyan)(feature)} script in ${(0, ansi_colors_1.underline)(exeDir)}`);
+        (0, logger_1.debug)('Executing command > ' + exeCommand);
+        (0, logger_1.info)(`> ${exeCommand}`);
+        const exitListeners = process.listeners('exit');
+        process.removeAllListeners('exit');
+        try {
+            yield new Promise((_res, _rej) => {
+                var _a, _b;
+                const scriptProcess = (0, shell_1.spawn)(exeCommand, [], {
+                    cwd: exeDir,
+                    shell: true,
+                    stdio: ['ignore', 'pipe', 'pipe']
+                }).RAW();
+                (_a = scriptProcess.stdout) === null || _a === void 0 ? void 0 : _a.pipe(env_1.isVsCode ? logger_1.LogStreamFactory.getStream() : process.stdout, {
+                    end: false
+                });
+                (_b = scriptProcess.stderr) === null || _b === void 0 ? void 0 : _b.pipe(env_1.isVsCode ? logger_1.LogStreamFactory.getStream() : process.stdout, {
+                    end: false
+                });
+                scriptProcess.on('exit', (code) => {
+                    if (code !== 0) {
+                        return _rej(code);
+                    }
+                    _res(code);
+                });
+                scriptProcess.on('error', (_error) => _rej(_error));
+            });
+        }
+        catch (er) {
+            if (er) {
+                throw new index_js_1.default('The script exited with code greater than 0 or an error', {
+                    exit: 0,
+                    original: new Error(JSON.stringify(er)),
+                    errorId: 'EXEC-SCRIPT-4',
+                    arg: [(0, ansi_colors_1.bold)(feature), ansi_colors_1.italic.red(JSON.stringify(er, null, '  '))]
+                });
+            }
+        }
+        if ((0, env_1.isPrimaryShell)()) {
+            js_1.JS.forEach(exitListeners || [], (listener) => {
+                process.addListener('exit', listener);
+            });
+        }
+    });
 }
 exports.executeCommand = executeCommand;
 exports.default = (commandName) => {
     const featureByScript = commandName.split(':');
     if (featureByScript.length !== 2) {
-        throw new error_1.default('Not a proper script command', {
+        throw new index_js_1.default('Not a proper script command', {
             exit: 1,
             errorId: 'EXEC-SCRIPT-1',
             arg: [ansi_colors_1.bold.red(commandName), (0, ansi_colors_1.bold)('feature:script')]
@@ -78,7 +108,7 @@ exports.default = (commandName) => {
     }
     const configModule = config[(featureByScript[0] + 'Config')];
     if (configModule === undefined) {
-        throw new error_1.default('Not a valid catayst feature', {
+        throw new index_js_1.default('Not a valid catayst feature', {
             exit: 1,
             errorId: 'EXEC-SCRIPT-2',
             arg: [
@@ -90,7 +120,7 @@ exports.default = (commandName) => {
     const exeTempCommand = configModule.script(featureByScript[1], null);
     if (exeTempCommand === null) {
         const availableScripts = configModule.script(undefined, false);
-        throw new error_1.default(featureByScript[1] + ' script is not available.', {
+        throw new index_js_1.default(featureByScript[1] + ' script is not available.', {
             exit: 1,
             errorId: 'EXEC-SCRIPT-3',
             arg: [
@@ -104,7 +134,7 @@ exports.default = (commandName) => {
             ]
         });
     }
-    const featureSource = (0, project_1.resolveProjectPath)(configModule.source());
+    const featureSource = configModule.source();
     const exeCommand = js_1.JS.chain(exeTempCommand)
         .split(' ')
         .map((arg) => {

package/lib/express_middlewares/apig-matcher.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (_REQ: express.Request, res: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/auth-checker.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/authenticator.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (req: express.Request, _RES: express.Response, next: (err?: Error) => void) => Promise<void>;
+export default _default;

package/lib/express_middlewares/authenticator.js

@@ -13,13 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const project_1 = __importDefault(require("../endpoints/lib/project"));
-const credential_1 = __importDefault(require("../internal/credential"));
+const credential_js_1 = __importDefault(require("../authentication/credential.js"));
 exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const projectId = req.headers['x-zc-projectid'];
     const projectDomain = req.headers['x-zc-project-domain'];
     const { cookie, authorization } = req.headers;
-    const accessToken = yield credential_1.default.getAccessToken();
+    const accessToken = yield credential_js_1.default.getAccessToken();
     const [hasCSRF, hasADT, hasBDT] = Object.keys(req.cookies || {}).reduce((acc, name) => {
         if (name === 'ZD_CSRF_TOKEN' && req.cookies[name]) {
             acc[0] = true;
@@ -62,5 +62,6 @@ exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, functio
     }
     req.headers['x-zc-admin-cred-type'] = 'token';
     req.headers['x-zc-admin-cred-token'] = accessToken;
+    req.headers['x-zc-instance-id'] = 'local';
     next();
 });

package/lib/express_middlewares/cookie-parser.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (req: express.Request, _RES: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/error-handler.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/logger.d.ts

@@ -0,0 +1,5 @@
+import express from 'express';
+import { IServerDetails } from '../serve/server';
+import { TAppSailServerDetails } from '../serve/features/appsail';
+declare const _default: (appSailDetails?: IServerDetails<TAppSailServerDetails>) => (req: express.Request, _RES: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/logger.js

@@ -1,9 +1,10 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
+const index_1 = require("../util_modules/logger/index");
 exports.default = (appSailDetails) => (req, _RES, next) => {
     var _a;
-    console.log('[' +
+    (0, index_1.log)('info', '[' +
         new Date().getTime() +
         '] ' +
         (appSailDetails ? (0, ansi_colors_1.cyan)(` Appsail[${(_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.name}] `) : '') +
@@ -12,6 +13,6 @@ exports.default = (appSailDetails) => (req, _RES, next) => {
         '" ' +
         ' "' +
         (0, ansi_colors_1.bold)(req.originalUrl) +
-        '"');
+        '"', true);
     next();
 };

package/lib/express_middlewares/project.d.ts

@@ -0,0 +1,6 @@
+import express from 'express';
+import { IProjectCliObj } from '../util_modules/project';
+declare const _default: (projectObj: Pick<IProjectCliObj, 'id' | 'domain_prefix' | 'key' | 'env_name'> & {
+    domain: string;
+}) => (req: express.Request, _RES: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/express_middlewares/url-rewriter.d.ts

@@ -0,0 +1,3 @@
+import express from 'express';
+declare const _default: (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export default _default;

package/lib/fn-utils/index.d.ts

@@ -0,0 +1,10 @@
+import * as common from './lib/common';
+import * as java from './lib/java';
+import * as node from './lib/node';
+import * as python from './lib/python';
+export declare const fnUtils: {
+    node: typeof node;
+    java: typeof java;
+    python: typeof python;
+    common: typeof common;
+};

package/lib/fn-utils/lib/browserLogic.d.ts

@@ -0,0 +1,2 @@
+export declare function getBrowserLogicFramework(stack: string): Promise<string>;
+export declare function downloadJavaDependencies(path: string, deps: Array<string>, isZip?: boolean): Promise<Array<void>>;

package/lib/fn-utils/lib/browserLogic.js

@@ -20,23 +20,24 @@ const endpoints_1 = require("../../endpoints");
 const prompt_1 = __importDefault(require("../../prompt"));
 const browserLogic_1 = __importDefault(require("../../util_modules/constants/lib/browserLogic"));
 const fs_1 = require("../../util_modules/fs");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 function getBrowserLogicFramework(stack) {
     return __awaiter(this, void 0, void 0, function* () {
         const choices = Object.keys(browserLogic_1.default[stack]).map((framework) => {
             return prompt_1.default.choice(framework, {
                 value: framework,
-                short: framework
+                short: framework,
+                id: framework
             });
         });
         if (choices.length === 0) {
             return '';
         }
-        const framework = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please choose a framework to initialize', {
+        const framework = yield prompt_1.default.ask(prompt_1.default.question('framework', 'Please choose a framework to initialize', {
             type: 'list',
             choices
         }));
-        return framework.name;
+        return framework.framework;
     });
 }
 exports.getBrowserLogicFramework = getBrowserLogicFramework;
@@ -58,8 +59,8 @@ function downloadJavaDependencies(path, deps, isZip = true) {
                 }
             }
             catch (err) {
-                (0, logger_1.labeled)(`Browser Logic[${name}]`, 'Unable to download the dependencies because of the following error');
-                (0, logger_1.error)((0, util_1.inspect)(err));
+                (0, index_1.labeled)(`Browser Logic[${name}]`, 'Unable to download the dependencies because of the following error');
+                (0, index_1.error)((0, util_1.inspect)(err));
             }
         })));
     });

package/lib/fn-utils/lib/common.d.ts

@@ -0,0 +1,85 @@
+/// <reference types="node" />
+import { FSWatcher } from 'chokidar';
+import { ReadStream } from 'fs-extra';
+import LocalFunction from '../../shell/dependencies/non-http-function';
+import { REMOTE_REF } from '../../util_modules/constants';
+export interface IRuntime {
+    eol_runtimes?: Record<string, number>;
+    runtimes: Array<string>;
+}
+export interface JavaFn {
+    compilerOut: {
+        warning: Array<string>;
+        error: Array<string>;
+    };
+    binPath?: string;
+}
+export interface PythonFn {
+    binPath: string;
+    debug?: {
+        port: number;
+        debugger: 'debugpy';
+    };
+}
+export interface NodeFn {
+    binPath: string;
+}
+export interface IFnTarget<T = JavaFn | PythonFn | NodeFn> {
+    name: string;
+    id?: string;
+    source: string;
+    build: string;
+    valid: boolean;
+    failure_reason?: string | Error;
+    stack?: string;
+    type?: keyof typeof REMOTE_REF.functions.type;
+    index?: string;
+    zip_stream?: {
+        stream: ReadStream;
+        length: number;
+    };
+    url?: string;
+    url_with_id?: string;
+    local_url?: string;
+    watcher?: FSWatcher;
+    localFn?: LocalFunction;
+    integ_config?: Array<{
+        service: string;
+        handlers?: Record<string, string>;
+    }>;
+    env_var?: Record<string, unknown>;
+    plugins?: {
+        serve: {
+            name?: string;
+            source?: string;
+        };
+    };
+    inputs?: string | Record<string, unknown>;
+    memory?: number;
+    additionalInfo?: T;
+}
+export declare function validate(skipFnFilter?: boolean): Promise<Array<string>>;
+export declare function refineTargets(rawTargets?: Array<string>, mapRemoteFn?: boolean): Promise<Array<IFnTarget>>;
+export declare function executeHook({ prefix, command }: {
+    prefix: 'pre' | 'post';
+    command: string;
+}): Promise<void>;
+export declare function pack(target: IFnTarget): Promise<void>;
+export declare function generateUrlForTarget(target: IFnTarget): string | void;
+export declare function findAndReplaceConfigProps(dir: string, { stack, type, integ_config, integ_handler }: {
+    stack: string;
+    type: keyof typeof REMOTE_REF.functions.type;
+    integ_config: string;
+    integ_handler: string;
+}): Promise<void>;
+export declare function resolveAllFnPorts(targets?: Array<IFnTarget>): Promise<void>;
+export declare function deleteFunctionLocal(path: string): Promise<void>;
+export declare function getSDK(fnType: string, dest: string, stack: 'java', options?: {
+    service?: string;
+}): Promise<void>;
+export declare function updateFnConfig(target: {
+    [x: string]: unknown;
+}): Promise<void>;
+export declare function copyModDirPerm(src: string, dest: string, perm: string, { replace }?: {
+    replace?: boolean | undefined;
+}): Promise<void>;