@hestia-earth/schema-convert 30.2.1 → 30.3.0

package/csv-pivot.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCsvPivot = exports.toCsv = void 0;
-var json_2_csv_1 = require("json-2-csv");
 var utils_1 = require("./utils");
 var json_pivot_1 = require("./json-pivot");
 var parseValue = function (value) {
@@ -16,13 +15,10 @@ var withType = function (nodes) {
 };
 var toCsv = function (nodes, keys, excludeKeys) {
     if (excludeKeys === void 0) { excludeKeys = utils_1.omitKeys; }
-    return (0, json_2_csv_1.json2csv)(withType(nodes), {
+    return (0, utils_1.jsonToCsv)(withType(nodes), {
         keys: keys,
         excludeKeys: excludeKeys,
         emptyFieldValue: '-',
-        expandArrayObjects: true,
-        arrayIndexesAsKeys: true,
-        sortHeader: true,
         parseValue: parseValue
     });
 };

package/index.d.ts

@@ -1,3 +1,4 @@
+export { jsonToCsv } from './utils';
 export { toCsvPivot } from './csv-pivot';
 export { pivotNode, pivotNodes } from './json-pivot';
 export * from './csv';

package/index.js

@@ -14,7 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pivotNodes = exports.pivotNode = exports.toCsvPivot = void 0;
+exports.pivotNodes = exports.pivotNode = exports.toCsvPivot = exports.jsonToCsv = void 0;
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "jsonToCsv", { enumerable: true, get: function () { return utils_1.jsonToCsv; } });
 var csv_pivot_1 = require("./csv-pivot");
 Object.defineProperty(exports, "toCsvPivot", { enumerable: true, get: function () { return csv_pivot_1.toCsvPivot; } });
 var json_pivot_1 = require("./json-pivot");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-convert",
-  "version": "30.2.1",
+  "version": "30.3.0",
   "description": "HESTIA Schema Converters",
   "main": "index.js",
   "typings": "index.d.ts",

package/utils.d.ts

@@ -1,3 +1,4 @@
+import { Json2CsvOptions } from 'json-2-csv';
 export declare const omitKeys: string[];
 export declare const parentKey: (key: string) => string;
 export declare const childkey: (key: string) => string;
@@ -18,3 +19,4 @@ export declare const daysInYear: (year: number) => 366 | 365;
 export declare const convertValue: (value: any) => any;
 export declare const findDuplicates: (values: string[]) => string[];
 export declare const findNonDuplicates: (values: string[]) => string[];
+export declare const jsonToCsv: (values: Record<string, any>[], options?: Json2CsvOptions) => string;

package/utils.js

@@ -36,7 +36,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findNonDuplicates = exports.findDuplicates = exports.convertValue = exports.daysInYear = exports.daysBefore = exports.diffInDays = exports.keyToLabel = exports.ellipsis = exports.reduceUndefinedValues = exports.nonEmptyNode = exports.nonEmptyValue = exports.isEmpty = exports.isNumber = exports.isBoolean = exports.isIri = exports.isExpandable = exports.omit = exports.childkey = exports.parentKey = exports.omitKeys = void 0;
+exports.jsonToCsv = exports.findNonDuplicates = exports.findDuplicates = exports.convertValue = exports.daysInYear = exports.daysBefore = exports.diffInDays = exports.keyToLabel = exports.ellipsis = exports.reduceUndefinedValues = exports.nonEmptyNode = exports.nonEmptyValue = exports.isEmpty = exports.isNumber = exports.isBoolean = exports.isIri = exports.isExpandable = exports.omit = exports.childkey = exports.parentKey = exports.omitKeys = void 0;
+var json_2_csv_1 = require("json-2-csv");
 var get = require('lodash.get');
 var unset = require('lodash.unset');
 exports.omitKeys = __spreadArray([
@@ -161,3 +162,22 @@ var findDuplicates = function (values) { return duplicates(count(values)); };
 exports.findDuplicates = findDuplicates;
 var findNonDuplicates = function (values) { return nonDuplicates(count(values)); };
 exports.findNonDuplicates = findNonDuplicates;
+/**
+ * Move every item on the same row.
+ *
+ * @param data
+ * @returns List of original records with less gaps in data.
+ */
+var compactDataForCsv = function (data) {
+    return data.reduce(function (prev, curr) {
+        var _a = __read(Object.entries(curr), 1), _b = __read(_a[0], 2), key = _b[0], value = _b[1];
+        var prevNoKeyIndex = prev.findIndex(function (p) { return !Object.keys(p).includes(key); });
+        prevNoKeyIndex >= 0 ? (prev[prevNoKeyIndex][key] = value) : prev.push(curr);
+        return prev;
+    }, []);
+};
+var jsonToCsv = function (values, options) {
+    if (options === void 0) { options = {}; }
+    return (0, json_2_csv_1.json2csv)(compactDataForCsv(values), __assign({ emptyFieldValue: '', expandNestedObjects: true, expandArrayObjects: true, arrayIndexesAsKeys: true, sortHeader: true }, options));
+};
+exports.jsonToCsv = jsonToCsv;