@tywalk/pcf-helper 1.4.21 → 1.4.22

package/dist/bin/build.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const task = __importStar(require("../tasks/build-pcf"));
 const package_json_1 = require("../package.json");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
+const argumentUtil_1 = require("../util/argumentUtil");
 const [, , ...args] = process.argv;
 const commandArgument = (_b = (_a = args.at(0)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
 if (['-v', '--version'].includes(commandArgument)) {
@@ -52,13 +53,7 @@ if (typeof verboseArgument !== 'undefined') {
     color_logger_1.default.setDebug(true);
 }
 color_logger_1.default.log('PCF Helper version', package_json_1.version);
-const pathArgument = args.find(a => ['-p', '--path'].includes(a));
-if (typeof pathArgument === 'undefined') {
-    color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
-    process.exit(1);
-}
-const pathIndex = args.indexOf(pathArgument) + 1;
-const path = args.at(pathIndex);
+const path = (0, argumentUtil_1.getArgValue)(args, ['-p', '--path']);
 if (typeof path === 'undefined') {
     color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
     process.exit(1);

package/dist/bin/deploy.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d;
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 const upgradeTask = __importStar(require("../tasks/upgrade-pcf"));
 const buildTask = __importStar(require("../tasks/build-pcf"));
@@ -44,6 +44,7 @@ const importTask = __importStar(require("../tasks/import-pcf"));
 const performanceUtil_1 = require("../util/performanceUtil");
 const package_json_1 = require("../package.json");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
+const argumentUtil_1 = require("../util/argumentUtil");
 const [, , ...args] = process.argv;
 const commandArgument = (_b = (_a = args.at(0)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
 if (['-v', '--version'].includes(commandArgument)) {
@@ -67,12 +68,7 @@ if (typeof path === 'undefined') {
     process.exit(1);
 }
 const tick = performance.now();
-const envArgument = (_c = args.find(a => ['-env', '--environment'].includes(a))) !== null && _c !== void 0 ? _c : '';
-let envIndex = args.indexOf(envArgument) + 1;
-let env = '';
-if (envIndex > 0) {
-    env = (_d = args.at(envIndex)) !== null && _d !== void 0 ? _d : '';
-}
+const env = (_c = (0, argumentUtil_1.getArgValue)(args, ['-env', '--environment'])) !== null && _c !== void 0 ? _c : '';
 function executeTasks() {
     const upgradeResult = upgradeTask.runUpgrade(path, typeof verboseArgument !== 'undefined');
     if (upgradeResult === 1)

package/dist/bin/import.js

@@ -36,11 +36,12 @@ var __importStar = (this && this.__importStar) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d;
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 const task = __importStar(require("../tasks/import-pcf"));
 const package_json_1 = require("../package.json");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
+const argumentUtil_1 = require("../util/argumentUtil");
 const [, , ...args] = process.argv;
 const commandArgument = (_b = (_a = args.at(0)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
 if (['-v', '--version'].includes(commandArgument)) {
@@ -52,21 +53,10 @@ if (typeof verboseArgument !== 'undefined') {
     color_logger_1.default.setDebug(true);
 }
 color_logger_1.default.log('PCF Helper version', package_json_1.version);
-const pathArgument = args.find(a => ['-p', '--path'].includes(a));
-if (typeof pathArgument === 'undefined') {
-    color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
-    process.exit(1);
-}
-const pathIndex = args.indexOf(pathArgument) + 1;
-const path = args.at(pathIndex);
+const path = (0, argumentUtil_1.getArgValue)(args, ['-p', '--path']);
 if (typeof path === 'undefined') {
     color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
     process.exit(1);
 }
-const envArgument = (_c = args.find(a => ['-env', '--environment'].includes(a))) !== null && _c !== void 0 ? _c : '';
-let envIndex = args.indexOf(envArgument) + 1;
-let env = '';
-if (envIndex > 0) {
-    env = (_d = args.at(envIndex)) !== null && _d !== void 0 ? _d : '';
-}
+const env = (_c = (0, argumentUtil_1.getArgValue)(args, ['-env', '--environment'])) !== null && _c !== void 0 ? _c : '';
 task.runImport(path, env);

package/dist/bin/init.js

@@ -36,11 +36,12 @@ var __importStar = (this && this.__importStar) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f;
+var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 const task = __importStar(require("../tasks/init-pcf"));
 const package_json_1 = require("../package.json");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
+const argumentUtil_1 = require("../util/argumentUtil");
 const [, , ...args] = process.argv;
 const commandArgument = (_b = (_a = args.at(0)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
 if (['-v', '--version'].includes(commandArgument)) {
@@ -52,39 +53,13 @@ if (typeof verboseArgument !== 'undefined') {
     color_logger_1.default.setDebug(true);
 }
 color_logger_1.default.log('PCF Helper version', package_json_1.version);
-const nameArgument = args.find(a => ['-n', '--name'].includes(a));
-if (typeof nameArgument === 'undefined') {
-    color_logger_1.default.error('Name argument is required. Use --name to specify the name of the control.');
-    process.exit(1);
-}
-const nameIndex = args.indexOf(nameArgument) + 1;
-const name = args.at(nameIndex);
+const name = (0, argumentUtil_1.getArgValue)(args, ['-n', '--name']);
 if (typeof name === 'undefined') {
-    color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
+    color_logger_1.default.error('Name argument is required. Use --name to specify the name of the PCF control.');
     process.exit(1);
 }
-let publisherName = '';
-const publisherNameArgument = args.find(a => ['-pn', '--publisher-name'].includes(a));
-if (typeof publisherNameArgument !== 'undefined') {
-    const publisherNameIndex = args.indexOf(publisherNameArgument) + 1;
-    publisherName = (_c = args.at(publisherNameIndex)) !== null && _c !== void 0 ? _c : '';
-}
-let publisherPrefix = '';
-const publisherPrefixArgument = args.find(a => ['-pp', '--publisher-prefix'].includes(a));
-if (typeof publisherPrefixArgument !== 'undefined') {
-    const publisherPrefixIndex = args.indexOf(publisherPrefixArgument) + 1;
-    publisherPrefix = (_d = args.at(publisherPrefixIndex)) !== null && _d !== void 0 ? _d : '';
-}
-let path = '';
-const pathArgument = args.find(a => ['-p', '--path'].includes(a));
-if (typeof pathArgument !== 'undefined') {
-    const pathIndex = args.indexOf(pathArgument) + 1;
-    path = (_e = args.at(pathIndex)) !== null && _e !== void 0 ? _e : '';
-}
-let npm = '';
-const npmArgument = args.find(a => ['-npm', '--run-npm-install'].includes(a));
-if (typeof npmArgument !== 'undefined') {
-    const pathIndex = args.indexOf(npmArgument) + 1;
-    npm = (_f = args.at(pathIndex)) !== null && _f !== void 0 ? _f : '';
-}
+const publisherName = (_c = (0, argumentUtil_1.getArgValue)(args, ['-pn', '--publisher-name'])) !== null && _c !== void 0 ? _c : '';
+const publisherPrefix = (_d = (0, argumentUtil_1.getArgValue)(args, ['-pp', '--publisher-prefix'])) !== null && _d !== void 0 ? _d : '';
+const path = (_e = (0, argumentUtil_1.getArgValue)(args, ['-p', '--path'])) !== null && _e !== void 0 ? _e : '';
+const npm = (0, argumentUtil_1.getArgValue)(args, ['-npm', '--run-npm-install'], 'true');
 task.runInit(path, name, publisherName, publisherPrefix, npm === 'true', verboseArgument !== undefined);

package/dist/bin/upgrade.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const task = __importStar(require("../tasks/upgrade-pcf"));
 const package_json_1 = require("../package.json");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
+const argumentUtil_1 = require("../util/argumentUtil");
 const [, , ...args] = process.argv;
 const commandArgument = (_b = (_a = args.at(0)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
 if (['-v', '--version'].includes(commandArgument)) {
@@ -52,13 +53,7 @@ if (typeof verboseArgument !== 'undefined') {
     color_logger_1.default.setDebug(true);
 }
 color_logger_1.default.log('PCF Helper version', package_json_1.version);
-const pathArgument = args.find(a => ['-p', '--path'].includes(a));
-if (typeof pathArgument === 'undefined') {
-    color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
-    process.exit(1);
-}
-const pathIndex = args.indexOf(pathArgument) + 1;
-const path = args.at(pathIndex);
+const path = (0, argumentUtil_1.getArgValue)(args, ['-p', '--path']);
 if (typeof path === 'undefined') {
     color_logger_1.default.error('Path argument is required. Use --path to specify the path to solution folder.');
     process.exit(1);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tywalk/pcf-helper",
-    "version": "1.4.21",
+    "version": "1.4.22",
     "description": "Command line helper for building and publishing PCF controls to Dataverse.",
     "main": "dist/index.js",
     "types": "./types/",

package/dist/tasks/init-pcf.js

@@ -37,6 +37,7 @@ function runInit(path, name, publisherName, publisherPrefix, npm, verbose) {
     }
     let pathFiles = fs_1.default.readdirSync(path);
     let atRoot = pathFiles.some(file => (0, path_1.extname)(file).toLowerCase() === '.pcfproj');
+    name += 'PCF'; // Prevent cdsproj from conflicting with pcfproj
     const cdsPath = atRoot ? (0, path_1.join)(path, 'Solutions', name) : (0, path_1.join)(path, name);
     color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Initializing solution...\n');
     const solutionTask = (0, child_process_1.spawnSync)('pac solution init', ['-pn', publisherName, '-pp', publisherPrefix, '-o', cdsPath], {

package/dist/util/argumentUtil.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getArg = getArg;
+exports.getArgValue = getArgValue;
+function getArg(args, arg) {
+    const index = args.indexOf(arg);
+    if (index !== -1 && index + 1 < args.length) {
+        return args[index + 1];
+    }
+    return undefined;
+}
+function getArgValue(args, argOpts, defaultIfExists) {
+    var _a;
+    const arg = args.find(a => argOpts.includes(a));
+    if (typeof arg === 'undefined') {
+        return undefined;
+    }
+    const argIndex = args.indexOf(arg) + 1;
+    return (_a = args.at(argIndex)) !== null && _a !== void 0 ? _a : defaultIfExists;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tywalk/pcf-helper",
-  "version": "1.4.21",
+  "version": "1.4.22",
   "description": "Command line helper for building and publishing PCF controls to Dataverse.",
   "main": "dist/index.js",
   "types": "./types/",

package/types/util/argumentUtil.d.ts

@@ -0,0 +1,2 @@
+export declare function getArg(args: string[], arg: string): string | undefined;
+export declare function getArgValue(args: string[], argOpts: string[], defaultIfExists?: any): string | undefined;