@strapi/core 0.0.0 → 5.0.0-alpha.1

package/dist/core-api/service/single-type.mjs

@@ -1,55 +1,39 @@
-import { propOr } from "lodash/fp";
-import { errors, contentTypes } from "@strapi/utils";
-import { getFetchParams } from "./get-fetch-params.mjs";
-const {
-  constants: { PUBLISHED_AT_ATTRIBUTE }
-} = contentTypes;
-const setPublishedAt = (data) => {
-  data[PUBLISHED_AT_ATTRIBUTE] = propOr(/* @__PURE__ */ new Date(), PUBLISHED_AT_ATTRIBUTE, data);
-};
-const createSingleTypeService = ({
-  contentType
-}) => {
-  const { uid } = contentType;
-  return {
-    getFetchParams,
-    /**
-     * Returns singleType content
-     */
-    find(params = {}) {
-      return strapi.entityService?.findMany(uid, this.getFetchParams(params)) ?? null;
-    },
-    /**
-     * Creates or updates a singleType content
-     *
-     * @return {Promise}
-     */
-    async createOrUpdate({ data, ...params } = { data: {} }) {
-      const entity = await this.find({ ...params, publicationState: "preview" });
-      if (!entity) {
-        const count = await strapi.query(uid).count();
-        if (count >= 1) {
-          throw new errors.ValidationError("singleType.alreadyExists");
-        }
-        setPublishedAt(data);
-        return strapi.entityService?.create(uid, { ...params, data });
-      }
-      return strapi.entityService?.update(uid, entity.id, { ...params, data });
-    },
-    /**
-     * Deletes the singleType content
-     *
-     * @return {Promise}
-     */
-    async delete(params = {}) {
-      const entity = await this.find(params);
-      if (!entity)
-        return;
-      return strapi.entityService?.delete(uid, entity.id);
+import { CoreService } from "./core-service.mjs";
+class SingleTypeService extends CoreService {
+  contentType;
+  constructor(contentType) {
+    super();
+    this.contentType = contentType;
+  }
+  async getDocumentId() {
+    const { uid } = this.contentType;
+    return strapi.db.query(uid).findOne().then((document) => document?.documentId);
+  }
+  async find(params = {}) {
+    const { uid } = this.contentType;
+    return strapi.documents(uid).findFirst(this.getFetchParams(params));
+  }
+  async createOrUpdate(params = {}) {
+    const { uid } = this.contentType;
+    const documentId = await this.getDocumentId();
+    if (documentId) {
+      return strapi.documents(uid).update(documentId, this.getFetchParams(params));
     }
-  };
+    return strapi.documents(uid).create(this.getFetchParams(params));
+  }
+  async delete(params = {}) {
+    const { uid } = this.contentType;
+    const documentId = await this.getDocumentId();
+    if (!documentId)
+      return { deletedEntries: 0 };
+    return strapi.documents(uid).delete(documentId, this.getFetchParams(params));
+  }
+}
+const createSingleTypeService = (contentType) => {
+  return new SingleTypeService(contentType);
 };
 export {
-  createSingleTypeService as default
+  SingleTypeService,
+  createSingleTypeService
 };
 //# sourceMappingURL=single-type.mjs.map

package/dist/core-api/service/single-type.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"single-type.mjs","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import { propOr } from 'lodash/fp';\nimport type { CoreApi, Schema, Common } from '@strapi/types';\nimport { errors, contentTypes as contentTypeUtils } from '@strapi/utils';\nimport { getFetchParams } from './get-fetch-params';\n\nconst {\n  constants: { PUBLISHED_AT_ATTRIBUTE },\n} = contentTypeUtils;\n\nconst setPublishedAt = (data: Record<string, unknown>) => {\n  data[PUBLISHED_AT_ATTRIBUTE] = propOr(new Date(), PUBLISHED_AT_ATTRIBUTE, data);\n};\n\n/**\n * Returns a single type service to handle default core-api actions\n */\nconst createSingleTypeService = ({\n  contentType,\n}: {\n  contentType: Schema.SingleType;\n}): CoreApi.Service.SingleType => {\n  const { uid } = contentType;\n\n  return <any>{\n    getFetchParams,\n    /**\n     * Returns singleType content\n     */\n    find(params = {}) {\n      return (\n        strapi.entityService?.findMany(uid as Common.UID.SingleType, this.getFetchParams(params)) ??\n        null\n      );\n    },\n\n    /**\n     * Creates or updates a singleType content\n     *\n     * @return {Promise}\n     */\n    async createOrUpdate({ data, ...params } = { data: {} }) {\n      const entity = await this.find({ ...params, publicationState: 'preview' });\n\n      if (!entity) {\n        const count = await strapi.query(uid).count();\n        if (count >= 1) {\n          throw new errors.ValidationError('singleType.alreadyExists');\n        }\n\n        setPublishedAt(data);\n\n        return strapi.entityService?.create(uid, { ...params, data });\n      }\n\n      return strapi.entityService?.update(uid, entity.id, { ...params, data });\n    },\n\n    /**\n     * Deletes the singleType content\n     *\n     * @return {Promise}\n     */\n    async delete(params = {}) {\n      const entity = await this.find(params);\n\n      if (!entity) return;\n\n      return strapi.entityService?.delete(uid, entity.id);\n    },\n  };\n};\n\nexport default createSingleTypeService;\n"],"names":["contentTypeUtils"],"mappings":";;;AAKA,MAAM;AAAA,EACJ,WAAW,EAAE,uBAAuB;AACtC,IAAIA;AAEJ,MAAM,iBAAiB,CAAC,SAAkC;AACxD,OAAK,sBAAsB,IAAI,2BAAW,QAAQ,wBAAwB,IAAI;AAChF;AAKA,MAAM,0BAA0B,CAAC;AAAA,EAC/B;AACF,MAEkC;AAC1B,QAAA,EAAE,IAAQ,IAAA;AAEJ,SAAA;AAAA,IACV;AAAA;AAAA;AAAA;AAAA,IAIA,KAAK,SAAS,IAAI;AAEd,aAAA,OAAO,eAAe,SAAS,KAA8B,KAAK,eAAe,MAAM,CAAC,KACxF;AAAA,IAEJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA,MAAM,eAAe,EAAE,MAAM,GAAG,OAAO,IAAI,EAAE,MAAM,CAAA,KAAM;AACjD,YAAA,SAAS,MAAM,KAAK,KAAK,EAAE,GAAG,QAAQ,kBAAkB,UAAA,CAAW;AAEzE,UAAI,CAAC,QAAQ;AACX,cAAM,QAAQ,MAAM,OAAO,MAAM,GAAG,EAAE;AACtC,YAAI,SAAS,GAAG;AACR,gBAAA,IAAI,OAAO,gBAAgB,0BAA0B;AAAA,QAC7D;AAEA,uBAAe,IAAI;AAEZ,eAAA,OAAO,eAAe,OAAO,KAAK,EAAE,GAAG,QAAQ,MAAM;AAAA,MAC9D;AAEO,aAAA,OAAO,eAAe,OAAO,KAAK,OAAO,IAAI,EAAE,GAAG,QAAQ,KAAA,CAAM;AAAA,IACzE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA,MAAM,OAAO,SAAS,IAAI;AACxB,YAAM,SAAS,MAAM,KAAK,KAAK,MAAM;AAErC,UAAI,CAAC;AAAQ;AAEb,aAAO,OAAO,eAAe,OAAO,KAAK,OAAO,EAAE;AAAA,IACpD;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"single-type.mjs","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Schema, CoreApi } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {\n  private contentType: Schema.SingleType;\n\n  constructor(contentType: Schema.SingleType) {\n    super();\n\n    this.contentType = contentType;\n  }\n\n  async getDocumentId() {\n    const { uid } = this.contentType;\n\n    return strapi.db\n      .query(uid)\n      .findOne()\n      .then((document) => document?.documentId as string);\n  }\n\n  async find(params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).findFirst(this.getFetchParams(params));\n  }\n\n  async createOrUpdate(params = {}) {\n    const { uid } = this.contentType;\n\n    const documentId = await this.getDocumentId();\n\n    if (documentId) {\n      return strapi.documents(uid).update(documentId, this.getFetchParams(params));\n    }\n\n    return strapi.documents(uid).create(this.getFetchParams(params));\n  }\n\n  async delete(params = {}) {\n    const { uid } = this.contentType;\n\n    const documentId = await this.getDocumentId();\n    if (!documentId) return { deletedEntries: 0 };\n\n    return strapi.documents(uid).delete(documentId, this.getFetchParams(params));\n  }\n}\n\nconst createSingleTypeService = (contentType: Schema.SingleType): CoreApi.Service.SingleType => {\n  return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":[],"mappings":";AAGO,MAAM,0BAA0B,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,gBAAgB;AACd,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,GACX,MAAM,GAAG,EACT,UACA,KAAK,CAAC,aAAa,UAAU,UAAoB;AAAA,EACtD;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,UAAU,KAAK,eAAe,MAAM,CAAC;AAAA,EACpE;AAAA,EAEA,MAAM,eAAe,SAAS,IAAI;AAC1B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAE9B,QAAI,YAAY;AACP,aAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,IAC7E;AAEO,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,MAAM,OAAO,SAAS,IAAI;AAClB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAC9B,QAAI,CAAC;AAAmB,aAAA,EAAE,gBAAgB;AAEnC,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC7E;AACF;AAEM,MAAA,0BAA0B,CAAC,gBAA+D;AACvF,SAAA,IAAI,kBAAkB,WAAW;AAC1C;"}

package/dist/{core/domain → domain}/content-type/index.d.ts

@@ -5,5 +5,6 @@ export type ContentTypeDefinition = {
     lifecycles: Record<string, unknown>;
 };
 declare const createContentType: (uid: string, definition: ContentTypeDefinition) => Schema.ContentType;
-export { createContentType };
+declare const getGlobalId: (schema: Schema.ContentType, prefix?: string) => string;
+export { createContentType, getGlobalId };
 //# sourceMappingURL=index.d.ts.map

package/dist/domain/content-type/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/content-type/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAUF,QAAA,MAAM,iBAAiB,QAAS,MAAM,cAAc,qBAAqB,uBAiCxE,CAAC;AAyDF,QAAA,MAAM,WAAW,WAAY,OAAO,WAAW,WAAW,MAAM,WAK/D,CAAC;AAmBF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC"}

package/dist/{core/domain → domain}/content-type/index.js

@@ -25,39 +25,20 @@ ${e.errors}`);
   }
   const { schema, actions, lifecycles } = _.cloneDeep(definition);
   Object.assign(schema, {
+    uid,
+    modelType: "contentType",
     kind: schema.kind || "collectionType",
     __schema__: pickSchema(definition.schema),
-    modelType: "contentType",
     modelName: definition.schema.info.singularName,
-    connection: "default"
+    actions,
+    lifecycles
   });
-  if (uid.startsWith("api::")) {
-    Object.assign(schema, {
-      uid,
-      apiName: uid.split("::")[1].split(".")[0],
-      collectionName: schema.collectionName || schema.info.singularName,
-      globalId: getGlobalId(schema, schema.info.singularName)
-    });
-  } else if (uid.startsWith("plugin::")) {
-    const pluginName = uid.split("::")[1].split(".")[0];
-    Object.assign(schema, {
-      uid,
-      plugin: pluginName,
-      // TODO: to be set in load-plugins.js
-      collectionName: schema.collectionName || `${pluginName}_${schema.info.singularName}`.toLowerCase(),
-      globalId: getGlobalId(schema, schema.info.singularName, pluginName)
-    });
-  } else if (uid.startsWith("admin::")) {
-    Object.assign(schema, {
-      uid,
-      plugin: "admin",
-      globalId: getGlobalId(schema, schema.info.singularName, "admin")
-    });
-  } else {
-    throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
-    );
-  }
+  addTimestamps(schema);
+  addDraftAndPublish(schema);
+  addCreatorFields(schema);
+  return schema;
+};
+const addTimestamps = (schema) => {
   Object.assign(schema.attributes, {
     [CREATED_AT_ATTRIBUTE]: {
       type: "datetime"
@@ -67,6 +48,11 @@ ${e.errors}`);
       type: "datetime"
     }
   });
