@tywalk/pcf-helper 1.4.18 → 1.4.21

package/dist/__tests__/pcf-helper-init.test.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const package_json_1 = require("../package.json");
+test('init displays version', (done) => {
+    const task = (0, child_process_1.spawn)('node', ['./dist/bin/init.js', '-v']);
+    let output = '';
+    task.stdout.on('data', (data) => {
+        output += data.toString();
+    });
+    task.on('close', (code) => {
+        console.log(output);
+        expect(output).toContain(package_json_1.version);
+        expect(code).toBe(0);
+        done();
+    });
+});
+test('init errors if no path is provided', (done) => {
+    const task = (0, child_process_1.spawn)('node', ['./dist/bin/init.js', '-p']);
+    let output = '';
+    task.stdout.on('data', (data) => {
+        output += data.toString();
+    });
+    task.stderr.on('data', (data) => {
+        console.error(`stderr: ${data}`);
+    });
+    task.on('close', (code) => {
+        console.log(output);
+        expect(code).toBe(1);
+        done();
+    });
+});
+// test('init creates pcf', () => {
+//   logger.setDebug(true);
+//   const result = runInit('./tests', 'test', 'testpb', 'tb', false, true);
+//   expect(result).toBe(0);
+// });

package/dist/bin/build.js

@@ -63,4 +63,4 @@ 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);
 }
-task.run(path, verboseArgument !== undefined);
+task.runBuild(path, verboseArgument !== undefined);

package/dist/bin/deploy.js

@@ -74,13 +74,13 @@ if (envIndex > 0) {
     env = (_d = args.at(envIndex)) !== null && _d !== void 0 ? _d : '';
 }
 function executeTasks() {
-    const upgradeResult = upgradeTask.run(path, typeof verboseArgument !== 'undefined');
+    const upgradeResult = upgradeTask.runUpgrade(path, typeof verboseArgument !== 'undefined');
     if (upgradeResult === 1)
         return 1;
-    const buildResult = buildTask.run(path, typeof verboseArgument !== 'undefined');
+    const buildResult = buildTask.runBuild(path, typeof verboseArgument !== 'undefined');
     if (buildResult === 1)
         return 1;
-    const importResult = importTask.run(path, env, typeof verboseArgument !== 'undefined');
+    const importResult = importTask.runImport(path, env, typeof verboseArgument !== 'undefined');
     if (importResult === 1)
         return 1;
     return 0;

package/dist/bin/import.js

@@ -69,4 +69,4 @@ let env = '';
 if (envIndex > 0) {
     env = (_d = args.at(envIndex)) !== null && _d !== void 0 ? _d : '';
 }
-task.run(path, env);
+task.runImport(path, env);

package/dist/bin/init.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, _e;
+var _a, _b, _c, _d, _e, _f;
 Object.defineProperty(exports, "__esModule", { value: true });
 const task = __importStar(require("../tasks/init-pcf"));
 const package_json_1 = require("../package.json");
@@ -81,4 +81,10 @@ if (typeof pathArgument !== 'undefined') {
     const pathIndex = args.indexOf(pathArgument) + 1;
     path = (_e = args.at(pathIndex)) !== null && _e !== void 0 ? _e : '';
 }
-task.run(path, name, publisherName, publisherPrefix, verboseArgument !== undefined);
+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 : '';
+}
+task.runInit(path, name, publisherName, publisherPrefix, npm === 'true', verboseArgument !== undefined);

package/dist/bin/upgrade.js

@@ -63,4 +63,4 @@ 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);
 }
-task.run(path, verboseArgument !== undefined);
+task.runUpgrade(path, verboseArgument !== undefined);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tywalk/pcf-helper",
-    "version": "1.4.18",
+    "version": "1.4.21",
     "description": "Command line helper for building and publishing PCF controls to Dataverse.",
     "main": "dist/index.js",
     "types": "./types/",
@@ -15,7 +15,7 @@
         "test": "jest",
         "build": "tsc",
         "upgrade": "npm version patch --no-git-tag-version",
