datagrok-tools 4.11.0 → 4.11.1

package/bin/commands/help.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.help = void 0;
 var HELP = "\nUsage: grok <command>\n\nDatagrok's package management tool\n\nCommands:\n    add       Add an object template\n    api       Create wrapper functions\n    check     Check package content (function signatures, etc.)\n    config    Create and manage config files\n    create    Create a package\n    init      Modify a package template\n    link      Link `datagrok-api` and libraries for local development\n    publish   Upload a package\n    test      Run package tests\n\nTo get help on a particular command, use:\n    grok <command> --help\n\nRead more about the package development workflow:\nhttps://datagrok.ai/help/develop/develop\n";
 var HELP_ADD = "\nUsage: grok add <entity> <name>\n\nAdd an object template to your package:\n\ngrok add app <name>\ngrok add connection <name>\ngrok add detector <semantic-type-name>\ngrok add function [tag] <name>\ngrok add query <name>\ngrok add script [tag] <language> <name>\ngrok add view <name>\ngrok add viewer <name>\ngrok add tests\n\nPlease note that entity names may only include letters and numbers\n\nSupported languages for scripts:\njavascript, julia, node, octave, python, r\n\nAvailable tags:\npanel, init\n";
-var HELP_INIT = "\nUsage: grok init\n\nModify a package template by adding config files for linters, IDE, etc.\n\nOptions:\n[--eslint] [--ide] [--test] [--ts]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--test      Add tests support (TypeScript packages only)\n--ts        Convert a JavaScript package to TypeScript\n";
+var HELP_INIT = "\nUsage: grok init\n\nModify a package template by adding config files for linters, IDE, etc.\n\nOptions:\n[--eslint] [--ide] [--test] [--ts] [--git]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--test      Add tests support (TypeScript packages only)\n--ts        Convert a JavaScript package to TypeScript\n--git       Configure GIT and install commit linting tools.\n            Read more: https://datagrok.ai/help/develop/advanced/git-policy\n";
 var HELP_API = "\nUsage: grok api\n\nCreate wrapper functions for package scripts and queries\n";
 var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file\n\nOptions:\n[--reset] [--server] [--alias] [-k | --key]\n\n--reset     Restore the default config file template\n--server    Use to add a server to the config (`grok config add --alias alias --server url --key key`)\n--alias     Use in conjunction with the `server` option to set the server name\n--key       Use in conjunction with the `server` option to set the developer key\n--default   Use in conjunction with the `server` option to set the added server as default\n";
 var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok create         Create a package in the current working directory\ngrok create <name>  Create a package in a folder with the specified name\n\nPlease note that the package name may only include letters, numbers, underscores, or hyphens\n\nOptions:\n[--eslint] [--ide] [--js | --ts] [--test]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--js        Create a JavaScript package\n--ts        Create a TypeScript package (default)\n--test      Add tests support (TypeScript packages only)\n";

package/bin/commands/init.js

@@ -10,6 +10,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
+var _child_process = require("child_process");
 var utils = _interopRequireWildcard(require("../utils/utils"));
 var color = _interopRequireWildcard(require("../utils/color-utils"));
 var _configValidator = require("../validators/config-validator");
@@ -26,8 +27,8 @@ var packageJsonPath = _path["default"].join(curDir, 'package.json');
 var tsConfigPath = _path["default"].join(curDir, 'tsconfig.json');
 var webpackConfigPath = _path["default"].join(curDir, 'webpack.config.js');
 var templateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'package-template');
+var options = ['ide', 'eslint', 'test', 'ts', 'git'];
 function init(args) {
-  var options = ['ide', 'eslint', 'test', 'ts'];
   var nOptions = Object.keys(args).length - 1;
   var nArgs = args['_'].length;
   if (nArgs > 1 || nOptions > options.length) {
@@ -54,7 +55,29 @@ function init(args) {
     }
     if (hasUnknownOpt) return false;
   }
-  if (!utils.isPackageDir(curDir)) {
+  if (args.git) {
+    (0, _child_process.exec)('git config --global pull.rebase false && ' + 'git config --global branch.master.rebase true && ' + 'git config --global branch.main.rebase true && ' + 'git config --global rebase.autostash true', function (err, stdout, stderr) {
+      color.info('Configuring rebase pull strategy...');
+      console.log('Read more: https://datagrok.ai/help/develop/advanced/git-policy');
+      if (err) throw err;else {
+        console.log(stderr, stdout);
+        color.success('GIT successfully configured\n');
+      }
+    });
+    (0, _child_process.exec)('npm install --location=global @commitlint/config-conventional @commitlint/cli', function (err, stdout, stderr) {
+      color.info('Installing @commitlint/config-conventional and @commitlint/cli...');
+      if (err) throw err;else console.log(stderr, stdout);
+    });
+    (0, _child_process.exec)('pip install pre-commit', function (err, stdout, stderr) {
+      color.info('Installing pre-commit...');
+      if (err) throw err;else console.log(stderr, stdout);
+      (0, _child_process.exec)('pre-commit install --install-hooks --hook-type pre-commit --hook-type commit-msg', function (err, stdout, stderr) {
+        color.info('Installing commit hooks...');
+        if (err) throw err;else console.log(stderr, stdout);
+      });
+    });
+  }
+  if (!utils.isPackageDir(curDir) && (args.ts || args.ide || args.eslint || args.test)) {
     color.error('File `package.json` not found. Run the command from the package directory');
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {