@strapi/strapi 4.11.0-exp.push-transfer-push-stuck → 4.11.1-beta.0

package/lib/types/utils/expression.d.ts

@@ -0,0 +1,68 @@
+import type { Utils } from '@strapi/strapi';
+
+export type True = true;
+export type False = false;
+export type BooleanValue = True | False;
+
+export type Extends<TLeft, TRight> = [TLeft] extends [TRight] ? True : False;
+
+export type Not<TExpression extends BooleanValue> = If<TExpression, False, True>;
+
+export type If<TExpression extends BooleanValue, TOnTrue, TOnFalse = never> = [
+  TExpression
+] extends [True]
+  ? TOnTrue
+  : TOnFalse;
+
+export type MatchFirst<TTests extends Test[], TDefault = never> = TTests extends [
+  infer THead extends Test,
+  ...infer TTail extends Test[]
+]
+  ? THead extends Test<infer TExpression, infer TValue>
+    ? If<
+        TExpression,
+        TValue,
+        If<Utils.Array.IsNotEmpty<TTail>, MatchFirst<TTail, TDefault>, TDefault>
+      >
+    : never
+  : never;
+
+export type MatchAll<TTests extends Test[], TDefault = never> = TTests extends [
+  infer THead extends Test,
+  ...infer TTail extends Test[]
+]
+  ? THead extends Test<infer TExpression, infer TValue>
+    ? Utils.Guard.Never<
+        If<TExpression, TValue> | If<Utils.Array.IsNotEmpty<TTail>, MatchAll<TTail, TDefault>>,
+        TDefault
+      >
+    : never
+  : never;
+
+export type Test<TExpression extends BooleanValue = BooleanValue, TValue = unknown> = [
+  TExpression,
+  TValue
+];
+
+export type Some<TExpressions extends BooleanValue[]> = TExpressions extends [
+  infer THead extends BooleanValue,
+  ...infer TTail extends BooleanValue[]
+]
+  ? If<Utils.Array.IsNotEmpty<TTail>, Or<THead, Some<TTail>>, Or<THead, false>>
+  : never;
+
+export type Every<TExpressions extends BooleanValue[]> = TExpressions extends [
+  infer THead extends BooleanValue,
+  ...infer TTail extends BooleanValue[]
+]
+  ? If<Utils.Array.IsNotEmpty<TTail>, And<THead, Every<TTail>>, And<THead, True>>
+  : never;
+
+export type And<TLeft extends BooleanValue, TRight extends BooleanValue> = Extends<
+  Extends<TLeft, True> | Extends<TRight, True>,
+  True
+>;
+
+export type Or<TLeft extends BooleanValue, TRight extends BooleanValue> = Not<
+  Extends<Extends<TLeft, True> | Extends<TRight, True>, False>
+>;

package/lib/types/utils/guard.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Assign a default value `TDefault` to `TValue` if `TValue` is of type `never`
+ *
+ * @example
+ * type X = Never<{ foo: 'bar' }, string>
+ * // { foo: 'bar' }
+ *
+ * type X = Never<never>
+ * // unknown
+ *
+ * type X = Never<never, string>
+ * // string
+ */
+export type Never<TValue, TDefault = unknown> = [TValue] extends [never] ? TDefault : TValue;

package/lib/types/utils/index.d.ts

@@ -0,0 +1,19 @@
+export * as Array from './array';
+export * as Guard from './guard';
+export * as Object from './object';
+export * as String from './string';
+export * as Tuple from './tuple';
+export * as Expression from './expression';
+
+/**
+ * Get the type of a specific key `TKey` in `TValue`
+ *
+ * @example
+ *
+ * type X = Get<{ foo: 'bar', 'bar': 'foo' }, 'foo'>
+ * // 'bar'
+ *
+ * type X = Get<{ foo: 'bar', 'bar': 'foo' }, 'bar'>
+ * // 'foo'
+ */
+export type Get<TValue, TKey extends keyof TValue> = TValue[TKey];

