@strapi/strapi 4.3.0-beta.1 → 4.3.1

package/lib/types/{strapi.d.ts → 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/{factories.d.ts → types/factories.d.ts}

@@ -1,8 +1,8 @@
-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 { 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';
 
 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 = Sevice> = (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/types/index.d.ts

@@ -0,0 +1,4 @@
+export * from './core';
+
+export * as utils from './utils'
+export * as factories from './factories';

package/lib/types/utils.d.ts

@@ -1 +1,95 @@
-export type StringMap<T> = { [key: string]: T };
+/**
+ *
+ * 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];

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.1",
+  "version": "4.3.1",
   "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.1",
-    "@strapi/database": "4.3.0-beta.1",
-    "@strapi/generate-new": "4.3.0-beta.1",
-    "@strapi/generators": "4.3.0-beta.1",
-    "@strapi/logger": "4.3.0-beta.1",
-    "@strapi/plugin-content-manager": "4.3.0-beta.1",
-    "@strapi/plugin-content-type-builder": "4.3.0-beta.1",
-    "@strapi/plugin-email": "4.3.0-beta.1",
-    "@strapi/plugin-upload": "4.3.0-beta.1",
-    "@strapi/typescript-utils": "4.3.0-beta.1",
-    "@strapi/utils": "4.3.0-beta.1",
+    "@strapi/admin": "4.3.1",
+    "@strapi/database": "4.3.1",
+    "@strapi/generate-new": "4.3.1",
+    "@strapi/generators": "4.3.1",
+    "@strapi/logger": "4.3.1",
+    "@strapi/plugin-content-manager": "4.3.1",
+    "@strapi/plugin-content-type-builder": "4.3.1",
+    "@strapi/plugin-email": "4.3.1",
+    "@strapi/plugin-upload": "4.3.1",
+    "@strapi/typescript-utils": "4.3.1",
+    "@strapi/utils": "4.3.1",
     "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",
@@ -105,10 +105,10 @@
     "execa": "5.1.1",
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
-    "http-errors": "1.8.0",
-    "inquirer": "8.2.0",
+    "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,23 +121,23 @@
     "mime-types": "2.1.35",
     "node-fetch": "2.6.7",
     "node-machine-id": "1.1.12",
-    "node-schedule": "2.0.0",
-    "open": "8.2.1",
+    "node-schedule": "2.1.0",
+    "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.5",
+    "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": "9d6555398960c39159d66bb4eea3bcb0362e37e3"
+  "gitHead": "1eab2fb08c7a4d3d40a5a7ff3b2f137ce0afcf8a"
 }