+};
+const addDraftAndPublish = (schema) => {
+  if (!___default.default.has(schema, "options.draftAndPublish")) {
+    ___default.default.set(schema, "options.draftAndPublish", false);
+  }
   schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {
     type: "datetime",
     configurable: false,
@@ -76,6 +62,8 @@ ${e.errors}`);
       return /* @__PURE__ */ new Date();
     }
   };
+};
+const addCreatorFields = (schema) => {
   const isPrivate = !___default.default.get(schema, "options.populateCreatorFields", false);
   schema.attributes[CREATED_BY_ATTRIBUTE] = {
     type: "relation",
@@ -97,12 +85,11 @@ ${e.errors}`);
     useJoinTable: false,
     private: isPrivate
   };
-  Object.assign(schema, { actions, lifecycles });
-  return schema;
 };
-const getGlobalId = (model, modelName, prefix) => {
+const getGlobalId = (schema, prefix) => {
+  const modelName = schema.info.singularName;
   const globalId = prefix ? `${prefix}-${modelName}` : modelName;
-  return model.globalId || ___default.default.upperFirst(___default.default.camelCase(globalId));
+  return schema.globalId || ___default.default.upperFirst(___default.default.camelCase(globalId));
 };
 const pickSchema = (model) => {
   const schema = ___default.default.cloneDeep(
@@ -112,11 +99,13 @@ const pickSchema = (model) => {
       "info",
       "options",
       "pluginOptions",
-      "attributes"
+      "attributes",
+      "kind"
     ])
   );
   schema.kind = model.kind || "collectionType";
   return schema;
 };
 exports.createContentType = createContentType;
+exports.getGlobalId = getGlobalId;
 //# sourceMappingURL=index.js.map