package/lib/types/utils/object.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Retrieve object's (`TValue`) keys if they extends the given `TTest` type.
+ *
+ * @example
+ * type X = KeysBy<{ foo: 'bar', bar: 'foo', foobar: 2 }, string>
+ * // 'foo' | 'bar'
+ *
+ * type Base = { x: 'foo' | 'bar' };
+ * type Obj = { foo: { x: 'foo' }, bar: { x: 'bar' }, other: { x: '42' } };
+ * type X = KeysBy<Obj, Base>
+ * // 'foo' | 'bar'
+ */
+export type KeysBy<TValue, TTest> = {
+  [key in keyof TValue]: TValue[key] extends TTest ? key : never;
+}[keyof TValue];
+
+/**
+ * Retrieve object's (`TValue`) properties if their value extends the given `TTest` type.
+ *
+ * @example
+ * type X = KeysBy<{ foo: 'bar', bar: 'foo', foobar: 2 }, string>
+ * // { foo: 'bar', bar: 'foo' }
+ *
+ * type Base = { x: 'foo' | 'bar' };
+ * type Obj = { foo: { x: 'foo' }, bar: { x: 'bar' }, other: { x: '42' } };
+ * type X = KeysBy<Obj, Base>
+ * // { foo: { x: 'foo' }, bar: { x: 'bar' } }
+ */
+export type PickBy<TValue, TTest> = Pick<TValue, KeysBy<TValue, TTest>>;

package/lib/types/utils/string.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Alias for any literal type (useful for template string parameters)
+ */
+export type Literal = string | number | bigint | boolean;
+
+/**
+ * Used to check if a string includes a given literal
+ */
+export type Includes<T extends Literal> = `${string}${T}${string}`;
+
+/**
+ * Used to make sure the given string is not empty
+ */
+export type NonEmpty<T extends string> = T extends '' ? never : T;
+
+/**
+ * Split the given string into a tuple using the given `TSeparator` literal
+ */
+export type Split<
+  TValue extends string,
+  TSeparator extends Literal
+> = TValue extends `${infer TLeft}${TSeparator}${infer TRight}`
+  ? [TLeft, ...Split<TRight, TSeparator>]
+  : TValue extends ''
+  ? []
+  : [TValue];
+
+/**
+ * Add a literal suffix (`TSuffix`) at the end of the given string
+ */
+export type Suffix<TValue extends string, TSuffix extends Literal> = `${TValue}${TSuffix}`;
+
+/**
+ * Add a literal prefix (`TPrefix`) at the beginning of the given string
+ */
+export type Prefix<TValue extends string, TPrefix extends Literal> = `${TPrefix}${TValue}`;
+
+/**
+ * Creates a record where every key is a string and every value is `T`
+ */
+export type Dict<T> = Record<string, T>;

package/lib/types/utils/tuple.d.ts

@@ -0,0 +1,13 @@
+import type { Literal } from './string';
+
+/**
+ * Aggregate the given tuple into a string, separated by the given `TSeparator` literal
+ */
+export type Join<TCollection extends unknown[], TSeparator extends Literal> = TCollection extends [
+  infer THead extends Literal,
+  ...infer TTail
+]
+  ? TTail['length'] extends 0
+    ? THead
+    : `${THead}${TSeparator}${Join<TTail, TSeparator>}`
+  : never;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.11.0-exp.push-transfer-push-stuck",
+  "version": "4.11.1-beta.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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/data-transfer": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/database": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/generate-new": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/generators": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/logger": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/permissions": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/plugin-content-manager": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/plugin-content-type-builder": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/plugin-email": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/plugin-upload": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/typescript-utils": "4.11.0-exp.push-transfer-push-stuck",
-    "@strapi/utils": "4.11.0-exp.push-transfer-push-stuck",
+    "@strapi/admin": "4.11.1-beta.0",
+    "@strapi/data-transfer": "4.11.1-beta.0",
+    "@strapi/database": "4.11.1-beta.0",
+    "@strapi/generate-new": "4.11.1-beta.0",
+    "@strapi/generators": "4.11.1-beta.0",
+    "@strapi/logger": "4.11.1-beta.0",
+    "@strapi/permissions": "4.11.1-beta.0",
+    "@strapi/plugin-content-manager": "4.11.1-beta.0",
+    "@strapi/plugin-content-type-builder": "4.11.1-beta.0",
+    "@strapi/plugin-email": "4.11.1-beta.0",
+    "@strapi/plugin-upload": "4.11.1-beta.0",
+    "@strapi/typescript-utils": "4.11.1-beta.0",
+    "@strapi/utils": "4.11.1-beta.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -131,16 +131,16 @@
     "package-json": "7.0.0",
     "qs": "6.11.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.8",