-        "ready": "npm run upgrade && npm run build"
+        "ready": "npm run upgrade"
     },
     "keywords": [
         "pcf"

package/dist/tasks/build-pcf.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
+exports.runBuild = runBuild;
 const child_process_1 = require("child_process");
 const performanceUtil_1 = require("../util/performanceUtil");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
@@ -15,7 +15,7 @@ const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
  *
  * @returns {number} The exit code of the spawned process.
  */
-function run(path, verbose) {
+function runBuild(path, verbose) {
     color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Starting build...\n');
     const tick = performance.now();
     const task = (0, child_process_1.spawnSync)('dotnet build', ['--restore', '-c', 'Release', path], {

package/dist/tasks/import-pcf.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
+exports.runImport = runImport;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const fs_1 = __importDefault(require("fs"));
@@ -18,7 +18,7 @@ const performanceUtil_1 = require("../util/performanceUtil");
  *
  * @returns {number} The exit status of the import process.
  */
-function run(path, env, verbose) {
+function runImport(path, env, verbose) {
     var _a;
     color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Starting import...\n');
     const tick = performance.now();

package/dist/tasks/index.js

@@ -14,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("."), exports);
+__exportStar(require("./build-pcf"), exports);
+__exportStar(require("./import-pcf"), exports);
+__exportStar(require("./init-pcf"), exports);
+__exportStar(require("./upgrade-pcf"), exports);

package/dist/tasks/init-pcf.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
+exports.runInit = runInit;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const fs_1 = __importDefault(require("fs"));
@@ -22,27 +22,39 @@ function pcfExistsInParent(path) {
     }
     throw new Error('PCF project not found.');
 }
-function run(path, name, publisherName, publisherPrefix, verbose) {
+function runInit(path, name, publisherName, publisherPrefix, npm, verbose) {
     color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Starting init...\n');
     const tick = performance.now();
     path = path !== null && path !== void 0 ? path : process.cwd();
+    const initTask = (0, child_process_1.spawnSync)('pac pcf init', ['-ns', publisherPrefix, '-n', name, '-t', 'field', '-fw', 'react', '-o', path, '-npm', npm ? 'true' : 'false'], {
+        cwd: process.cwd(),
+        stdio: 'inherit',
+        shell: true,
+        timeout: 1000 * 60 * 5, // 5 minutes
+    });
+    if (initTask.status !== 0) {
+        return (0, performanceUtil_1.handleTaskCompletion)(initTask, 'init', performance.now() - tick, verbose);
+    }
     let pathFiles = fs_1.default.readdirSync(path);
     let atRoot = pathFiles.some(file => (0, path_1.extname)(file).toLowerCase() === '.pcfproj');
     const cdsPath = atRoot ? (0, path_1.join)(path, 'Solutions', name) : (0, path_1.join)(path, name);
-    const initTask = (0, child_process_1.spawnSync)('pac solution init', ['-pn', publisherName, '-pp', publisherPrefix, '-o', cdsPath], {
+    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], {
         cwd: process.cwd(),
         stdio: 'inherit',
         shell: true,
         timeout: 1000 * 60 * 5, // 5 minutes
     });
-    if (initTask.status !== 0) {
-        return (0, performanceUtil_1.handleTaskCompletion)(initTask, 'init', performance.now() - tick, verbose);
+    if (solutionTask.status !== 0) {
+        return (0, performanceUtil_1.handleTaskCompletion)(solutionTask, 'init', performance.now() - tick, verbose);
     }
     if (!atRoot) {
         path = pcfExistsInParent(path);
     }
-    const packageTask = (0, child_process_1.spawnSync)('pac solution add-reference', ['-p', path], {
-        cwd: process.cwd(),
+    const pcfProjPath = fs_1.default.realpathSync(path);
+    color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Adding solution reference...', pcfProjPath);
+    const packageTask = (0, child_process_1.spawnSync)('pac solution add-reference', ['-p', pcfProjPath], {
+        cwd: cdsPath,
         stdio: 'inherit',
         shell: true,
         timeout: 1000 * 60 * 5, // 5 minutes

package/dist/tasks/upgrade-pcf.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
+exports.runUpgrade = runUpgrade;
 const child_process_1 = require("child_process");
 const performanceUtil_1 = require("../util/performanceUtil");
 const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
@@ -15,7 +15,7 @@ const color_logger_1 = __importDefault(require("@tywalk/color-logger"));
  *
  * @returns {number} The exit code of the spawned process.
  */
-function run(path, verbose) {
+function runUpgrade(path, verbose) {
     color_logger_1.default.log('[PCF Helper] ' + (0, performanceUtil_1.formatTime)(new Date()) + ' Starting upgrade...\n');
     const tick = performance.now();
     const task = (0, child_process_1.spawnSync)(`pac solution version -s Solution -sp ${path} && pac pcf version -s Manifest && npm version patch --no-git-tag-version`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tywalk/pcf-helper",
-  "version": "1.4.18",
+  "version": "1.4.21",
   "description": "Command line helper for building and publishing PCF controls to Dataverse.",
   "main": "dist/index.js",
   "types": "./types/",
@@ -15,7 +15,7 @@
     "test": "jest",
     "build": "tsc",
     "upgrade": "npm version patch --no-git-tag-version",
-    "ready": "npm run upgrade && npm run build"
+    "ready": "npm run upgrade"
   },
   "keywords": [
     "pcf"

package/types/__tests__/pcf-helper-init.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/tasks/build-pcf.d.ts

@@ -6,5 +6,5 @@
  *
  * @returns {number} The exit code of the spawned process.
  */
-declare function run(path: string, verbose: boolean): number;
-export { run };
+declare function runBuild(path: string, verbose: boolean): number;
+export { runBuild };

package/types/tasks/import-pcf.d.ts

@@ -7,5 +7,5 @@
  *
  * @returns {number} The exit status of the import process.
  */
-declare function run(path: string, env: string, verbose?: boolean): number;
-export { run };
+declare function runImport(path: string, env: string, verbose?: boolean): number;
+export { runImport };

package/types/tasks/index.d.ts

@@ -1 +1,4 @@
-export * from '.';
+export * from './build-pcf';
+export * from './import-pcf';
+export * from './init-pcf';
+export * from './upgrade-pcf';

package/types/tasks/init-pcf.d.ts

@@ -1,2 +1,2 @@
-declare function run(path: string, name: string, publisherName: string, publisherPrefix: string, verbose: boolean): number;
-export { run };
+declare function runInit(path: string, name: string, publisherName: string, publisherPrefix: string, npm: boolean, verbose: boolean): number;
+export { runInit };

package/types/tasks/upgrade-pcf.d.ts

@@ -6,5 +6,5 @@
  *
  * @returns {number} The exit code of the spawned process.
  */
-declare function run(path: string, verbose?: boolean): number;
-export { run };
+declare function runUpgrade(path: string, verbose?: boolean): number;
+export { runUpgrade };