@tywalk/pcf-helper 1.4.20 → 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/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.runInit(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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tywalk/pcf-helper",
-    "version": "1.4.20",
+    "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/init-pcf.js

@@ -22,27 +22,39 @@ function pcfExistsInParent(path) {
     }
     throw new Error('PCF project not found.');
 }
-function runInit(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tywalk/pcf-helper",
-  "version": "1.4.20",
+  "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/init-pcf.d.ts

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