+    "semver": "7.5.1",
     "statuses": "2.0.1"
   },
   "devDependencies": {
     "supertest": "6.3.3",
-    "typescript": "5.0.4"
+    "typescript": "5.1.3"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "90032a791f5413b9f139ea01687eda04c057eacd"
+  "gitHead": "30e56b8376b9cb52c39ecd1c3b7d8706688a1685"
 }

package/lib/core/registries/services.d.ts

@@ -1,7 +0,0 @@
-import { Strapi } from '../../';
-
-export type Service = {
-  [key: string]: (...args: any) => any;
-};
-
-export type ServiceFactory = ({ strapi: Strapi }) => Service;

package/lib/core-api/controller/index.d.ts

@@ -1,27 +0,0 @@
-import { Context, Next } from 'koa';
-
-type ControllerResponse<T = unknown> = T | Promise<T> | undefined;
-
-interface Controller {
-  transformResponse(data: object, meta: object): object;
-  sanitizeOutput(data: object, ctx: Context): Promise<object>;
-  sanitizeInput(data: object, ctx: Context): Promise<object>;
-}
-
-export interface SingleTypeController extends Controller {
-  find?(ctx: Context, next: Next): ControllerResponse;
-  update?(ctx: Context, next: Next): ControllerResponse;
-  delete?(ctx: Context, next: Next): ControllerResponse;
-}
-
-export interface CollectionTypeController extends Controller {
-  find?(ctx: Context, next: Next): ControllerResponse;
-  findOne?(ctx: Context, next: Next): ControllerResponse;
-  create?(ctx: Context, next: Next): ControllerResponse;
-  update?(ctx: Context, next: Next): ControllerResponse;
-  delete?(ctx: Context, next: Next): ControllerResponse;
-}
-
-export type GenericController = Partial<Controller> & {
-  [method: string | number | symbol]: (ctx: Context) => unknown;
-};

package/lib/core-api/service/index.d.ts

@@ -1,25 +0,0 @@
-type Entity = object;
-
-interface BaseService {
-  getFetchParams?(params: object): object;
-}
-
-export interface SingleTypeService extends BaseService {
-  find?(params: object): Promise<Entity> | Entity;
-  createOrUpdate?(params: object): Promise<Entity> | Entity;
-  delete?(params: object): Promise<Entity> | Entity;
-}
-
-export interface CollectionTypeService extends BaseService {
-  find?(params: object): Promise<Entity[]> | Entity;
-  findOne?(entityId: string, params: object): Promise<Entity> | Entity;
-  create?(params: object): Promise<Entity> | Entity;
-  update?(entityId: string, params: object): Promise<Entity> | Entity;
-  delete?(entityId: string, params: object): Promise<Entity> | Entity;
-}
-
-export type Service = SingleTypeService | CollectionTypeService;
-
-export type GenericService = Partial<Service> & {
-  [method: string | number | symbol]: (...args: any) => any;
-};

package/lib/types/factories.d.ts