package/dist/domain/content-type/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../../src/domain/content-type/index.ts"],"sourcesContent":["import { cloneDeep } from 'lodash/fp';\nimport _ from 'lodash';\nimport { yup, contentTypes as contentTypesUtils } from '@strapi/utils';\nimport type { Schema } from '@strapi/types';\nimport { validateContentTypeDefinition } from './validator';\n\nexport type ContentTypeDefinition = {\n  schema: Schema.ContentType;\n  actions: Record<string, unknown>;\n  lifecycles: Record<string, unknown>;\n};\n\nconst {\n  CREATED_AT_ATTRIBUTE,\n  UPDATED_AT_ATTRIBUTE,\n  PUBLISHED_AT_ATTRIBUTE,\n  CREATED_BY_ATTRIBUTE,\n  UPDATED_BY_ATTRIBUTE,\n} = contentTypesUtils.constants;\n\nconst createContentType = (uid: string, definition: ContentTypeDefinition) => {\n  try {\n    validateContentTypeDefinition(definition);\n  } catch (e) {\n    if (e instanceof yup.ValidationError) {\n      throw new Error(`Content Type Definition is invalid for ${uid}'.\\n${e.errors}`);\n    }\n\n    throw e;\n  }\n\n  const { schema, actions, lifecycles } = cloneDeep(definition);\n\n  // general info\n  Object.assign(schema, {\n    uid,\n    modelType: 'contentType',\n    kind: schema.kind || 'collectionType',\n    __schema__: pickSchema(definition.schema),\n    modelName: definition.schema.info.singularName,\n    actions,\n    lifecycles,\n  });\n\n  addTimestamps(schema);\n\n  // Published at is added regardless of draft and publish being enabled\n  // In case it is not enabled, value will be always published, and it will not contain a draft\n  addDraftAndPublish(schema);\n\n  addCreatorFields(schema);\n\n  return schema;\n};\n\nconst addTimestamps = (schema: Schema.ContentType) => {\n  // attributes\n  Object.assign(schema.attributes, {\n    [CREATED_AT_ATTRIBUTE]: {\n      type: 'datetime',\n    },\n    // TODO: handle on edit set to new date\n    [UPDATED_AT_ATTRIBUTE]: {\n      type: 'datetime',\n    },\n  });\n};\n\nconst addDraftAndPublish = (schema: Schema.ContentType) => {\n  if (!_.has(schema, 'options.draftAndPublish')) {\n    _.set(schema, 'options.draftAndPublish', false); // Disabled by default\n  }\n\n  schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {\n    type: 'datetime',\n    configurable: false,\n    writable: true,\n    visible: false,\n    default() {\n      return new Date();\n    },\n  };\n};\n\nconst addCreatorFields = (schema: Schema.ContentType) => {\n  const isPrivate = !_.get(schema, 'options.populateCreatorFields', false);\n\n  schema.attributes[CREATED_BY_ATTRIBUTE] = {\n    type: 'relation',\n    relation: 'oneToOne',\n    target: 'admin::user',\n    configurable: false,\n    writable: false,\n    visible: false,\n    useJoinTable: false,\n    private: isPrivate,\n  };\n\n  schema.attributes[UPDATED_BY_ATTRIBUTE] = {\n    type: 'relation',\n    relation: 'oneToOne',\n    target: 'admin::user',\n    configurable: false,\n    writable: false,\n    visible: false,\n    useJoinTable: false,\n    private: isPrivate,\n  };\n};\n\nconst getGlobalId = (schema: Schema.ContentType, prefix?: string) => {\n  const modelName = schema.info.singularName;\n  const globalId = prefix ? `${prefix}-${modelName}` : modelName;\n\n  return schema.globalId || _.upperFirst(_.camelCase(globalId));\n};\n\nconst pickSchema = (model: Schema.ContentType) => {\n  const schema = _.cloneDeep(\n    _.pick(model, [\n      'connection',\n      'collectionName',\n      'info',\n      'options',\n      'pluginOptions',\n      'attributes',\n      'kind',\n    ])\n  );\n\n  schema.kind = model.kind || 'collectionType';\n  return schema;\n};\n\nexport { createContentType, getGlobalId };\n"],"names":["contentTypesUtils","validateContentTypeDefinition","yup","cloneDeep","_"],"mappings":";;;;;;;;AAYA,MAAM;AAAA,EACJ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,IAAIA,YAAAA,aAAkB;AAEhB,MAAA,oBAAoB,CAAC,KAAa,eAAsC;AACxE,MAAA;AACFC,cAAA,8BAA8B,UAAU;AAAA,WACjC,GAAG;AACN,QAAA,aAAaC,gBAAI,iBAAiB;AAC9B,YAAA,IAAI,MAAM,0CAA0C,GAAG;AAAA,EAAO,EAAE,MAAM,EAAE;AAAA,IAChF;AAEM,UAAA;AAAA,EACR;AAEA,QAAM,EAAE,QAAQ,SAAS,WAAW,IAAIC,EAAAA,UAAU,UAAU;AAG5D,SAAO,OAAO,QAAQ;AAAA,IACpB;AAAA,IACA,WAAW;AAAA,IACX,MAAM,OAAO,QAAQ;AAAA,IACrB,YAAY,WAAW,WAAW,MAAM;AAAA,IACxC,WAAW,WAAW,OAAO,KAAK;AAAA,IAClC;AAAA,IACA;AAAA,EAAA,CACD;AAED,gBAAc,MAAM;AAIpB,qBAAmB,MAAM;AAEzB,mBAAiB,MAAM;AAEhB,SAAA;AACT;AAEA,MAAM,gBAAgB,CAAC,WAA+B;AAE7C,SAAA,OAAO,OAAO,YAAY;AAAA,IAC/B,CAAC,oBAAoB,GAAG;AAAA,MACtB,MAAM;AAAA,IACR;AAAA;AAAA,IAEA,CAAC,oBAAoB,GAAG;AAAA,MACtB,MAAM;AAAA,IACR;AAAA,EAAA,CACD;AACH;AAEA,MAAM,qBAAqB,CAAC,WAA+B;AACzD,MAAI,CAACC,WAAAA,QAAE,IAAI,QAAQ,yBAAyB,GAAG;AAC3CA,eAAAA,QAAA,IAAI,QAAQ,2BAA2B,KAAK;AAAA,EAChD;AAEO,SAAA,WAAW,sBAAsB,IAAI;AAAA,IAC1C,MAAM;AAAA,IACN,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,UAAU;AACR,iCAAW,KAAK;AAAA,IAClB;AAAA,EAAA;AAEJ;AAEA,MAAM,mBAAmB,CAAC,WAA+B;AACvD,QAAM,YAAY,CAACA,mBAAE,IAAI,QAAQ,iCAAiC,KAAK;AAEhE,SAAA,WAAW,oBAAoB,IAAI;AAAA,IACxC,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,cAAc;AAAA,IACd,SAAS;AAAA,EAAA;AAGJ,SAAA,WAAW,oBAAoB,IAAI;AAAA,IACxC,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,cAAc;AAAA,IACd,SAAS;AAAA,EAAA;AAEb;AAEM,MAAA,cAAc,CAAC,QAA4B,WAAoB;AAC7D,QAAA,YAAY,OAAO,KAAK;AAC9B,QAAM,WAAW,SAAS,GAAG,MAAM,IAAI,SAAS,KAAK;AAErD,SAAO,OAAO,YAAYA,mBAAE,WAAWA,WAAAA,QAAE,UAAU,QAAQ,CAAC;AAC9D;AAEA,MAAM,aAAa,CAAC,UAA8B;AAChD,QAAM,SAASA,WAAAA,QAAE;AAAA,IACfA,WAAA,QAAE,KAAK,OAAO;AAAA,MACZ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EAAA;AAGI,SAAA,OAAO,MAAM,QAAQ;AACrB,SAAA;AACT;;;"}

package/dist/{core/domain → domain}/content-type/index.mjs

@@ -21,39 +21,20 @@ ${e.errors}`);
   }
   const { schema, actions, lifecycles } = cloneDeep(definition);
   Object.assign(schema, {
+    uid,
+    modelType: "contentType",
     kind: schema.kind || "collectionType",
     __schema__: pickSchema(definition.schema),
-    modelType: "contentType",
     modelName: definition.schema.info.singularName,
-    connection: "default"
+    actions,
+    lifecycles
   });
-  if (uid.startsWith("api::")) {
-    Object.assign(schema, {
-      uid,
-      apiName: uid.split("::")[1].split(".")[0],
-      collectionName: schema.collectionName || schema.info.singularName,
-      globalId: getGlobalId(schema, schema.info.singularName)
-    });
-  } else if (uid.startsWith("plugin::")) {
-    const pluginName = uid.split("::")[1].split(".")[0];
-    Object.assign(schema, {
-      uid,
-      plugin: pluginName,
-      // TODO: to be set in load-plugins.js
-      collectionName: schema.collectionName || `${pluginName}_${schema.info.singularName}`.toLowerCase(),
-      globalId: getGlobalId(schema, schema.info.singularName, pluginName)
-    });
-  } else if (uid.startsWith("admin::")) {
-    Object.assign(schema, {
-      uid,
-      plugin: "admin",
-      globalId: getGlobalId(schema, schema.info.singularName, "admin")
-    });
-  } else {
-    throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
-    );
-  }
+  addTimestamps(schema);
+  addDraftAndPublish(schema);
+  addCreatorFields(schema);
+  return schema;
+};
+const addTimestamps = (schema) => {
   Object.assign(schema.attributes, {
     [CREATED_AT_ATTRIBUTE]: {
       type: "datetime"
@@ -63,6 +44,11 @@ ${e.errors}`);
       type: "datetime"
     }
   });
+};
+const addDraftAndPublish = (schema) => {
+  if (!_.has(schema, "options.draftAndPublish")) {
+    _.set(schema, "options.draftAndPublish", false);
+  }
   schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {
     type: "datetime",
     configurable: false,
@@ -72,6 +58,8 @@ ${e.errors}`);
       return /* @__PURE__ */ new Date();
     }
   };
+};
+const addCreatorFields = (schema) => {
   const isPrivate = !_.get(schema, "options.populateCreatorFields", false);
   schema.attributes[CREATED_BY_ATTRIBUTE] = {
     type: "relation",
@@ -93,12 +81,11 @@ ${e.errors}`);
     useJoinTable: false,
     private: isPrivate
   };
-  Object.assign(schema, { actions, lifecycles });
-  return schema;
 };
-const getGlobalId = (model, modelName, prefix) => {
+const getGlobalId = (schema, prefix) => {
+  const modelName = schema.info.singularName;
   const globalId = prefix ? `${prefix}-${modelName}` : modelName;
-  return model.globalId || _.upperFirst(_.camelCase(globalId));
+  return schema.globalId || _.upperFirst(_.camelCase(globalId));
 };
 const pickSchema = (model) => {
   const schema = _.cloneDeep(
@@ -108,13 +95,15 @@ const pickSchema = (model) => {
       "info",
       "options",
       "pluginOptions",
-      "attributes"
+      "attributes",
+      "kind"
     ])
   );
   schema.kind = model.kind || "collectionType";
   return schema;
 };
 export {
-  createContentType
+  createContentType,
+  getGlobalId
 };
 //# sourceMappingURL=index.mjs.map

