@strapi/strapi 4.3.0-beta.2 → 4.3.0

package/bin/strapi.js

@@ -213,17 +213,6 @@ program
   .description('List all the application content-types')
   .action(getLocalScript('content-types/list'));
 
-program
-  .command('content-types:generate-types')
-  .description('Generate TypeScript typings for the content-types')
-  .option(
-    '-o, --out-dir <outDir>',
-    'Specify a relative directory in which the schemas definitions will be generated'
-  )
-  .option('-f, --file <file>', 'Specify a filename to store the schemas definitions')
-  .option('--verbose', `Display more information about the types generation`, false)
-  .action(getLocalScript('content-types/generate-types'));
-
 program
   .command('hooks:list')
   .description('List all the application hooks')
@@ -251,4 +240,16 @@ program
   .description('Enable anonymous telemetry and metadata sending to Strapi analytics')
   .action(getLocalScript('opt-in-telemetry'));
 
+program
+  .command('ts:generate-types')
+  .description(`Generate TypeScript typings for your schemas`)
+  .option(
+    '-o, --out-dir <outDir>',
+    'Specify a relative directory in which the schemas definitions will be generated'
+  )
+  .option('-f, --file <file>', 'Specify a filename to store the schemas definitions')
+  .option('--verbose', `Display more information about the types generation`, false)
+  .option('-s, --silent', `Run the generation silently, without any output`, false)
+  .action(getLocalScript('ts/generate-types'));
+
 program.parseAsync(process.argv);

package/lib/Strapi.js

@@ -405,8 +405,10 @@ class Strapi {
       entityValidator: this.entityValidator,
     });
 
-    const cronTasks = this.config.get('server.cron.tasks', {});
-    this.cron.add(cronTasks);
+    if (strapi.config.get('server.cron.enabled', true)) {
+      const cronTasks = this.config.get('server.cron.tasks', {});
+      this.cron.add(cronTasks);
+    }
 
     this.telemetry.bootstrap();
 

package/lib/commands/{content-types → ts}/generate-types.js

@@ -4,7 +4,12 @@ const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../../index');
 
