datagrok-tools 4.14.11 → 4.14.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Datagrok-tools changelog
 
+## 4.14.13 (2025-06-16)
+
+### Features
+
+* Grok Link added ability to link packages from root directory
+* Grok Link added without-common-dir
+
 ## 4.14.10 (2025-06-08)
 
 ### Features

package/bin/commands/help.js

@@ -194,10 +194,11 @@ Usage: grok link
 Link \`datagrok-api\`, all necessary libraries and packages for local development by \`npm link\` command 
 
 Options:
---dev               Links also dev dependencies
---path              Instead of npm linking sets dependecies in package.json to local
---unlink            Unlinks packages and sets last versions instead of local path in package.json dependencies 
---verbose           Prints detailed information about linked packages  
+--dev                 Links also dev dependencies
+--path                Instead of npm linking sets dependecies in package.json to local
+--without-common-dir  Links packages only from the current repository
+--unlink              Unlinks packages and sets last versions instead of local path in package.json dependencies 
+--verbose             Prints detailed information about linked packages  
 `;
 
 // const HELP_MIGRATE = `

package/bin/commands/link.js

@@ -8,37 +8,42 @@ exports.link = link;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("../utils/utils");
+var _glob = require("glob");
 /* eslint-disable valid-jsdoc */
 
-const repositoryDirNameRegex = new RegExp(_path.default.join('1', '2')[1] + 'public$');
-const excludedPackages = ['@datagrok/diff-grok', ''];
+const excludedPackages = ['@datagrok-misc/eslint-plugin-config', 'wiki-merge', 'datagrok-tools', ''];
+const versionDependencyRegex = /(?:\^)?\d+\.\d+\.\d+/;
+let packagesInRepo;
+let packagesOutOfRepo;
 const curDir = process.cwd();
 let repositoryDir = curDir;
+let containerDir = curDir;
+let dirStep = _path.default.dirname(curDir);
 let currentPackage;
 let localPackageDependencies;
 let packagesToLink;
