datagrok-tools 4.14.27 → 4.14.29

package/bin/grok.js

@@ -15,31 +15,32 @@ const commands = {
   link: require('./commands/link').link,
   publish: require('./commands/publish').publish,
   test: require('./commands/test').test,
-  testall: require('./commands/test-all').testAll, 
+  testall: require('./commands/test-all').testAll,
 };
 
-const onPackageCommandNames = ['api', 'check', 'link', 'publish', 'test']; 
+const onPackageCommandNames = ['api', 'check', 'link', 'publish', 'test'];
 
-const command = argv['_'][0]; 
+const command = argv['_'][0];
 if (command in commands) {
-  try { 
-    if(argv["help"]){ 
+  try {
+    if (argv['help']) {
       console.log(help[command]);
       exitWithCode(1);
     }
-    else if (argv.all && onPackageCommandNames.includes(command)){
-      runAllCommand(process.cwd(), `grok ${process.argv.slice(2).join(' ')}`.replace('--all', ''), {});
+    else if (argv.all && onPackageCommandNames.includes(command)) {
+      runAllCommand(process.cwd(),
+        `grok ${process.argv.slice(2).join(' ')}`.replace('--all', ''), {});
     }
-    else if (!commands[command](argv)) { 
+    else if (!commands[command](argv)) {
       console.log(help[command]);
       exitWithCode(1);
     }
-  } catch (err) { 
+  } catch (err) {
     console.error(err);
     console.log(help[command]);
     exitWithCode(255);
   }
-} else 
+} else
   console.log(help.help);
 
 

package/bin/utils/func-generation.js

@@ -9,7 +9,7 @@ exports.generateExport = generateExport;
 exports.generateFunc = generateFunc;
 exports.generateImport = generateImport;
 exports.getFuncAnnotation = getFuncAnnotation;
-exports.typesToAnnotation = exports.reservedDecorators = exports.pseudoParams = exports.headerParams = void 0;
+exports.typesToAny = exports.typesToAnnotation = exports.reservedDecorators = exports.pseudoParams = exports.headerParams = void 0;
 /* eslint-disable no-unused-vars */
 /* eslint-disable valid-jsdoc */
 
@@ -23,51 +23,51 @@ let pseudoParams = exports.pseudoParams = /*#__PURE__*/function (pseudoParams) {
 const nonMetaData = ['sidebar', 'editor'];
 const decoratorOptionToAnnotation = new Map([['initialValue', 'default']]);
 const dgAnnotationTypes = exports.dgAnnotationTypes = {
-  INT: "int",
-  BIG_INT: "bigint",
-  FLOAT: "double",
-  NUM: "num",
-  QNUM: "qnum",
-  BOOL: "bool",
-  STRING: "string",
-  STRING_LIST: "string_list",
-  DATE_TIME: "datetime",
-  OBJECT: "object",
-  BYTE_ARRAY: "byte_array",
-  DATA_FRAME: "dataframe",
-  DATA_FRAME_LIST: "dataframe_list",
-  CELL: "cell",
-  COLUMN: "column",
-  COLUMN_LIST: "column_list",
-  GRAPHICS: "graphics",
-  FILE: "file",
-  BLOB: "blob",
-  ROW_FILTER: "tablerowfiltercall",
-  COLUMN_FILTER: "colfiltercall",
-  BIT_SET: "bitset",
-  MAP: "map",
-  DYNAMIC: "dynamic",
-  VIEWER: "viewer",
-  LIST: "list",
-  SEM_VALUE: "semantic_value",
-  FUNC: "func",
-  FUNC_CALL: "funccall",
-  PROPERTY: "property",
-  CATEGORICAL: "categorical",
-  NUMERICAL: "numerical",
-  GRID_CELL_RENDER_ARGS: "GridCellRenderArgs",
-  ELEMENT: "element",
-  VIEW: "view",
-  TABLE_VIEW: "TableView",
-  USER: "User",
-  MENU: "Menu",
-  PROJECT: "Project",
-  SEMANTIC_VALUE: "semantic_value",
-  EVENT_DATA: "event_data",
-  PROGRESS_INDICATOR: "progressindicator",
-  CREDENTIALS: "Credentials",
-  SCRIPT_ENVIRONMENT: "ScriptEnvironment",
-  NOTEBOOK: "Notebook"
+  INT: 'int',
+  BIG_INT: 'bigint',
+  FLOAT: 'double',
+  NUM: 'num',
+  QNUM: 'qnum',
+  BOOL: 'bool',
+  STRING: 'string',
+  STRING_LIST: 'string_list',
+  DATE_TIME: 'datetime',
+  OBJECT: 'object',
+  BYTE_ARRAY: 'byte_array',
+  DATA_FRAME: 'dataframe',
+  DATA_FRAME_LIST: 'dataframe_list',
+  CELL: 'cell',
+  COLUMN: 'column',
+  COLUMN_LIST: 'column_list',
+  GRAPHICS: 'graphics',
+  FILE: 'file',
+  BLOB: 'blob',
+  ROW_FILTER: 'tablerowfiltercall',
+  COLUMN_FILTER: 'colfiltercall',
+  BIT_SET: 'bitset',
+  MAP: 'map',
+  DYNAMIC: 'dynamic',
+  VIEWER: 'viewer',
+  LIST: 'list',
+  SEM_VALUE: 'semantic_value',
+  FUNC: 'func',
+  FUNC_CALL: 'funccall',
+  PROPERTY: 'property',
+  CATEGORICAL: 'categorical',
+  NUMERICAL: 'numerical',
+  GRID_CELL_RENDER_ARGS: 'GridCellRenderArgs',
+  ELEMENT: 'element',
+  VIEW: 'view',
+  TABLE_VIEW: 'TableView',
+  USER: 'User',
+  MENU: 'Menu',
+  PROJECT: 'Project',
+  SEMANTIC_VALUE: 'semantic_value',
+  EVENT_DATA: 'event_data',
+  PROGRESS_INDICATOR: 'progressindicator',
+  CREDENTIALS: 'Credentials',
+  SCRIPT_ENVIRONMENT: 'ScriptEnvironment',
+  NOTEBOOK: 'Notebook'
 };
 let FUNC_TYPES = exports.FUNC_TYPES = /*#__PURE__*/function (FUNC_TYPES) {
   FUNC_TYPES["APP"] = "app";
@@ -119,6 +119,7 @@ const typesToAnnotation = exports.typesToAnnotation = {
   'void': 'void',
   'string': 'string'
 };
+const typesToAny = exports.typesToAny = ['dayjs.Dayjs', 'Dayjs'];
 
 /** Generates an annotation header for a function based on provided metadata. */
 function getFuncAnnotation(data, comment = '//', sep = '\n') {
@@ -130,7 +131,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   if (data.tags && data.tags?.length > 0) {
     s += `${comment}tags: ${isFileViewer && data[pseudoParams.EXTENSIONS] ? data.tags.concat(data[pseudoParams.EXTENSIONS].map(ext => 'fileViewer-' + ext)).join(', ') : data.tags.join(', ')}${sep}`;
   }
-  for (let input of data.inputs ?? []) {
+  for (const input of data.inputs ?? []) {
     if (!input) continue;
     let type = input?.type;
     let isArray = false;
@@ -147,10 +148,12 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     s += comment + 'input: ' + type + ' ' + functionName + (input.defaultValue !== undefined ? `= ${input.defaultValue}` : '') + ' ' + options.replaceAll('"', '\'') + sep;
   }
   if (data.outputs) {
-    for (const output of data.outputs) if (output.type !== 'void') s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output.options)}` : ''}` : '') + sep;
+    for (const output of data.outputs) {
+      if (output.type !== 'void') s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output.options)}` : ''}` : '') + sep;
+    }
   }
   if (data.meta) {
-    for (let entry of Object.entries(data.meta)) s += `${comment}meta.${entry[0]}: ${entry[1]}${sep}`;
+    for (const entry of Object.entries(data.meta)) s += `${comment}meta.${entry[0]}: ${entry[1]}${sep}`;
   }
   for (const parameter in data) {
     if (parameter === pseudoParams.EXTENSION || parameter === pseudoParams.INPUT_TYPE || parameter === 'meta' || parameter === 'isAsync' || parameter === 'test') continue;else if (parameter === pseudoParams.EXTENSIONS) {
@@ -161,7 +164,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     }
   }
   if (data.test) {
-    for (let entry of Object.entries(data.test)) {
+    for (const entry of Object.entries(data.test)) {
       if (entry[0] === 'test' || entry[0] === 'wait') s += `${comment}`;else s += `, `;
       s += `${entry[0]}: ${entry[1]} `;
     }
@@ -170,7 +173,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   return s;
 }
 function buildStringOfOptions(options) {
-  let optionsInString = [];
+  const optionsInString = [];
   for (const [key, value] of Object.entries(options ?? {})) {
     let val = value;
     let option = key;
@@ -428,8 +431,8 @@ const primitives = new Set(['string', 'string[]', 'number', 'number[]', 'boolean
 
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], isAsync = false) {
-  let funcSigNature = inputs.map(e => `${e.name}: ${primitives.has(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] ? e.type : 'any'}`).join(', ');
-  let funcArguments = inputs.map(e => e.name).join(', ');
+  const funcSigNature = inputs.map(e => `${e.name}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
+  const funcArguments = inputs.map(e => e.name).join(', ');
   return sep + annotation + `export ${isAsync ? 'async ' : ''}function ${funcName}(${funcSigNature}) {${sep}  return ${className.length > 0 ? `${className}.` : ''}${funcName}(${funcArguments});${sep}}${sep}`;
 }
 function generateImport(className, path, sep = '\n') {

package/package.json

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

package/plugins/func-gen-plugin.js

@@ -460,7 +460,7 @@ class FuncGeneratorPlugin {
     } else
       fs.writeFileSync(
         this.options.outputPath,
-        `${baseImport}\n${importArray.join("")}`,
+        `${annotationForGeneratedFile}${baseImport}\n${importArray.join("")}`,
         "utf-8"
       );
   }