zcatalyst-cli 1.25.2 → 1.26.0

package/lib/api-timer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import EventEmitter from 'events';
 export default class APITimer extends EventEmitter {
     private apiFn;

package/lib/apig-utils.d.ts

@@ -34,7 +34,7 @@ export declare const apigUtils: {
     validate: () => Promise<Array<IAPIGRules>>;
     compile: (ruleArr: Array<IAPIGRules>) => IAPIGLocal;
     executeHook: ({ prefix, command }: {
-        prefix: 'pre' | 'post';
+        prefix: "pre" | "post";
         command: string;
     }) => Promise<void>;
     pack: () => Promise<ReadStream>;

package/lib/apig-utils.js

@@ -358,7 +358,7 @@ exports.apigUtils = {
         }
         return localConfig;
     },
-    executeHook: ({ prefix, command }) => __awaiter(void 0, void 0, void 0, function* () {
+    executeHook: (_a) => __awaiter(void 0, [_a], void 0, function* ({ prefix, command }) {
         if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
             (0, index_1.debug)(`skipping ${prefix + command} hook`);
             return;

package/lib/appsail-utils.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAppSail = exports.filterTargets = void 0;
+exports.filterTargets = filterTargets;
+exports.validateAppSail = validateAppSail;
 const ansi_colors_1 = require("ansi-colors");
 const error_1 = __importDefault(require("./error"));
 const appsail_1 = require("./util_modules/config/lib/appsail");
@@ -23,6 +24,21 @@ const container_1 = require("./util_modules/container");
 const image_1 = require("@zcatalyst/container-plugin/out/endpoints/image");
 const fs_1 = require("./util_modules/fs");
 const util_1 = require("util");
+const OCI_IMAGE_INDEX_MEDIA_TYPES = [
+    'application/vnd.oci.image.index.v1+json',
+    'application/vnd.docker.distribution.manifest.list.v2+json'
+];
+const OCI_IMAGE_MANIFEST_MEDIA_TYPES = [
+    'application/vnd.oci.image.manifest.v1+json',
+    'application/vnd.docker.distribution.manifest.v2+json'
+];
+function getBlobPathFromDigest(digest, sourceFile) {
+    const [algorithm, hash] = digest.split(':');
+    if (!algorithm || !hash) {
+        throw new error_1.default(`Corrupted image tar :: invalid digest ${digest} found in ${sourceFile}`, { exit: 1 });
+    }
+    return `blobs/${algorithm}/${hash}`;
+}
 function getAppSailFilters(targetStr) {
     return targetStr.split(',').reduce((filterArr, target) => {
         const opts = target.split(':');
@@ -82,7 +98,6 @@ function filterTargets(allTargets) {
     }
     return allTargets;
 }
-exports.filterTargets = filterTargets;
 function validateAppSail(targDetails) {
     return __awaiter(this, void 0, void 0, function* () {
         let isSocket;
@@ -102,17 +117,70 @@ function validateAppSail(targDetails) {
                         var _a;
                         try {
                             const manifestJsonStream = yield (0, image_1.getTarEntry)(imgTar, 'manifest.json');
-                            if (!manifestJsonStream) {
-                                throw new error_1.default('Corrupted image tar :: manifest.json not found in the tar', { exit: 1 });
+                            const repositoriesStream = yield (0, image_1.getTarEntry)(imgTar, 'repositories');
+                            const indexJsonStream = yield (0, image_1.getTarEntry)(imgTar, 'index.json');
+                            if (!indexJsonStream) {
+                                if (manifestJsonStream || repositoriesStream) {
+                                    throw new error_1.default('Legacy docker-archive format is not supported. Only OCI-compliant docker-archive formats (pure OCI or hybrid OCI) are supported.', { exit: 1 });
+                                }
+                                throw new error_1.default('Corrupted image tar :: required OCI metadata index.json not found in the tar', { exit: 1 });
                             }
-                            const manifestJson = yield fs_1.ASYNC.readStreamAsJSON(manifestJsonStream);
-                            const config = (_a = manifestJson.at(0)) === null || _a === void 0 ? void 0 : _a.Config;
-                            if (!config) {
-                                throw new error_1.default('Corrupted image tar :: invalid manifest.json file. Unable to identify the config file', { exit: 1 });
+                            const indexJson = yield fs_1.ASYNC.readStreamAsJSON(indexJsonStream);
+                            if (indexJson.schemaVersion !== 2) {
+                                throw new error_1.default('Corrupted image tar :: invalid index.json file. Unsupported schemaVersion', { exit: 1 });
                             }
-                            const configFileStream = yield (0, image_1.getTarEntry)(imgTar, config);
+                            const traversedDigests = new Set();
+                            const resolveImageManifestPath = (manifestIndex, sourceFile) => __awaiter(this, void 0, void 0, function* () {
+                                var _a;
+                                const imageDescriptor = (_a = manifestIndex.manifests) === null || _a === void 0 ? void 0 : _a.find((manifest) => {
+                                    if (!(manifest === null || manifest === void 0 ? void 0 : manifest.digest)) {
+                                        return false;
+                                    }
+                                    if (!manifest.mediaType) {
+                                        return true;
+                                    }
+                                    return (OCI_IMAGE_MANIFEST_MEDIA_TYPES.includes(manifest.mediaType) ||
+                                        OCI_IMAGE_INDEX_MEDIA_TYPES.includes(manifest.mediaType));
+                                });
+                                if (!(imageDescriptor === null || imageDescriptor === void 0 ? void 0 : imageDescriptor.digest)) {
+                                    throw new error_1.default(`Corrupted image tar :: invalid ${sourceFile} file. Unable to identify image manifest`, { exit: 1 });
+                                }
+                                if (traversedDigests.has(imageDescriptor.digest)) {
+                                    throw new error_1.default(`Corrupted image tar :: circular descriptor reference found for digest ${imageDescriptor.digest}`, { exit: 1 });
+                                }
+                                if (!imageDescriptor.mediaType ||
+                                    OCI_IMAGE_MANIFEST_MEDIA_TYPES.includes(imageDescriptor.mediaType)) {
+                                    return getBlobPathFromDigest(imageDescriptor.digest, sourceFile);
+                                }
+                                traversedDigests.add(imageDescriptor.digest);
+                                const nestedIndexPath = getBlobPathFromDigest(imageDescriptor.digest, sourceFile);
+                                const nestedIndexStream = yield (0, image_1.getTarEntry)(imgTar, nestedIndexPath);
+                                if (!nestedIndexStream) {
+                                    throw new error_1.default(`Corrupted image tar :: nested image index ${nestedIndexPath} not found in the tar`, { exit: 1 });
+                                }
+                                const nestedIndex = yield fs_1.ASYNC.readStreamAsJSON(nestedIndexStream);
+                                if (nestedIndex.schemaVersion !== 2) {
+                                    throw new error_1.default(`Corrupted image tar :: invalid nested image index ${nestedIndexPath}. Unsupported schemaVersion`, { exit: 1 });
+                                }
+                                return resolveImageManifestPath(nestedIndex, nestedIndexPath);
+                            });
+                            const imageManifestPath = yield resolveImageManifestPath(indexJson, 'index.json');
+                            const imageManifestStream = yield (0, image_1.getTarEntry)(imgTar, imageManifestPath);
+                            if (!imageManifestStream) {
+                                throw new error_1.default(`Corrupted image tar :: image manifest ${imageManifestPath} not found in the tar`, { exit: 1 });
+                            }
+                            const imageManifest = yield fs_1.ASYNC.readStreamAsJSON(imageManifestStream);
+                            if (imageManifest.schemaVersion !== 2) {
+                                throw new error_1.default('Corrupted image tar :: invalid image manifest file. Unsupported schemaVersion', { exit: 1 });
+                            }
+                            const configDigest = (_a = imageManifest.config) === null || _a === void 0 ? void 0 : _a.digest;
+                            if (!configDigest) {
+                                throw new error_1.default('Corrupted image tar :: invalid image manifest file. Unable to identify the config blob', { exit: 1 });
+                            }
+                            const configBlobPath = getBlobPathFromDigest(configDigest, imageManifestPath);
+                            const configFileStream = yield (0, image_1.getTarEntry)(imgTar, configBlobPath);
                             if (!configFileStream) {
-                                throw new error_1.default(`Corrupted image tar :: config file ${config} not found in the tar`, { exit: 1 });
+                                throw new error_1.default(`Corrupted image tar :: config blob ${configBlobPath} not found in the tar`, { exit: 1 });
                             }
                             const configFile = yield fs_1.ASYNC.readStreamAsJSON(configFileStream);
                             resolve(configFile);
@@ -130,7 +198,7 @@ function validateAppSail(targDetails) {
             }
         });
         const _details = targDetails.map((targ) => __awaiter(this, void 0, void 0, function* () {
-            var _b, _c;
+            var _a, _b;
             if (targ.validity.valid) {
                 if (targ.runtime === 'custom') {
                     if (isSocket === undefined) {
@@ -172,7 +240,7 @@ function validateAppSail(targDetails) {
                     }
                     return targ;
                 }
-                if (((_b = targ.config) === null || _b === void 0 ? void 0 : _b.platform) !== 'war' && !((_c = targ.config) === null || _c === void 0 ? void 0 : _c.command)) {
+                if (((_a = targ.config) === null || _a === void 0 ? void 0 : _a.platform) !== 'war' && !((_b = targ.config) === null || _b === void 0 ? void 0 : _b.command)) {
                     targ.validity = {
                         valid: false,
                         reason: 'Start-up command missing'
@@ -185,4 +253,3 @@ function validateAppSail(targDetails) {
         return Promise.all(_details);
     });
 }
-exports.validateAppSail = validateAppSail;

package/lib/archiver.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { ReadStream } from 'fs-extra';
 declare class Archiver {
     name: string;

package/lib/archiver.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) {
@@ -55,13 +65,13 @@ class Archiver {
         this.jszip = (0, jszip_1.loadAsync)(content, { createFolders });
         return this;
     }
-    _writeFolder(folder, to, recursive = false, ignoreLevel = 1) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _writeFolder(folder_1, to_1) {
+        return __awaiter(this, arguments, void 0, function* (folder, to, recursive = false, ignoreLevel = 1) {
             return this._writeAllFile(folder.filter((_relPath, file) => !file.dir), to, recursive, ignoreLevel);
         });
     }
-    _writeAllFile(files, to, recursive = false, ignoreLevel = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _writeAllFile(files_1, to_1) {
+        return __awaiter(this, arguments, void 0, function* (files, to, recursive = false, ignoreLevel = 0) {
             while (files.length > 0) {
                 const limit = files.length < Archiver.maxWriteLimit ? files.length : Archiver.maxWriteLimit;
                 yield Promise.all(files.splice(0, limit).map((file) => __awaiter(this, void 0, void 0, function* () {

package/lib/authentication/constants/auth.js

@@ -22,7 +22,6 @@ class AUTH {
         return AUTH._mobile[dc.m_auth];
     }
 }
-exports.default = AUTH;
 AUTH._web = {
     [dc_type_js_1.default.us.ref]: {
         id: (0, env_js_1.envOverride)('W_CATALYST_CLIENT_ID', '1000.D5IIHDXSPN2MII26AD0V61I6RMVSNM'),
@@ -35,3 +34,4 @@ AUTH._mobile = {
         secret: (0, env_js_1.envOverride)('M_CATALYST_CLIENT_SECRET', 'ee359029dc211b37c797d3584c59953f2bd6aa1adc')
     }
 };
+exports.default = AUTH;

package/lib/authentication/credential.js

@@ -121,8 +121,8 @@ class Credential {
         }
     }
     refreshAccessToken() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             (0, index_1.debug)('> refreshing access token <');
             const res = yield new api_js_1.default({ authNeeded: false })
                 .post('/oauth/v2/token', {
@@ -223,8 +223,8 @@ class Credential {
         Credential.isTempCred = temp;
         return Credential.globalSelf;
     }
-    static getAccessToken(forceRefresh = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static getAccessToken() {
+        return __awaiter(this, arguments, void 0, function* (forceRefresh = false) {
             if (Credential.globalSelf === null) {
                 if (Credential.oneTimeToken === null) {
                     throw new error_js_1.default('Authentication required', {

package/lib/authentication/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) {
@@ -35,7 +45,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logout = exports.login = exports.revoke = exports.list = exports.create = void 0;
+exports.create = create;
+exports.list = list;
+exports.revoke = revoke;
+exports.login = login;
+exports.logout = logout;
 const ansi_colors_1 = __importStar(require("ansi-colors"));
 const moment_1 = __importDefault(require("moment"));
 const config_store_js_1 = __importDefault(require("../util_modules/config-store.js"));
@@ -50,6 +64,7 @@ const option_js_1 = require("../util_modules/option.js");
 const login_js_1 = __importDefault(require("./login.js"));
 const revoke_js_1 = __importDefault(require("./revoke.js"));
 const runtime_store_js_1 = __importDefault(require("../runtime-store.js"));
+const env_js_1 = require("../util_modules/env.js");
 function create() {
     return __awaiter(this, void 0, void 0, function* () {
         if ((0, option_js_1.getOptionValue)('current', false)) {
@@ -60,14 +75,14 @@ function create() {
         return result.token.token;
     });
 }
-exports.create = create;
 function list() {
     const tokens = config_store_js_1.default.get(`${(0, dc_js_1.getActiveDC)()}.tokens`, null);
     if (tokens === null || Object.keys(tokens).length === 0) {
         throw new error_js_1.default('No tokens found', {
             exit: 0,
             errorId: 'IDX-1',
-            arg: [(0, ansi_colors_1.bold)('catalyst token:generate')]
+            arg: [(0, ansi_colors_1.bold)('catalyst token:generate')],
+            skipHelp: env_js_1.isExtension
         });
     }
     const tableData = [];
@@ -84,7 +99,6 @@ function list() {
     });
     return tableData;
 }
-exports.list = list;
 function revoke(id) {
     return __awaiter(this, void 0, void 0, function* () {
         const tokens = config_store_js_1.default.get(`${(0, dc_js_1.getActiveDC)()}.tokens`, {});
@@ -105,7 +119,6 @@ function revoke(id) {
         return new revoke_js_1.default(credential, 'tokens.' + id).init();
     });
 }
-exports.revoke = revoke;
 function login() {
     return __awaiter(this, void 0, void 0, function* () {
         let activeDC = (0, dc_js_1.getActiveDC)();
@@ -146,7 +159,6 @@ function login() {
         (0, index_1.success)('Success! Logged in as : ' + ansi_colors_1.default.cyan.bold(result.user.Email));
     });
 }
-exports.login = login;
 function logout() {
     return __awaiter(this, void 0, void 0, function* () {
         const activeDC = (0, dc_js_1.getActiveDC)();
@@ -173,4 +185,3 @@ function logout() {
         (0, index_1.success)('SuccessFully Logged out, we hope to see you soon. (＾-＾)ノ');
     });
 }
-exports.logout = logout;

package/lib/authentication/login.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import SCOPE from './constants/scopes.js';
 import EventEmitter from 'events';

package/lib/authentication/login.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) {
@@ -60,6 +70,7 @@ const option_js_1 = require("../util_modules/option.js");
 const events_1 = __importDefault(require("events"));
 const index_js_4 = __importDefault(require("../error/index.js"));
 const crypto_1 = require("crypto");
+const env_js_1 = require("../util_modules/env.js");
 exports.missingScopes = {
     [index_js_3.DC_TYPE.in.value]: getScopes(['dataverse']),
     [index_js_3.DC_TYPE.eu.value]: getScopes(['dataverse']),
@@ -184,14 +195,16 @@ class Login {
                     if ((0, option_js_1.getCurrentCommand)() === 'login') {
                         throw new error_js_1.default('Unable to get refresh_token from code', {
                             exit: 0,
-                            errorId: 'LOGIN-1'
+                            errorId: 'LOGIN-1',
+                            skipHelp: env_js_1.isExtension
                         });
                     }
                     else {
                         throw new error_js_1.default('Unable to get refresh_token from code', {
                             exit: 1,
                             errorId: 'LOGIN-2',
-                            arg: [(0, ansi_colors_1.bold)('catalyst token:generate')]
+                            arg: [(0, ansi_colors_1.bold)('catalyst token:generate')],
+                            skipHelp: env_js_1.isExtension
                         });
                     }
                 }
@@ -428,5 +441,5 @@ class Login {
         return scopes_js_1.default;
     }
 }
-exports.default = Login;
 Login.loginEvents = new events_1.default();
+exports.default = Login;

package/lib/bin/catalyst.js

@@ -16,13 +16,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/client-utils.d.ts

@@ -1,11 +1,11 @@
 import { ReadStream } from 'fs-extra';
 export declare const clientUtils: {
     validate: ({ source, skipPluginValidation }?: {
-        source?: string | undefined;
-        skipPluginValidation?: boolean | undefined;
+        source?: string;
+        skipPluginValidation?: boolean;
     }) => Promise<Record<string, unknown>>;
     executeHook: ({ prefix, command }: {
-        prefix: 'pre' | 'post';
+        prefix: "pre" | "post";
         command: string;
     }) => Promise<void>;
     pack: () => Promise<{

package/lib/client-utils.js

@@ -28,7 +28,7 @@ const index_1 = require("./util_modules/logger/index");
 const option_1 = require("./util_modules/option");
 const stream_1 = require("stream");
 exports.clientUtils = {
-    validate: ({ source, skipPluginValidation = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    validate: (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ source, skipPluginValidation = false } = {}) {
         if (source === null || source === void 0 ? void 0 : source.includes(path_1.sep)) {
             throw new index_js_1.default(`Invalid source: "${source}" should not contain a path.`, {
                 exit: 1
@@ -125,7 +125,7 @@ exports.clientUtils = {
         runtime_store_1.default.set('context.client.valid', true);
         return packageJson;
     }),
-    executeHook: ({ prefix, command }) => __awaiter(void 0, void 0, void 0, function* () {
+    executeHook: (_a) => __awaiter(void 0, [_a], void 0, function* ({ prefix, command }) {
         if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
             (0, index_1.debug)(`skipping ${prefix + command} hook`);
             return;

package/lib/client.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) {
@@ -106,8 +116,8 @@ class Client {
         });
         return optionsArr;
     }
-    exec(command, projectRoot, cwd, { args = [], options = {}, inputs } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    exec(command_1, projectRoot_1, cwd_1) {
+        return __awaiter(this, arguments, void 0, function* (command, projectRoot, cwd, { args = [], options = {}, inputs } = {}) {
             runtime_store_1.default.set('context', {});
             utils_js_1.runtime.set('context', {});
             runtime_store_1.default.set('cwd', cwd);

package/lib/code-deck.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export type CodeDeckDetails = {
     category: string;
     title: string;

package/lib/code-deck.js

@@ -12,7 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeDeckToken = exports.getDeckFromGit = exports.getTemplateFile = exports.listenDeploy = void 0;
+exports.CodeDeckToken = void 0;
+exports.listenDeploy = listenDeploy;
+exports.getTemplateFile = getTemplateFile;
+exports.getDeckFromGit = getDeckFromGit;
 const archiver_1 = __importDefault(require("./archiver"));
 const endpoints_1 = require("./endpoints");
 const error_1 = __importDefault(require("./error"));
@@ -46,7 +49,6 @@ function listenDeploy(id, gitUrl) {
         }
     });
 }
-exports.listenDeploy = listenDeploy;
 function getTemplateFile(deckZip) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -59,7 +61,6 @@ function getTemplateFile(deckZip) {
         }
     });
 }
-exports.getTemplateFile = getTemplateFile;
 function getDeckFromGit() {
     return __awaiter(this, void 0, void 0, function* () {
         const deckAPI = yield (0, endpoints_1.codeDeck)();
@@ -99,7 +100,6 @@ function getDeckFromGit() {
         return deck.code;
     });
 }
-exports.getDeckFromGit = getDeckFromGit;
 class CodeDeckToken {
     static createToken(importId, gitUrl) {
         const tokenObj = [importId, gitUrl];

package/lib/command_needs/config.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = __importDefault(require("../internal/config"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
-exports.default = ({ optional = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ optional = false } = {}) {
     const userConfig = yield config_1.default.load(optional);
     runtime_store_1.default.set('config', userConfig);
 });

package/lib/command_needs/rc.js

@@ -28,7 +28,7 @@ const config_store_1 = __importDefault(require("../util_modules/config-store"));
 const dc_1 = require("../util_modules/dc");
 const env_1 = require("../util_modules/env");
 const features_1 = require("../init/features");
-exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck = true, skipProjectCheck = true, generateRc = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ optional = false, resolveOnNotFound = false, skipOrgCheck = true, skipProjectCheck = true, generateRc = false } = {}) {
     const globOrgOpt = (0, option_1.getGlobalOptionValue)('org', null);
     const orgOpt = globOrgOpt
         ? globOrgOpt
@@ -248,7 +248,10 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
                         errorId: 'RC-5',
                         arg: [
                             (0, ansi_colors_1.bold)(`${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.name}(${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id})`),
-                            (0, ansi_colors_1.bold)((0, ansi_colors_1.cyan)('command: ') + 'catalyst init --force')
+                            (0, ansi_colors_1.bold)((0, ansi_colors_1.cyan)('command: ') +
+                                (env_1.isExtension
+                                    ? 'zcatalyst.init.init'
+                                    : 'catalyst init --force'))
                         ]
                     });
                 }