-while (_path.default.dirname(repositoryDir) !== repositoryDir) {
-  if (repositoryDirNameRegex.test(repositoryDir)) break;
-  repositoryDir = _path.default.dirname(repositoryDir);
+while (_path.default.dirname(dirStep) !== dirStep) {
+  if (_fs.default.existsSync(_path.default.join(dirStep, '.git')) && repositoryDir === curDir) repositoryDir = dirStep;
+  if (!_fs.default.existsSync(_path.default.join(dirStep, '.git')) && repositoryDir !== curDir && containerDir === curDir) {
+    containerDir = dirStep;
+    break;
+  }
+  dirStep = _path.default.dirname(dirStep);
 }
 let verbose = false;
 let pathMode = false;
 let devMode = false;
 let unlink = false;
-const apiDir = _path.default.join(repositoryDir, 'js-api');
-const libDir = _path.default.join(repositoryDir, 'libraries');
-const packageDir = _path.default.join(repositoryDir, 'packages');
-const apiPackageName = 'datagrok-api';
-const libName = '@datagrok-libraries/';
-const packageName = '@datagrok/';
 async function link(args) {
   verbose = args.verbose ?? false;
   devMode = args.dev ?? false;
   pathMode = args.path ?? false;
   unlink = args.unlink ?? false;
+  let collectedPackages = collectAvaliablePackages(args['without-common-dir']);
+  packagesInRepo = collectedPackages.packagesInRepo;
+  packagesOutOfRepo = collectedPackages.packagesOutOfRepo;
   localPackageDependencies = [];
   packagesToLink = new Set();
-  collectPackagesData(curDir);
   currentPackage = new PackageData(curDir);
   if (unlink) {
     await unlinkPackages();
@@ -68,9 +73,8 @@ function collectPackagesData(packagePath = curDir) {
 }
 function collectPacakgeDataFromJsonObject(object) {
   let result = [];
-  for (let dependencyName of Object.keys(object)) {
-    let nameSplitted = dependencyName.split('/');
-    if (dependencyName === apiPackageName) result = result.concat(parsePackageDependencies(dependencyName, apiDir));else if (dependencyName.includes(libName)) result = result.concat(parsePackageDependencies(dependencyName, _path.default.join(libDir, nameSplitted[nameSplitted.length - 1])));else if (dependencyName.includes(packageName)) result = result.concat(parsePackageDependencies(dependencyName, _path.default.join(packageDir, toCamelCase(nameSplitted[nameSplitted.length - 1]))));
+  for (let dependencyName of Object.keys(object ?? {})) {
+    if (packagesInRepo[dependencyName]) result = result.concat(parsePackageDependencies(dependencyName, _path.default.dirname(packagesInRepo[dependencyName].path)));else if (packagesOutOfRepo[dependencyName]) result = result.concat(parsePackageDependencies(dependencyName, _path.default.dirname(packagesOutOfRepo[dependencyName].path)));
   }
   return result;
 }
@@ -86,10 +90,49 @@ function parsePackageDependencies(dependencyName, pathToLink) {
   result.push(dependencyName);
   return result;
 }
+function collectAvaliablePackages(noOutLink = false) {
+  let repositoryPackages = collectAvaliablePackagesPathesFromDir(repositoryDir);
+  let commonPakcages = collectAvaliablePackagesPathesFromDir(containerDir, repositoryDir);
+  const packagesInRepoBaseInfo = parsePackages(repositoryPackages);
+  const packagesOutOfRepoBaseInfo = noOutLink ? [] : parsePackages(commonPakcages);
+  const packagesInRepo = Object.fromEntries(packagesInRepoBaseInfo.map(({
+    name,
+    ...rest
+  }) => [name, rest]));
+  const packagesOutOfRepo = Object.fromEntries(packagesOutOfRepoBaseInfo.map(({
+    name,
+    ...rest
+  }) => [name, rest]));
+  return {
+    packagesInRepo: packagesInRepo,
+    packagesOutOfRepo: packagesOutOfRepo
+  };
+}
+function collectAvaliablePackagesPathesFromDir(dir, dirToExclude = '') {
+  let res = _glob.glob.sync('./**/package.json', {
+    cwd: dir,
+    ignore: ['**/node_modules/**']
+  }).map(e => _path.default.join(dir, e));
+  if (dirToExclude.length > 0) res = res.filter(e => !e.includes(dirToExclude));
+  return res;
+}
+function parsePackages(packagPathes) {
+  let res = packagPathes.map(e => {
+    let packageData = {};
+    if (_fs.default.existsSync(e)) {
+      packageData.path = e;
+      const packageJson = JSON.parse(_fs.default.readFileSync(e, 'utf8'));
+      packageData.name = packageJson.name;
+      packageData.version = packageJson.version;
+    }
+    return packageData;
+  });
+  return res;
+}
 async function unlinkPackages() {
-  const packaegs = [...localPackageDependencies];
-  if (currentPackage) packaegs.push(currentPackage);
-  for (let packageData of packaegs) {
+  const packages = [...localPackageDependencies];
+  if (currentPackage) packages.push(currentPackage);
+  for (let packageData of packages) {
     if (excludedPackages.includes(packageData.name)) continue;
     if (verbose) console.log(`Package ${packageData.name} is unlinking`);
     const packageJsonPath = _path.default.join(packageData.packagePath, 'package.json');
@@ -103,11 +146,10 @@ async function unlinkPackages() {
 function updateDependenciesToVersion(packageData, dependecyNode) {
   for (let dependency of packageData.dependencies) {
     if (excludedPackages.includes(dependency)) continue;
-    if (dependecyNode[dependency]) {
+    if (dependecyNode[dependency] && !versionDependencyRegex.test(dependecyNode[dependency])) {
       const packageToLink = (localPackageDependencies.filter(e => e.name === dependency) ?? [])[0];
       if (packageToLink) {
-        const startIndex = packageToLink.packagePath.indexOf(`public${_path.default.sep}`) + `public${_path.default.sep}`.length;
-        if (startIndex !== -1) dependecyNode[dependency] = `^${packageToLink.version}`;
+        dependecyNode[dependency] = `^${packagesInRepo[dependency]?.version ?? packagesOutOfRepo[dependency]?.version}`;
       }
     }
   }
@@ -154,15 +196,14 @@ async function linkPathMode(packageData) {
   _fs.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
 function updateDependenciesToLocal(packageData, dependecyNode) {
-  const dirNames = packageData.packagePath.split(_path.default.sep);
-  const backRoute = `../`.repeat(dirNames.length - dirNames.indexOf('public') - 1);
+  const backRouteForCont = `../`.repeat(packageData.packagePath.replace(containerDir, '').split(_path.default.sep).length - 1);
+  const backRouteForRepo = `../`.repeat(packageData.packagePath.replace(repositoryDir, '').split(_path.default.sep).length - 1);
   for (let dependency of packageData.dependencies) {
     if (excludedPackages.includes(dependency)) continue;
     if (dependecyNode[dependency]) {
       const packageToLink = (localPackageDependencies.filter(e => e.name === dependency) ?? [])[0];
       if (packageToLink) {
-        const startIndex = packageToLink.packagePath.indexOf(`public${_path.default.sep}`) + `public${_path.default.sep}`.length;
-        if (startIndex !== -1) dependecyNode[dependency] = `${backRoute}${packageToLink.packagePath.substring(startIndex).replaceAll(_path.default.sep, '/')}`;
+        if (packageToLink.packagePath.includes(repositoryDir) && packageData.packagePath.includes(repositoryDir)) dependecyNode[dependency] = `${backRouteForRepo}${packageToLink.packagePath.replace(repositoryDir, '').replaceAll(_path.default.sep, '/').replace('/', '')}`;else dependecyNode[dependency] = `${backRouteForCont}${packageToLink.packagePath.replace(containerDir, '').replaceAll(_path.default.sep, '/').replace('/', '')}`;
       }
     }
   }

package/bin/utils/utils.js

@@ -103,7 +103,7 @@ const replacers = exports.replacers = {
   NAME_LOWERCASE: (s, name) => s.replace(/#{NAME_LOWERCASE}/g, name.toLowerCase()),
   NAME_PREFIX: (s, name) => s.replace(/#{NAME_PREFIX}/g, name.slice(0, 3)),
   PACKAGE_DETECTORS_NAME: (s, name) => s.replace(/#{PACKAGE_DETECTORS_NAME}/g, kebabToCamelCase(name)),
-  PACKAGE_NAMESPACE: (s, name) => s.replace(/#{PACKAGE_NAMESPACE}/g, kebabToCamelCase(removeScope(name))),
+  PACKAGE_NAMESPACE: (s, name) => s.replace(/#{PACKAGE_NAMESPACE}/g, name),
   FUNC_DESCRIPTION: (s, desc) => s.replace(/#{FUNC_DESCRIPTION}/g, descriptionToComment(desc)),
   FUNC_NAME: (s, name) => s.replace(/#{FUNC_NAME}/g, friendlyNameToName(name)),
   FUNC_NAME_LOWERCASE: (s, name) => s.replace(/#{FUNC_NAME_LOWERCASE}/g, friendlyNameToName(name, false)),

package/package-template/tsconfig.json

@@ -67,6 +67,5 @@
     /* Advanced Options */
     "skipLibCheck": true,                          /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true,        /* Disallow inconsistently-cased references to the same file. */
-    "declaration": true
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.11",
+  "version": "4.14.13",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -13,6 +13,7 @@
     "archiver-promise": "^1.0.0",
     "estraverse": "^5.3.0",
     "fs": "^0.0.1-security",
+    "glob": "^11.0.2",
     "ignore-walk": "^3.0.4",
     "inquirer": "^7.3.3",
     "js-yaml": "^4.1.0",