json-rest-api 1.0.14 → 1.0.15

package/plugins/core/lib/anyapi/schema-utils.js

@@ -1,9 +1,9 @@
-const STRING_SLOT_COUNT = 10;
-const NUMBER_SLOT_COUNT = 10;
-const BOOLEAN_SLOT_COUNT = 5;
-const DATE_SLOT_COUNT = 5;
-const JSON_SLOT_COUNT = 5;
-const BELONGS_TO_SLOT_COUNT = 5;
+const STRING_SLOT_COUNT = 10
+const NUMBER_SLOT_COUNT = 10
+const BOOLEAN_SLOT_COUNT = 5
+const DATE_SLOT_COUNT = 5
+const JSON_SLOT_COUNT = 5
+const BELONGS_TO_SLOT_COUNT = 5
 
 export const SLOT_LIMITS = {
   string: STRING_SLOT_COUNT,
@@ -12,7 +12,7 @@ export const SLOT_LIMITS = {
   date: DATE_SLOT_COUNT,
   json: JSON_SLOT_COUNT,
   belongsTo: BELONGS_TO_SLOT_COUNT,
-};
+}
 
 export const DEFAULT_CANONICAL_CONFIG = {
   scopeName: 'anyapi_records',
@@ -25,137 +25,137 @@ export const DEFAULT_CANONICAL_CONFIG = {
   leftResourceColumn: 'left_resource',
   rightIdColumn: 'right_id',
   rightResourceColumn: 'right_resource',
-};
+}
 
 const ensureTable = async (knex, tableName, tableBuilder) => {
-  const exists = await knex.schema.hasTable(tableName);
+  const exists = await knex.schema.hasTable(tableName)
   if (!exists) {
-    await knex.schema.createTable(tableName, tableBuilder);
+    await knex.schema.createTable(tableName, tableBuilder)
   }
-};
+}
 
 const ensureIndex = async (knex, tableName, columns, indexName) => {
-  const exists = await knex.schema.hasTable(tableName);
-  if (!exists) return;
-  const hasIndex = await knex.schema.withSchema('main').hasIndex?.(tableName, indexName);
+  const exists = await knex.schema.hasTable(tableName)
+  if (!exists) return
+  const hasIndex = await knex.schema.withSchema('main').hasIndex?.(tableName, indexName)
   if (!hasIndex) {
     await knex.schema.table(tableName, (table) => {
-      table.index(columns, indexName);
-    });
+      table.index(columns, indexName)
+    })
   }
