@hestia-earth/schema-convert 7.7.0 → 7.9.0

package/json.js

@@ -110,6 +110,28 @@ var internalProperties = function (_a) {
 };
 var isEmptyCell = function (value) { return value === IGNORE_FIELD_KEY || value === ''; };
 var nonEmptyCell = function (value) { return !isEmptyCell(value); };
+var isEmptyValueType = (_a = {
+        undefined: function () { return true; },
+        number: function (value) { return isNaN(value); }
+    },
+    _a[schema_1.SchemaType.Term] = function (value) { return !(value['@id'] || value.id || value.name); },
+    _a.BlankNode = function (value, schemas) {
+        return Object.values(value).filter(function (value) { return !utils_1.isEmpty(value); }).length <= schemaMinKeys(schemas, value);
+    },
+    _a.array = function (value) { return value.filter(function (v) { return !utils_1.isEmpty(v); }).length === 0; },
+    _a.object = function (value, schemas) {
+        return Array.isArray(value) ?
+            isEmptyValueType.array(value) :
+            (value['@type'] || value.type) === schema_1.SchemaType.Term ?
+                isEmptyValueType[schema_1.SchemaType.Term](value) :
+                schema_1.isBlankNode(value) ?
+                    isEmptyValueType.BlankNode(value, schemas) :
+                    Object.keys(value).length === 0;
+    },
+    _a);
+var isEmptyValue = function (value, schemas) {
+    return (typeof value) in isEmptyValueType ? isEmptyValueType[typeof value](value, schemas) : isEmptyCell(value);
+};
 var compileFullKey = function (key1, key2) {
     // handle arrays
     var joinKey = (key2 || '').startsWith('[') ? '' : '.';
@@ -129,8 +151,9 @@ var parseError = function (err) { return safeParseJSON(err.message); };
 exports.throwCSVError = function (error) {
     throw new Error(JSON.stringify(error));
 };
-var schemaNotFoundError = function () { return exports.throwCSVError({
-    message: 'schema-not-found'
+var schemaNotFoundError = function (schema) { return exports.throwCSVError({
+    message: 'schema-not-found',
+    schema: schema
 }); };
 var propertyNotFoundError = function (schema, key, value) { return exports.throwCSVError({
     schema: schema.title,
@@ -172,10 +195,13 @@ var handleArrayError = function (func) { return function (value, index) {
 }; };
 /**
  * If the user provided a non-object where an object was expected, assume it was meant to be the `name` property.
+ * For non-Terms, we assume it is the `id`.
  *
  * @param value The value mapped as a Ref
  */
-var schemaRefValue = function (value) { return typeof value === 'object' ? value : ({ name: value }); };
+var schemaRefValue = function (value, schemaType) {
+    return typeof value === 'object' ? value : schemaType === schema_1.SchemaType.Term ? { name: value } : { id: value };
+};
 exports.cleanStringValue = function (value) { return (value.match(/^[\d]+\.[\d]+\.[\d]+$/) === null ? value.replace(/\.0$/, '') : value).trim(); };
 var propertyTypeToValue = {
     null: function (value) {
@@ -194,7 +220,15 @@ var propertyTypeToValue = {
             })() : +value;
     },
     integer: function (value) { return isEmptyCell(value) ? undefined : +value; },
-    boolean: function (value) { return isEmptyCell(value) ? undefined : value.toLowerCase() === 'true'; },
+    boolean: function (value) {
+        return isEmptyCell(value) ?
+            undefined :
+            utils_1.isBoolean(value) ?
+                value.toLowerCase() === 'true' :
+                (function () {
+                    throw new Error('failed to parse boolean, expected true or false');
+                })();
+    },
     object: function (value, schemas, _a, _i) {
         var $ref = _a.$ref, required = _a.required;
         return $ref ?
@@ -226,7 +260,7 @@ var propertyTypeToValue = {
         var $ref = _a.$ref;
         var schemaType = schema_1.refToSchemaType($ref);
         var schema = schemaType ? schemas[schemaType] : undefined;
-        var data = schema ? mapContent(schemas, schema, _i)(schemaRefValue(value)) : safeParseJSON(value);
+        var data = schema ? mapContent(schemas, schema, _i)(schemaRefValue(value, schemaType)) : safeParseJSON(value);
         return utils_1.isEmpty(data) ? {} : (schema ? extendDataFromSchema(data, schema, schemaType, _i) : data);
     }
 };
@@ -283,25 +317,6 @@ var extendDataFromSchema = function (_a, schema, type, ignoreInternal, top) {
         }, {}) :
         {})), nodeType(id, type, '@id' in data)), true);
 };
-var isEmptyValueType = (_a = {},
-    _a[schema_1.SchemaType.Term] = function (value) { return !(value['@id'] || value.id || value.name); },
-    _a.BlankNode = function (value, schemas) {
-        return Object.values(value).filter(function (value) { return !utils_1.isEmpty(value); }).length <= schemaMinKeys(schemas, value);
-    },
-    _a.array = function (value) { return value.filter(function (v) { return !utils_1.isEmpty(v); }).length === 0; },
-    _a.object = function (value, schemas) {
-        return Array.isArray(value) ?
-            isEmptyValueType.array(value) :
-            (value['@type'] || value.type) === schema_1.SchemaType.Term ?
-                isEmptyValueType[schema_1.SchemaType.Term](value) :
-                schema_1.isBlankNode(value) ?
-                    isEmptyValueType.BlankNode(value, schemas) :
-                    Object.keys(value).length === 0;
-    },
-    _a);
-var isEmptyValue = function (value, schemas) {
-    return (typeof value) in isEmptyValueType ? isEmptyValueType[typeof value](value, schemas) : isEmptyCell(value);
-};
 var mapContent = function (schemas, schema, ignoreInternal) { return function (json) {
     return Object.keys(json)
         .filter(nonEmptyCell)
@@ -319,7 +334,7 @@ var mapContent = function (schemas, schema, ignoreInternal) { return function (j
 }; };
 exports.formatNode = function (schemas, type, data, ignoreInternal, top) {
     if (top === void 0) { top = false; }
-    var schema = type in schemas ? schemas[type] : schemaNotFoundError();
+    var schema = type in schemas ? schemas[type] : schemaNotFoundError(type);
     var content = mapContent(schemas, schema, ignoreInternal)(data);
     return utils_1.reduceUndefinedValues(__assign({ id: isEmptyCell(data.id) ? undefined : data.id }, extendDataFromSchema(content, schema, type, ignoreInternal, top)), true);
 };
@@ -341,9 +356,14 @@ var convetToNode = function (schemas) { return function (data) {
  * @param content The content of the CSV as a string
  * @returns A list of JSON-LD content.
  */
-exports.toJson = function (schemas, content) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-    switch (_a.label) {
-        case 0: return [4 /*yield*/, csvtojson({ delimiter: 'auto' }).fromString(content)];
-        case 1: return [2 /*return*/, (_a.sent()).flatMap(convetToNode(schemas))];
-    }
-}); }); };
+exports.toJson = function (schemas, content) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, csvtojson({
+                    delimiter: 'auto',
+                    ignoreColumns: /^$/
+                }).fromString(content)];
+            case 1: return [2 /*return*/, (_a.sent()).flatMap(convetToNode(schemas))];
+        }
+    });
+}); };

package/package.json

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