datagrok-tools 4.14.66 → 4.14.68

package/bin/commands/stress-tests.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stressTests = stressTests;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var utils = _interopRequireWildcard(require("../utils/utils"));
+var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
+var testUtils = _testUtils;
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const cwd = process.cwd();
+async function stressTests(args) {
+  const pkgPath = _path.default.join(cwd, 'package.json');
+  if (!_fs.default.existsSync(pkgPath)) {
+    console.error('❌ Error: This command must be executed from the ApiTests package folder (package.json not found).');
+    process.exit(1);
+  }
+  let pkg;
+  try {
+    pkg = JSON.parse(_fs.default.readFileSync(pkgPath, 'utf8'));
+  } catch (e) {
+    console.error('❌ Error: Failed to read package.json. Make sure it is valid JSON.');
+    process.exit(1);
+  }
+  if (pkg.name !== '@datagrok/api-tests') {
+    console.error(`❌ Error: This command must be executed from the ApiTests package folder. Found package name: '${pkg.name ?? 'undefined'}'`);
+    process.exit(1);
+  }
+  const config = (0, _testUtils.getDevKey)(args.host);
+  await testUtils.loadPackage('', 'ApiTests', args.host, args['skip-publish'], args['skip-build']);
+  await utils.runScript(`npm run build-node`, '');
+  try {
+    await utils.runScript(`node -r ./tsconfig-paths-bootstrap.js dist-node/package-test-node.js --apiUrl=${config.url} --devKey=${config.key} --concurrentRuns=${args["concurrent-runs"] ?? 1}${args.loop ? ' --loop' : ''}`, '');
+    return true;
+  } catch (e) {
+    console.error(`❌ Error: Something went wrong: ${e}`);
+    return false;
+  }
+}

package/bin/grok.js

@@ -16,6 +16,7 @@ const commands = {
   publish: require('./commands/publish').publish,
   test: require('./commands/test').test,
   testall: require('./commands/test-all').testAll,
+  stresstest: require('./commands/stress-tests').stressTests
 };
 
 const onPackageCommandNames = ['api', 'check', 'link', 'publish', 'test'];

package/bin/utils/func-generation.js