-};
+}
 
 export const ensureAnyApiSchema = async (knex) => {
   await ensureTable(knex, 'any_records', (table) => {
-    table.increments('id').primary();
-    table.string('tenant_id').notNullable();
-    table.string('resource').notNullable();
+    table.increments('id').primary()
+    table.string('tenant_id').notNullable()
+    table.string('resource').notNullable()
 
     for (let index = 1; index <= STRING_SLOT_COUNT; index += 1) {
-      table.text(`string_${index}`);
+      table.text(`string_${index}`)
     }
     for (let index = 1; index <= NUMBER_SLOT_COUNT; index += 1) {
-      table.double(`number_${index}`);
+      table.double(`number_${index}`)
     }
     for (let index = 1; index <= BOOLEAN_SLOT_COUNT; index += 1) {
-      table.boolean(`boolean_${index}`);
+      table.boolean(`boolean_${index}`)
     }
     for (let index = 1; index <= DATE_SLOT_COUNT; index += 1) {
-      table.dateTime(`date_${index}`);
+      table.dateTime(`date_${index}`)
     }
     for (let index = 1; index <= JSON_SLOT_COUNT; index += 1) {
-      table.text(`json_${index}`);
+      table.text(`json_${index}`)
     }
 
     for (let index = 1; index <= BELONGS_TO_SLOT_COUNT; index += 1) {
-      table.string(`rel_${index}_id`);
-      table.string(`rel_${index}_type`);
+      table.string(`rel_${index}_id`)
+      table.string(`rel_${index}_type`)
     }
 
-    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('deleted_at');
+    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('deleted_at')
 
-    table.index(['tenant_id', 'resource']);
-    table.index(['resource']);
-  });
+    table.index(['tenant_id', 'resource'])
+    table.index(['resource'])
+  })
 
   await ensureTable(knex, 'any_links', (table) => {
-    table.increments('id').primary();
-    table.string('tenant_id').notNullable();
-    table.string('relationship').notNullable();
-    table.string('inverse_relationship');
-    table.string('left_resource').notNullable();
-    table.string('left_id').notNullable();
-    table.string('right_resource').notNullable();
-    table.string('right_id').notNullable();
-    table.text('payload');
-    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable();
-
-    table.index(['tenant_id', 'relationship']);
-    table.index(['tenant_id', 'inverse_relationship']);
-    table.index(['tenant_id', 'left_resource']);
-    table.index(['tenant_id', 'right_resource']);
-    table.index(['relationship']);
-    table.index(['inverse_relationship']);
-  });
+    table.increments('id').primary()
+    table.string('tenant_id').notNullable()
+    table.string('relationship').notNullable()
+    table.string('inverse_relationship')
+    table.string('left_resource').notNullable()
+    table.string('left_id').notNullable()
+    table.string('right_resource').notNullable()
+    table.string('right_id').notNullable()
+    table.text('payload')
+    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable()
+
+    table.index(['tenant_id', 'relationship'])
+    table.index(['tenant_id', 'inverse_relationship'])
+    table.index(['tenant_id', 'left_resource'])
+    table.index(['tenant_id', 'right_resource'])
+    table.index(['relationship'])
+    table.index(['inverse_relationship'])
+  })
 
   await ensureTable(knex, 'any_resource_configs', (table) => {
-    table.increments('id').primary();
-    table.string('tenant_id').notNullable();
-    table.string('resource').notNullable();
-    table.text('schema_json').notNullable();
-    table.text('relationships_json').notNullable();
-    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable();
+    table.increments('id').primary()
+    table.string('tenant_id').notNullable()
+    table.string('resource').notNullable()
+    table.text('schema_json').notNullable()
+    table.text('relationships_json').notNullable()
+    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable()
 
-    table.unique(['tenant_id', 'resource']);
-  });
+    table.unique(['tenant_id', 'resource'])
+  })
 
   await ensureTable(knex, 'any_field_configs', (table) => {
-    table.increments('id').primary();
+    table.increments('id').primary()
     table.integer('resource_config_id').notNullable()
-      .references('id').inTable('any_resource_configs').onDelete('CASCADE');
-    table.string('field_name').notNullable();
-    table.string('slot_type').notNullable();
-    table.integer('slot_index').notNullable();
-    table.string('slot_column').notNullable();
-    table.boolean('nullable').defaultTo(false).notNullable();
-    table.boolean('required').defaultTo(false).notNullable();
-    table.string('target_resource');
-    table.string('alias');
-    table.text('meta_json');
-    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable();
-
-    table.unique(['resource_config_id', 'field_name']);
-    table.index(['resource_config_id']);
-  });
+      .references('id').inTable('any_resource_configs').onDelete('CASCADE')
+    table.string('field_name').notNullable()
+    table.string('slot_type').notNullable()
+    table.integer('slot_index').notNullable()
+    table.string('slot_column').notNullable()
+    table.boolean('nullable').defaultTo(false).notNullable()
+    table.boolean('required').defaultTo(false).notNullable()
+    table.string('target_resource')
+    table.string('alias')
+    table.text('meta_json')
+    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable()
+
+    table.unique(['resource_config_id', 'field_name'])
+    table.index(['resource_config_id'])
+  })
 
   await ensureTable(knex, 'any_relationship_configs', (table) => {
-    table.increments('id').primary();
+    table.increments('id').primary()
     table.integer('resource_config_id').notNullable()
-      .references('id').inTable('any_resource_configs').onDelete('CASCADE');
-    table.string('relationship_name').notNullable();
-    table.string('relationship_type').notNullable();
-    table.string('target_resource');
-    table.integer('slot_index');
-    table.string('id_column');
-    table.string('type_column');
-    table.string('relationship_key');
-    table.string('through');
-    table.string('foreign_key');
-    table.string('other_key');
-    table.string('alias');
-    table.text('meta_json');
-    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable();
-    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable();
-
-    table.unique(['resource_config_id', 'relationship_name']);
-    table.index(['resource_config_id']);
-  });
-};
+      .references('id').inTable('any_resource_configs').onDelete('CASCADE')
+    table.string('relationship_name').notNullable()
+    table.string('relationship_type').notNullable()
+    table.string('target_resource')
+    table.integer('slot_index')
+    table.string('id_column')
+    table.string('type_column')
+    table.string('relationship_key')
+    table.string('through')
+    table.string('foreign_key')
+    table.string('other_key')
+    table.string('alias')
+    table.text('meta_json')
+    table.dateTime('created_at').defaultTo(knex.fn.now()).notNullable()
+    table.dateTime('updated_at').defaultTo(knex.fn.now()).notNullable()
+
+    table.unique(['resource_config_id', 'relationship_name'])
+    table.index(['resource_config_id'])
+  })
+}
 
 export const SLOT_POOLS = {
   string: Array.from({ length: STRING_SLOT_COUNT }, (_, index) => `string_${index + 1}`),
@@ -164,7 +164,7 @@ export const SLOT_POOLS = {
   date: Array.from({ length: DATE_SLOT_COUNT }, (_, index) => `date_${index + 1}`),
   json: Array.from({ length: JSON_SLOT_COUNT }, (_, index) => `json_${index + 1}`),
   belongsTo: Array.from({ length: BELONGS_TO_SLOT_COUNT }, (_, index) => index + 1),
-};
+}
 
 export const TYPE_TO_POOL = new Map([
   ['string', 'string'],
@@ -183,4 +183,4 @@ export const TYPE_TO_POOL = new Map([
   ['time', 'date'],
   ['json', 'json'],
   ['object', 'json'],
-]);
+])

package/plugins/core/lib/anyapi/utils/descriptor-helpers.js

