@squiz/dxp-cli-next 5.1.0 → 5.2.0

package/lib/__tests__/integration/main.spec.js

@@ -19,7 +19,6 @@ describe('dxp', () => {
             .match(/Commands\:(.*)/is)) === null || _a === void 0 ? void 0 : _a[1].split('\n').map(a => a.trim()).filter(a => !!a);
         expect(commandsText).toEqual([
             'auth           Authenticate into the DXP CLI',
-            'td             Template deployment commands',
             'cmp            Component Service Commands',
         ]);
     });

package/lib/cmp/deploy.js

@@ -42,6 +42,7 @@ const deployCommand = new commander_1.Command()
         return yield (0, component_cli_lib_1.uploadComponentFolder)(apiService.client, componentServiceUrl, source);
     }
     catch (error) {
+        // console.error(error);
         if (error instanceof ApiService_1.InvalidLoginSessionError) {
             deployCommand.error(cli_color_1.default.red('Login session expired. Please login again.'));
         }

package/lib/dxp.js

@@ -12,7 +12,7 @@ validateNodeVersion();
     isGlobal: true,
 });
 const auth_1 = __importDefault(require("./auth"));
-const td_1 = __importDefault(require("./td"));
+// import tdCommand from './td';
 const cmp_1 = __importDefault(require("./cmp"));
 const program = new commander_1.default.Command();
 const packageJson = require('../package.json');
@@ -22,9 +22,9 @@ program
     .version(version)
     .description('dxp commands')
     .addCommand(auth_1.default);
-if (process.env.FEATURE_TD_ACTIVE === 'true') {
-    program.addCommand(td_1.default);
-}
+// if (process.env.FEATURE_TD_ACTIVE === 'true') {
+//   program.addCommand(tdCommand);
+// }
 program
     .addCommand(cmp_1.default)
     .action(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -40,7 +40,6 @@
   ],
   "dependencies": {
     "@squiz/component-cli-lib": "1.3.3",
-    "@squiz/deployment-service-lib": "1.1.5-alpha.85",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",

package/lib/td/deploy.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const deployCommand: Command;
-export default deployCommand;

package/lib/td/deploy.js

@@ -1,49 +0,0 @@
-"use strict";
-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 });
-const commander_1 = require("commander");
-const deployment_service_lib_1 = require("@squiz/deployment-service-lib");
-const cli_color_1 = __importDefault(require("cli-color"));
-const deployCommand = new commander_1.Command()
-    .name('deploy')
-    .argument('<source>', 'folder/file path containing the template files to deploy')
-    .argument('<destination>', 'asset id to deploy too')
-    .addOption(new commander_1.Option('-api, --matrix-api-url <string>', 'Required: Matrix asset management api url')
-    .env('MATRIX_ASSET_API_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-key, --matrix-api-key <string>', 'Required: Matrix asset management api key')
-    .env('MATRIX_ASSET_API_KEY')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-deploy, --template-deployment-url <string>', 'Required: Url for the template deployment api')
-    .env('DEPLOYMENT_INFO_API_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-f, --force', 'Optional: Do a force deployment. This will attempt to bypass whatever validation it can').default(false, 'default is false'))
-    .addOption(new commander_1.Option('--no-watch', 'Optional: disabling polling for a result. The deployment ID will be returned and return.').default(true))
-    .addOption(new commander_1.Option('--dry-run', 'Optional: Perform validation on the local template and do not upload package').default(false))
-    .addOption(new commander_1.Option('--ignore-sort-order', 'Optional: Ignore the asset link sort order validation check').default(false, 'default is false'))
-    .action((source, destination, options, self) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        return yield (0, deployment_service_lib_1.CliUpload)(options.matrixApiUrl, options.matrixApiKey, options.templateDeploymentUrl, source, destination, options.watch, options.force, options.dryRun, options.ignoreSortOrder);
-    }
-    catch (error) {
-        if (error.message) {
-            deployCommand.error(cli_color_1.default.red(error.message));
-        }
-        else {
-            console.error(error);
-            deployCommand.error('An unknown error occurred');
-        }
-    }
-}));
-exports.default = deployCommand;

package/lib/td/download.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const downCommand: Command;
-export default downCommand;

package/lib/td/download.js

