@strapi/strapi 4.2.1-alpha.0 → 4.3.0-beta.2

package/lib/load/load-files.js

@@ -3,6 +3,8 @@
 const path = require('path');
 const _ = require('lodash');
 const fse = require('fs-extra');
+
+const { importDefault } = require('../utils');
 const glob = require('./glob');
 const filePathToPath = require('./filepath-to-prop-path');
 
@@ -19,7 +21,7 @@ const filePathToPath = require('./filepath-to-prop-path');
 const loadFiles = async (
   dir,
   pattern,
-  { requireFn = require, shouldUseFileNameAsKey = () => true, globArgs = {} } = {}
+  { requireFn = importDefault, shouldUseFileNameAsKey = () => true, globArgs = {} } = {}
 ) => {
   const root = {};
   const files = await glob(pattern, { cwd: dir, ...globArgs });

package/lib/middlewares/favicon.js

@@ -15,5 +15,5 @@ const defaults = {
 module.exports = (config, { strapi }) => {
   const { maxAge, path: faviconPath } = defaultsDeep(defaults, config);
 
-  return favicon(resolve(strapi.dirs.root, faviconPath), { maxAge });
+  return favicon(resolve(strapi.dirs.app.root, faviconPath), { maxAge });
 };

package/lib/middlewares/public/index.js

@@ -80,7 +80,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/(.*)',
-        handler: koaStatic(strapi.dirs.public, {
+        handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,
         }),

package/lib/services/entity-service/index.d.ts

@@ -6,6 +6,7 @@ type ID = number | string;
 type EntityServiceAction =
   | 'findMany'
   | 'findPage'
+  | 'findWithRelationCountsPage'
   | 'findWithRelationCounts'
   | 'findOne'
   | 'count'
@@ -54,7 +55,7 @@ export interface EntityService {
     pagination: PaginationInfo;
   }>;
 
-  findWithRelationCounts<K extends keyof AllTypes, T extends AllTypes[K]>(
+  findWithRelationCountsPage<K extends keyof AllTypes, T extends AllTypes[K]>(
     uid: K,
     params: Params<T>
   ): Promise<{
@@ -62,6 +63,11 @@ export interface EntityService {
     pagination: PaginationInfo;
   }>;
 
+  findWithRelationCounts<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    params: Params<T>
+  ): Promise<T[]>;
+
   findOne<K extends keyof AllTypes, T extends AllTypes[K]>(
     uid: K,
     entityId: ID,

package/lib/services/entity-service/index.js

@@ -125,7 +125,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   // TODO: streamline the logic based on the populate option
-  async findWithRelationCounts(uid, opts) {
+  async findWithRelationCountsPage(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: 'findWithRelationCounts' });
 
     const query = transformParamsToQuery(uid, wrappedParams);
@@ -138,6 +138,16 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     };
   },
 
+  async findWithRelationCounts(uid, opts) {
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findWithRelationCounts' });
+
+    const query = transformParamsToQuery(uid, wrappedParams);
+
+    const results = await db.query(uid).findMany(query);
+
+    return results;
+  },
+
   async findOne(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: 'findOne' });
 

package/lib/services/fs.js

@@ -12,7 +12,7 @@ module.exports = strapi => {
 
     const normalizedPath = path.normalize(filePath).replace(/^\/?(\.\/|\.\.\/)+/, '');
 
-    return path.resolve(strapi.dirs.root, normalizedPath);
+    return path.resolve(strapi.dirs.app.root, normalizedPath);
   }
 
   const strapiFS = {

package/lib/services/metrics/index.js

@@ -33,6 +33,10 @@ const createTelemetryInstance = strapi => {
   const sendEvent = wrapWithRateLimit(sender, { limitedEvents: LIMITED_EVENTS });
 
   return {
+    get isDisabled() {
+      return isDisabled;
+    },
+
     register() {
       if (!isDisabled) {
         const pingCron = scheduleJob('0 0 12 * * *', () => sendEvent('ping'));
@@ -92,7 +96,7 @@ const hashProject = strapi =>
 
 const hashDep = strapi => {
   const depStr = JSON.stringify(strapi.config.info.dependencies);
-  const readmePath = path.join(strapi.dirs.root, 'README.md');
+  const readmePath = path.join(strapi.dirs.app.root, 'README.md');
 
   try {
     if (fs.existsSync(readmePath)) {

package/lib/services/metrics/sender.js

@@ -1,10 +1,12 @@
 'use strict';
 
 const os = require('os');
+const path = require('path');
 const _ = require('lodash');
 const isDocker = require('is-docker');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
+const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const ee = require('../../utils/ee');
 const machineID = require('../../utils/machine-id');
 const stringifyDeep = require('./stringify-deep');
@@ -36,6 +38,9 @@ module.exports = strapi => {
   const deviceId = machineID();
   const isEE = strapi.EE === true && ee.isEE === true;
 
+  const serverRootPath = strapi.dirs.app.root;
+  const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
+
   const anonymous_metadata = {
     environment: strapi.config.environment,
     os: os.type(),
@@ -47,6 +52,8 @@ module.exports = strapi => {
     version: strapi.config.get('info.strapi'),
     strapiVersion: strapi.config.get('info.strapi'),
     projectType: isEE ? 'Enterprise' : 'Community',
+    useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
+    useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
   };
 
   addPackageJsonStrapiMetadata(anonymous_metadata, strapi);

package/lib/services/server/middleware.js

@@ -112,7 +112,7 @@ const resolveCustomMiddleware = (resolve, strapi) => {
     modulePath = require.resolve(resolve);
   } catch (error) {
     if (error.code === 'MODULE_NOT_FOUND') {
-      modulePath = path.resolve(strapi.dirs.root, resolve);
+      modulePath = path.resolve(strapi.dirs.dist.root, resolve);
     } else {
       throw error;
     }

package/lib/services/utils/upload-files.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 
 /**
- * Upload files and like them to an entity
+ * Upload files and link them to an entity
  * @param {string} uid model uid
  * @param {object} entity entity created
  * @param {object} files files to upload

package/lib/types/core/attributes/base.d.ts

@@ -0,0 +1,74 @@
+import { GetAttributeValue } from './utils';
+
+/**
+ * List of all the Strapi attribute types
+ */
+export type AttributeType =
+  | 'string'
+  | 'text'
+  | 'richtext'
+  | 'email'
+  | 'password'
+  | 'date'
+  | 'time'
+  | 'datetime'
+  | 'timestamp'
+  | 'integer'
+  | 'biginteger'
+  | 'float'
+  | 'decimal'
+  | 'uid'
+  | 'enumeration'
+  | 'boolean'
+  | 'json'
+  | 'media'
+  | 'relation'
+  | 'component'
+  | 'dynamiczone';
+
+/**
+ * Most basic shape of a schema attribute
+ */
+export interface Attribute<T extends AttributeType = AttributeType> {
+  /**
+   * Type of the attribute
+   */
+  type: T;
+
+  /**
+   * Options defined and used by the plugins
+   */
+  pluginOptions?: object;
+}
+
+// Common attributes Options
+
+export interface RequiredOption {
+  required?: boolean;
+}
+
+export interface PrivateOption {
+  private?: boolean;
+}
+
+export interface UniqueOption {
+  unique?: boolean;
+}
+
+export interface DefaultOption<T> {
+  default?: T;
+}
+
+export interface ConfigurableOption {
+  configurable?: boolean;
+}
+
+export interface MinMaxOption<T = number> {
+  min?: T;
+  max?: T;
+}
+
+export interface MinMaxLengthOption {
+  minLength?: number;
+  maxLength?: number;
+}

package/lib/types/core/attributes/biginteger.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type BigIntegerAttribute = Attribute<'biginteger'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<BigIntegerValue> &
+  MinMaxOption<string> &
+  PrivateOption &
+  RequiredOption;
+
+export type BigIntegerValue = string;
+
+export type GetBigIntegerAttributeValue<T extends Attribute> = T extends BigIntegerAttribute
+  ? BigIntegerValue
+  : never;

package/lib/types/core/attributes/boolean.d.ts

@@ -0,0 +1,20 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type BooleanAttribute = Attribute<'boolean'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<BooleanValue> &
+  PrivateOption &
+  RequiredOption;
+
+export type BooleanValue = boolean;
+
+export type GetBooleanAttributeValue<T extends Attribute> = T extends BooleanAttribute
+  ? BooleanValue
+  : never;

package/lib/types/core/attributes/common.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Strapi custom scalar types
+ */
+
+import { MinMaxLengthOption, MinMaxOption } from './base';
+import { StringAttribute } from './string';
+
+export type JSON<T extends object = object> = T;
+
+export type Media = any;
+
+/**
+ * Setters for the attributes options
+ */
+
+// required
+export type RequiredAttribute = { required: true };
+export type NonRequiredAttribute = { required: false };
+
+// private
+export type PrivateAttribute = { private: true };
+export type NonPrivateAttribute = { private: false };
+
+// unique
+export type UniqueAttribute = { unique: true };
+export type NonUniqueAttribute = { unique: false };
+
+// configurable
+export type ConfigurableAttribute = { configurable: true };
+export type NonConfigurableAttribute = { configurable: false };
+
+// min/max
+export type SetMinMax<T extends MinMaxOption<U>, U = number> = T;
+
+// minLength/maxLength
+export type SetMinMaxLength<T extends MinMaxLengthOption> = T;
+
+// pluginOptions
+export type SetPluginOptions<T extends object = object> = { pluginOptions?: T };
+
+// default
+export type DefaultTo<T> = { default: T };

package/lib/types/core/attributes/component.d.ts

@@ -0,0 +1,41 @@
+import { Attribute, ConfigurableOption, MinMaxOption, PrivateOption, RequiredOption } from './base';
+import { GetAttributesValues } from './utils';
+
+export interface ComponentAttributeProperties<
+  // Targeted component
+  T extends Strapi.ComponentUIDs,
+  // Repeatable
+  R extends boolean = false
+> {
+  component: T;
+  repeatable?: R;
+}
+
+export type ComponentAttribute<
+  // Targeted component
+  T extends Strapi.ComponentUIDs,
+  // Repeatable
+  R extends boolean = false
+> = Attribute<'component'> &
+  // Component Properties
+  ComponentAttributeProperties<T, R> &
+  // Options
+  ConfigurableOption &
+  MinMaxOption &
+  PrivateOption &
+  RequiredOption;
+
+export type ComponentValue<T extends Strapi.ComponentUIDs, R extends boolean> = GetAttributesValues<
+  T
+> extends infer V
+  ? R extends true
+    ? V[]
+    : V
+  : never;
+
+export type GetComponentAttributeValue<T extends Attribute> = T extends ComponentAttribute<
+  infer U,
+  infer R
+>
+  ? ComponentValue<U, R>
+  : never;

package/lib/types/core/attributes/date-time.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  PrivateOption,
+  RequiredOption,
+  UniqueOption,
+} from './base';
+
+export type DateTimeAttribute = Attribute<'datetime'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<DateTimeValue> &
+  PrivateOption &
+  RequiredOption &
+  UniqueOption;
+
+export type DateTimeValue = string;
+
+export type GetDateTimeAttributeValue<T extends Attribute> = T extends DateTimeAttribute
+  ? DateTimeValue
+  : never;

package/lib/types/core/attributes/date.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  PrivateOption,
+  RequiredOption,
+  UniqueOption,
+} from './base';
+
+export type DateAttribute = Attribute<'date'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<DateValue> &
+  PrivateOption &
+  RequiredOption &
+  UniqueOption;
+
+export type DateValue = Date;
+
+export type GetDateAttributeValue<T extends Attribute> = T extends DateAttribute
+  ? DateValue
+  : never;

package/lib/types/core/attributes/decimal.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type DecimalAttribute = Attribute<'decimal'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<DecimalValue> &
+  MinMaxOption &
+  PrivateOption &
+  RequiredOption;
+
+export type DecimalValue = number;
+
+export type GetDecimalAttributeValue<T extends Attribute> = T extends DecimalAttribute
+  ? DecimalValue
+  : never;

package/lib/types/core/attributes/dynamic-zone.d.ts

@@ -0,0 +1,29 @@
+import { SchemaUID, GetArrayValues } from '../../utils';
+import { Attribute, ConfigurableOption, MinMaxOption, RequiredOption } from './base';
+import { GetAttributesValues } from './utils';
+
+export interface DynamicZoneAttributeProperties<T extends Strapi.ComponentUIDs[] = []> {
+  components: T;
+}
+
+export type DynamicZoneAttribute<T extends Strapi.ComponentUIDs[] = []> = Attribute<'dynamiczone'> &
+  // Properties
+  DynamicZoneAttributeProperties<T> &
+  // Options
+  ConfigurableOption &
+  MinMaxOption &
+  RequiredOption;
+
+type DynamicZoneValue<T extends Strapi.ComponentUIDs[]> = Array<
+  GetArrayValues<T> extends infer P
+    ? P extends SchemaUID
+      ? GetAttributesValues<P> & { __component: P }
+      : never
+    : never
+>;
+
+export type GetDynamicZoneAttributeValue<T extends Attribute> = T extends DynamicZoneAttribute<
+  infer U
+>
+  ? DynamicZoneValue<U>
+  : never;

package/lib/types/core/attributes/email.d.ts

@@ -0,0 +1,24 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxLengthOption,
+  PrivateOption,
+  RequiredOption,
+  UniqueOption,
+} from './base';
+
+export type EmailAttribute = Attribute<'email'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<EmailValue> &
+  MinMaxLengthOption &
+  PrivateOption &
+  RequiredOption &
+  UniqueOption;
+
+export type EmailValue = string;
+
+export type GetEmailAttributeValue<T extends Attribute> = T extends EmailAttribute
+  ? EmailValue
+  : never;

package/lib/types/core/attributes/enumeration.d.ts

@@ -0,0 +1,28 @@
+import { GetArrayValues } from '../../utils';
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export interface EnumerationAttributeProperties<T extends string[] = []> {
+  enum: T;
+}
+
+export type EnumerationAttribute<T extends string[] = []> = Attribute<'enumeration'> &
+  EnumerationAttributeProperties<T> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<T> &
+  PrivateOption &
+  RequiredOption;
+
+export type EnumerationValue<T extends string[]> = GetArrayValues<T>;
+
+export type GetEnumerationAttributeValue<T extends Attribute> = T extends EnumerationAttribute<
+  infer U
+>
+  ? EnumerationValue<U>
+  : never;

package/lib/types/core/attributes/float.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type FloatAttribute = Attribute<'float'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<FloatValue> &
+  MinMaxOption &
+  PrivateOption &
+  RequiredOption;
+
+export type FloatValue = number;
+
+export type GetFloatAttributeValue<T extends Attribute> = T extends FloatAttribute
+  ? FloatValue
+  : never;

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

@@ -0,0 +1,26 @@
+export * from './base';
+
+export * from './biginteger';
+export * from './boolean';
+export * from './component';
+export * from './decimal';
+export * from './dynamic-zone';
+export * from './enumeration';
+export * from './float';
+export * from './integer';
+export * from './json';
+export * from './media';
+export * from './password';
+export * from './relation';
+export * from './richtext';
+export * from './string';
+export * from './text';
+export * from './uid';
+export * from './email';
+export * from './date';
+export * from './date-time';
+export * from './timestamp';
+export * from './time';
+
+export * from './common';
+export * from './utils';

package/lib/types/core/attributes/integer.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type IntegerAttribute = Attribute<'integer'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<IntegerValue> &
+  MinMaxOption &
+  PrivateOption &
+  RequiredOption;
+
+export type IntegerValue = number;
+
+export type GetIntegerAttributeValue<T extends Attribute> = T extends IntegerAttribute
+  ? IntegerValue
+  : never;

package/lib/types/core/attributes/json.d.ts

@@ -0,0 +1,14 @@
+import { Attribute, ConfigurableOption, PrivateOption, RequiredOption } from './base';
+import { JSON } from './common';
+
+export type JSONAttribute = Attribute<'json'> &
+  //Options
+  ConfigurableOption &
+  RequiredOption &
+  PrivateOption;
+
+export type JsonValue = JSON;
+
+export type GetJsonAttributeValue<T extends Attribute> = T extends JSONAttribute
+  ? JsonValue
+  : never;

package/lib/types/core/attributes/media.d.ts

@@ -0,0 +1,36 @@
+import { Attribute, ConfigurableOption, PrivateOption, RequiredOption } from './base';
+import { Media } from './common';
+
+export type AllowedMediaTypes = 'images' | 'videos' | 'files' | 'audios';
+
+export interface MediaAttributeProperties<
+  // Media Type
+  T extends AllowedMediaTypes = undefined,
+  // Multiple
+  U extends boolean = false
+> {
+  allowedTypes?: T;
+  multiple?: U;
+}
+
+export type MediaAttribute<
+  // Media Type
+  T extends AllowedMediaTypes = undefined,
+  // Multiple
+  U extends boolean = false
+> = Attribute<'media'> &
+  // Properties
+  MediaAttributeProperties<T, U> &
+  // Options
+  ConfigurableOption &
+  RequiredOption &
+  PrivateOption;
+
+export type MediaValue<T extends boolean = false> = T extends true ? Media[] : Media;
+
+export type GetMediaAttributeValue<T extends Attribute> = T extends MediaAttribute<
+  infer _U,
+  infer S
+>
+  ? MediaValue<S>
+  : never;

package/lib/types/core/attributes/password.d.ts

@@ -0,0 +1,22 @@
+import {
+  Attribute,
+  ConfigurableOption,
+  DefaultOption,
+  MinMaxLengthOption,
+  PrivateOption,
+  RequiredOption,
+} from './base';
+
+export type PasswordAttribute = Attribute<'password'> &
+  // Options
+  ConfigurableOption &
+  DefaultOption<PasswordValue> &
+  MinMaxLengthOption &
+  PrivateOption &
+  RequiredOption;
+
+export type PasswordValue = string;
+
+export type GetPasswordAttributeValue<T extends Attribute> = T extends PasswordAttribute
+  ? PasswordValue
+  : never;