jupyter-ijavascript-utils 1.12.0 → 1.12.2

package/README.md

@@ -7,7 +7,7 @@
     </a>
     <img src="https://img.shields.io/badge/Coverage-98-green" />
     <a href="https://github.com/paulroth3d/jupyter-ijavascript-utils" alt="npm">
-        <img src="https://img.shields.io/badge/npm-%5E1.12.0-red" />
+        <img src="https://img.shields.io/badge/npm-%5E1.12-red" />
     </a>
 </p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-ijavascript-utils",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "description": "Utilities for working with iJavaScript - a Jupyter Kernel",
   "homepage": "https://jupyter-ijavascript-utils.onrender.com/",
   "license": "MIT",

package/src/TableGenerator.js

@@ -1,9 +1,8 @@
 /* eslint-disable
   prefer-template,
   function-paren-newline,
-  no-unused-vars,
   implicit-arrow-linebreak,
-  max-len
+  arrow-body-style
 */
 
 //-- TODO: review stringbuilder for large datasets
@@ -355,7 +354,6 @@ class TableGenerator {
       return this;
     }
 
-    const fnMap = new Map();
     const augmentKeys = Object.getOwnPropertyNames(obj);
 
     augmentKeys.forEach((key) => {
@@ -421,7 +419,7 @@ class TableGenerator {
     let cleanCSS = '';
 
     if (borderCSS === true) {
-      cleanCSS = 'border: 1px solid #AAA';
+      cleanCSS = 'border: 1px solid #aaa';
     } else if (borderCSS) {
       cleanCSS = `border: ${borderCSS}`;
     }
@@ -1000,6 +998,8 @@ class TableGenerator {
    * @private
    */
   prepare() {
+    //-- data should ALWAYS be set to a valid array, but added in case
+    /* istanbul ignore next */
     let cleanCollection = this.#data || [];
     if (this.#sortFn) {
       cleanCollection = cleanCollection.sort(this.#sortFn);
@@ -1091,29 +1091,48 @@ class TableGenerator {
         .join('\n\t')
       + '\n</tr>\n';
 
+    //-- todo - investigate shadow root so css only applies to table
+    const printInlineCSS = (...cssStyles) => {
+      const cleanCSS = cssStyles
+        .filter((style) => style ? true : false);
+      
+      //-- short circuit if empty
+      if (cleanCSS.length < 1) {
+        return '';
+      }
+
+      const cssContents = cleanCSS
+        .map((style) => style.trim())
+        .map((style) => style.endsWith(';') ? style : `${style};`)
+        .join(' ');
+      
+      return `style="${cssContents}"`;
+    };
+
     const printBody = (collection) => collection
       .map((dataRow, rowIndex) => {
         const record = this.#data[rowIndex];
-        const rowStyle = !styleRowFn ? null : styleRowFn({ rowIndex, row: dataRow, record });
-        return '<tr '
-          + (!rowStyle ? '' : `style="${rowStyle}"`)
-          + '>\n\t'
+        const rowStyle = !styleRowFn ? null : styleRowFn({ rowIndex, row: dataRow, record }) || '';
+
+        return `<tr ${printInlineCSS(rowStyle)}>\n\t`
           + dataRow.map((value, columnIndex) => {
-            //-- note - the data is from the original dataset, not the results
-            const cellStyle = !styleCellFn
-              ? ''
-              : styleCellFn({ value, columnIndex, rowIndex, row: dataRow, record });
-            return '<td '
-              + (borderCSS || cellStyle ? `style="${cellStyle} ${borderCSS}"` : '')
-              + `>${cleanFn(value, printOptions)}</td>`;
+            //-- style for the cell
+            const cellStyle = !styleCellFn ? '' : styleCellFn({ value, columnIndex, rowIndex, row: dataRow, record });
+
+            return `<td ${
+              printInlineCSS(
+                borderCSS,
+                //-- could be inline, but not as clear
+                cellStyle
+              )
+            }>${
+              cleanFn(value, printOptions)
+            }</td>`;
           }).join('\n\t')
           + '\n</tr>';
       }).join('\n');
     
-    const tableResults = '<table '
-      + 'cellspacing="0px" '
-      + (!styleTable ? '' : `style="${styleTable}"`)
-      + '>'
+    const tableResults = `<table cellspacing="0px" ${printInlineCSS(styleTable)}>`
       + printHeader(results.headers, '')
       + printBody(results.data)
       + '\n</table>';
@@ -1131,7 +1150,9 @@ class TableGenerator {
       align = true
     } = options || {};
 
-    const styleCellFn = this.#styleCell;
+    //-- review style options for markdown
+    // const styleCellFn = this.#styleCell;
+
     const printOptions = this.#printOptions;
     const cleanFn = printValue;
 
@@ -1146,10 +1167,10 @@ class TableGenerator {
     data = data.map((row, rowIndex) =>
       row.map((value, columnIndex) => {
         //-- shift down because the headers are added
-        const record = rowIndex > 0 ? this.#data[rowIndex - 1] : {};
         const cleanedValue = cleanFn(value, printOptions);
         
         //-- @TODO - we want to bold / make italic, but this needs more thought
+        // const record = rowIndex > 0 ? this.#data[rowIndex - 1] : {};
         // const cellStyle = !styleCellFn
         //   ? null
         //   : styleCellFn({ value, columnIndex, rowIndex, row, record });

package/src/datasets.js

@@ -145,8 +145,8 @@ module.exports.fetch = (library) => {
  * 
  * // use worldJSON as global variable
  */
-module.exports.fetchJSON = async function fetchJSON(targetAddress, options = {}) {
-  const response = await fetch(targetAddress, options);
+module.exports.fetchJSON = async function fetchJSON(targetAddress, options) {
+  const response = await fetch(targetAddress, options || {});
   if (!response.ok) throw new Error(`unexpected response ${response.statusText}`);
   return response.json();
 };

package/src/file.js

@@ -249,7 +249,7 @@ module.exports.writeFile = function writeFile(filePath, contents, fsOptions = {}
  */
 module.exports.writeFileStd = function writeFileStd(filePath, contents) {
   //-- allow tests to use, but should be cleared prior to commit
-  // eslint-disable-next-line no-console
+  /* istanbul ignore next */
   if (process.env.JEST_WORKER_ID !== undefined) console.warn('Warning: Test using writeFileStd');
   
   const resolvedPath = path.resolve(filePath);

package/src/ijs.js

@@ -459,6 +459,8 @@ module.exports.htmlScript = function htmlScripts(
     if (!onReadyCode.endsWith(';')) {
       onReadyCode += ';';
     }
+  } else {
+    throw Error('ijsUtils.htmlScript: onReadyCode must be a string or function');
   }
 
   //-- the unique identifier for this run

package/src/leaflet.js

@@ -316,6 +316,8 @@ module.exports.renderMarkers = function renderMarkers(markers, mapOptions) {
       throw Error('leaflet.renderMarkers(markers, options): object markers must follow schema: ({ lat, lon, title? })');
     }
     cleanMarkers = markers.map(({ lat, lon, title }) => [lat, lon, title]);
+  } else {
+    throw Error('leaflet.renderMarkers(markers, options): object markers must follow schema: ({ lat, lon, title? })');
   }
 
   //-- will be executed as JavaScript - not Node

package/src/object.js

@@ -274,7 +274,7 @@ module.exports.cleanPropertyName = function cleanPropertyName(property) {
   return cleanProperty;
 };
 
-const renameObjectProperties = function renameObjectProperties(object = {}, originalKeys, targetKeys) {
+const renameObjectProperties = function renameObjectProperties(object, originalKeys, targetKeys) {
   const result = { ...object };
   originalKeys.forEach((originalKey, index) => {
     const targetKey = targetKeys[index];
@@ -344,11 +344,16 @@ module.exports.collapse = function collapse(targetObj) {
  * @param {String[]} propertyNames - list of the only properties to keep
  * @returns {Object[]}
  */
-module.exports.selectObjectProperties = function selectObjectProperties(list, propertyNames) {
+module.exports.selectObjectProperties = function selectObjectProperties(list, ...propertyNames) {
+  const cleanPropertyNames = propertyNames.length > 0 && Array.isArray(propertyNames[0])
+    ? propertyNames[0]
+    : propertyNames;
+
   if (!list) return [];
   const targetList = Array.isArray(list) ? list : [list];
+
   return targetList.map(
-    (record) => (propertyNames || []).reduce(
+    (record) => cleanPropertyNames.reduce(
       (result, prop) => ObjectUtils.objAssign(result, prop, record[prop]), {}
     )
   );