@hestia-earth/schema-convert 21.2.0 → 21.4.0

package/default-values.d.ts

@@ -1,6 +1,11 @@
 import { SchemaType, JSON as HestiaJson, Cycle, Product, Site, Organisation, Term, ImpactAssessment } from '@hestia-earth/schema';
+export declare const siteLocationName: (region?: Term, country?: Term) => string;
 export declare const primaryProduct: (products?: Product[], defaultValue?: Product) => Product;
+export declare const cycleDefaultName: ({ endDate, treatment, description }: Cycle, site?: Site, product?: Product) => string;
+export declare const calculateCycleDuration: ({ cycleDuration, startDate, endDate }: Cycle) => boolean;
+export declare const cycleDefaultDuration: ({ startDate, endDate }: Cycle) => number;
 export declare const extendCycle: (nodes: HestiaJson<SchemaType>[], cycle: Cycle) => Cycle;
+export declare const impactAssessmentDefaultName: ({ product, country, region, endDate }: Partial<ImpactAssessment>) => string;
 export declare const extendImpactAssessment: (_n: HestiaJson<SchemaType>[], impactAssessment: ImpactAssessment) => {
     name: string;
     version?: string;
@@ -39,5 +44,6 @@ export declare const extendImpactAssessment: (_n: HestiaJson<SchemaType>[], impa
     type: SchemaType.ImpactAssessment;
     id?: string;
 };
+export declare const siteDefaultName: ({ siteType, region, country, description }: Site, organisation?: Organisation) => string;
 export declare const extendSite: (nodes: HestiaJson<SchemaType>[], site: Site) => Site;
 export declare const setDefaultValues: (nodes: HestiaJson<any>[]) => (HestiaJson<SchemaType> | Partial<Partial<HestiaJson<SchemaType.Cycle>> | Partial<HestiaJson<SchemaType.ImpactAssessment>> | Partial<HestiaJson<SchemaType.Site>> | Partial<HestiaJson<SchemaType.Actor>> | Partial<HestiaJson<SchemaType.Animal>> | Partial<HestiaJson<SchemaType.Bibliography>> | Partial<HestiaJson<SchemaType.Completeness>> | Partial<HestiaJson<SchemaType.Emission>> | Partial<HestiaJson<SchemaType.Indicator>> | Partial<HestiaJson<SchemaType.Infrastructure>> | Partial<HestiaJson<SchemaType.Input>> | Partial<HestiaJson<SchemaType.Measurement>> | Partial<HestiaJson<SchemaType.Organisation>> | Partial<HestiaJson<SchemaType.Practice>> | Partial<HestiaJson<SchemaType.Product>> | Partial<HestiaJson<SchemaType.Property>> | Partial<HestiaJson<SchemaType.Source>> | Partial<HestiaJson<SchemaType.Term>> | Partial<HestiaJson<SchemaType.Transformation>> | Partial<HestiaJson<SchemaType.Transport>>>)[];

package/default-values.js

@@ -12,7 +12,7 @@ var __assign = (this && this.__assign) || function () {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setDefaultValues = exports.extendSite = exports.extendImpactAssessment = exports.extendCycle = exports.primaryProduct = void 0;
+exports.setDefaultValues = exports.extendSite = exports.siteDefaultName = exports.extendImpactAssessment = exports.impactAssessmentDefaultName = exports.extendCycle = exports.cycleDefaultDuration = exports.calculateCycleDuration = exports.cycleDefaultName = exports.primaryProduct = exports.siteLocationName = void 0;
 var schema_1 = require("@hestia-earth/schema");
 var utils_1 = require("./utils");
 var findLinkedNode = function (nodes, type, node) {
@@ -25,6 +25,7 @@ var siteLocationName = function (region, country) { return [
     // make sure country doesnt appear in region already, if so don't add it
     (country === null || country === void 0 ? void 0 : country.name) ? ((region === null || region === void 0 ? void 0 : region.name) && region.name.includes(country === null || country === void 0 ? void 0 : country.name) ? undefined : country === null || country === void 0 ? void 0 : country.name) : undefined
 ].filter(Boolean).join(', '); };
+exports.siteLocationName = siteLocationName;
 var primaryProduct = function (products, defaultValue) {
     if (defaultValue === void 0) { defaultValue = {}; }
     return (products && products.length ? (products.find(function (product) { return product.primary || product.economicValueShare > 50; }) || products[0]) : null) || defaultValue;
@@ -33,9 +34,9 @@ exports.primaryProduct = primaryProduct;
 var defaultName = function (product, country, region, endDate, treatment, description) {
     return [
         (product === null || product === void 0 ? void 0 : product.name) || 'No Product',
-        siteLocationName(region, country),
+        (0, exports.siteLocationName)(region, country),
         endDate,
-        treatment,
+        (0, utils_1.ellipsis)(treatment, 20),
         (0, utils_1.ellipsis)(description, 30)
     ].filter(Boolean).join(' - ');
 };
@@ -43,40 +44,45 @@ var cycleDefaultName = function (_a, site, product) {
     var endDate = _a.endDate, treatment = _a.treatment, description = _a.description;
     return defaultName(product === null || product === void 0 ? void 0 : product.term, site === null || site === void 0 ? void 0 : site.country, site === null || site === void 0 ? void 0 : site.region, endDate, treatment, description);
 };
+exports.cycleDefaultName = cycleDefaultName;
 var cycleDurationDefault = 365;
 var calculateCycleDuration = function (_a) {
     var cycleDuration = _a.cycleDuration, startDate = _a.startDate, endDate = _a.endDate;
     return (!cycleDuration || cycleDuration === cycleDurationDefault) &&
         startDate && endDate && (new Date(startDate).getTime() < new Date(endDate).getTime());
 };
+exports.calculateCycleDuration = calculateCycleDuration;
 var cycleDefaultDuration = function (_a) {
     var startDate = _a.startDate, endDate = _a.endDate;
     return (0, utils_1.diffInDays)(startDate, endDate);
 };
+exports.cycleDefaultDuration = cycleDefaultDuration;
 var extendCycle = function (nodes, cycle) {
     var product = (0, exports.primaryProduct)(cycle.products);
     var site = findLinkedNode(nodes, schema_1.SchemaType.Site, cycle.site);
-    return __assign(__assign(__assign({}, cycle), { name: cycleDefaultName(cycle, site, product) }), (calculateCycleDuration(cycle) ? { cycleDuration: cycleDefaultDuration(cycle) } : {}));
+    return __assign(__assign(__assign({}, cycle), { name: (0, exports.cycleDefaultName)(cycle, site, product) }), ((0, exports.calculateCycleDuration)(cycle) ? { cycleDuration: (0, exports.cycleDefaultDuration)(cycle) } : {}));
 };
 exports.extendCycle = extendCycle;
 var impactAssessmentDefaultName = function (_a) {
     var product = _a.product, country = _a.country, region = _a.region, endDate = _a.endDate;
     return defaultName(product === null || product === void 0 ? void 0 : product.term, country, region, endDate);
 };
-var extendImpactAssessment = function (_n, impactAssessment) { return (__assign(__assign({}, impactAssessment), { name: impactAssessment.name || impactAssessmentDefaultName(impactAssessment) })); };
+exports.impactAssessmentDefaultName = impactAssessmentDefaultName;
+var extendImpactAssessment = function (_n, impactAssessment) { return (__assign(__assign({}, impactAssessment), { name: impactAssessment.name || (0, exports.impactAssessmentDefaultName)(impactAssessment) })); };
 exports.extendImpactAssessment = extendImpactAssessment;
 var siteDefaultName = function (_a, organisation) {
     var siteType = _a.siteType, region = _a.region, country = _a.country, description = _a.description;
     return [
         siteType ? (0, utils_1.keyToLabel)(siteType) : null,
         organisation === null || organisation === void 0 ? void 0 : organisation.name,
-        siteLocationName(region, country),
+        (0, exports.siteLocationName)(region, country),
         (0, utils_1.ellipsis)(description, 30)
     ].filter(Boolean).join(' - ');
 };
+exports.siteDefaultName = siteDefaultName;
 var extendSite = function (nodes, site) {
     var org = findLinkedNode(nodes, schema_1.SchemaType.Organisation, site.organisation);
-    return __assign(__assign({}, site), { name: siteDefaultName(site, org) });
+    return __assign(__assign({}, site), { name: (0, exports.siteDefaultName)(site, org) });
 };
 exports.extendSite = extendSite;
 var extendNodeType = (_a = {},

package/json.js

@@ -455,6 +455,15 @@ var extendDataFromSchema = function (_a, schema, type, ignoreInternal, addDefaul
         }, {}) :
         {})), nodeType(id, type, '@id' in data)), true);
 };
+var validateArrayType = function (schema, def, key, value) {
+    return typeof value !== 'object' || def.type !== 'array' || Array.isArray(value) || (0, exports.throwCSVError)({
+        schema: schema.title,
+        message: 'object-array-invalid',
+        schemaKey: key,
+        key: key,
+        value: value
+    });
+};
 var mapContent = function (schemas, schema, ignoreInternal) { return function (json) {
     return Object.keys(json)
         .filter(nonEmptyCell)
@@ -464,6 +473,8 @@ var mapContent = function (schemas, schema, ignoreInternal) { return function (j
         var propertyDefinition = getPropertyDefinition(schema, key, false, json);
         var valueType = getValueType(schema, json);
         var type = getPropertyType(propertyDefinition, key, valueType);
+        // console.log(key, propertyDefinition, valueType, type, typeof value);
+        validateArrayType(schema, propertyDefinition, key, value);
         var newValue = key === VALUE_TYPE_KEY ? '' : propertyInvalidFormat(schema, key, value, function () {
             return Array.isArray(type) ? value : propertyTypeToValue[type](value, schemas, propertyDefinition, ignoreInternal);
         });

package/package.json

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