@@ -1,46 +0,0 @@
-"use strict";
-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 });
-const commander_1 = require("commander");
-const cli_color_1 = __importDefault(require("cli-color"));
-const deployment_service_lib_1 = require("@squiz/deployment-service-lib");
-const downCommand = new commander_1.Command()
-    .name('download')
-    .argument('<destination>', 'folder to download the exported package to')
-    .argument('<root-asset-id>', 'root node asset ID to export')
-    .addOption(new commander_1.Option('-api, --matrix-api-url <string>', 'Required: Matrix asset management api url')
-    .env('MATRIX_ASSET_API_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-key, --matrix-api-key <string>', 'Required: Matrix asset management api key')
-    .env('MATRIX_ASSET_API_KEY')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-url, --template-deployment-url <string>', 'Required: Url for the template deployment api')
-    .env('DEPLOYMENT_INFO_API_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-f, --force', 'Optional: Do a force download. This will attempt to bypass whatever validation it can').default(false, 'default is false'))
-    .action((source, destination, options, self) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        return yield (0, deployment_service_lib_1.cliDownload)(options.matrixApiUrl, options.matrixApiKey, options.templateDeploymentUrl, source, destination, options.force);
-    }
-    catch (error) {
-        if (error.message) {
-            downCommand.error(cli_color_1.default.red(error.message));
-        }
-        else {
-            console.error(error);
-            downCommand.error('An unknown error occurred');
-        }
-    }
-}));
-exports.default = downCommand;

package/lib/td/index.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const tdCommand: Command;
-export default tdCommand;

package/lib/td/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const deploy_1 = __importDefault(require("./deploy"));
-const download_1 = __importDefault(require("./download"));
-const setExternalIds_1 = __importDefault(require("./setExternalIds"));
-const validate_1 = __importDefault(require("./validate"));
-const tdCommand = new commander_1.Command('td');
-tdCommand
-    .description('Template deployment commands')
-    .addCommand(deploy_1.default)
-    .addCommand(download_1.default)
-    .addCommand(setExternalIds_1.default)
-    .addCommand(validate_1.default);
-exports.default = tdCommand;

package/lib/td/setExternalIds.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const setExternalIdsCommand: Command;
-export default setExternalIdsCommand;

package/lib/td/setExternalIds.js

@@ -1,42 +0,0 @@
-"use strict";
-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 });
-const commander_1 = require("commander");
-const deployment_service_lib_1 = require("@squiz/deployment-service-lib");
-const cli_color_1 = __importDefault(require("cli-color"));
-const setExternalIdsCommand = new commander_1.Command()
-    .name('set-external-ids')
-    .argument('<root-asset-id>', 'root asset ID to set external ids for')
-    .addOption(new commander_1.Option('-f, --force', 'Optional: Do a force reset. This will reset all the external ids for the given root asset id').default(false, 'default is false'))
-    .addOption(new commander_1.Option('-api, --matrix-api-url <string>', 'Required: Matrix asset management api url')
-    .env('MATRIX_ASSET_API_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-key, --matrix-api-key <string>', 'Required: Matrix asset management api key')
-    .env('MATRIX_ASSET_API_KEY')
-    .makeOptionMandatory(true))
-    .action((rootAssetId, options, self) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        return (0, deployment_service_lib_1.cliSetExternalIds)(options.matrixApiUrl, options.matrixApiKey, rootAssetId, options.force);
-    }
-    catch (error) {
-        if (error.message) {
-            setExternalIdsCommand.error(cli_color_1.default.red(error.message));
-        }
-        else {
-            console.error(error);
-            setExternalIdsCommand.error('An unknown error occurred');
-        }
-    }
-}));
-exports.default = setExternalIdsCommand;

package/lib/td/validate.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const validateCommand: Command;
-export default validateCommand;

package/lib/td/validate.js

@@ -1,35 +0,0 @@
-"use strict";
-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 });
-const commander_1 = require("commander");
-const deployment_service_lib_1 = require("@squiz/deployment-service-lib");
-const cli_color_1 = __importDefault(require("cli-color"));
-const validateCommand = new commander_1.Command()
-    .name('validate')
-    .argument('<source>', 'folder/file path containing the files to validate')
-    .action((source) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        return yield (0, deployment_service_lib_1.cliValidate)(source);
-    }
-    catch (error) {
-        if (error.message) {
-            validateCommand.error(cli_color_1.default.red(error.message));
-        }
-        else {
-            console.error(error);
-            validateCommand.error('An unknown error occurred');
-        }
-    }
-}));
-exports.default = validateCommand;