package/dist/domain/content-type/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":["../../../src/domain/content-type/index.ts"],"sourcesContent":["import { cloneDeep } from 'lodash/fp';\nimport _ from 'lodash';\nimport { yup, contentTypes as contentTypesUtils } from '@strapi/utils';\nimport type { Schema } from '@strapi/types';\nimport { validateContentTypeDefinition } from './validator';\n\nexport type ContentTypeDefinition = {\n  schema: Schema.ContentType;\n  actions: Record<string, unknown>;\n  lifecycles: Record<string, unknown>;\n};\n\nconst {\n  CREATED_AT_ATTRIBUTE,\n  UPDATED_AT_ATTRIBUTE,\n  PUBLISHED_AT_ATTRIBUTE,\n  CREATED_BY_ATTRIBUTE,\n  UPDATED_BY_ATTRIBUTE,\n} = contentTypesUtils.constants;\n\nconst createContentType = (uid: string, definition: ContentTypeDefinition) => {\n  try {\n    validateContentTypeDefinition(definition);\n  } catch (e) {\n    if (e instanceof yup.ValidationError) {\n      throw new Error(`Content Type Definition is invalid for ${uid}'.\\n${e.errors}`);\n    }\n\n    throw e;\n  }\n\n  const { schema, actions, lifecycles } = cloneDeep(definition);\n\n  // general info\n  Object.assign(schema, {\n    uid,\n    modelType: 'contentType',\n    kind: schema.kind || 'collectionType',\n    __schema__: pickSchema(definition.schema),\n    modelName: definition.schema.info.singularName,\n    actions,\n    lifecycles,\n  });\n\n  addTimestamps(schema);\n\n  // Published at is added regardless of draft and publish being enabled\n  // In case it is not enabled, value will be always published, and it will not contain a draft\n  addDraftAndPublish(schema);\n\n  addCreatorFields(schema);\n\n  return schema;\n};\n\nconst addTimestamps = (schema: Schema.ContentType) => {\n  // attributes\n  Object.assign(schema.attributes, {\n    [CREATED_AT_ATTRIBUTE]: {\n      type: 'datetime',\n    },\n    // TODO: handle on edit set to new date\n    [UPDATED_AT_ATTRIBUTE]: {\n      type: 'datetime',\n    },\n  });\n};\n\nconst addDraftAndPublish = (schema: Schema.ContentType) => {\n  if (!_.has(schema, 'options.draftAndPublish')) {\n    _.set(schema, 'options.draftAndPublish', false); // Disabled by default\n  }\n\n  schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {\n    type: 'datetime',\n    configurable: false,\n    writable: true,\n    visible: false,\n    default() {\n      return new Date();\n    },\n  };\n};\n\nconst addCreatorFields = (schema: Schema.ContentType) => {\n  const isPrivate = !_.get(schema, 'options.populateCreatorFields', false);\n\n  schema.attributes[CREATED_BY_ATTRIBUTE] = {\n    type: 'relation',\n    relation: 'oneToOne',\n    target: 'admin::user',\n    configurable: false,\n    writable: false,\n    visible: false,\n    useJoinTable: false,\n    private: isPrivate,\n  };\n\n  schema.attributes[UPDATED_BY_ATTRIBUTE] = {\n    type: 'relation',\n    relation: 'oneToOne',\n    target: 'admin::user',\n    configurable: false,\n    writable: false,\n    visible: false,\n    useJoinTable: false,\n    private: isPrivate,\n  };\n};\n\nconst getGlobalId = (schema: Schema.ContentType, prefix?: string) => {\n  const modelName = schema.info.singularName;\n  const globalId = prefix ? `${prefix}-${modelName}` : modelName;\n\n  return schema.globalId || _.upperFirst(_.camelCase(globalId));\n};\n\nconst pickSchema = (model: Schema.ContentType) => {\n  const schema = _.cloneDeep(\n    _.pick(model, [\n      'connection',\n      'collectionName',\n      'info',\n      'options',\n      'pluginOptions',\n      'attributes',\n      'kind',\n    ])\n  );\n\n  schema.kind = model.kind || 'collectionType';\n  return schema;\n};\n\nexport { createContentType, getGlobalId };\n"],"names":["contentTypesUtils"],"mappings":";;;;AAYA,MAAM;AAAA,EACJ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,IAAIA,aAAkB;AAEhB,MAAA,oBAAoB,CAAC,KAAa,eAAsC;AACxE,MAAA;AACF,kCAA8B,UAAU;AAAA,WACjC,GAAG;AACN,QAAA,aAAa,IAAI,iBAAiB;AAC9B,YAAA,IAAI,MAAM,0CAA0C,GAAG;AAAA,EAAO,EAAE,MAAM,EAAE;AAAA,IAChF;AAEM,UAAA;AAAA,EACR;AAEA,QAAM,EAAE,QAAQ,SAAS,WAAW,IAAI,UAAU,UAAU;AAG5D,SAAO,OAAO,QAAQ;AAAA,IACpB;AAAA,IACA,WAAW;AAAA,IACX,MAAM,OAAO,QAAQ;AAAA,IACrB,YAAY,WAAW,WAAW,MAAM;AAAA,IACxC,WAAW,WAAW,OAAO,KAAK;AAAA,IAClC;AAAA,IACA;AAAA,EAAA,CACD;AAED,gBAAc,MAAM;AAIpB,qBAAmB,MAAM;AAEzB,mBAAiB,MAAM;AAEhB,SAAA;AACT;AAEA,MAAM,gBAAgB,CAAC,WAA+B;AAE7C,SAAA,OAAO,OAAO,YAAY;AAAA,IAC/B,CAAC,oBAAoB,GAAG;AAAA,MACtB,MAAM;AAAA,IACR;AAAA;AAAA,IAEA,CAAC,oBAAoB,GAAG;AAAA,MACtB,MAAM;AAAA,IACR;AAAA,EAAA,CACD;AACH;AAEA,MAAM,qBAAqB,CAAC,WAA+B;AACzD,MAAI,CAAC,EAAE,IAAI,QAAQ,yBAAyB,GAAG;AAC3C,MAAA,IAAI,QAAQ,2BAA2B,KAAK;AAAA,EAChD;AAEO,SAAA,WAAW,sBAAsB,IAAI;AAAA,IAC1C,MAAM;AAAA,IACN,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,UAAU;AACR,iCAAW,KAAK;AAAA,IAClB;AAAA,EAAA;AAEJ;AAEA,MAAM,mBAAmB,CAAC,WAA+B;AACvD,QAAM,YAAY,CAAC,EAAE,IAAI,QAAQ,iCAAiC,KAAK;AAEhE,SAAA,WAAW,oBAAoB,IAAI;AAAA,IACxC,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,cAAc;AAAA,IACd,SAAS;AAAA,EAAA;AAGJ,SAAA,WAAW,oBAAoB,IAAI;AAAA,IACxC,MAAM;AAAA,IACN,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,cAAc;AAAA,IACd,UAAU;AAAA,IACV,SAAS;AAAA,IACT,cAAc;AAAA,IACd,SAAS;AAAA,EAAA;AAEb;AAEM,MAAA,cAAc,CAAC,QAA4B,WAAoB;AAC7D,QAAA,YAAY,OAAO,KAAK;AAC9B,QAAM,WAAW,SAAS,GAAG,MAAM,IAAI,SAAS,KAAK;AAErD,SAAO,OAAO,YAAY,EAAE,WAAW,EAAE,UAAU,QAAQ,CAAC;AAC9D;AAEA,MAAM,aAAa,CAAC,UAA8B;AAChD,QAAM,SAAS,EAAE;AAAA,IACf,EAAE,KAAK,OAAO;AAAA,MACZ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EAAA;AAGI,SAAA,OAAO,MAAM,QAAQ;AACrB,SAAA;AACT;"}

package/dist/domain/content-type/validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/domain/content-type/validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAW,MAAM,eAAe,CAAC;AAkG7C,QAAA,MAAM,6BAA6B,SAAU,OAAO;;;;;;;;;;;;;;;;;;;GAEnD,CAAC;AAEF,OAAO,EAAE,6BAA6B,EAAE,CAAC"}

package/dist/{core/domain → domain}/content-type/validator.js

@@ -40,7 +40,7 @@ const contentTypeSchemaValidator = strapiUtils.yup.object().shape({
         for (const attrName of Object.keys(attributes)) {
           const attr = attributes[attrName];
           if (attr.type === "enumeration") {
-            const regressedValues = attr.enum.map(strapiUtils.toRegressedEnumValue);
+            const regressedValues = attr.enum.map(strapiUtils.strings.toRegressedEnumValue);
             if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
               const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;
               return this.createError({ message });

package/dist/domain/content-type/validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sources":["../../../src/domain/content-type/validator.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup, strings } from '@strapi/utils';\nimport type { Schema } from '@strapi/types';\n\nconst LIFECYCLES = [\n  'beforeCreate',\n  'afterCreate',\n  'beforeFindOne',\n  'afterFindOne',\n  'beforeFindMany',\n  'afterFindMany',\n  'beforeCount',\n  'afterCount',\n  'beforeCreateMany',\n  'afterCreateMany',\n  'beforeUpdate',\n  'afterUpdate',\n  'beforeUpdateMany',\n  'afterUpdateMany',\n  'beforeDelete',\n  'afterDelete',\n  'beforeDeleteMany',\n  'afterDeleteMany',\n] as const;\n\n/**\n * For enumerations the least common denomiator is GraphQL, where\n * values needs to match the secure name regex:\n * GraphQL Spec https://spec.graphql.org/June2018/#sec-Names\n *\n * Therefore we need to make sure our users only use values, which\n * can be returned by GraphQL, by checking the regressed values\n * agains the GraphQL regex.\n *\n * TODO V5: check if we can avoid this coupling by moving this logic\n * into the GraphQL plugin.\n */\nconst GRAPHQL_ENUM_REGEX = /^[_A-Za-z][_0-9A-Za-z]*$/;\n\nconst lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () => yup.mixed().nullable().isFunction());\n\nconst contentTypeSchemaValidator = yup.object().shape({\n  schema: yup.object().shape({\n    info: yup\n      .object()\n      .shape({\n        displayName: yup.string().required(),\n        singularName: yup.string().isKebabCase().required(),\n        pluralName: yup.string().isKebabCase().required(),\n      })\n      .required(),\n    attributes: yup.object().test({\n      name: 'valuesCollide',\n      message: 'Some values collide when normalized',\n      test(attributes: Schema.ContentType['attributes']) {\n        for (const attrName of Object.keys(attributes)) {\n          const attr = attributes[attrName];\n          if (attr.type === 'enumeration') {\n            const regressedValues = attr.enum.map(strings.toRegressedEnumValue);\n\n            // should match the GraphQL regex\n            if (!regressedValues.every((value: string) => GRAPHQL_ENUM_REGEX.test(value))) {\n              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;\n\n              return this.createError({ message });\n            }\n\n            // should not contain empty values\n            if (regressedValues.some((value: string) => value === '')) {\n              return this.createError({\n                message: `At least one value of the enumeration '${attrName}' appears to be empty. Only alphanumerical characters are taken into account.`,\n              });\n            }\n\n            // should not collide\n            const duplicates = _.uniq(\n              regressedValues.filter(\n                (value: string, index: number, values: string[]) => values.indexOf(value) !== index\n              )\n            );\n\n            if (duplicates.length) {\n              const message = `Some enumeration values of the field '${attrName}' collide when normalized: ${duplicates.join(\n                ', '\n              )}. Please modify your enumeration.`;\n\n              return this.createError({ message });\n            }\n          }\n        }\n\n        return true;\n      },\n    }),\n  }),\n  actions: yup.object().onlyContainsFunctions(),\n  lifecycles: yup.object().shape(lifecyclesShape).noUnknown(),\n});\n\nconst validateContentTypeDefinition = (data: unknown) => {\n  return contentTypeSchemaValidator.validateSync(data, { strict: true, abortEarly: false });\n};\n\nexport { validateContentTypeDefinition };\n"],"names":["_","yup","strings"],"mappings":";;;;;;AAIA,MAAM,aAAa;AAAA,EACjB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAcA,MAAM,qBAAqB;AAE3B,MAAM,kBAAkBA,WAAAA,QAAE,UAAUA,WAAA,QAAE,MAAM,UAAU,GAAG,MAAMC,YAAAA,IAAI,MAAM,EAAE,SAAS,EAAE,WAAY,CAAA;AAElG,MAAM,6BAA6BA,YAAA,IAAI,OAAO,EAAE,MAAM;AAAA,EACpD,QAAQA,YAAA,IAAI,OAAO,EAAE,MAAM;AAAA,IACzB,MAAMA,YAAA,IACH,OAAO,EACP,MAAM;AAAA,MACL,aAAaA,YAAA,IAAI,OAAO,EAAE,SAAS;AAAA,MACnC,cAAcA,YAAAA,IAAI,OAAS,EAAA,YAAA,EAAc,SAAS;AAAA,MAClD,YAAYA,YAAAA,IAAI,OAAS,EAAA,YAAA,EAAc,SAAS;AAAA,IACjD,CAAA,EACA,SAAS;AAAA,IACZ,YAAYA,YAAA,IAAI,OAAO,EAAE,KAAK;AAAA,MAC5B,MAAM;AAAA,MACN,SAAS;AAAA,MACT,KAAK,YAA8C;AACjD,mBAAW,YAAY,OAAO,KAAK,UAAU,GAAG;AACxC,gBAAA,OAAO,WAAW,QAAQ;AAC5B,cAAA,KAAK,SAAS,eAAe;AAC/B,kBAAM,kBAAkB,KAAK,KAAK,IAAIC,YAAAA,QAAQ,oBAAoB;AAG9D,gBAAA,CAAC,gBAAgB,MAAM,CAAC,UAAkB,mBAAmB,KAAK,KAAK,CAAC,GAAG;AACvE,oBAAA,UAAU,yJAAyJ,QAAQ;AAEjL,qBAAO,KAAK,YAAY,EAAE,QAAS,CAAA;AAAA,YACrC;AAGA,gBAAI,gBAAgB,KAAK,CAAC,UAAkB,UAAU,EAAE,GAAG;AACzD,qBAAO,KAAK,YAAY;AAAA,gBACtB,SAAS,0CAA0C,QAAQ;AAAA,cAAA,CAC5D;AAAA,YACH;AAGA,kBAAM,aAAaF,WAAAA,QAAE;AAAA,cACnB,gBAAgB;AAAA,gBACd,CAAC,OAAe,OAAe,WAAqB,OAAO,QAAQ,KAAK,MAAM;AAAA,cAChF;AAAA,YAAA;AAGF,gBAAI,WAAW,QAAQ;AACrB,oBAAM,UAAU,yCAAyC,QAAQ,8BAA8B,WAAW;AAAA,gBACxG;AAAA,cACD,CAAA;AAED,qBAAO,KAAK,YAAY,EAAE,QAAS,CAAA;AAAA,YACrC;AAAA,UACF;AAAA,QACF;AAEO,eAAA;AAAA,MACT;AAAA,IAAA,CACD;AAAA,EAAA,CACF;AAAA,EACD,SAASC,YAAA,IAAI,OAAO,EAAE,sBAAsB;AAAA,EAC5C,YAAYA,YAAI,IAAA,OAAA,EAAS,MAAM,eAAe,EAAE,UAAU;AAC5D,CAAC;AAEK,MAAA,gCAAgC,CAAC,SAAkB;AAChD,SAAA,2BAA2B,aAAa,MAAM,EAAE,QAAQ,MAAM,YAAY,OAAO;AAC1F;;"}

package/dist/{core/domain → domain}/content-type/validator.mjs

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { yup, toRegressedEnumValue } from "@strapi/utils";
+import { yup, strings } from "@strapi/utils";
 const LIFECYCLES = [
   "beforeCreate",
   "afterCreate",
@@ -36,7 +36,7 @@ const contentTypeSchemaValidator = yup.object().shape({
         for (const attrName of Object.keys(attributes)) {
           const attr = attributes[attrName];
           if (attr.type === "enumeration") {
-            const regressedValues = attr.enum.map(toRegressedEnumValue);
+            const regressedValues = attr.enum.map(strings.toRegressedEnumValue);
             if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
               const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;
               return this.createError({ message });

package/dist/domain/content-type/validator.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.mjs","sources":["../../../src/domain/content-type/validator.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup, strings } from '@strapi/utils';\nimport type { Schema } from '@strapi/types';\n\nconst LIFECYCLES = [\n  'beforeCreate',\n  'afterCreate',\n  'beforeFindOne',\n  'afterFindOne',\n  'beforeFindMany',\n  'afterFindMany',\n  'beforeCount',\n  'afterCount',\n  'beforeCreateMany',\n  'afterCreateMany',\n  'beforeUpdate',\n  'afterUpdate',\n  'beforeUpdateMany',\n  'afterUpdateMany',\n  'beforeDelete',\n  'afterDelete',\n  'beforeDeleteMany',\n  'afterDeleteMany',\n] as const;\n\n/**\n * For enumerations the least common denomiator is GraphQL, where\n * values needs to match the secure name regex:\n * GraphQL Spec https://spec.graphql.org/June2018/#sec-Names\n *\n * Therefore we need to make sure our users only use values, which\n * can be returned by GraphQL, by checking the regressed values\n * agains the GraphQL regex.\n *\n * TODO V5: check if we can avoid this coupling by moving this logic\n * into the GraphQL plugin.\n */\nconst GRAPHQL_ENUM_REGEX = /^[_A-Za-z][_0-9A-Za-z]*$/;\n\nconst lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () => yup.mixed().nullable().isFunction());\n\nconst contentTypeSchemaValidator = yup.object().shape({\n  schema: yup.object().shape({\n    info: yup\n      .object()\n      .shape({\n        displayName: yup.string().required(),\n        singularName: yup.string().isKebabCase().required(),\n        pluralName: yup.string().isKebabCase().required(),\n      })\n      .required(),\n    attributes: yup.object().test({\n      name: 'valuesCollide',\n      message: 'Some values collide when normalized',\n      test(attributes: Schema.ContentType['attributes']) {\n        for (const attrName of Object.keys(attributes)) {\n          const attr = attributes[attrName];\n          if (attr.type === 'enumeration') {\n            const regressedValues = attr.enum.map(strings.toRegressedEnumValue);\n\n            // should match the GraphQL regex\n            if (!regressedValues.every((value: string) => GRAPHQL_ENUM_REGEX.test(value))) {\n              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;\n\n              return this.createError({ message });\n            }\n\n            // should not contain empty values\n            if (regressedValues.some((value: string) => value === '')) {\n              return this.createError({\n                message: `At least one value of the enumeration '${attrName}' appears to be empty. Only alphanumerical characters are taken into account.`,\n              });\n            }\n\n            // should not collide\n            const duplicates = _.uniq(\n              regressedValues.filter(\n                (value: string, index: number, values: string[]) => values.indexOf(value) !== index\n              )\n            );\n\n            if (duplicates.length) {\n              const message = `Some enumeration values of the field '${attrName}' collide when normalized: ${duplicates.join(\n                ', '\n              )}. Please modify your enumeration.`;\n\n              return this.createError({ message });\n            }\n          }\n        }\n\n        return true;\n      },\n    }),\n  }),\n  actions: yup.object().onlyContainsFunctions(),\n  lifecycles: yup.object().shape(lifecyclesShape).noUnknown(),\n});\n\nconst validateContentTypeDefinition = (data: unknown) => {\n  return contentTypeSchemaValidator.validateSync(data, { strict: true, abortEarly: false });\n};\n\nexport { validateContentTypeDefinition };\n"],"names":[],"mappings":";;AAIA,MAAM,aAAa;AAAA,EACjB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAcA,MAAM,qBAAqB;AAE3B,MAAM,kBAAkB,EAAE,UAAU,EAAE,MAAM,UAAU,GAAG,MAAM,IAAI,MAAM,EAAE,SAAS,EAAE,WAAY,CAAA;AAElG,MAAM,6BAA6B,IAAI,OAAO,EAAE,MAAM;AAAA,EACpD,QAAQ,IAAI,OAAO,EAAE,MAAM;AAAA,IACzB,MAAM,IACH,OAAO,EACP,MAAM;AAAA,MACL,aAAa,IAAI,OAAO,EAAE,SAAS;AAAA,MACnC,cAAc,IAAI,OAAS,EAAA,YAAA,EAAc,SAAS;AAAA,MAClD,YAAY,IAAI,OAAS,EAAA,YAAA,EAAc,SAAS;AAAA,IACjD,CAAA,EACA,SAAS;AAAA,IACZ,YAAY,IAAI,OAAO,EAAE,KAAK;AAAA,MAC5B,MAAM;AAAA,MACN,SAAS;AAAA,MACT,KAAK,YAA8C;AACjD,mBAAW,YAAY,OAAO,KAAK,UAAU,GAAG;AACxC,gBAAA,OAAO,WAAW,QAAQ;AAC5B,cAAA,KAAK,SAAS,eAAe;AAC/B,kBAAM,kBAAkB,KAAK,KAAK,IAAI,QAAQ,oBAAoB;AAG9D,gBAAA,CAAC,gBAAgB,MAAM,CAAC,UAAkB,mBAAmB,KAAK,KAAK,CAAC,GAAG;AACvE,oBAAA,UAAU,yJAAyJ,QAAQ;AAEjL,qBAAO,KAAK,YAAY,EAAE,QAAS,CAAA;AAAA,YACrC;AAGA,gBAAI,gBAAgB,KAAK,CAAC,UAAkB,UAAU,EAAE,GAAG;AACzD,qBAAO,KAAK,YAAY;AAAA,gBACtB,SAAS,0CAA0C,QAAQ;AAAA,cAAA,CAC5D;AAAA,YACH;AAGA,kBAAM,aAAa,EAAE;AAAA,cACnB,gBAAgB;AAAA,gBACd,CAAC,OAAe,OAAe,WAAqB,OAAO,QAAQ,KAAK,MAAM;AAAA,cAChF;AAAA,YAAA;AAGF,gBAAI,WAAW,QAAQ;AACrB,oBAAM,UAAU,yCAAyC,QAAQ,8BAA8B,WAAW;AAAA,gBACxG;AAAA,cACD,CAAA;AAED,qBAAO,KAAK,YAAY,EAAE,QAAS,CAAA;AAAA,YACrC;AAAA,UACF;AAAA,QACF;AAEO,eAAA;AAAA,MACT;AAAA,IAAA,CACD;AAAA,EAAA,CACF;AAAA,EACD,SAAS,IAAI,OAAO,EAAE,sBAAsB;AAAA,EAC5C,YAAY,IAAI,OAAA,EAAS,MAAM,eAAe,EAAE,UAAU;AAC5D,CAAC;AAEK,MAAA,gCAAgC,CAAC,SAAkB;AAChD,SAAA,2BAA2B,aAAa,MAAM,EAAE,QAAQ,MAAM,YAAY,OAAO;AAC1F;"}

package/dist/domain/module/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/module/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAW5D,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC;IAC1D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CAAC;IACpE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACjD,OAAO,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC;IAC7D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC;IACzD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACxC,UAAU,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC;IACzE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/C,UAAU,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC;IACzE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;CAChD;AAiBD,eAAO,MAAM,YAAY,cAAe,MAAM,aAAa,SAAS,UAAU,MAAM,KAAG,MAoFtF,CAAC"}

package/dist/{core/domain → domain}/module/index.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const _ = require("lodash");
 const strapiUtils = require("@strapi/utils");
-const utils = require("../../utils.js");
+const namespace = require("../../registries/namespace.js");
 const validation = require("./validation.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const ___default = /* @__PURE__ */ _interopDefault(_);
-const uidToPath = (uid) => uid.replace("::", ".");
-const removeNamespacedKeys = (map, namespace) => {
-  return ___default.default.mapKeys(map, (value, key) => utils.removeNamespace(key, namespace));
+const removeNamespacedKeys = (map, namespace$1) => {
+  return ___default.default.mapKeys(map, (value, key) => namespace.removeNamespace(key, namespace$1));
 };
 const defaultModule = {
   config: {},
@@ -19,13 +18,13 @@ const defaultModule = {
   policies: {},
   middlewares: {}
 };
-const createModule = (namespace, rawModule, strapi) => {
+const createModule = (namespace2, rawModule, strapi) => {
   ___default.default.defaults(rawModule, defaultModule);
   try {
     validation.validateModule(rawModule);
   } catch (e) {
     if (e instanceof strapiUtils.yup.ValidationError) {
-      throw new Error(`strapi-server.js is invalid for '${namespace}'.
+      throw new Error(`strapi-server.js is invalid for '${namespace2}'.
 ${e.errors.join("\n")}`);
     }
   }
@@ -33,73 +32,73 @@ ${e.errors.join("\n")}`);
   return {
     async bootstrap() {
       if (called.bootstrap) {
-        throw new Error(`Bootstrap for ${namespace} has already been called`);
+        throw new Error(`Bootstrap for ${namespace2} has already been called`);
       }
       called.bootstrap = true;
       await (rawModule.bootstrap && rawModule.bootstrap({ strapi }));
     },
     async register() {
       if (called.register) {
-        throw new Error(`Register for ${namespace} has already been called`);
+        throw new Error(`Register for ${namespace2} has already been called`);
       }
       called.register = true;
       await (rawModule.register && rawModule.register({ strapi }));
     },
     async destroy() {
       if (called.destroy) {
-        throw new Error(`Destroy for ${namespace} has already been called`);
+        throw new Error(`Destroy for ${namespace2} has already been called`);
       }
       called.destroy = true;
       await (rawModule.destroy && rawModule.destroy({ strapi }));
     },
     load() {
-      strapi.get("content-types").add(namespace, rawModule.contentTypes);
-      strapi.get("services").add(namespace, rawModule.services);
-      strapi.get("policies").add(namespace, rawModule.policies);
-      strapi.get("middlewares").add(namespace, rawModule.middlewares);
-      strapi.get("controllers").add(namespace, rawModule.controllers);
-      strapi.get("config").set(uidToPath(namespace), rawModule.config);
+      strapi.get("content-types").add(namespace2, rawModule.contentTypes);
+      strapi.get("services").add(namespace2, rawModule.services);
+      strapi.get("policies").add(namespace2, rawModule.policies);
+      strapi.get("middlewares").add(namespace2, rawModule.middlewares);
+      strapi.get("controllers").add(namespace2, rawModule.controllers);
+      strapi.get("config").set(namespace2, rawModule.config);
     },
     get routes() {
       return rawModule.routes ?? {};
     },
     config(path, defaultValue) {
-      return strapi.get("config").get(`${uidToPath(namespace)}.${path}`, defaultValue);
+      return strapi.get("config").get(`${namespace2}.${path}`, defaultValue);
     },
     contentType(ctName) {
-      return strapi.get("content-types").get(`${namespace}.${ctName}`);
+      return strapi.get("content-types").get(`${namespace2}.${ctName}`);
     },
     get contentTypes() {
-      const contentTypes = strapi.get("content-types").getAll(namespace);
-      return removeNamespacedKeys(contentTypes, namespace);
+      const contentTypes = strapi.get("content-types").getAll(namespace2);
+      return removeNamespacedKeys(contentTypes, namespace2);
     },
     service(serviceName) {
-      return strapi.get("services").get(`${namespace}.${serviceName}`);
+      return strapi.get("services").get(`${namespace2}.${serviceName}`);
     },
     get services() {
-      const services = strapi.get("services").getAll(namespace);
-      return removeNamespacedKeys(services, namespace);
+      const services = strapi.get("services").getAll(namespace2);
+      return removeNamespacedKeys(services, namespace2);
     },
     policy(policyName) {
-      return strapi.get("policies").get(`${namespace}.${policyName}`);
+      return strapi.get("policies").get(`${namespace2}.${policyName}`);
     },
     get policies() {
-      const policies = strapi.get("policies").getAll(namespace);
-      return removeNamespacedKeys(policies, namespace);
+      const policies = strapi.get("policies").getAll(namespace2);
+      return removeNamespacedKeys(policies, namespace2);
     },
     middleware(middlewareName) {
-      return strapi.get("middlewares").get(`${namespace}.${middlewareName}`);
+      return strapi.get("middlewares").get(`${namespace2}.${middlewareName}`);
     },
     get middlewares() {
-      const middlewares = strapi.get("middlewares").getAll(namespace);
-      return removeNamespacedKeys(middlewares, namespace);
+      const middlewares = strapi.get("middlewares").getAll(namespace2);
+      return removeNamespacedKeys(middlewares, namespace2);
     },
     controller(controllerName) {
-      return strapi.get("controllers").get(`${namespace}.${controllerName}`);
+      return strapi.get("controllers").get(`${namespace2}.${controllerName}`);
     },
     get controllers() {
-      const controllers = strapi.get("controllers").getAll(namespace);
-      return removeNamespacedKeys(controllers, namespace);
+      const controllers = strapi.get("controllers").getAll(namespace2);
+      return removeNamespacedKeys(controllers, namespace2);
     }
   };
 };

package/dist/domain/module/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../../src/domain/module/index.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup } from '@strapi/utils';\nimport type { Strapi, Common, Schema } from '@strapi/types';\n\nimport { removeNamespace } from '../../registries/namespace';\nimport { validateModule } from './validation';\n\ninterface LifecyclesState {\n  bootstrap?: boolean;\n  register?: boolean;\n  destroy?: boolean;\n}\n\nexport interface RawModule {\n  config?: Record<string, unknown>;\n  routes?: Common.Module['routes'];\n  controllers?: Common.Module['controllers'];\n  services?: Common.Module['services'];\n  contentTypes?: Common.Module['contentTypes'];\n  policies?: Common.Module['policies'];\n  middlewares?: Common.Module['middlewares'];\n  bootstrap?: (params: { strapi: Strapi }) => Promise<void>;\n  register?: (params: { strapi: Strapi }) => Promise<void>;\n  destroy?: (params: { strapi: Strapi }) => Promise<void>;\n}\n\nexport interface Module {\n  bootstrap: () => Promise<void>;\n  register: () => Promise<void>;\n  destroy: () => Promise<void>;\n  load: () => void;\n  routes: Common.Module['routes'];\n  config: (path: string, defaultValue?: unknown) => unknown;\n  contentType: (ctName: Common.UID.ContentType) => Schema.ContentType;\n  contentTypes: Record<string, Schema.ContentType>;\n  service: (serviceName: Common.UID.Service) => Common.Service;\n  services: Record<string, Common.Service>;\n  policy: (policyName: Common.UID.Policy) => Common.Policy;\n  policies: Record<string, Common.Policy>;\n  middleware: (middlewareName: Common.UID.Middleware) => Common.Middleware;\n  middlewares: Record<string, Common.Middleware>;\n  controller: (controllerName: Common.UID.Controller) => Common.Controller;\n  controllers: Record<string, Common.Controller>;\n}\n\n// Removes the namespace from a map with keys prefixed with a namespace\nconst removeNamespacedKeys = <T extends Record<string, unknown>>(map: T, namespace: string) => {\n  return _.mapKeys(map, (value, key) => removeNamespace(key, namespace));\n};\n\nconst defaultModule = {\n  config: {},\n  routes: [],\n  controllers: {},\n  services: {},\n  contentTypes: {},\n  policies: {},\n  middlewares: {},\n};\n\nexport const createModule = (namespace: string, rawModule: RawModule, strapi: Strapi): Module => {\n  _.defaults(rawModule, defaultModule);\n\n  try {\n    validateModule(rawModule);\n  } catch (e) {\n    if (e instanceof yup.ValidationError) {\n      throw new Error(`strapi-server.js is invalid for '${namespace}'.\\n${e.errors.join('\\n')}`);\n    }\n  }\n\n  const called: LifecyclesState = {};\n  return {\n    async bootstrap() {\n      if (called.bootstrap) {\n        throw new Error(`Bootstrap for ${namespace} has already been called`);\n      }\n      called.bootstrap = true;\n      await (rawModule.bootstrap && rawModule.bootstrap({ strapi }));\n    },\n    async register() {\n      if (called.register) {\n        throw new Error(`Register for ${namespace} has already been called`);\n      }\n      called.register = true;\n      await (rawModule.register && rawModule.register({ strapi }));\n    },\n    async destroy() {\n      if (called.destroy) {\n        throw new Error(`Destroy for ${namespace} has already been called`);\n      }\n      called.destroy = true;\n      await (rawModule.destroy && rawModule.destroy({ strapi }));\n    },\n    load() {\n      strapi.get('content-types').add(namespace, rawModule.contentTypes);\n      strapi.get('services').add(namespace, rawModule.services);\n      strapi.get('policies').add(namespace, rawModule.policies);\n      strapi.get('middlewares').add(namespace, rawModule.middlewares);\n      strapi.get('controllers').add(namespace, rawModule.controllers);\n      strapi.get('config').set(namespace, rawModule.config);\n    },\n    get routes() {\n      return rawModule.routes ?? {};\n    },\n    config(path: string, defaultValue: unknown) {\n      return strapi.get('config').get(`${namespace}.${path}`, defaultValue);\n    },\n    contentType(ctName: Common.UID.ContentType) {\n      return strapi.get('content-types').get(`${namespace}.${ctName}`);\n    },\n    get contentTypes() {\n      const contentTypes = strapi.get('content-types').getAll(namespace);\n      return removeNamespacedKeys(contentTypes, namespace);\n    },\n    service(serviceName: Common.UID.Service) {\n      return strapi.get('services').get(`${namespace}.${serviceName}`);\n    },\n    get services() {\n      const services = strapi.get('services').getAll(namespace);\n      return removeNamespacedKeys(services, namespace);\n    },\n    policy(policyName: Common.UID.Policy) {\n      return strapi.get('policies').get(`${namespace}.${policyName}`);\n    },\n    get policies() {\n      const policies = strapi.get('policies').getAll(namespace);\n      return removeNamespacedKeys(policies, namespace);\n    },\n    middleware(middlewareName: Common.UID.Middleware) {\n      return strapi.get('middlewares').get(`${namespace}.${middlewareName}`);\n    },\n    get middlewares() {\n      const middlewares = strapi.get('middlewares').getAll(namespace);\n      return removeNamespacedKeys(middlewares, namespace);\n    },\n    controller(controllerName: Common.UID.Controller) {\n      return strapi.get('controllers').get(`${namespace}.${controllerName}`);\n    },\n    get controllers() {\n      const controllers = strapi.get('controllers').getAll(namespace);\n      return removeNamespacedKeys(controllers, namespace);\n    },\n  };\n};\n"],"names":["namespace","_","removeNamespace","validateModule","yup"],"mappings":"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"}

package/dist/{core/domain → domain}/module/index.mjs

@@ -1,8 +1,7 @@
 import _ from "lodash";
 import { yup } from "@strapi/utils";
-import { removeNamespace } from "../../utils.mjs";
+import { removeNamespace } from "../../registries/namespace.mjs";
 import { validateModule } from "./validation.mjs";
-const uidToPath = (uid) => uid.replace("::", ".");
 const removeNamespacedKeys = (map, namespace) => {
   return _.mapKeys(map, (value, key) => removeNamespace(key, namespace));
 };
@@ -54,13 +53,13 @@ ${e.errors.join("\n")}`);
       strapi.get("policies").add(namespace, rawModule.policies);
       strapi.get("middlewares").add(namespace, rawModule.middlewares);
       strapi.get("controllers").add(namespace, rawModule.controllers);
-      strapi.get("config").set(uidToPath(namespace), rawModule.config);
+      strapi.get("config").set(namespace, rawModule.config);
     },
     get routes() {
       return rawModule.routes ?? {};
     },
     config(path, defaultValue) {
-      return strapi.get("config").get(`${uidToPath(namespace)}.${path}`, defaultValue);
+      return strapi.get("config").get(`${namespace}.${path}`, defaultValue);
     },
     contentType(ctName) {
       return strapi.get("content-types").get(`${namespace}.${ctName}`);

package/dist/domain/module/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":["../../../src/domain/module/index.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup } from '@strapi/utils';\nimport type { Strapi, Common, Schema } from '@strapi/types';\n\nimport { removeNamespace } from '../../registries/namespace';\nimport { validateModule } from './validation';\n\ninterface LifecyclesState {\n  bootstrap?: boolean;\n  register?: boolean;\n  destroy?: boolean;\n}\n\nexport interface RawModule {\n  config?: Record<string, unknown>;\n  routes?: Common.Module['routes'];\n  controllers?: Common.Module['controllers'];\n  services?: Common.Module['services'];\n  contentTypes?: Common.Module['contentTypes'];\n  policies?: Common.Module['policies'];\n  middlewares?: Common.Module['middlewares'];\n  bootstrap?: (params: { strapi: Strapi }) => Promise<void>;\n  register?: (params: { strapi: Strapi }) => Promise<void>;\n  destroy?: (params: { strapi: Strapi }) => Promise<void>;\n}\n\nexport interface Module {\n  bootstrap: () => Promise<void>;\n  register: () => Promise<void>;\n  destroy: () => Promise<void>;\n  load: () => void;\n  routes: Common.Module['routes'];\n  config: (path: string, defaultValue?: unknown) => unknown;\n  contentType: (ctName: Common.UID.ContentType) => Schema.ContentType;\n  contentTypes: Record<string, Schema.ContentType>;\n  service: (serviceName: Common.UID.Service) => Common.Service;\n  services: Record<string, Common.Service>;\n  policy: (policyName: Common.UID.Policy) => Common.Policy;\n  policies: Record<string, Common.Policy>;\n  middleware: (middlewareName: Common.UID.Middleware) => Common.Middleware;\n  middlewares: Record<string, Common.Middleware>;\n  controller: (controllerName: Common.UID.Controller) => Common.Controller;\n  controllers: Record<string, Common.Controller>;\n}\n\n// Removes the namespace from a map with keys prefixed with a namespace\nconst removeNamespacedKeys = <T extends Record<string, unknown>>(map: T, namespace: string) => {\n  return _.mapKeys(map, (value, key) => removeNamespace(key, namespace));\n};\n\nconst defaultModule = {\n  config: {},\n  routes: [],\n  controllers: {},\n  services: {},\n  contentTypes: {},\n  policies: {},\n  middlewares: {},\n};\n\nexport const createModule = (namespace: string, rawModule: RawModule, strapi: Strapi): Module => {\n  _.defaults(rawModule, defaultModule);\n\n  try {\n    validateModule(rawModule);\n  } catch (e) {\n    if (e instanceof yup.ValidationError) {\n      throw new Error(`strapi-server.js is invalid for '${namespace}'.\\n${e.errors.join('\\n')}`);\n    }\n  }\n\n  const called: LifecyclesState = {};\n  return {\n    async bootstrap() {\n      if (called.bootstrap) {\n        throw new Error(`Bootstrap for ${namespace} has already been called`);\n      }\n      called.bootstrap = true;\n      await (rawModule.bootstrap && rawModule.bootstrap({ strapi }));\n    },\n    async register() {\n      if (called.register) {\n        throw new Error(`Register for ${namespace} has already been called`);\n      }\n      called.register = true;\n      await (rawModule.register && rawModule.register({ strapi }));\n    },\n    async destroy() {\n      if (called.destroy) {\n        throw new Error(`Destroy for ${namespace} has already been called`);\n      }\n      called.destroy = true;\n      await (rawModule.destroy && rawModule.destroy({ strapi }));\n    },\n    load() {\n      strapi.get('content-types').add(namespace, rawModule.contentTypes);\n      strapi.get('services').add(namespace, rawModule.services);\n      strapi.get('policies').add(namespace, rawModule.policies);\n      strapi.get('middlewares').add(namespace, rawModule.middlewares);\n      strapi.get('controllers').add(namespace, rawModule.controllers);\n      strapi.get('config').set(namespace, rawModule.config);\n    },\n    get routes() {\n      return rawModule.routes ?? {};\n    },\n    config(path: string, defaultValue: unknown) {\n      return strapi.get('config').get(`${namespace}.${path}`, defaultValue);\n    },\n    contentType(ctName: Common.UID.ContentType) {\n      return strapi.get('content-types').get(`${namespace}.${ctName}`);\n    },\n    get contentTypes() {\n      const contentTypes = strapi.get('content-types').getAll(namespace);\n      return removeNamespacedKeys(contentTypes, namespace);\n    },\n    service(serviceName: Common.UID.Service) {\n      return strapi.get('services').get(`${namespace}.${serviceName}`);\n    },\n    get services() {\n      const services = strapi.get('services').getAll(namespace);\n      return removeNamespacedKeys(services, namespace);\n    },\n    policy(policyName: Common.UID.Policy) {\n      return strapi.get('policies').get(`${namespace}.${policyName}`);\n    },\n    get policies() {\n      const policies = strapi.get('policies').getAll(namespace);\n      return removeNamespacedKeys(policies, namespace);\n    },\n    middleware(middlewareName: Common.UID.Middleware) {\n      return strapi.get('middlewares').get(`${namespace}.${middlewareName}`);\n    },\n    get middlewares() {\n      const middlewares = strapi.get('middlewares').getAll(namespace);\n      return removeNamespacedKeys(middlewares, namespace);\n    },\n    controller(controllerName: Common.UID.Controller) {\n      return strapi.get('controllers').get(`${namespace}.${controllerName}`);\n    },\n    get controllers() {\n      const controllers = strapi.get('controllers').getAll(namespace);\n      return removeNamespacedKeys(controllers, namespace);\n    },\n  };\n};\n"],"names":[],"mappings":";;;;AA8CA,MAAM,uBAAuB,CAAoC,KAAQ,cAAsB;AACtF,SAAA,EAAE,QAAQ,KAAK,CAAC,OAAO,QAAQ,gBAAgB,KAAK,SAAS,CAAC;AACvE;AAEA,MAAM,gBAAgB;AAAA,EACpB,QAAQ,CAAC;AAAA,EACT,QAAQ,CAAC;AAAA,EACT,aAAa,CAAC;AAAA,EACd,UAAU,CAAC;AAAA,EACX,cAAc,CAAC;AAAA,EACf,UAAU,CAAC;AAAA,EACX,aAAa,CAAC;AAChB;AAEO,MAAM,eAAe,CAAC,WAAmB,WAAsB,WAA2B;AAC7F,IAAA,SAAS,WAAW,aAAa;AAE/B,MAAA;AACF,mBAAe,SAAS;AAAA,WACjB,GAAG;AACN,QAAA,aAAa,IAAI,iBAAiB;AAC9B,YAAA,IAAI,MAAM,oCAAoC,SAAS;AAAA,EAAO,EAAE,OAAO,KAAK,IAAI,CAAC,EAAE;AAAA,IAC3F;AAAA,EACF;AAEA,QAAM,SAA0B,CAAA;AACzB,SAAA;AAAA,IACL,MAAM,YAAY;AAChB,UAAI,OAAO,WAAW;AACpB,cAAM,IAAI,MAAM,iBAAiB,SAAS,0BAA0B;AAAA,MACtE;AACA,aAAO,YAAY;AACnB,aAAO,UAAU,aAAa,UAAU,UAAU,EAAE,OAAQ,CAAA;AAAA,IAC9D;AAAA,IACA,MAAM,WAAW;AACf,UAAI,OAAO,UAAU;AACnB,cAAM,IAAI,MAAM,gBAAgB,SAAS,0BAA0B;AAAA,MACrE;AACA,aAAO,WAAW;AAClB,aAAO,UAAU,YAAY,UAAU,SAAS,EAAE,OAAQ,CAAA;AAAA,IAC5D;AAAA,IACA,MAAM,UAAU;AACd,UAAI,OAAO,SAAS;AAClB,cAAM,IAAI,MAAM,eAAe,SAAS,0BAA0B;AAAA,MACpE;AACA,aAAO,UAAU;AACjB,aAAO,UAAU,WAAW,UAAU,QAAQ,EAAE,OAAQ,CAAA;AAAA,IAC1D;AAAA,IACA,OAAO;AACL,aAAO,IAAI,eAAe,EAAE,IAAI,WAAW,UAAU,YAAY;AACjE,aAAO,IAAI,UAAU,EAAE,IAAI,WAAW,UAAU,QAAQ;AACxD,aAAO,IAAI,UAAU,EAAE,IAAI,WAAW,UAAU,QAAQ;AACxD,aAAO,IAAI,aAAa,EAAE,IAAI,WAAW,UAAU,WAAW;AAC9D,aAAO,IAAI,aAAa,EAAE,IAAI,WAAW,UAAU,WAAW;AAC9D,aAAO,IAAI,QAAQ,EAAE,IAAI,WAAW,UAAU,MAAM;AAAA,IACtD;AAAA,IACA,IAAI,SAAS;AACJ,aAAA,UAAU,UAAU;IAC7B;AAAA,IACA,OAAO,MAAc,cAAuB;AACnC,aAAA,OAAO,IAAI,QAAQ,EAAE,IAAI,GAAG,SAAS,IAAI,IAAI,IAAI,YAAY;AAAA,IACtE;AAAA,IACA,YAAY,QAAgC;AACnC,aAAA,OAAO,IAAI,eAAe,EAAE,IAAI,GAAG,SAAS,IAAI,MAAM,EAAE;AAAA,IACjE;AAAA,IACA,IAAI,eAAe;AACjB,YAAM,eAAe,OAAO,IAAI,eAAe,EAAE,OAAO,SAAS;AAC1D,aAAA,qBAAqB,cAAc,SAAS;AAAA,IACrD;AAAA,IACA,QAAQ,aAAiC;AAChC,aAAA,OAAO,IAAI,UAAU,EAAE,IAAI,GAAG,SAAS,IAAI,WAAW,EAAE;AAAA,IACjE;AAAA,IACA,IAAI,WAAW;AACb,YAAM,WAAW,OAAO,IAAI,UAAU,EAAE,OAAO,SAAS;AACjD,aAAA,qBAAqB,UAAU,SAAS;AAAA,IACjD;AAAA,IACA,OAAO,YAA+B;AAC7B,aAAA,OAAO,IAAI,UAAU,EAAE,IAAI,GAAG,SAAS,IAAI,UAAU,EAAE;AAAA,IAChE;AAAA,IACA,IAAI,WAAW;AACb,YAAM,WAAW,OAAO,IAAI,UAAU,EAAE,OAAO,SAAS;AACjD,aAAA,qBAAqB,UAAU,SAAS;AAAA,IACjD;AAAA,IACA,WAAW,gBAAuC;AACzC,aAAA,OAAO,IAAI,aAAa,EAAE,IAAI,GAAG,SAAS,IAAI,cAAc,EAAE;AAAA,IACvE;AAAA,IACA,IAAI,cAAc;AAChB,YAAM,cAAc,OAAO,IAAI,aAAa,EAAE,OAAO,SAAS;AACvD,aAAA,qBAAqB,aAAa,SAAS;AAAA,IACpD;AAAA,IACA,WAAW,gBAAuC;AACzC,aAAA,OAAO,IAAI,aAAa,EAAE,IAAI,GAAG,SAAS,IAAI,cAAc,EAAE;AAAA,IACvE;AAAA,IACA,IAAI,cAAc;AAChB,YAAM,cAAc,OAAO,IAAI,aAAa,EAAE,OAAO,SAAS;AACvD,aAAA,qBAAqB,aAAa,SAAS;AAAA,IACpD;AAAA,EAAA;AAEJ;"}