@@ -136,7 +136,13 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   }
   for (const input of data.inputs ?? []) {
     if (!input) continue;
-    let type = input?.type;
+    let type = input?.type?.replaceAll(" ", "");
+    if (type?.includes(`|undefined`)) {
+      type = type.replaceAll(`|undefined`, '');
+      // modify original payload
+      input.optional = true;
+      input.type = type;
+    }
     let isArray = false;
     if (type?.includes(`[]`)) {
       type = type.replace(/\[\]$/, '');
@@ -470,8 +476,19 @@ const primitives = exports.primitives = new Set(['string', 'string[]', 'number',
 
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], output, isAsync = false) {
-  // eslint-disable-next-line max-len
-  const funcSigNature = inputs.map(e => `${e.name}${e.optional ? '?' : ''}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
+  // FuncCall can have an optional followed by mandatory args for ui reasons, typescript cannot
+  let firstTsValidOptionalIdx = inputs.length - 1;
+  for (; firstTsValidOptionalIdx >= 0; firstTsValidOptionalIdx--) {
+    const e = inputs[firstTsValidOptionalIdx];
+    if (!e.optional) break;
+  }
+  const funcSigNature = inputs.map((e, idx) => {
+    const namePart = `${e.name}${e.optional && idx >= firstTsValidOptionalIdx ? '?' : ''}`;
+    // eslint-disable-next-line max-len
+    let typePart = `${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`;
+    if (e.optional && idx < firstTsValidOptionalIdx) typePart += ' | undefined';
+    return `${namePart}: ${typePart}`;
+  }).join(', ');
   const funcArguments = inputs.map(e => e.name).join(', ');
   const returnType = output ? primitives.has(output) ? !isAsync ? `: ${output} ` : `: Promise<${output}> ` : !isAsync ? `: any ` : `: Promise<any> ` : '';
   // eslint-disable-next-line max-len

package/bin/utils/test-utils.js

@@ -14,6 +14,7 @@ exports.getBrowserPage = getBrowserPage;
 exports.getDevKey = getDevKey;
 exports.getToken = getToken;
 exports.getWebUrl = getWebUrl;
+exports.loadPackage = loadPackage;
 exports.loadPackages = loadPackages;
 exports.loadTestsList = loadTestsList;
 exports.mergeBrowsersResults = mergeBrowsersResults;
@@ -181,6 +182,20 @@ const recorderConfig = exports.recorderConfig = {
   }
   // aspectRatio: '16:9',
 };
+async function loadPackage(packageDir, dirName, hostString, skipPublish, skipBuild, linkPackage, release) {
+  try {
+    if (skipPublish != true) {
+      process.stdout.write(`Building and publishing ${dirName}...`);
+      await utils.runScript(`npm install`, packageDir);
+      if (linkPackage) await utils.runScript(`grok link`, packageDir);
+      if (skipBuild != true) await utils.runScript(`npm run build`, packageDir);
+      await utils.runScript(`grok publish ${hostString}${release ? ' --release' : ''}`, packageDir);
+      process.stdout.write(` success!\n`);
+    }
+  } catch (e) {
+    process.stdout.write(` failed to load package ${dirName}!\n`);
+  }
+}
 async function loadPackages(packagesDir, packagesToLoad, host, skipPublish, skipBuild, linkPackage, release) {
   const packagesToRun = new Map();
   const hostString = host === undefined ? `` : `${host}`;
@@ -198,19 +213,8 @@ async function loadPackages(packagesDir, packagesToLoad, host, skipPublish, skip
         }));
         const packageFriendlyName = packagesToRun.get((0, _utils.spaceToCamelCase)(packageJsonData['friendlyName'] ?? packageJsonData['name'].split('/')[1] ?? packageJsonData['name'] ?? '').toLocaleLowerCase() ?? '') ?? packagesToRun.get(dirName);
         if (utils.isPackageDir(packageDir) && (packageFriendlyName !== undefined || packagesToLoad === 'all')) {
-          try {
-            process.stdout.write(`Building and publishing ${dirName}...`);
-            if (skipPublish != true) {
-              await utils.runScript(`npm install`, packageDir);
-              if (linkPackage) await utils.runScript(`grok link`, packageDir);
-              if (skipBuild != true) await utils.runScript(`npm run build`, packageDir);
-              await utils.runScript(`grok publish ${hostString}${release ? ' --release' : ''}`, packageDir);
-            }
-            packagesToRun.set(dirName, true);
-            process.stdout.write(` success!\n`);
-          } catch (e) {
-            process.stdout.write(` fail!\n`);
-          }
+          await loadPackage(packageDir, dirName, hostString, skipPublish, skipBuild, linkPackage, release);
+          packagesToRun.set(dirName, true);
         }
       } catch (e) {
         if (utils.isPackageDir(packageDir) && (packagesToRun.get((0, _utils.spaceToCamelCase)(dirName).toLocaleLowerCase()) !== undefined || packagesToLoad === 'all')) console.log(`Couldn't read package.json  ${dirName}`);

package/bin/utils/utils.js

@@ -110,7 +110,7 @@ const replacers = exports.replacers = {
   FUNC_NAME_LOWERCASE: (s, name) => s.replace(/#{FUNC_NAME_LOWERCASE}/g, friendlyNameToName(name, false)),
   PARAMS_OBJECT: (s, params) => s.replace(/#{PARAMS_OBJECT}/g, params.length ? `{ ${params.map(p => p.name).join(', ')} }` : `{}`),
   OUTPUT_TYPE: (s, type) => s.replace(/#{OUTPUT_TYPE}/g, type),
-  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type} ${p.nullable ? '| null' : ''}`).join(', '))
+  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type} ${p.undefinable ? '| undefined' : ''}${p.nullable ? '| null' : ''}`).join(', '))
 };
 class TemplateBuilder {
   static sep = '\n';
@@ -219,9 +219,18 @@ function getScriptOutputType(script, comment = '#') {
 ;
 function getScriptInputs(script, comment = '#') {
   const regex = new RegExp(`${comment}\\s*input:\\s?([a-z_]+)(?:<[^>]*>)?\\s+(\\w+)(?:[^{\\n]*{[^}\\n]*})?`, 'g');
+  const testOptional = inputAnnotation => /isOptional\s*:\s*true/.test(inputAnnotation) || /optional\s*:\s*true/.test(inputAnnotation);
+  const inputAnnotations = [...script.matchAll(regex)];
+  let firstTsValidOptionalIdx = inputAnnotations.length - 1;
+  for (; firstTsValidOptionalIdx >= 0; firstTsValidOptionalIdx--) {
+    const annotation = inputAnnotations[firstTsValidOptionalIdx][0];
+    if (!testOptional(annotation)) break;
+  }
   const inputs = [];
-  for (const match of script.matchAll(regex)) {
-    const isOptional = /isOptional\s*:\s*true/.test(match[0]) || /optional\s*:\s*true/.test(match[0]);
+  for (const [idx, match] of inputAnnotations.entries()) {
+    const hasOptionalAnnotation = testOptional(match[0]);
+    const isOptional = hasOptionalAnnotation && idx >= firstTsValidOptionalIdx;
+    const undefinable = hasOptionalAnnotation && idx < firstTsValidOptionalIdx;
     const nullable = /nullable\s*:\s*true/.test(match[0]);
     const type = dgToTsTypeMap[match[1]] || 'any';
     const name = match[2];
@@ -229,6 +238,7 @@ function getScriptInputs(script, comment = '#') {
       type,
       name,
       isOptional,
+      undefinable,
       nullable
     });
   }

package/package.json

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