-module.exports = async function({ outDir, file, verbose }) {
+module.exports = async function({ outDir, file, verbose, silent }) {
+  if (verbose && silent) {
+    console.error('You cannot enable verbose and silent flags at the same time, exiting...');
+    process.exit(1);
+  }
+
   const appContext = await strapi.compile();
   const app = await strapi(appContext).register();
 
@@ -14,6 +19,7 @@ module.exports = async function({ outDir, file, verbose }) {
     file,
     dirs: appContext,
     verbose,
+    silent,
   });
 
   app.destroy();

package/lib/core/domain/content-type/validator.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const { yup, toRegressedEnumValue, startsWithANumber } = require('@strapi/utils');
+const { yup, toRegressedEnumValue } = require('@strapi/utils');
 
 const LIFECYCLES = [
   'beforeCreate',
@@ -24,6 +24,20 @@ const LIFECYCLES = [
   'afterDeleteMany',
 ];
 
+/**
+ * For enumerations the least common denomiator is GraphQL, where
+ * values needs to match the secure name regex:
+ * GraphQL Spec https://spec.graphql.org/June2018/#sec-Names
+ *
+ * Therefore we need to make sure our users only use values, which
+ * can be returned by GraphQL, by checking the regressed values
+ * agains the GraphQL regex.
+ *
+ * TODO V5: check if we can avoid this coupling by moving this logic
+ * into the GraphQL plugin.
+ */
+const GRAPHQL_ENUM_REGEX = new RegExp('^[_A-Za-z][_0-9A-Za-z]*$');
+
 const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () =>
   yup
     .mixed()
@@ -54,22 +68,29 @@ const contentTypeSchemaValidator = yup.object().shape({
         for (const attrName in attributes) {
           const attr = attributes[attrName];
           if (attr.type === 'enumeration') {
-            // should not start by a number
-            if (attr.enum.some(startsWithANumber)) {
-              const message = `Enum values should not start with a number. Please modify your enumeration '${attrName}'.`;
+            const regressedValues = attr.enum.map(toRegressedEnumValue);
+
+            // should match the GraphQL regex
+            if (!regressedValues.every(value => GRAPHQL_ENUM_REGEX.test(value))) {
+              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceeding the first occurence of a number. Update your enumeration '${attrName}'.`;
 
               return this.createError({ message });
             }
 
+            // should not contain empty values
+            if (regressedValues.some(value => value === '')) {
+              return this.createError({
+                message: `At least one value of the enumeration '${attrName}' appears to be empty. Only alphanumerical characters are taken into account.`,
+              });
+            }
+
             // should not collide
             const duplicates = _.uniq(
-              attr.enum
-                .map(toRegressedEnumValue)
-                .filter((value, index, values) => values.indexOf(value) !== index)
+              regressedValues.filter((value, index, values) => values.indexOf(value) !== index)
             );
 
             if (duplicates.length) {
-              const message = `Some enum values of the field '${attrName}' collide when normalized: ${duplicates.join(
+              const message = `Some enumeration values of the field '${attrName}' collide when normalized: ${duplicates.join(
                 ', '
               )}. Please modify your enumeration.`;
 

package/lib/services/cron.js

@@ -5,6 +5,7 @@ const { isFunction } = require('lodash/fp');
 
 const createCronService = () => {
   let jobsSpecs = [];
+  let running = false;
 
   return {
     add(tasks = {}) {
@@ -29,18 +30,21 @@ const createCronService = () => {
 
         const job = new Job(null, fnWithStrapi);
         jobsSpecs.push({ job, options });
+
+        if (running) {
+          job.schedule(options);
+        }
       }
       return this;
     },
     start() {
-      if (!strapi.config.get('server.cron.enabled')) {
-        return;
-      }
       jobsSpecs.forEach(({ job, options }) => job.schedule(options));
+      running = true;
       return this;
     },
     stop() {
       jobsSpecs.forEach(({ job }) => job.cancel());
+      running = false;
       return this;
     },
     destroy() {

package/lib/services/webhook-runner.js

@@ -29,7 +29,7 @@ class WebhookRunner {
 
     this.config = _.merge(defaultConfiguration, configuration);
 
-    this.queue = new WorkerQueue({ logger, concurency: 5 });
+    this.queue = new WorkerQueue({ logger, concurrency: 5 });
     this.queue.subscribe(this.executeListener.bind(this));
   }
 

package/lib/types/core/strapi/index.d.ts

@@ -1,4 +1,5 @@
 import type Koa from 'koa';
+import { Database } from '@strapi/database';
 
 import type { StringMap } from './utils';
 import type { GenericController } from '../core-api/controller'
@@ -335,6 +336,26 @@ export interface Strapi {
    * Telemetry util used to collect anonymous data on the application usage
    */
   telemetry: any;
+
+  /**
+   * Strapi DB layer instance
+   */
+  db: Database;
+
+  /**
+   * Core Store accessor
+   */
+  store: any;
+
+  /**
+   * Entity Validator instance
+   */
+  entityValidator: any;
+
+  /**
+   * Entity Service instance
+   */
+  entityService: any;  
 }
 
 export interface Lifecycles {

package/lib/types/factories.d.ts

@@ -2,7 +2,7 @@ import { Service } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
-import { Strapi } from '@strapi/strapi'
+import { Strapi } from '@strapi/strapi';
 
 type ControllerConfig<T extends Controller = Controller> = T;
 
@@ -10,8 +10,8 @@ type ServiceConfig = Service;
 
 type HandlerConfig = {
   auth?: false | { scope: string[] };
-  policies?: Array<string | Policy>;
-  middlewares?: Array<string | Middleware>;
+  policies?: Array<string | Policy | { name: string; config: object }>;
+  middlewares?: Array<string | Middleware | { name: string; config: object }>;
 };
 
 type SingleTypeRouterConfig = {
@@ -44,9 +44,17 @@ interface Router {
   routes: Route[];
 }
 
-type ControllerCallback <T extends GenericController = GenericController> = (params:{strapi:Strapi}) => T;
-type ServiceCallback <T extends Service = Service> = (params:{strapi:Strapi}) => T
+type ControllerCallback<T extends GenericController = GenericController> = (params: {
+  strapi: Strapi;
+}) => T;
+type ServiceCallback<T extends Service = Service> = (params: { strapi: Strapi }) => T;
 
 export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
-export function createCoreController<T extends GenericController = GenericController>(uid: string, cfg?: ControllerCallback<T> | T = {}): () => T & Controller;
-export function createCoreService<T extends Service = Service>(uid: string, cfg?: ServiceCallback<T> | T = {}): () => T ;
+export function createCoreController<T extends GenericController = GenericController>(
+  uid: string,
+  cfg?: ControllerCallback<T> | T = {}
+): () => T & Controller;
+export function createCoreService<T extends Service = Service>(
+  uid: string,
+  cfg?: ServiceCallback<T> | T = {}
+): () => T;

package/lib/utils/machine-id.js

@@ -1,14 +1,14 @@
 'use strict';
 
 const { machineIdSync } = require('node-machine-id');
-const uuid = require('uuid');
+const { v4: uuidv4 } = require('uuid');
 
 module.exports = () => {
   try {
     const deviceId = machineIdSync();
     return deviceId;
   } catch (error) {
-    const deviceId = uuid();
+    const deviceId = uuidv4();
     return deviceId;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.3.0-beta.2",
+  "version": "4.3.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",
@@ -80,23 +80,23 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.3.0-beta.2",
-    "@strapi/database": "4.3.0-beta.2",
-    "@strapi/generate-new": "4.3.0-beta.2",
-    "@strapi/generators": "4.3.0-beta.2",
-    "@strapi/logger": "4.3.0-beta.2",
-    "@strapi/plugin-content-manager": "4.3.0-beta.2",
-    "@strapi/plugin-content-type-builder": "4.3.0-beta.2",
-    "@strapi/plugin-email": "4.3.0-beta.2",
-    "@strapi/plugin-upload": "4.3.0-beta.2",
-    "@strapi/typescript-utils": "4.3.0-beta.2",
-    "@strapi/utils": "4.3.0-beta.2",
+    "@strapi/admin": "4.3.0",
+    "@strapi/database": "4.3.0",
+    "@strapi/generate-new": "4.3.0",
+    "@strapi/generators": "4.3.0",
+    "@strapi/logger": "4.3.0",
+    "@strapi/plugin-content-manager": "4.3.0",
+    "@strapi/plugin-content-type-builder": "4.3.0",
+    "@strapi/plugin-email": "4.3.0",
+    "@strapi/plugin-upload": "4.3.0",
+    "@strapi/typescript-utils": "4.3.0",
+    "@strapi/utils": "4.3.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
     "ci-info": "3.2.0",
-    "cli-table3": "0.6.1",
+    "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
     "debug": "4.3.2",
@@ -108,7 +108,7 @@
     "http-errors": "1.8.1",
     "inquirer": "8.2.4",
     "is-docker": "2.2.1",
-    "koa": "2.13.3",
+    "koa": "2.13.4",
     "koa-body": "4.2.0",
     "koa-compose": "4.1.0",
     "koa-compress": "5.1.0",
@@ -121,7 +121,7 @@
     "mime-types": "2.1.35",
     "node-fetch": "2.6.7",
     "node-machine-id": "1.1.12",
-    "node-schedule": "2.0.0",
+    "node-schedule": "2.1.0",
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
@@ -129,15 +129,15 @@
     "resolve-cwd": "3.0.0",
     "semver": "7.3.7",
     "statuses": "2.0.1",
-    "uuid": "^3.3.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "supertest": "^6.1.6",
+    "supertest": "6.2.4",
     "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "42aba356ad1b0751584d3b375e83baa4a2c18f65"
+  "gitHead": "74a2b908df75bc8001d72f9dc8571c4b7a2da337"
 }