@extrahorizon/exh-cli 1.6.1-feat-42-c1c6f34 → 1.7.0-dev-48-62caf3f

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Extra Horizon CLI changelog
 
+### v1.7.0
+
+### v1.6.1
+* `exh data schemas sync` no longer logs the full schema definition json
+* Fixed `exh data schemas sync` not being able to traverse an object definition with only `additionalProperties` set
+
 ### v1.6.0
 * Fixed some security vulnerabilities in the dependencies (Thanks @tran-simon)
 * Removed the update notifier. The version of the package we used had security vulnerabilities and we're unable to migrate to the latest version right now. We'll look into this again in the future.

package/build/commands/data/schemas/util/schemaverify.js

@@ -111,7 +111,7 @@ _SchemaVerify_instances = new WeakSet(), _SchemaVerify_verifyMetaSchema = functi
         if (!this.ajv.validateSchema(tmpSchema)) {
             return { ok: false, errors: transformAjvErrors('', this.ajv.errors) };
         }
-        const errors = getIdInObjectArrayErrors(this.schema.properties);
+        const errors = getIdInObjectArrayErrors(this.schema);
         if (errors.length > 0) {
             return { ok: false, errors: errors.map(path => `The following id property is not allowed: ${path}`) };
         }
@@ -179,26 +179,29 @@ _SchemaVerify_instances = new WeakSet(), _SchemaVerify_verifyMetaSchema = functi
     }
     return { ok, errors };
 };
-function getIdInObjectArrayErrors(properties, path = []) {
+function getIdInObjectArrayErrors(configuration, pathPrefix = '') {
+    if (!configuration) {
+        return [];
+    }
     const pathsWithIdInArray = [];
-    let name;
-    let value;
-    for ([name, value] of Object.entries(properties)) {
-        while (value.type === 'array' && value.items.type === 'array') {
-            value = value.items;
-            name = `${name}.items`;
-        }
-        if (value.type === 'array' && value.items.type === 'object') {
-            if ('id' in value.items.properties) {
-                pathsWithIdInArray.push([...path, `${name}.items.properties`, 'id'].join('.'));
-            }
-            if (value.items.properties) {
-                pathsWithIdInArray.push(...getIdInObjectArrayErrors(value.items.properties, [...path, `${name}.items.properties`]));
+    if (configuration.type === 'object' || isSchemaConfiguration(configuration)) {
+        if (configuration.properties) {
+            for (const [name, value] of Object.entries(configuration.properties)) {
+                pathsWithIdInArray.push(...getIdInObjectArrayErrors(value, `${pathPrefix}properties.${name}.`));
             }
         }
-        if (value.type === 'object' && value.properties) {
-            pathsWithIdInArray.push(...getIdInObjectArrayErrors(value.properties, [...path, `${name}.properties`]));
+        if (configuration.additionalProperties) {
+            pathsWithIdInArray.push(...getIdInObjectArrayErrors(configuration.additionalProperties, `${pathPrefix}additionalProperties.`));
         }
     }
+    if (configuration.type === 'array') {
+        if (configuration.items.type === 'object' && configuration.items.properties?.id) {
+            pathsWithIdInArray.push(`${pathPrefix}items.properties.id`);
+        }
+        pathsWithIdInArray.push(...getIdInObjectArrayErrors(configuration.items, `${pathPrefix}items.`));
+    }
     return pathsWithIdInArray;
 }
+function isSchemaConfiguration(configuration) {
+    return configuration && configuration.properties;
+}

package/build/commands/data/schemas/util/syncSchema.js

@@ -57,7 +57,6 @@ _SyncSchema_instances = new WeakSet(), _SyncSchema_syncRootAttributes = async fu
         await schemaRepository.updateSchema(this.sdk, this.cloudSchema.id, diff);
     }
 }, _SyncSchema_syncProperties = async function _SyncSchema_syncProperties() {
-    console.log(JSON.stringify({ local: this.localSchema, cloud: this.cloudSchema }, null, 2));
     const propertiesDiff = compareSchemaKey(this.localSchema, this.cloudSchema, 'properties');
     if (this.dry) {
         reportSchemaChanges(`Schema ${this.cloudSchema.name} - Properties`, propertiesDiff);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.6.1-feat-42-c1c6f34",
+  "version": "1.7.0-dev-48-62caf3f",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",