@strapi/core 0.0.0-experimental.2363945b79274c79e6505e5a6c3cdec876ed8cec → 0.0.0-experimental.3f7595ce0400b451ca4947408046e7b9b9cd4885

package/dist/core-api/service/collection-type.js

@@ -33,19 +33,28 @@ class CollectionTypeService extends coreService.CoreService {
   }
   findOne(documentId, params = {}) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).findOne(documentId, this.getFetchParams(params));
+    return strapi.documents(uid).findOne({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
   async create(params = { data: {} }) {
     const { uid } = this.contentType;
     return strapi.documents(uid).create(this.getFetchParams(params));
   }
-  update(docId, params = { data: {} }) {
+  update(documentId, params = { data: {} }) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).update(docId, this.getFetchParams(params));
+    return strapi.documents(uid).update({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
-  async delete(docId, params = {}) {
+  async delete(documentId, params = {}) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).delete(docId, this.getFetchParams(params));
+    return strapi.documents(uid).delete({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
 }
 const createCollectionTypeService = (contentType) => {

package/dist/core-api/service/collection-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"collection-type.js","sources":["../../../src/core-api/service/collection-type.ts"],"sourcesContent":["import type { CoreApi, Schema, Documents } from '@strapi/types';\n\nimport { getPaginationInfo, shouldCount, transformPaginationResponse } from './pagination';\n\nimport { CoreService } from './core-service';\n\nexport class CollectionTypeService extends CoreService implements CoreApi.Service.CollectionType {\n  private contentType: Schema.CollectionType;\n\n  constructor(contentType: Schema.CollectionType) {\n    super();\n\n    this.contentType = contentType;\n  }\n\n  async find(params = {}) {\n    const { uid } = this.contentType;\n\n    const fetchParams = this.getFetchParams(params);\n\n    const paginationInfo = getPaginationInfo(fetchParams);\n\n    const results = await strapi.documents(uid).findMany({\n      ...fetchParams,\n      ...paginationInfo,\n    });\n\n    if (shouldCount(fetchParams)) {\n      const count = await strapi.documents(uid).count({ ...fetchParams, ...paginationInfo });\n\n      if (typeof count !== 'number') {\n        throw new Error('Count should be a number');\n      }\n\n      return {\n        results,\n        pagination: transformPaginationResponse(paginationInfo, count),\n      };\n    }\n\n    return {\n      results,\n      pagination: paginationInfo,\n    };\n  }\n\n  findOne(documentId: Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).findOne(documentId, this.getFetchParams(params));\n  }\n\n  async create(params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).create(this.getFetchParams(params));\n  }\n\n  update(docId: Documents.ID, params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).update(docId, this.getFetchParams(params));\n  }\n\n  async delete(docId: Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).delete(docId, this.getFetchParams(params));\n  }\n}\n\n/**\n *\n * Returns a collection type service to handle default core-api actions\n */\n\nconst createCollectionTypeService = (\n  contentType: Schema.CollectionType\n): CoreApi.Service.CollectionType => {\n  return new CollectionTypeService(contentType);\n};\n\nexport { createCollectionTypeService };\n"],"names":["CoreService","getPaginationInfo","shouldCount","transformPaginationResponse"],"mappings":";;;;AAMO,MAAM,8BAA8BA,YAAAA,YAAsD;AAAA,EACvF;AAAA,EAER,YAAY,aAAoC;AACxC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AAExC,UAAA,iBAAiBC,6BAAkB,WAAW;AAEpD,UAAM,UAAU,MAAM,OAAO,UAAU,GAAG,EAAE,SAAS;AAAA,MACnD,GAAG;AAAA,MACH,GAAG;AAAA,IAAA,CACJ;AAEG,QAAAC,WAAAA,YAAY,WAAW,GAAG;AAC5B,YAAM,QAAQ,MAAM,OAAO,UAAU,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,eAAgB,CAAA;AAEjF,UAAA,OAAO,UAAU,UAAU;AACvB,cAAA,IAAI,MAAM,0BAA0B;AAAA,MAC5C;AAEO,aAAA;AAAA,QACL;AAAA,QACA,YAAYC,WAAAA,4BAA4B,gBAAgB,KAAK;AAAA,MAAA;AAAA,IAEjE;AAEO,WAAA;AAAA,MACL;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,EAEhB;AAAA,EAEA,QAAQ,YAA0B,SAAS,IAAI;AACvC,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,QAAQ,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,OAAO,SAAS,EAAE,MAAM,MAAM;AAC5B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,OAAO,OAAqB,SAAS,EAAE,MAAM,MAAM;AAC3C,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,OAAO,OAAqB,SAAS,IAAI;AACvC,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACxE;AACF;AAOM,MAAA,8BAA8B,CAClC,gBACmC;AAC5B,SAAA,IAAI,sBAAsB,WAAW;AAC9C;;;"}
+{"version":3,"file":"collection-type.js","sources":["../../../src/core-api/service/collection-type.ts"],"sourcesContent":["import type { Core, Struct, Modules } from '@strapi/types';\n\nimport { getPaginationInfo, shouldCount, transformPaginationResponse } from './pagination';\n\nimport { CoreService } from './core-service';\n\nexport class CollectionTypeService\n  extends CoreService\n  implements Core.CoreAPI.Service.CollectionType\n{\n  private contentType: Struct.CollectionTypeSchema;\n\n  constructor(contentType: Struct.CollectionTypeSchema) {\n    super();\n\n    this.contentType = contentType;\n  }\n\n  async find(params = {}) {\n    const { uid } = this.contentType;\n\n    const fetchParams = this.getFetchParams(params);\n\n    const paginationInfo = getPaginationInfo(fetchParams);\n\n    const results = await strapi.documents(uid).findMany({\n      ...fetchParams,\n      ...paginationInfo,\n    });\n\n    if (shouldCount(fetchParams)) {\n      const count = await strapi.documents(uid).count({ ...fetchParams, ...paginationInfo });\n\n      if (typeof count !== 'number') {\n        throw new Error('Count should be a number');\n      }\n\n      return {\n        results,\n        pagination: transformPaginationResponse(paginationInfo, count),\n      };\n    }\n\n    return {\n      results,\n      pagination: paginationInfo,\n    };\n  }\n\n  findOne(documentId: Modules.Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).findOne({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n\n  async create(params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).create(this.getFetchParams(params));\n  }\n\n  update(documentId: Modules.Documents.ID, params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).update({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n\n  async delete(documentId: Modules.Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).delete({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n}\n\n/**\n *\n * Returns a collection type service to handle default core-api actions\n */\n\nconst createCollectionTypeService = (\n  contentType: Struct.CollectionTypeSchema\n): Core.CoreAPI.Service.CollectionType => {\n  return new CollectionTypeService(contentType);\n};\n\nexport { createCollectionTypeService };\n"],"names":["CoreService","getPaginationInfo","shouldCount","transformPaginationResponse"],"mappings":";;;;AAMO,MAAM,8BACHA,YAAAA,YAEV;AAAA,EACU;AAAA,EAER,YAAY,aAA0C;AAC9C;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AAExC,UAAA,iBAAiBC,6BAAkB,WAAW;AAEpD,UAAM,UAAU,MAAM,OAAO,UAAU,GAAG,EAAE,SAAS;AAAA,MACnD,GAAG;AAAA,MACH,GAAG;AAAA,IAAA,CACJ;AAEG,QAAAC,WAAAA,YAAY,WAAW,GAAG;AAC5B,YAAM,QAAQ,MAAM,OAAO,UAAU,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,eAAgB,CAAA;AAEjF,UAAA,OAAO,UAAU,UAAU;AACvB,cAAA,IAAI,MAAM,0BAA0B;AAAA,MAC5C;AAEO,aAAA;AAAA,QACL;AAAA,QACA,YAAYC,WAAAA,4BAA4B,gBAAgB,KAAK;AAAA,MAAA;AAAA,IAEjE;AAEO,WAAA;AAAA,MACL;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,EAEhB;AAAA,EAEA,QAAQ,YAAkC,SAAS,IAAI;AAC/C,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,QAAQ;AAAA,MACnC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AAAA,EAEA,MAAM,OAAO,SAAS,EAAE,MAAM,MAAM;AAC5B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,OAAO,YAAkC,SAAS,EAAE,MAAM,MAAM;AACxD,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AAAA,EAEA,MAAM,OAAO,YAAkC,SAAS,IAAI;AACpD,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAOM,MAAA,8BAA8B,CAClC,gBACwC;AACjC,SAAA,IAAI,sBAAsB,WAAW;AAC9C;;;"}

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

@@ -31,19 +31,28 @@ class CollectionTypeService extends CoreService {
   }
   findOne(documentId, params = {}) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).findOne(documentId, this.getFetchParams(params));
+    return strapi.documents(uid).findOne({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
   async create(params = { data: {} }) {
     const { uid } = this.contentType;
     return strapi.documents(uid).create(this.getFetchParams(params));
   }
-  update(docId, params = { data: {} }) {
+  update(documentId, params = { data: {} }) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).update(docId, this.getFetchParams(params));
+    return strapi.documents(uid).update({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
-  async delete(docId, params = {}) {
+  async delete(documentId, params = {}) {
     const { uid } = this.contentType;
-    return strapi.documents(uid).delete(docId, this.getFetchParams(params));
+    return strapi.documents(uid).delete({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
 }
 const createCollectionTypeService = (contentType) => {

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

@@ -1 +1 @@
-{"version":3,"file":"collection-type.mjs","sources":["../../../src/core-api/service/collection-type.ts"],"sourcesContent":["import type { CoreApi, Schema, Documents } from '@strapi/types';\n\nimport { getPaginationInfo, shouldCount, transformPaginationResponse } from './pagination';\n\nimport { CoreService } from './core-service';\n\nexport class CollectionTypeService extends CoreService implements CoreApi.Service.CollectionType {\n  private contentType: Schema.CollectionType;\n\n  constructor(contentType: Schema.CollectionType) {\n    super();\n\n    this.contentType = contentType;\n  }\n\n  async find(params = {}) {\n    const { uid } = this.contentType;\n\n    const fetchParams = this.getFetchParams(params);\n\n    const paginationInfo = getPaginationInfo(fetchParams);\n\n    const results = await strapi.documents(uid).findMany({\n      ...fetchParams,\n      ...paginationInfo,\n    });\n\n    if (shouldCount(fetchParams)) {\n      const count = await strapi.documents(uid).count({ ...fetchParams, ...paginationInfo });\n\n      if (typeof count !== 'number') {\n        throw new Error('Count should be a number');\n      }\n\n      return {\n        results,\n        pagination: transformPaginationResponse(paginationInfo, count),\n      };\n    }\n\n    return {\n      results,\n      pagination: paginationInfo,\n    };\n  }\n\n  findOne(documentId: Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).findOne(documentId, this.getFetchParams(params));\n  }\n\n  async create(params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).create(this.getFetchParams(params));\n  }\n\n  update(docId: Documents.ID, params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).update(docId, this.getFetchParams(params));\n  }\n\n  async delete(docId: Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).delete(docId, this.getFetchParams(params));\n  }\n}\n\n/**\n *\n * Returns a collection type service to handle default core-api actions\n */\n\nconst createCollectionTypeService = (\n  contentType: Schema.CollectionType\n): CoreApi.Service.CollectionType => {\n  return new CollectionTypeService(contentType);\n};\n\nexport { createCollectionTypeService };\n"],"names":[],"mappings":";;AAMO,MAAM,8BAA8B,YAAsD;AAAA,EACvF;AAAA,EAER,YAAY,aAAoC;AACxC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AAExC,UAAA,iBAAiB,kBAAkB,WAAW;AAEpD,UAAM,UAAU,MAAM,OAAO,UAAU,GAAG,EAAE,SAAS;AAAA,MACnD,GAAG;AAAA,MACH,GAAG;AAAA,IAAA,CACJ;AAEG,QAAA,YAAY,WAAW,GAAG;AAC5B,YAAM,QAAQ,MAAM,OAAO,UAAU,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,eAAgB,CAAA;AAEjF,UAAA,OAAO,UAAU,UAAU;AACvB,cAAA,IAAI,MAAM,0BAA0B;AAAA,MAC5C;AAEO,aAAA;AAAA,QACL;AAAA,QACA,YAAY,4BAA4B,gBAAgB,KAAK;AAAA,MAAA;AAAA,IAEjE;AAEO,WAAA;AAAA,MACL;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,EAEhB;AAAA,EAEA,QAAQ,YAA0B,SAAS,IAAI;AACvC,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,QAAQ,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,OAAO,SAAS,EAAE,MAAM,MAAM;AAC5B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,OAAO,OAAqB,SAAS,EAAE,MAAM,MAAM;AAC3C,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,OAAO,OAAqB,SAAS,IAAI;AACvC,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACxE;AACF;AAOM,MAAA,8BAA8B,CAClC,gBACmC;AAC5B,SAAA,IAAI,sBAAsB,WAAW;AAC9C;"}
+{"version":3,"file":"collection-type.mjs","sources":["../../../src/core-api/service/collection-type.ts"],"sourcesContent":["import type { Core, Struct, Modules } from '@strapi/types';\n\nimport { getPaginationInfo, shouldCount, transformPaginationResponse } from './pagination';\n\nimport { CoreService } from './core-service';\n\nexport class CollectionTypeService\n  extends CoreService\n  implements Core.CoreAPI.Service.CollectionType\n{\n  private contentType: Struct.CollectionTypeSchema;\n\n  constructor(contentType: Struct.CollectionTypeSchema) {\n    super();\n\n    this.contentType = contentType;\n  }\n\n  async find(params = {}) {\n    const { uid } = this.contentType;\n\n    const fetchParams = this.getFetchParams(params);\n\n    const paginationInfo = getPaginationInfo(fetchParams);\n\n    const results = await strapi.documents(uid).findMany({\n      ...fetchParams,\n      ...paginationInfo,\n    });\n\n    if (shouldCount(fetchParams)) {\n      const count = await strapi.documents(uid).count({ ...fetchParams, ...paginationInfo });\n\n      if (typeof count !== 'number') {\n        throw new Error('Count should be a number');\n      }\n\n      return {\n        results,\n        pagination: transformPaginationResponse(paginationInfo, count),\n      };\n    }\n\n    return {\n      results,\n      pagination: paginationInfo,\n    };\n  }\n\n  findOne(documentId: Modules.Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).findOne({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n\n  async create(params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).create(this.getFetchParams(params));\n  }\n\n  update(documentId: Modules.Documents.ID, params = { data: {} }) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).update({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n\n  async delete(documentId: Modules.Documents.ID, params = {}) {\n    const { uid } = this.contentType;\n\n    return strapi.documents(uid).delete({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n}\n\n/**\n *\n * Returns a collection type service to handle default core-api actions\n */\n\nconst createCollectionTypeService = (\n  contentType: Struct.CollectionTypeSchema\n): Core.CoreAPI.Service.CollectionType => {\n  return new CollectionTypeService(contentType);\n};\n\nexport { createCollectionTypeService };\n"],"names":[],"mappings":";;AAMO,MAAM,8BACH,YAEV;AAAA,EACU;AAAA,EAER,YAAY,aAA0C;AAC9C;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AAExC,UAAA,iBAAiB,kBAAkB,WAAW;AAEpD,UAAM,UAAU,MAAM,OAAO,UAAU,GAAG,EAAE,SAAS;AAAA,MACnD,GAAG;AAAA,MACH,GAAG;AAAA,IAAA,CACJ;AAEG,QAAA,YAAY,WAAW,GAAG;AAC5B,YAAM,QAAQ,MAAM,OAAO,UAAU,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,eAAgB,CAAA;AAEjF,UAAA,OAAO,UAAU,UAAU;AACvB,cAAA,IAAI,MAAM,0BAA0B;AAAA,MAC5C;AAEO,aAAA;AAAA,QACL;AAAA,QACA,YAAY,4BAA4B,gBAAgB,KAAK;AAAA,MAAA;AAAA,IAEjE;AAEO,WAAA;AAAA,MACL;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,EAEhB;AAAA,EAEA,QAAQ,YAAkC,SAAS,IAAI;AAC/C,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,QAAQ;AAAA,MACnC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AAAA,EAEA,MAAM,OAAO,SAAS,EAAE,MAAM,MAAM;AAC5B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,OAAO,YAAkC,SAAS,EAAE,MAAM,MAAM;AACxD,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AAAA,EAEA,MAAM,OAAO,YAAkC,SAAS,IAAI;AACpD,UAAA,EAAE,IAAI,IAAI,KAAK;AAErB,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAOM,MAAA,8BAA8B,CAClC,gBACwC;AACjC,SAAA,IAAI,sBAAsB,WAAW;AAC9C;"}

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

@@ -1,9 +1,9 @@
-import type { CoreApi, Schema } from '@strapi/types';
+import type { Core, Struct } from '@strapi/types';
 /**
  * Returns a core api for the provided model
  */
-declare function createService<T extends Schema.SingleType | Schema.CollectionType>(opts: {
+declare function createService<T extends Struct.SingleTypeSchema | Struct.CollectionTypeSchema>(opts: {
     contentType: T;
-}): T extends Schema.SingleType ? CoreApi.Service.SingleType : CoreApi.Service.CollectionType;
+}): T extends Struct.SingleTypeSchema ? Core.CoreAPI.Service.SingleType : Core.CoreAPI.Service.CollectionType;
 export { createService };
 //# sourceMappingURL=index.d.ts.map

package/dist/core-api/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAQrD;;GAEG;AACH,iBAAS,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE;IAChF,WAAW,EAAE,CAAC,CAAC;CAChB,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;AAa9F,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AASlD;;GAEG;AACH,iBAAS,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,oBAAoB,EAAE,IAAI,EAAE;IAC5F,WAAW,EAAE,CAAC,CAAC;CAChB,GAAG,CAAC,SAAS,MAAM,CAAC,gBAAgB,GACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,GAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;AAaxC,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/core-api/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/core-api/service/index.ts"],"sourcesContent":["import { contentTypes as contentTypeUtils } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { createSingleTypeService } from './single-type';\nimport { createCollectionTypeService } from './collection-type';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n  contentTypeUtils.isSingleType(contentType);\n\n/**\n * Returns a core api for the provided model\n */\nfunction createService<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n  contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Service.SingleType : CoreApi.Service.CollectionType;\nfunction createService({\n  contentType,\n}: {\n  contentType: Schema.CollectionType | Schema.SingleType;\n}): CoreApi.Service.SingleType | CoreApi.Service.CollectionType {\n  if (isSingleType(contentType)) {\n    return createSingleTypeService(contentType);\n  }\n\n  return createCollectionTypeService(contentType);\n}\n\nexport { createService };\n"],"names":["contentTypeUtils","createSingleTypeService","createCollectionTypeService"],"mappings":";;;;;AAMA,MAAM,eAAe,CAAC,gBACpBA,YAAA,aAAiB,aAAa,WAAW;AAQ3C,SAAS,cAAc;AAAA,EACrB;AACF,GAEgE;AAC1D,MAAA,aAAa,WAAW,GAAG;AAC7B,WAAOC,WAAAA,wBAAwB,WAAW;AAAA,EAC5C;AAEA,SAAOC,eAAAA,4BAA4B,WAAW;AAChD;;"}
+{"version":3,"file":"index.js","sources":["../../../src/core-api/service/index.ts"],"sourcesContent":["import { contentTypes as contentTypeUtils } from '@strapi/utils';\nimport type { Core, Struct } from '@strapi/types';\n\nimport { createSingleTypeService } from './single-type';\nimport { createCollectionTypeService } from './collection-type';\n\nconst isSingleType = (\n  contentType: Struct.ContentTypeSchema\n): contentType is Struct.SingleTypeSchema => contentTypeUtils.isSingleType(contentType);\n\n/**\n * Returns a core api for the provided model\n */\nfunction createService<T extends Struct.SingleTypeSchema | Struct.CollectionTypeSchema>(opts: {\n  contentType: T;\n}): T extends Struct.SingleTypeSchema\n  ? Core.CoreAPI.Service.SingleType\n  : Core.CoreAPI.Service.CollectionType;\nfunction createService({\n  contentType,\n}: {\n  contentType: Struct.CollectionTypeSchema | Struct.SingleTypeSchema;\n}): Core.CoreAPI.Service.SingleType | Core.CoreAPI.Service.CollectionType {\n  if (isSingleType(contentType)) {\n    return createSingleTypeService(contentType);\n  }\n\n  return createCollectionTypeService(contentType);\n}\n\nexport { createService };\n"],"names":["contentTypeUtils","createSingleTypeService","createCollectionTypeService"],"mappings":";;;;;AAMA,MAAM,eAAe,CACnB,gBAC2CA,YAAA,aAAiB,aAAa,WAAW;AAUtF,SAAS,cAAc;AAAA,EACrB;AACF,GAE0E;AACpE,MAAA,aAAa,WAAW,GAAG;AAC7B,WAAOC,WAAAA,wBAAwB,WAAW;AAAA,EAC5C;AAEA,SAAOC,eAAAA,4BAA4B,WAAW;AAChD;;"}

package/dist/core-api/service/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../src/core-api/service/index.ts"],"sourcesContent":["import { contentTypes as contentTypeUtils } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { createSingleTypeService } from './single-type';\nimport { createCollectionTypeService } from './collection-type';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n  contentTypeUtils.isSingleType(contentType);\n\n/**\n * Returns a core api for the provided model\n */\nfunction createService<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n  contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Service.SingleType : CoreApi.Service.CollectionType;\nfunction createService({\n  contentType,\n}: {\n  contentType: Schema.CollectionType | Schema.SingleType;\n}): CoreApi.Service.SingleType | CoreApi.Service.CollectionType {\n  if (isSingleType(contentType)) {\n    return createSingleTypeService(contentType);\n  }\n\n  return createCollectionTypeService(contentType);\n}\n\nexport { createService };\n"],"names":["contentTypeUtils"],"mappings":";;;AAMA,MAAM,eAAe,CAAC,gBACpBA,aAAiB,aAAa,WAAW;AAQ3C,SAAS,cAAc;AAAA,EACrB;AACF,GAEgE;AAC1D,MAAA,aAAa,WAAW,GAAG;AAC7B,WAAO,wBAAwB,WAAW;AAAA,EAC5C;AAEA,SAAO,4BAA4B,WAAW;AAChD;"}
+{"version":3,"file":"index.mjs","sources":["../../../src/core-api/service/index.ts"],"sourcesContent":["import { contentTypes as contentTypeUtils } from '@strapi/utils';\nimport type { Core, Struct } from '@strapi/types';\n\nimport { createSingleTypeService } from './single-type';\nimport { createCollectionTypeService } from './collection-type';\n\nconst isSingleType = (\n  contentType: Struct.ContentTypeSchema\n): contentType is Struct.SingleTypeSchema => contentTypeUtils.isSingleType(contentType);\n\n/**\n * Returns a core api for the provided model\n */\nfunction createService<T extends Struct.SingleTypeSchema | Struct.CollectionTypeSchema>(opts: {\n  contentType: T;\n}): T extends Struct.SingleTypeSchema\n  ? Core.CoreAPI.Service.SingleType\n  : Core.CoreAPI.Service.CollectionType;\nfunction createService({\n  contentType,\n}: {\n  contentType: Struct.CollectionTypeSchema | Struct.SingleTypeSchema;\n}): Core.CoreAPI.Service.SingleType | Core.CoreAPI.Service.CollectionType {\n  if (isSingleType(contentType)) {\n    return createSingleTypeService(contentType);\n  }\n\n  return createCollectionTypeService(contentType);\n}\n\nexport { createService };\n"],"names":["contentTypeUtils"],"mappings":";;;AAMA,MAAM,eAAe,CACnB,gBAC2CA,aAAiB,aAAa,WAAW;AAUtF,SAAS,cAAc;AAAA,EACrB;AACF,GAE0E;AACpE,MAAA,aAAa,WAAW,GAAG;AAC7B,WAAO,wBAAwB,WAAW;AAAA,EAC5C;AAEA,SAAO,4BAA4B,WAAW;AAChD;"}

package/dist/core-api/service/single-type.d.ts

@@ -1,15 +1,15 @@
-import type { Schema, CoreApi } from '@strapi/types';
+import type { Struct, Core } from '@strapi/types';
 import { CoreService } from './core-service';
-export declare class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {
+export declare class SingleTypeService extends CoreService implements Core.CoreAPI.Service.SingleType {
     private contentType;
-    constructor(contentType: Schema.SingleType);
-    getDocumentId(opts?: {}): Promise<string>;
+    constructor(contentType: Struct.SingleTypeSchema);
+    getDocumentId(): Promise<string>;
     find(params?: {}): Promise<import("@strapi/types/dist/modules/documents").AnyDocument | null>;
     createOrUpdate(params?: {}): Promise<import("@strapi/types/dist/modules/documents").AnyDocument | null>;
     delete(params?: {}): Promise<{
         deletedEntries: number;
     }>;
 }
-declare const createSingleTypeService: (contentType: Schema.SingleType) => CoreApi.Service.SingleType;
+declare const createSingleTypeService: (contentType: Struct.SingleTypeSchema) => Core.CoreAPI.Service.SingleType;
 export { createSingleTypeService };
 //# sourceMappingURL=single-type.d.ts.map

package/dist/core-api/service/single-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"single-type.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/single-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,OAAO,CAAC,OAAO,CAAC,UAAU;IACtF,OAAO,CAAC,WAAW,CAAoB;gBAE3B,WAAW,EAAE,MAAM,CAAC,UAAU;IAMpC,aAAa,CAAC,IAAI,KAAK;IASvB,IAAI,CAAC,MAAM,KAAK;IAMhB,cAAc,CAAC,MAAM,KAAK;IAa1B,MAAM,CAAC,MAAM,KAAK;;;CAQzB;AAED,QAAA,MAAM,uBAAuB,gBAAiB,OAAO,UAAU,KAAG,QAAQ,OAAO,CAAC,UAEjF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"single-type.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/single-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU;IAC3F,OAAO,CAAC,WAAW,CAA0B;gBAEjC,WAAW,EAAE,MAAM,CAAC,gBAAgB;IAM1C,aAAa;IASb,IAAI,CAAC,MAAM,KAAK;IAMhB,cAAc,CAAC,MAAM,KAAK;IAe1B,MAAM,CAAC,MAAM,KAAK;;;CAWzB;AAED,QAAA,MAAM,uBAAuB,gBACd,OAAO,gBAAgB,KACnC,KAAK,OAAO,CAAC,OAAO,CAAC,UAEvB,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -7,9 +7,9 @@ class SingleTypeService extends coreService.CoreService {
     super();
     this.contentType = contentType;
   }
-  async getDocumentId(opts = {}) {
+  async getDocumentId() {
     const { uid } = this.contentType;
-    return strapi.documents(uid).findFirst(opts).then((document) => document?.documentId);
+    return strapi.db.query(uid).findOne().then((document) => document?.documentId);
   }
   async find(params = {}) {
     const { uid } = this.contentType;
@@ -17,10 +17,12 @@ class SingleTypeService extends coreService.CoreService {
   }
   async createOrUpdate(params = {}) {
     const { uid } = this.contentType;
-    const fetchParams = this.getFetchParams(params);
-    const documentId = await this.getDocumentId({ status: fetchParams.status });
+    const documentId = await this.getDocumentId();
     if (documentId) {
-      return strapi.documents(uid).update(documentId, this.getFetchParams(params));
+      return strapi.documents(uid).update({
+        ...this.getFetchParams(params),
+        documentId
+      });
     }
     return strapi.documents(uid).create(this.getFetchParams(params));
   }
@@ -29,7 +31,10 @@ class SingleTypeService extends coreService.CoreService {
     const documentId = await this.getDocumentId();
     if (!documentId)
       return { deletedEntries: 0 };
-    return strapi.documents(uid).delete(documentId, this.getFetchParams(params));
+    return strapi.documents(uid).delete({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
 }
 const createSingleTypeService = (contentType) => {

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

@@ -1 +1 @@
-{"version":3,"file":"single-type.js","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(opts = {}) {\n    const { uid } = this.contentType;\n\n    return strapi\n      .documents(uid)\n      .findFirst(opts)\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 fetchParams = this.getFetchParams(params);\n    const documentId = await this.getDocumentId({ status: fetchParams.status });\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":["CoreService"],"mappings":";;;AAGO,MAAM,0BAA0BA,YAAAA,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,cAAc,OAAO,IAAI;AACvB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OACJ,UAAU,GAAG,EACb,UAAU,IAAI,EACd,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,cAAc,KAAK,eAAe,MAAM;AACxC,UAAA,aAAa,MAAM,KAAK,cAAc,EAAE,QAAQ,YAAY,QAAQ;AAE1E,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;;;"}
+{"version":3,"file":"single-type.js","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Struct, Core } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements Core.CoreAPI.Service.SingleType {\n  private contentType: Struct.SingleTypeSchema;\n\n  constructor(contentType: Struct.SingleTypeSchema) {\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({\n        ...this.getFetchParams(params),\n        documentId,\n      });\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({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n}\n\nconst createSingleTypeService = (\n  contentType: Struct.SingleTypeSchema\n): Core.CoreAPI.Service.SingleType => {\n  return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":["CoreService"],"mappings":";;;AAGO,MAAM,0BAA0BA,YAAAA,YAAuD;AAAA,EACpF;AAAA,EAER,YAAY,aAAsC;AAC1C;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;AACd,aAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,QAClC,GAAG,KAAK,eAAe,MAAM;AAAA,QAC7B;AAAA,MAAA,CACD;AAAA,IACH;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;AAE1C,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAEM,MAAA,0BAA0B,CAC9B,gBACoC;AAC7B,SAAA,IAAI,kBAAkB,WAAW;AAC1C;;;"}

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

@@ -5,9 +5,9 @@ class SingleTypeService extends CoreService {
     super();
     this.contentType = contentType;
   }
-  async getDocumentId(opts = {}) {
+  async getDocumentId() {
     const { uid } = this.contentType;
-    return strapi.documents(uid).findFirst(opts).then((document) => document?.documentId);
+    return strapi.db.query(uid).findOne().then((document) => document?.documentId);
   }
   async find(params = {}) {
     const { uid } = this.contentType;
@@ -15,10 +15,12 @@ class SingleTypeService extends CoreService {
   }
   async createOrUpdate(params = {}) {
     const { uid } = this.contentType;
-    const fetchParams = this.getFetchParams(params);
-    const documentId = await this.getDocumentId({ status: fetchParams.status });
+    const documentId = await this.getDocumentId();
     if (documentId) {
-      return strapi.documents(uid).update(documentId, this.getFetchParams(params));
+      return strapi.documents(uid).update({
+        ...this.getFetchParams(params),
+        documentId
+      });
     }
     return strapi.documents(uid).create(this.getFetchParams(params));
   }
@@ -27,7 +29,10 @@ class SingleTypeService extends CoreService {
     const documentId = await this.getDocumentId();
     if (!documentId)
       return { deletedEntries: 0 };
-    return strapi.documents(uid).delete(documentId, this.getFetchParams(params));
+    return strapi.documents(uid).delete({
+      ...this.getFetchParams(params),
+      documentId
+    });
   }
 }
 const createSingleTypeService = (contentType) => {

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 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(opts = {}) {\n    const { uid } = this.contentType;\n\n    return strapi\n      .documents(uid)\n      .findFirst(opts)\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 fetchParams = this.getFetchParams(params);\n    const documentId = await this.getDocumentId({ status: fetchParams.status });\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,cAAc,OAAO,IAAI;AACvB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OACJ,UAAU,GAAG,EACb,UAAU,IAAI,EACd,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,cAAc,KAAK,eAAe,MAAM;AACxC,UAAA,aAAa,MAAM,KAAK,cAAc,EAAE,QAAQ,YAAY,QAAQ;AAE1E,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;"}
+{"version":3,"file":"single-type.mjs","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Struct, Core } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements Core.CoreAPI.Service.SingleType {\n  private contentType: Struct.SingleTypeSchema;\n\n  constructor(contentType: Struct.SingleTypeSchema) {\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({\n        ...this.getFetchParams(params),\n        documentId,\n      });\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({\n      ...this.getFetchParams(params),\n      documentId,\n    });\n  }\n}\n\nconst createSingleTypeService = (\n  contentType: Struct.SingleTypeSchema\n): Core.CoreAPI.Service.SingleType => {\n  return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":[],"mappings":";AAGO,MAAM,0BAA0B,YAAuD;AAAA,EACpF;AAAA,EAER,YAAY,aAAsC;AAC1C;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;AACd,aAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,QAClC,GAAG,KAAK,eAAe,MAAM;AAAA,QAC7B;AAAA,MAAA,CACD;AAAA,IACH;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;AAE1C,WAAO,OAAO,UAAU,GAAG,EAAE,OAAO;AAAA,MAClC,GAAG,KAAK,eAAe,MAAM;AAAA,MAC7B;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAEM,MAAA,0BAA0B,CAC9B,gBACoC;AAC7B,SAAA,IAAI,kBAAkB,WAAW;AAC1C;"}

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

@@ -4,7 +4,7 @@ export type ContentTypeDefinition = {
     actions: Record<string, unknown>;
     lifecycles: Record<string, unknown>;
 };
-declare const createContentType: (uid: string, definition: ContentTypeDefinition) => Schema.ContentType;
+declare const createContentType: (uid: string, definition: ContentTypeDefinition) => import("@strapi/types/dist/struct").ContentTypeSchema;
 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

@@ -1 +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,uBA+BxE,CAAC;AAqDF,QAAA,MAAM,WAAW,WAAY,OAAO,WAAW,WAAW,MAAM,WAK/D,CAAC;AAmBF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC"}
+{"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,0DAiCxE,CAAC;AAyDF,QAAA,MAAM,WAAW,WAAY,OAAO,WAAW,WAAW,MAAM,WAK/D,CAAC;AAmBF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC"}

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

@@ -50,6 +50,9 @@ const addTimestamps = (schema) => {
   });
 };
 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,

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

@@ -1 +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  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  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;AAEpB,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;AAClD,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,CAACC,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;;;"}
+{"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/domain/content-type/index.mjs

@@ -46,6 +46,9 @@ const addTimestamps = (schema) => {
   });
 };
 const addDraftAndPublish = (schema) => {
+  if (!_.has(schema, "options.draftAndPublish")) {
+    _.set(schema, "options.draftAndPublish", false);
+  }
   schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {
     type: "datetime",
     configurable: false,

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

@@ -1 +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  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  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;AAEpB,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;AAClD,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;"}
+{"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

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/domain/content-type/validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAwB,MAAM,eAAe,CAAC;AAkG1D,QAAA,MAAM,6BAA6B,SAAU,OAAO;;;;;;;;;;;;;;;;;;;GAEnD,CAAC;AAEF,OAAO,EAAE,6BAA6B,EAAE,CAAC"}
+{"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/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

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sources":["../../../src/domain/content-type/validator.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup, toRegressedEnumValue } 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(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","toRegressedEnumValue"],"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,YAAoB,oBAAA;AAGtD,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;;"}
+{"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/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

@@ -1 +1 @@
-{"version":3,"file":"validator.mjs","sources":["../../../src/domain/content-type/validator.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup, toRegressedEnumValue } 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(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,oBAAoB;AAGtD,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;"}
+{"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

@@ -1,20 +1,21 @@
-import type { Strapi, Common, Schema } from '@strapi/types';
+import { type PropertyPath } from 'lodash';
+import type { Core, UID, Struct } from '@strapi/types';
 export interface RawModule {
     config?: Record<string, unknown>;
-    routes?: Common.Module['routes'];
-    controllers?: Common.Module['controllers'];
-    services?: Common.Module['services'];
-    contentTypes?: Common.Module['contentTypes'];
-    policies?: Common.Module['policies'];
-    middlewares?: Common.Module['middlewares'];
+    routes?: Core.Module['routes'];
+    controllers?: Core.Module['controllers'];
+    services?: Core.Module['services'];
+    contentTypes?: Core.Module['contentTypes'];
+    policies?: Core.Module['policies'];
+    middlewares?: Core.Module['middlewares'];
     bootstrap?: (params: {
-        strapi: Strapi;
+        strapi: Core.Strapi;
     }) => Promise<void>;
     register?: (params: {
-        strapi: Strapi;
+        strapi: Core.Strapi;
     }) => Promise<void>;
     destroy?: (params: {
-        strapi: Strapi;
+        strapi: Core.Strapi;
     }) => Promise<void>;
 }
 export interface Module {
@@ -22,18 +23,18 @@ export interface Module {
     register: () => Promise<void>;
     destroy: () => Promise<void>;
     load: () => void;
-    routes: Common.Module['routes'];
-    config: (path: string, defaultValue?: unknown) => unknown;
-    contentType: (ctName: Common.UID.ContentType) => Schema.ContentType;
-    contentTypes: Record<string, Schema.ContentType>;
-    service: (serviceName: Common.UID.Service) => Common.Service;
-    services: Record<string, Common.Service>;
-    policy: (policyName: Common.UID.Policy) => Common.Policy;
-    policies: Record<string, Common.Policy>;
-    middleware: (middlewareName: Common.UID.Middleware) => Common.Middleware;
-    middlewares: Record<string, Common.Middleware>;
-    controller: (controllerName: Common.UID.Controller) => Common.Controller;
-    controllers: Record<string, Common.Controller>;
+    routes: Core.Module['routes'];
+    config<T = unknown>(key: PropertyPath, defaultVal?: T): T;
+    contentType: (ctName: UID.ContentType) => Struct.ContentTypeSchema;
+    contentTypes: Record<string, Struct.ContentTypeSchema>;
+    service: (serviceName: UID.Service) => Core.Service;
+    services: Record<string, Core.Service>;
+    policy: (policyName: UID.Policy) => Core.Policy;
+    policies: Record<string, Core.Policy>;
+    middleware: (middlewareName: UID.Middleware) => Core.Middleware;
+    middlewares: Record<string, Core.Middleware>;
+    controller: (controllerName: UID.Controller) => Core.Controller;
+    controllers: Record<string, Core.Controller>;
 }
-export declare const createModule: (namespace: string, rawModule: RawModule, strapi: Strapi) => Module;
+export declare const createModule: (namespace: string, rawModule: RawModule, strapi: Core.Strapi) => Module;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +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;AAmBD,eAAO,MAAM,YAAY,cAAe,MAAM,aAAa,SAAS,UAAU,MAAM,KAAG,MAoFtF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/module/index.ts"],"names":[],"mappings":"AAAA,OAAU,EAAE,KAAK,YAAY,EAAW,MAAM,QAAQ,CAAC;AAEvD,OAAO,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAWvD,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,YAAY,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;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,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1D,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,iBAAiB,CAAC;IACnE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACvD,OAAO,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;IACpD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC;IAChD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC;IAChE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,UAAU,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC;IAChE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;CAC9C;AAiBD,eAAO,MAAM,YAAY,cACZ,MAAM,aACN,SAAS,UACZ,KAAK,MAAM,KAClB,MAqFF,CAAC"}