@@ -1,60 +0,0 @@
-import { Service, GenericService } from '../core-api/service';
-import { Controller, GenericController } from '../core-api/controller';
-import { Middleware } from '../middlewares';
-import { Policy } from '../core/registries/policies';
-import { Strapi } from './core/strapi';
-
-type ControllerConfig<T extends Controller = Controller> = T;
-
-type ServiceConfig = Service;
-
-type HandlerConfig = {
-  auth?: false | { scope: string[] };
-  policies?: Array<string | Policy | { name: string; config: object }>;
-  middlewares?: Array<string | Middleware | { name: string; config: object }>;
-};
-
-type SingleTypeRouterConfig = {
-  find?: HandlerConfig;
-  update?: HandlerConfig;
-  delete?: HandlerConfig;
-};
-
-type CollectionTypeRouterConfig = {
-  find?: HandlerConfig;
-  findOne?: HandlerConfig;
-  create?: HandlerConfig;
-  update?: HandlerConfig;
-  delete?: HandlerConfig;
-};
-
-type RouterConfig = {
-  prefix?: string;
-  only?: string[];
-  except?: string[];
-  config: SingleTypeRouterConfig | CollectionTypeRouterConfig;
-};
-
-interface Route {
-  method: string;
-  path: string;
-}
-interface Router {
-  prefix: string;
-  routes: Route[];
-}
-
-type ControllerCallback<T extends GenericController = GenericController> = (params: {
-  strapi: Strapi;
-}) => T;
-type ServiceCallback<T extends GenericService = GenericService> = (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 GenericService = GenericService>(
-  uid: string,
-  cfg?: ServiceCallback<T> | T = {}
-): () => T;

package/lib/types/utils.d.ts

@@ -1,95 +0,0 @@
-/**
- *
- * Common utilities used across Strapi typings
- *
- * */
-
-/**
- *
- * Extract the array values into an union type
- *
- **/
-export type GetArrayValues<T extends Array<unknown>> = T extends Array<infer U> ? U : never;
-
-/**
- * Creates a record where every key is a string and every value is `T`
- */
-export type StringRecord<T> = Record<string, T>;
-
-/**
- * Retrieve object's (`T`) keys if they extends the given `U` type.
- *
- * @example
- * type X = KeysBy<{ foo: 'bar', bar: 'foo', foobar: 2 }, string>
- * // 'foo' | 'bar'
- *
- * type Base = { x: 'foo' | 'bar' };
- * type Obj = { foo: { x: 'foo' }, bar: { x: 'bar' }, other: { x: '42' } };
- * type X = KeysBy<Obj, Base>
- * // 'foo' | 'bar'
- */
-export type KeysBy<T, U> = {
-  [key in keyof T]: T[key] extends U ? key : never;
-}[keyof T];
-
-/**
- * Retrieve object's (`T`) properties if their value extends the given `U` type.
- *
- * @example
- * type X = KeysBy<{ foo: 'bar', bar: 'foo', foobar: 2 }, string>
- * // { foo: 'bar', bar: 'foo' }
- *
- * type Base = { x: 'foo' | 'bar' };
- * type Obj = { foo: { x: 'foo' }, bar: { x: 'bar' }, other: { x: '42' } };
- * type X = KeysBy<Obj, Base>
- * // { foo: { x: 'foo' }, bar: { x: 'bar' } }
- */
-export type PickBy<T, U> = Pick<T, KeysBy<T, U>>;
-
-/**
- * Assign a default value `U` to `T` if `T` is of type `never`
- *
- * @example
- * type X = NeverGuard<{ foo: 'bar' }, string>
- * // { foo: 'bar' }
- *
- * type X = NeverGuard<never>
- * // unknown
- *
- * type X = NeverGuard<never, string>
- * // string
- */
-export type NeverGuard<T, U = unknown> = [T] extends [never] ? U : T;
-
-/**
- * Dynamic type based on the keys of `Strapi.Schemas`.
- * It represents all the registered schemas' UID as a union type.
- *
- * @example
- *
- * declare global {
- *   namespace Strapi {
- *     interface Schemas {
- *       'api::foo.foo': CollectionTypeSchema;
- *       'api::bar.bar': ComponentSchema;
- *     }
- *   }
- * }
- *
- * type X = SchemaUID;
- * // 'api::foo.foo' | 'api::bar.bar'
- */
-export type SchemaUID = keyof Strapi.Schemas;
-
-/**
- * Get the type of a specific key `U` in `T`
- *
- * @example
- *
- * type X = Get<{ foo: 'bar', 'bar': 'foo' }, 'foo'>
- * // 'bar'
- *
- * type X = Get<{ foo: 'bar', 'bar': 'foo' }, 'bar'>
- * // 'foo'
- */
-export type Get<T, U extends keyof T> = T[U];