@@ -1,104 +1,104 @@
-import { RestApiValidationError } from '../../../../../lib/rest-api-errors.js';
+import { RestApiValidationError } from '../../../../../lib/rest-api-errors.js'
 
-export const normalizeId = (value) => (value === null || value === undefined ? null : String(value));
+export const normalizeId = (value) => (value === null || value === undefined ? null : String(value))
 
 export const findSchemaFieldByAlias = (descriptor, alias) => {
-  if (!descriptor?.schema) return null;
+  if (!descriptor?.schema) return null
   for (const [fieldName, definition] of Object.entries(descriptor.schema)) {
-    if (!definition) continue;
+    if (!definition) continue
     if (definition.as === alias) {
-      return { fieldName, definition };
+      return { fieldName, definition }
     }
     if (definition.belongsTo && !definition.as) {
-      const inferredAlias = fieldName.endsWith('_id') ? fieldName.slice(0, -3) : fieldName;
+      const inferredAlias = fieldName.endsWith('_id') ? fieldName.slice(0, -3) : fieldName
       if (inferredAlias === alias) {
-        return { fieldName, definition };
+        return { fieldName, definition }
       }
     }
   }
-  return null;
-};
+  return null
+}
 
 export const resolveFieldInfo = (descriptor, field) => {
-  if (!descriptor) return null;
+  if (!descriptor) return null
   if (field === 'id') {
-    return { column: 'id', definition: { type: 'id' } };
+    return { column: 'id', definition: { type: 'id' } }
   }
 
-  const directField = descriptor.fields?.[field];
+  const directField = descriptor.fields?.[field]
   if (directField?.slot) {
     return {
       column: directField.slot,
       definition: descriptor.schema?.[field] || null,
-    };
+    }
   }
 
-  const belongsToInfo = descriptor.belongsTo?.[field];
+  const belongsToInfo = descriptor.belongsTo?.[field]
   if (belongsToInfo?.idColumn) {
-    const schemaField = findSchemaFieldByAlias(descriptor, field);
+    const schemaField = findSchemaFieldByAlias(descriptor, field)
     return {
       column: belongsToInfo.idColumn,
       definition: schemaField?.definition || null,
       isRelationship: true,
-    };
+    }
   }
 
-  const aliasField = findSchemaFieldByAlias(descriptor, field);
+  const aliasField = findSchemaFieldByAlias(descriptor, field)
   if (aliasField) {
-    const fieldEntry = descriptor.fields?.[aliasField.fieldName];
+    const fieldEntry = descriptor.fields?.[aliasField.fieldName]
     if (fieldEntry?.slot) {
       return {
         column: fieldEntry.slot,
         definition: aliasField.definition,
-      };
+      }
     }
   }
 
-  return null;
-};
+  return null
+}
 
 export const coerceValueForDefinition = (value, definition, { isRelationship } = {}) => {
-  if (value === null || value === undefined) return null;
+  if (value === null || value === undefined) return null
 
   if (isRelationship) {
-    return normalizeId(value);
+    return normalizeId(value)
   }
 
-  const type = definition?.type || definition?.dataType;
+  const type = definition?.type || definition?.dataType
   if (!type) {
-    return value;
+    return value
   }
 
   if (['number', 'integer', 'float', 'decimal'].includes(type)) {
-    const numeric = Number(value);
-    return Number.isNaN(numeric) ? value : numeric;
+    const numeric = Number(value)
+    return Number.isNaN(numeric) ? value : numeric
   }
 
   if (type === 'boolean') {
-    if (typeof value === 'boolean') return value;
+    if (typeof value === 'boolean') return value
     if (typeof value === 'string') {
-      if (value.toLowerCase() === 'true') return true;
-      if (value.toLowerCase() === 'false') return false;
+      if (value.toLowerCase() === 'true') return true
+      if (value.toLowerCase() === 'false') return false
     }
-    return Boolean(value);
+    return Boolean(value)
   }
 
   if (['string', 'text', 'uuid', 'email'].includes(type)) {
-    return String(value);
+    return String(value)
   }
 
-  return value;
-};
+  return value
+}
 
 export const normalizeFilterValues = (rawValue, definition, options) => {
   if (Array.isArray(rawValue)) {
-    return rawValue.map((item) => coerceValueForDefinition(item, definition, options));
+    return rawValue.map((item) => coerceValueForDefinition(item, definition, options))
   }
-  return [coerceValueForDefinition(rawValue, definition, options)];
-};
+  return [coerceValueForDefinition(rawValue, definition, options)]
+}
 
 export const ensureFilterableField = (descriptor, field) => {
-  const fieldInfo = resolveFieldInfo(descriptor, field);
+  const fieldInfo = resolveFieldInfo(descriptor, field)
   if (!fieldInfo?.column) {
     throw new RestApiValidationError('Invalid filter field', {
       fields: [`filters.${field}`],
@@ -107,7 +107,7 @@ export const ensureFilterableField = (descriptor, field) => {
         rule: 'unknown_field',
         message: `Filter on '${field}' is not supported in AnyAPI mode`,
       }],
-    });
+    })
   }
-  return fieldInfo;
-};
+  return fieldInfo
+}