create-powerapps-project 0.14.2 → 0.14.6

package/README.md

@@ -1,36 +1,36 @@
-# create-powerapps-project
-| NPM |
-| --- |
-| [![npm](https://img.shields.io/npm/v/create-powerapps-project.svg?style=flat-square)](https://www.npmjs.com/package/create-powerapps-project) |
-
-Project generator for Dataverse development
-
-# Generators
-
-* Web resource project scaffolding
-  * [Typescript](https://www.typescriptlang.org/index.html) for JavaScript files
-  * [Webpack](https://webpack.js.org/) for bundling
-  * [Babel](https://babeljs.io/) for polyfills and compiling ES2015+  
-  * Unit tests using [xrm-mock](https://github.com/camelCaseDave/xrm-mock) and [Jest](https://jestjs.io/)
-  * Deploy web resources
-* Plugin project scaffolding
-  * Base plugin classes
-  * No ILMerge needed
-  * Deploy plugin assemblies and types
-  * Deploy plugin steps
-* Workflow project scaffolding
-  * Workflow activity base class
-  * No ILMerge needed
-  * Deploy workflow assemblies and types
-
-# Create project
-
-```sh
-npm init powerapps-project
-```
-
-# Add files to project
-
-```sh
-npm run gen
+# create-powerapps-project
+| NPM |
+| --- |
+| [![npm](https://img.shields.io/npm/v/create-powerapps-project.svg?style=flat-square)](https://www.npmjs.com/package/create-powerapps-project) |
+
+Project generator for Dataverse development
+
+# Generators
+
+* Web resource project scaffolding
+  * [Typescript](https://www.typescriptlang.org/index.html) for JavaScript files
+  * [Webpack](https://webpack.js.org/) for bundling
+  * [Babel](https://babeljs.io/) for polyfills and compiling ES2015+  
+  * Unit tests using [xrm-mock](https://github.com/camelCaseDave/xrm-mock) and [Jest](https://jestjs.io/)
+  * Deploy web resources
+* Plugin project scaffolding
+  * Base plugin classes
+  * No ILMerge needed
+  * Deploy plugin assemblies and types
+  * Deploy plugin steps
+* Workflow project scaffolding
+  * Workflow activity base class
+  * No ILMerge needed
+  * Deploy workflow assemblies and types
+
+# Create project
+
+```sh
+npm init powerapps-project
+```
+
+# Add files to project
+
+```sh
+npm run gen
 ```

package/lib/createDataverseProject.js

@@ -1,41 +1,17 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const prompts_1 = __importDefault(require("prompts"));
-const nuget_1 = require("./nuget");
-const path_1 = __importDefault(require("path"));
-const plop_1 = require("./plop");
-const pkg = __importStar(require("./packageManager"));
-const just_scripts_utils_1 = require("just-scripts-utils");
-const getEnvInfo_1 = require("./getEnvInfo");
-async function create(argv) {
-    await getEnvInfo_1.initialize();
-    argv.name = path_1.default.basename(process.cwd());
+import prompts from 'prompts';
+import { getNugetPackageVersions, install } from './nuget';
+import path from 'path';
+import { getGenerator, runGenerator } from './plop';
+import * as pkg from './packageManager';
+import { logger, prettyPrintMarkdown } from 'just-scripts-utils';
+import { initialize } from './getEnvInfo';
+export default async function create(argv) {
+    await initialize();
+    argv.name = path.basename(process.cwd());
     if (!argv.type || (argv.type !== 'webresource' && argv.type !== 'assembly')) {
         const invalid = argv.type !== undefined && argv.type !== 'webresource' && argv.type !== 'assembly';
         const invalidMessage = invalid ? `${argv.type} is not a valid project type.` : '';
-        const { type } = await prompts_1.default({
+        const { type } = await prompts({
             type: 'select',
             name: 'type',
             message: `${invalidMessage} Select dataverse project to create?`,
@@ -47,24 +23,23 @@ async function create(argv) {
         argv.type = type;
     }
     const questions = await getAnswers(argv.type);
-    const config = (await prompts_1.default(questions));
+    const config = (await prompts(questions));
     if (argv.type === 'assembly') {
-        const xrmVersions = await nuget_1.getNugetPackageVersions('JourneyTeam.Xrm');
+        const xrmVersions = await getNugetPackageVersions('JourneyTeam.Xrm');
         config.xrmVersion = xrmVersions.shift();
     }
-    just_scripts_utils_1.logger.info('get plop generator');
-    const generator = plop_1.getGenerator(argv);
-    just_scripts_utils_1.logger.info(`run powerapps-project-${argv.type} code generator`);
-    await plop_1.runGenerator(generator, config);
-    just_scripts_utils_1.logger.info('initialize project');
+    logger.info('get plop generator');
+    const generator = await getGenerator(argv);
+    logger.info(`run powerapps-project-${argv.type} code generator`);
+    await runGenerator(generator, config);
+    logger.info('initialize project');
     pkg.install(process.cwd(), argv.type);
     if (argv.type === 'assembly') {
-        just_scripts_utils_1.logger.info('add nuget packages');
-        nuget_1.install(config.name, config.sdkVersion, config.xrmVersion);
+        logger.info('add nuget packages');
+        install(config.name, config.sdkVersion, config.xrmVersion);
     }
     done(argv);
 }
-exports.default = create;
 async function getAnswers(type) {
     let questions = [];
     if (type === 'webresource') {
@@ -75,7 +50,7 @@ async function getAnswers(type) {
         });
     }
     else {
-        const versions = await nuget_1.getNugetPackageVersions('Microsoft.CrmSdk.Workflow');
+        const versions = await getNugetPackageVersions('Microsoft.CrmSdk.Workflow');
         questions = [
             {
                 type: 'select',
@@ -148,5 +123,5 @@ function done(argv) {
   run code generator with this command:
       ${pkg.getYarn() ? 'yarn' : 'npm run'} gen
   `;
-    just_scripts_utils_1.logger.info(just_scripts_utils_1.prettyPrintMarkdown(message));
+    logger.info(prettyPrintMarkdown(message));
 }

package/lib/getEnvInfo.js

@@ -1,20 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialize = exports.getEnvInfo = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const envinfo_1 = __importDefault(require("envinfo"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+import envinfo from 'envinfo';
+import os from 'os';
+import path from 'path';
 let envInfoCache;
-const getEnvInfo = () => {
+export const getEnvInfo = () => {
     return envInfoCache;
 };
-exports.getEnvInfo = getEnvInfo;
-const initialize = async () => {
-    envInfoCache = JSON.parse(await envinfo_1.default.run({
+export const initialize = async () => {
+    envInfoCache = JSON.parse(await envinfo.run({
         Binaries: ['Yarn', 'npm']
     }, { json: true, showNotFound: false }));
     if (envInfoCache.Binaries.Yarn) {
@@ -25,10 +18,9 @@ const initialize = async () => {
     }
     return envInfoCache;
 };
-exports.initialize = initialize;
 const expandHome = (pathString) => {
-    if (pathString.startsWith('~' + path_1.default.sep)) {
-        return pathString.replace('~', os_1.default.homedir());
+    if (pathString.startsWith('~' + path.sep)) {
+        return pathString.replace('~', os.homedir());
     }
     return pathString;
 };

package/lib/index.js

@@ -1,16 +1,11 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const yargs_1 = require("yargs");
-const createDataverseProject_1 = __importDefault(require("./createDataverseProject"));
+import { command } from 'yargs';
+import create from './createDataverseProject';
 const options = {
     aliases: '*',
     command: 'init',
     builder: yargs => yargs.option('type', { describe: 'Type of project to generate', alias: ['t'] }),
     describe: 'Create new dataverse project',
-    handler: createDataverseProject_1.default
+    handler: create
 };
-yargs_1.command(options).help().argv;
+command(options).help().argv;

package/lib/nuget.js

@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.install = exports.getNugetPackageVersions = void 0;
-const https_1 = __importDefault(require("https"));
-const child_process_1 = require("child_process");
-const getNugetPackageVersions = (name) => {
+import https from 'https';
+import { spawnSync } from 'child_process';
+export const getNugetPackageVersions = (name) => {
     return new Promise((resolve, reject) => {
-        https_1.default.get(`https://azuresearch-usnc.nuget.org/query?q=packageid:${name}`, (response) => {
+        https.get(`https://azuresearch-usnc.nuget.org/query?q=packageid:${name}`, (response) => {
             let body = '';
             response.on('data', (d) => {
                 body += d;
@@ -25,31 +19,29 @@ const getNugetPackageVersions = (name) => {
         });
     });
 };
-exports.getNugetPackageVersions = getNugetPackageVersions;
-const install = (project, sdkVersion, xrmVersion) => {
+export const install = (project, sdkVersion, xrmVersion) => {
     // Add solution
-    child_process_1.spawnSync('dotnet', ['new', 'sln', '-n', project], {
+    spawnSync('dotnet', ['new', 'sln', '-n', project], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
-    child_process_1.spawnSync('dotnet', ['sln', 'add', `${project}.csproj`], {
+    spawnSync('dotnet', ['sln', 'add', `${project}.csproj`], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
     // Install nuget packages
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    child_process_1.spawnSync('dotnet', ['add', 'package', 'Microsoft.CrmSdk.Workflow', '-v', sdkVersion, '-n'], {
+    spawnSync('dotnet', ['add', 'package', 'Microsoft.CrmSdk.Workflow', '-v', sdkVersion, '-n'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    child_process_1.spawnSync('dotnet', ['add', 'package', 'JourneyTeam.Xrm', '-v', xrmVersion, '-n'], {
+    spawnSync('dotnet', ['add', 'package', 'JourneyTeam.Xrm', '-v', xrmVersion, '-n'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
-    child_process_1.spawnSync('dotnet', ['restore'], {
+    spawnSync('dotnet', ['restore'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
 };
-exports.install = install;

package/lib/packageManager.js

@@ -1,38 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.install = exports.getYarn = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const child_process_1 = require("child_process");
-const getEnvInfo_1 = require("./getEnvInfo");
-const getYarn = () => {
-    const yarnInfo = getEnvInfo_1.getEnvInfo().Binaries.Yarn;
+import { spawnSync } from 'child_process';
+import { getEnvInfo } from './getEnvInfo';
+export const getYarn = () => {
+    const yarnInfo = getEnvInfo().Binaries.Yarn;
     return yarnInfo && yarnInfo.path;
 };
-exports.getYarn = getYarn;
 const getNpm = () => {
-    const npmInfo = getEnvInfo_1.getEnvInfo().Binaries.npm;
+    const npmInfo = getEnvInfo().Binaries.npm;
     return npmInfo && npmInfo.path;
 };
-const install = (cwd, type) => {
+export const install = (cwd, type) => {
     const packages = getPackages(type);
-    if (exports.getYarn()) {
-        child_process_1.spawnSync(exports.getYarn(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
+    if (getYarn()) {
+        spawnSync(getYarn(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
         if (packages.dependencies) {
-            child_process_1.spawnSync(exports.getYarn(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
+            spawnSync(getYarn(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
         }
     }
     else {
-        child_process_1.spawnSync(getNpm(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
+        spawnSync(getNpm(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
         if (packages.dependencies) {
-            child_process_1.spawnSync(getNpm(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
+            spawnSync(getNpm(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
         }
     }
 };
-exports.install = install;
 function getPackages(type) {
     const packages = {
         devDependencies: [
-            'plop',
             `powerapps-project-${type}`,
             'dataverse-utils'
         ]

package/lib/plop.d.ts

@@ -1,5 +1,5 @@
 import { PlopGenerator } from 'node-plop';
 import yargs from 'yargs';
 import { Config } from './createDataverseProject';
-export declare const getGenerator: (argv: yargs.Arguments) => PlopGenerator;
+export declare const getGenerator: (argv: yargs.Arguments) => Promise<PlopGenerator>;
 export declare const runGenerator: (generator: PlopGenerator, args: Config) => Promise<void>;

package/lib/plop.js

@@ -1,24 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runGenerator = exports.getGenerator = void 0;
-const node_plop_1 = __importDefault(require("node-plop"));
-const path_1 = __importDefault(require("path"));
-const just_scripts_utils_1 = require("just-scripts-utils");
+import nodePlop from 'node-plop';
+import path from 'path';
+import { logger } from 'just-scripts-utils';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getGenerator = (argv) => {
-    const plopFile = path_1.default.resolve(__dirname, 'plopfile.js');
-    const plop = node_plop_1.default(plopFile, { destBasePath: argv.destination, force: false });
+export const getGenerator = async (argv) => {
+    const plopFile = path.resolve(__dirname, 'plopfile.js');
+    const plop = await nodePlop(plopFile, { destBasePath: argv.destination, force: false });
     const generator = plop.getGenerator(argv.type);
     return generator;
 };
-exports.getGenerator = getGenerator;
-const runGenerator = async (generator, args) => {
+export const runGenerator = async (generator, args) => {
     const results = await generator.runActions(args, {
         onComment: (comment) => {
-            just_scripts_utils_1.logger.info(comment);
+            logger.info(comment);
         }
     });
     if (results.failures && results.failures.length > 0) {
@@ -27,8 +20,7 @@ const runGenerator = async (generator, args) => {
     // do something after the actions have run
     for (const change of results.changes) {
         if (change.path) {
-            just_scripts_utils_1.logger.info(change.path);
+            logger.info(change.path);
         }
     }
 };
-exports.runGenerator = runGenerator;

package/lib/plopfile.js

@@ -1,16 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
+import path from 'path';
+import { spawnSync } from 'child_process';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-exports.default = (plop) => {
+export default (plop) => {
     plop.setActionType('signAssembly', (answers) => {
-        const keyPath = path_1.default.resolve(process.cwd(), `${answers.name}.snk`);
-        child_process_1.spawnSync(path_1.default.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
+        const keyPath = path.resolve(process.cwd(), `${answers.name}.snk`);
+        spawnSync(path.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
         return 'signed assembly';
     });
     plop.setGenerator('webresource', {
@@ -29,7 +24,7 @@ exports.default = (plop) => {
             {
                 type: 'add',
                 templateFile: '../plop-templates/assembly/assembly.csproj.hbs',
-                path: path_1.default.resolve(process.cwd(), '{{name}}.csproj'),
+                path: path.resolve(process.cwd(), '{{name}}.csproj'),
             },
             {
                 type: 'addMany',

package/license

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Derek Finlinson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "create-powerapps-project",
-  "version": "0.14.2",
+  "description": "Project generator for Dataverse development",
+  "version": "0.14.6",
   "license": "MIT",
   "main": "lib/index.js",
   "bin": {
@@ -23,14 +24,14 @@
   "dependencies": {
     "envinfo": "^7.8.1",
     "node-plop": "^0.26.2",
-    "prompts": "^2.4.0",
-    "just-scripts-utils": "^1.1.1",
-    "yargs": "^16.2.0"
+    "prompts": "^2.4.2",
+    "just-scripts-utils": "^1.1.4",
+    "yargs": "^17.3.0"
   },
   "devDependencies": {
-    "@types/envinfo": "^7.8.0",
+    "@types/envinfo": "^7.8.1",
     "@types/node": "^14.14.21",
-    "@types/prompts": "^2.0.9",
-    "@types/yargs": "^15.0.12"
+    "@types/prompts": "^2.0.14",
+    "@types/yargs": "^17.0.7"
   }
 }

package/plop-templates/assembly/.vscode/tasks.json

@@ -1,25 +1,25 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        }
-    ]
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
 }

package/plop-templates/assembly/package.json.hbs

@@ -4,6 +4,6 @@
   "private": true,
   "scripts": {
     "gen": "plop",
-    "deploy": "dataverse-deploy deploy assembly"
+    "deploy": "dataverse-utils deploy assembly"
   }
 }

package/plop-templates/assembly/plopfile.js

@@ -1,3 +1,3 @@
 module.exports = function (plop) {
-  plop.load('powerapps-project-assembly/plopfile.js');
-}
+  plop.load('powerapps-project-assembly');
+};

package/plop-templates/webresource/plopfile.js

@@ -1,3 +1,3 @@
 module.exports = function (plop) {
-  plop.load('powerapps-project-webresource/plopfile.js');
-}
+  plop.load('powerapps-project-webresource');
+};