@strapi/strapi 4.4.0-beta.1 → 4.4.0-beta.4

package/lib/Strapi.js

@@ -23,6 +23,7 @@ const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
 const createAuth = require('./services/auth');
 const createContentAPI = require('./services/content-api');
+const createCustomFields = require('./services/custom-fields');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
 const { LIFECYCLES } = require('./utils/lifecycles');
@@ -35,12 +36,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');
@@ -88,6 +91,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('content-api', createContentAPI(this));
@@ -111,6 +115,8 @@ class Strapi {
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
 
+    this.customFields = createCustomFields(this);
+
     createUpdateNotifier(this).notify();
   }
 
@@ -383,6 +389,8 @@ class Strapi {
     this.telemetry.register();
 
     await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
+    // NOTE: Swap type customField for underlying data type
+    convertCustomFieldType(this);
 
     return this;
   }

package/lib/commands/admin-create.js

@@ -17,7 +17,7 @@ const passwordValidator = yup
 const adminCreateSchema = yup.object().shape({
   email: emailValidator,
   password: passwordValidator,
-  firstname: yup.string().required('First name is required'),
+  firstname: yup.string().trim().required('First name is required'),
   lastname: yup.string(),
 });
 

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/types/core/strapi/index.d.ts

@@ -5,6 +5,28 @@ import type { StringMap } from './utils';
 import type { GenericController } from '../../../core-api/controller'
 import type { GenericService } from '../../../core-api/service'
 
+// TODO move custom fields types to a separate file
+interface CustomFieldServerOptions {
+  /**
+   * The name of the custom field
+   */
+  name: string;
+
+  /**
+   * The name of the plugin creating the custom field
+   */
+  plugin?: string;
+
+  /**
+   * The existing Strapi data type the custom field uses
+   */
+  type: string;
+}
+
+interface CustomFields {
+  register: (customFields: CustomFieldServerOptions[] | CustomFieldServerOptions) => void;
+}
+
 /**
  * The Strapi interface implemented by the main Strapi class.
  */
@@ -70,6 +92,13 @@ export interface Strapi {
    */
   contentType(uid: string): any;
 
+  /**
+   * The custom fields registry
+   * 
+   * It returns the custom fields interface
+   */
+  readonly customFields: CustomFields;
+
   /**
    * Getter for the Strapi policies container
    *
@@ -200,7 +229,7 @@ export interface Strapi {
   /**
    * Restart the server and reload all the configuration.
    * It re-runs all the lifecycles phases.
-   * 
+   *
    * @example
    * ``` ts
    * setImmediate(() => strapi.reload());
@@ -228,13 +257,13 @@ export interface Strapi {
   /**
    * Opent he administration panel in a browser if the option is enabled.
    * You can disable it using the admin.autoOpen configuration variable.
-   * 
+   *
    * Note: It only works in development envs.
    */
   openAdmin(options: { isInitialized: boolean }): Promise<void>;
 
   /**
-   * Load the admin panel server logic into the server code and initialize its configuration. 
+   * Load the admin panel server logic into the server code and initialize its configuration.
    */
   loadAdmin(): Promise<void>;
 
@@ -293,7 +322,7 @@ export interface Strapi {
   container: any;
 
   /**
-   * References to all the directories handled by Strapi 
+   * References to all the directories handled by Strapi
    */
   dirs: StrapiDirectories;
 
@@ -328,7 +357,7 @@ export interface Strapi {
   startupLogger: any;
 
   /**
-   * Strapi logger used to send errors, warning or information messages 
+   * Strapi logger used to send errors, warning or information messages
    */
   log: any;
 
@@ -361,7 +390,7 @@ export interface Strapi {
   /**
    * Entity Service instance
    */
-  entityService: any;  
+  entityService: any;
 }
 
 export interface Lifecycles {
@@ -394,4 +423,4 @@ export interface StrapiDirectories {
     middlewares: string;
     config: string;
   };
-}
+}

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.4.0-beta.1",
+  "version": "4.4.0-beta.4",
   "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",
@@ -80,18 +80,18 @@
   "dependencies": {
     "@koa/cors": "3.4.1",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.4.0-beta.1",
-    "@strapi/database": "4.4.0-beta.1",
-    "@strapi/generate-new": "4.4.0-beta.1",
-    "@strapi/generators": "4.4.0-beta.1",
-    "@strapi/logger": "4.4.0-beta.1",
-    "@strapi/permissions": "4.4.0-beta.1",
-    "@strapi/plugin-content-manager": "4.4.0-beta.1",
-    "@strapi/plugin-content-type-builder": "4.4.0-beta.1",
-    "@strapi/plugin-email": "4.4.0-beta.1",
-    "@strapi/plugin-upload": "4.4.0-beta.1",
-    "@strapi/typescript-utils": "4.4.0-beta.1",
-    "@strapi/utils": "4.4.0-beta.1",
+    "@strapi/admin": "4.4.0-beta.4",
+    "@strapi/database": "4.4.0-beta.4",
+    "@strapi/generate-new": "4.4.0-beta.4",
+    "@strapi/generators": "4.4.0-beta.4",
+    "@strapi/logger": "4.4.0-beta.4",
+    "@strapi/permissions": "4.4.0-beta.4",
+    "@strapi/plugin-content-manager": "4.4.0-beta.4",
+    "@strapi/plugin-content-type-builder": "4.4.0-beta.4",
+    "@strapi/plugin-email": "4.4.0-beta.4",
+    "@strapi/plugin-upload": "4.4.0-beta.4",
+    "@strapi/typescript-utils": "4.4.0-beta.4",
+    "@strapi/utils": "4.4.0-beta.4",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "cae16f7f259fa4473a55e8fea57839cda98f34ae"
+  "gitHead": "8ad31453be3eda4e01eae027995e7e584892e688"
 }