@strapi/strapi 4.3.6 → 4.4.0-alpha.0

package/lib/Strapi.js

@@ -22,6 +22,7 @@ const createCronService = require('./services/cron');
 const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
 const createAuth = require('./services/auth');
+const createCustomFields = require('./services/custom-fields');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
 const { LIFECYCLES } = require('./utils/lifecycles');
@@ -34,12 +35,14 @@ const hooksRegistry = require('./core/registries/hooks');
 const controllersRegistry = require('./core/registries/controllers');
 const modulesRegistry = require('./core/registries/modules');
 const pluginsRegistry = require('./core/registries/plugins');
+const customFieldsRegistry = require('./core/registries/custom-fields');
 const createConfigProvider = require('./core/registries/config');
 const apisRegistry = require('./core/registries/apis');
 const bootstrap = require('./core/bootstrap');
 const loaders = require('./core/loaders');
 const { destroyOnSignal } = require('./utils/signals');
 const sanitizersRegistry = require('./core/registries/sanitizers');
+const convertCustomFieldType = require('./utils/convert-custom-field-type');
 
 // TODO: move somewhere else
 const draftAndPublishSync = require('./migrations/draft-publish');
@@ -87,6 +90,7 @@ class Strapi {
     this.container.register('controllers', controllersRegistry(this));
     this.container.register('modules', modulesRegistry(this));
     this.container.register('plugins', pluginsRegistry(this));
+    this.container.register('custom-fields', customFieldsRegistry(this));
     this.container.register('apis', apisRegistry(this));
     this.container.register('auth', createAuth(this));
     this.container.register('sanitizers', sanitizersRegistry(this));
@@ -109,6 +113,8 @@ class Strapi {
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
 
+    this.customFields = createCustomFields(this);
+
     createUpdateNotifier(this).notify();
   }
 
@@ -454,6 +460,8 @@ class Strapi {
 
   async load() {
     await this.register();
+    // Swap type customField for underlying data type
+    convertCustomFieldType(this);
     await this.bootstrap();
 
     this.isLoaded = true;

package/lib/core/registries/custom-fields.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const { has } = require('lodash/fp');
+const validators = require('../../services/entity-validator/validators');
+
+const customFieldsRegistry = strapi => {
+  const customFields = {};
+
+  return {
+    getAll() {
+      return customFields;
+    },
+    get(customField) {
+      const registeredCustomField = customFields[customField];
+      if (!registeredCustomField) {
+        throw new Error(`Could not find Custom Field: ${customField}`);
+      }
+
+      return registeredCustomField;
+    },
+    add(customField) {
+      const customFieldList = Array.isArray(customField) ? customField : [customField];
+
+      for (const cf of customFieldList) {
+        if (!has('name', cf) || !has('type', cf)) {
+          throw new Error(`Custom fields require a 'name' and 'type' key`);
+        }
+
+        const { name, plugin, type } = cf;
+        if (!has(type, validators)) {
+          throw new Error(
+            `Custom field type: '${type}' is not a valid Strapi type or it can't be used with a Custom Field`
+          );
+        }
+
+        const isValidObjectKey = /^(?![0-9])[a-zA-Z0-9$_-]+$/g;
+        if (!isValidObjectKey.test(name)) {
+          throw new Error(`Custom field name: '${name}' is not a valid object key`);
+        }
+
+        // When no plugin is specified, or it isn't found in Strapi, default to global
+        const uid = strapi.plugin(plugin) ? `plugin::${plugin}.${name}` : `global::${name}`;
+
+        if (has(uid, customFields)) {
+          throw new Error(`Custom field: '${uid}' has already been registered`);
+        }
+
+        customFields[uid] = cf;
+      }
+    },
+  };
+};
+
+module.exports = customFieldsRegistry;

package/lib/services/custom-fields.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const createCustomFields = strapi => {
+  return {
+    register(customField) {
+      strapi.container.get('custom-fields').add(customField);
+    },
+  };
+};
+
+module.exports = createCustomFields;

package/lib/utils/convert-custom-field-type.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const convertCustomFieldType = strapi => {
+  const allContentTypeSchemaAttributes = Object.values(strapi.contentTypes).map(
+    schema => schema.attributes
+  );
+  const allComponentSchemaAttributes = Object.values(strapi.components).map(
+    schema => schema.attributes
+  );
+  const allSchemasAttributes = [...allContentTypeSchemaAttributes, ...allComponentSchemaAttributes];
+
+  for (const schemaAttrbutes of allSchemasAttributes) {
+    for (const attribute of Object.values(schemaAttrbutes)) {
+      if (attribute.type === 'customField') {
+        const customField = strapi.container.get('custom-fields').get(attribute.customField);
+        attribute.type = customField.type;
+      }
+    }
+  }
+};
+
+module.exports = convertCustomFieldType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.3.6",
+  "version": "4.4.0-alpha.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -78,19 +78,19 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "@koa/cors": "3.1.0",
+    "@koa/cors": "3.4.1",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.3.6",
-    "@strapi/database": "4.3.6",
-    "@strapi/generate-new": "4.3.6",
-    "@strapi/generators": "4.3.6",
-    "@strapi/logger": "4.3.6",
-    "@strapi/plugin-content-manager": "4.3.6",
-    "@strapi/plugin-content-type-builder": "4.3.6",
-    "@strapi/plugin-email": "4.3.6",
-    "@strapi/plugin-upload": "4.3.6",
-    "@strapi/typescript-utils": "4.3.6",
-    "@strapi/utils": "4.3.6",
+    "@strapi/admin": "4.4.0-alpha.0",
+    "@strapi/database": "4.4.0-alpha.0",
+    "@strapi/generate-new": "4.4.0-alpha.0",
+    "@strapi/generators": "4.4.0-alpha.0",
+    "@strapi/logger": "4.4.0-alpha.0",
+    "@strapi/plugin-content-manager": "4.4.0-alpha.0",
+    "@strapi/plugin-content-type-builder": "4.4.0-alpha.0",
+    "@strapi/plugin-email": "4.4.0-alpha.0",
+    "@strapi/plugin-upload": "4.4.0-alpha.0",
+    "@strapi/typescript-utils": "4.4.0-alpha.0",
+    "@strapi/utils": "4.4.0-alpha.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -139,5 +139,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "4c6e67c4934580ed051a2afb83e6fc8f64f3a5b5"
+  "gitHead": "fc78298ae4f9b247d636beda568734d5f8ed7b3e"
 }